[sophora-ugc] shorten ugc multimedia manifest names

subshell · Mar 22, 2024 · 2c23ff2 · 2c23ff2
1 parent 773b4f9
commit 2c23ff2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/charts/sophora-ugc/Chart.yaml b/charts/sophora-ugc/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.0.0
+version: 2.0.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/sophora-ugc/README.md b/charts/sophora-ugc/README.md
@@ -112,6 +112,8 @@ ugc:
     # configure the port of the embedded jetty
     server:
       port: 9080
+
+    previewUrl: "https://localhost:8090/demosite/demosite/system/preview.jsp?sophoraid="
 
     # ratings, image uploads and comments can be enabled for a list of node types
     rating:

diff --git a/charts/sophora-ugc/templates/ingress.yaml b/charts/sophora-ugc/templates/ingress.yaml
@@ -55,35 +55,35 @@ spec:
             pathType: {{ default "ImplementationSpecific" .pathType }}
             backend:
               service:
-                name: {{ $ugcMultimediaFullName }}-multimedia
+                name: {{ $ugcMultimediaFullName }}
                 port:
                   number: 8080
           - path: /public/multimedia
             pathType: {{ default "ImplementationSpecific" .pathType }}
             backend:
               service:
-                name: {{ $ugcMultimediaFullName }}-multimedia
+                name: {{ $ugcMultimediaFullName }}
                 port:
                   number: 8080
           - path: /secure/binary
             pathType: {{ default "ImplementationSpecific" .pathType }}
             backend:
               service:
-                name: {{ $ugcMultimediaFullName }}-multimedia
+                name: {{ $ugcMultimediaFullName }}
                 port:
                   number: 8080
           - path: /secure/multimedia
             pathType: {{ default "ImplementationSpecific" .pathType }}
             backend:
               service:
-                name: {{ $ugcMultimediaFullName }}-multimedia
+                name: {{ $ugcMultimediaFullName }}
                 port:
                   number: 8080
           - path: /websocket/multimedia
             pathType: {{ default "ImplementationSpecific" .pathType }}
             backend:
               service:
-                name: {{ $ugcMultimediaFullName }}-multimedia
+                name: {{ $ugcMultimediaFullName }}
                 port:
                   number: 8080
           {{- end }}

diff --git a/charts/sophora-ugc/templates/ugc-multimedia/multimedia-service.yaml b/charts/sophora-ugc/templates/ugc-multimedia/multimedia-service.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "sophora-ugc-multimedia.fullname" . }}-multimedia
+  name: {{ include "sophora-ugc-multimedia.fullname" . }}
   labels:
     {{- include "sophora-ugc-multimedia.labels" . | nindent 4 }}
   {{- with .Values.service.annotations }}

diff --git a/charts/sophora-ugc/templates/ugc-multimedia/statefulset.yaml b/charts/sophora-ugc/templates/ugc-multimedia/statefulset.yaml
@@ -7,7 +7,7 @@ metadata:
     {{- include "sophora-ugc-multimedia.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.replicaCount }}
-  serviceName: {{ include "sophora-ugc-multimedia.fullname" . }}-multimedia
+  serviceName: {{ include "sophora-ugc-multimedia.fullname" . }}
   selector:
     matchLabels:
       {{- include "sophora-ugc-multimedia.selectorLabels" . | nindent 6 }}