use service names

Signed-off-by: Jörn Friedrich Dreyer <[email protected]>
owncloud · Jun 5, 2023 · 01a8e6e · 01a8e6e
1 parent c37e17f
commit 01a8e6e
Show file tree

Hide file tree

Showing 26 changed files with 67 additions and 67 deletions.
diff --git a/charts/ocis/templates/appprovider/deployment.yaml b/charts/ocis/templates/appprovider/deployment.yaml
@@ -71,7 +71,7 @@ spec:
               value: {{ tpl $.Values.features.appsIntegration.wopiIntegration.wopiFolderURI $ | quote }}
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ $.appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: APP_PROVIDER_JWT_SECRET
               valueFrom:

diff --git a/charts/ocis/templates/appregistry/deployment.yaml b/charts/ocis/templates/appregistry/deployment.yaml
@@ -49,7 +49,7 @@ spec:
               value: 0.0.0.0:9243
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: APP_REGISTRY_JWT_SECRET
               valueFrom:

diff --git a/charts/ocis/templates/authbasic/deployment.yaml b/charts/ocis/templates/authbasic/deployment.yaml
@@ -52,7 +52,7 @@ spec:
               value: 0.0.0.0:9147
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             {{- if .Values.features.externalUserManagement.enabled }}
             - name: AUTH_BASIC_LDAP_INSECURE

diff --git a/charts/ocis/templates/authmachine/deployment.yaml b/charts/ocis/templates/authmachine/deployment.yaml
@@ -51,7 +51,7 @@ spec:
               value: 0.0.0.0:9167
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: AUTH_MACHINE_JWT_SECRET
               valueFrom:

diff --git a/charts/ocis/templates/frontend/deployment.yaml b/charts/ocis/templates/frontend/deployment.yaml
@@ -54,7 +54,7 @@ spec:
               value: "https://{{ .Values.externalDomain }}"
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: OCIS_LDAP_SERVER_WRITE_ENABLED
               value: {{ .Values.features.externalUserManagement.ldap.writeable | quote }}

diff --git a/charts/ocis/templates/gateway/deployment.yaml b/charts/ocis/templates/gateway/deployment.yaml
@@ -60,29 +60,29 @@ spec:
               value: "https://{{ .Values.externalDomain }}"
 
             - name: GATEWAY_USERS_ENDPOINT
-              value: {{ .appNameUsers }}:9144
+              value: com.owncloud.api.users
             - name: GATEWAY_GROUPS_ENDPOINT
-              value: {{ .appNameGroups }}:9160
+              value: com.owncloud.api.groups
 
             - name: GATEWAY_AUTH_BASIC_ENDPOINT
-              value: {{ .appNameAuthBasic }}:9146
+              value: com.owncloud.api.auth-basic
             - name: GATEWAY_AUTH_MACHINE_ENDPOINT
-              value: {{ .appNameAuthMachine }}:9166
+              value: com.owncloud.api.auth-machine
 
             - name: GATEWAY_PERMISSIONS_ENDPOINT
-              value: {{ .appNameSettings }}:9191
+              value: com.owncloud.api.settings
 
             - name: GATEWAY_SHARING_ENDPOINT
-              value: {{ .appNameSharing }}:9150
+              value: com.owncloud.api.sharing
             - name: GATEWAY_STORAGE_PUBLIC_LINK_ENDPOINT
-              value: {{ .appNameStoragePubliclink }}:9178
+              value: com.owncloud.api.storage-publiclink
             - name: GATEWAY_STORAGE_USERS_ENDPOINT
-              value: {{ .appNameStorageUsers }}:9157
+              value: com.owncloud.api.storage-users
             - name: GATEWAY_STORAGE_SHARES_ENDPOINT
-              value: {{ .appNameStorageShares }}:9154
+              value: com.owncloud.api.storage-shares
 
             - name: GATEWAY_APP_REGISTRY_ENDPOINT
-              value: {{ .appNameAppRegistry }}:9242
+              value: com.owncloud.api.app-registry
 
             # cache
             # the stat cache is disabled for now for performance reasons, see https://github.com/owncloud/ocis-charts/issues/214

diff --git a/charts/ocis/templates/graph/deployment.yaml b/charts/ocis/templates/graph/deployment.yaml
@@ -157,7 +157,7 @@ spec:
             {{- end }}
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
             - name: GRAPH_EVENTS_ENDPOINT
             {{- if not .Values.messagingSystem.external.enabled }}
               value: {{ .appNameNats }}:9233

diff --git a/charts/ocis/templates/groups/deployment.yaml b/charts/ocis/templates/groups/deployment.yaml
@@ -138,7 +138,7 @@ spec:
             {{ end }}
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: GROUPS_JWT_SECRET
               valueFrom:

diff --git a/charts/ocis/templates/notifications/deployment.yaml b/charts/ocis/templates/notifications/deployment.yaml
@@ -78,7 +78,7 @@ spec:
               value: "https://{{ .Values.externalDomain }}"
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
             - name: NOTIFICATIONS_EVENTS_ENDPOINT
             {{- if not .Values.messagingSystem.external.enabled }}
               value: {{ .appNameNats }}:9233

diff --git a/charts/ocis/templates/ocdav/deployment.yaml b/charts/ocis/templates/ocdav/deployment.yaml
@@ -57,7 +57,7 @@ spec:
               value: {{ .Values.features.edition | quote }}
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: OCDAV_INSECURE
               value: {{ .Values.insecure.ocisHttpApiInsecure | quote }}

diff --git a/charts/ocis/templates/ocs/deployment.yaml b/charts/ocis/templates/ocs/deployment.yaml
@@ -58,7 +58,7 @@ spec:
             {{ end }}
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: OCS_JWT_SECRET
               valueFrom:

diff --git a/charts/ocis/templates/policies/deployment.yaml b/charts/ocis/templates/policies/deployment.yaml
@@ -71,7 +71,7 @@ spec:
               {{- end }}
             {{- end }}
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
             - name: POLICIES_JWT_SECRET
               valueFrom:
                 secretKeyRef:

diff --git a/charts/ocis/templates/proxy/config.yaml b/charts/ocis/templates/proxy/config.yaml
@@ -34,75 +34,75 @@ data:
     - name: ocis
       routes:
       - endpoint: /
-        backend: http://{{ .appNameWeb }}:9100
+        service: com.owncloud.web.web
         unprotected: true
       - endpoint: /.well-known/openid-configuration
-        backend: http://{{ .appNameIdp }}:9130
+        service: com.owncloud.web.idp
         unprotected: true
       - endpoint: /branding/logo
-        backend: http://{{ .appNameWeb }}:9100
+        service: com.owncloud.web.web
       - endpoint: /konnect/
-        backend: http://{{ .appNameIdp }}:9130
+        service: com.owncloud.web.idp
         unprotected: true
       - endpoint: /signin/
-        backend: http://{{ .appNameIdp }}:9130
+        service: com.owncloud.web.idp
         unprotected: true
       - endpoint: /archiver
-        backend: http://{{ .appNameFrontend }}:9140
+        service: com.owncloud.web.frontend
       - endpoint: /ocs/v2.php/apps/notifications/api/v1/notifications
-        backend: http://{{ .appNameUserlog }}:8080
+        service: com.owncloud.userlog.userlog
       - type: regex
         endpoint: /ocs/v[12].php/cloud/user/signing-key
-        backend: http://{{ .appNameOcs }}:9110
+        service: com.owncloud.web.ocs
       - type: regex
         endpoint: /ocs/v[12].php/config
-        backend: http://{{ .appNameFrontend }}:9140
+        service: com.owncloud.web.frontend
         unprotected: true
       - endpoint: /ocs/
-        backend: http://{{ .appNameFrontend }}:9140
+        service: com.owncloud.web.frontend
       - type: query
         endpoint: /remote.php/?preview=1
-        backend: http://{{ .appNameWebdav }}:9115
+        service: com.owncloud.web.webdav
       - method: REPORT
         endpoint: /remote.php/dav/
-        backend: http://{{ .appNameWebdav }}:9115
+        service: com.owncloud.web.webdav
       - method: REPORT
         endpoint: /remote.php/webdav
-        backend: http://{{ .appNameWebdav }}:9115
+        service: com.owncloud.web.webdav
       - method: REPORT
         endpoint: /dav/spaces
-        backend: http://{{ .appNameWebdav }}:9115
+        service: com.owncloud.web.webdav
       - type: query
         endpoint: /dav/?preview=1
-        backend: http://{{ .appNameWebdav }}:9115
+        service: com.owncloud.web.webdav
       - type: query
         endpoint: /webdav/?preview=1
-        backend: http://{{ .appNameWebdav }}:9115
+        service: com.owncloud.web.webdav
       - endpoint: /remote.php/
-        backend: http://{{ .appNameOcdav }}:8080
+        service: com.owncloud.web.ocdav
       - endpoint: /dav/
-        backend: http://{{ .appNameOcdav }}:8080
+        service: com.owncloud.web.ocdav
       - endpoint: /webdav/
-        backend: http://{{ .appNameOcdav }}:8080
+        service: com.owncloud.web.ocdav
       - endpoint: /status
-        backend: http://{{ .appNameOcdav }}:8080
+        service: com.owncloud.web.ocdav
         unprotected: true
       - endpoint: /status.php
-        backend: http://{{ .appNameOcdav }}:8080
+        service: com.owncloud.web.ocdav
         unprotected: true
       - endpoint: /index.php/
-        backend: http://{{ .appNameOcdav }}:8080
+        service: com.owncloud.web.ocdav
       - endpoint: /apps/
-        backend: http://{{ .appNameOcdav }}:8080
+        service: com.owncloud.web.ocdav
       - endpoint: /data
-        backend: http://{{ .appNameFrontend }}:9140
+        service: com.owncloud.web.frontend
         unprotected: true
       - endpoint: /app/list
-        backend: http://{{ .appNameFrontend }}:9140
+        service: com.owncloud.web.frontend
         unprotected: true
       - endpoint: /app/
-        backend: http://{{ .appNameFrontend }}:9140
+        service: com.owncloud.web.frontend
       - endpoint: /graph/
-        backend: http://{{ .appNameGraph }}:9120
+        service: com.owncloud.graph.graph
       - endpoint: /api/v0/settings
-        backend: http://{{ .appNameSettings }}:9190
+        service: com.owncloud.web.settings
diff --git a/charts/ocis/templates/proxy/deployment.yaml b/charts/ocis/templates/proxy/deployment.yaml
@@ -80,7 +80,7 @@ spec:
               value: "false"
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: PROXY_OIDC_INSECURE
               value: {{ .Values.insecure.oidcIdpInsecure | quote }}

diff --git a/charts/ocis/templates/search/deployment.yaml b/charts/ocis/templates/search/deployment.yaml
@@ -53,7 +53,7 @@ spec:
               value: 0.0.0.0:9224
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
             - name: SEARCH_EVENTS_ENDPOINT
             {{- if not .Values.messagingSystem.external.enabled }}
               value: {{ .appNameNats }}:9233

diff --git a/charts/ocis/templates/settings/deployment.yaml b/charts/ocis/templates/settings/deployment.yaml
@@ -53,9 +53,9 @@ spec:
               value: 0.0.0.0:9194
 
             - name: STORAGE_GATEWAY_GRPC_ADDR
-              value: {{ .appNameStorageSystem }}:9215
+              value: com.owncloud.api.storage-system
             - name: STORAGE_GRPC_ADDR
-              value: {{ .appNameStorageSystem }}:9215
+              value: com.owncloud.api.storage-system
 
             {{- if not .Values.features.externalUserManagement.oidc.roleAssignment.enabled }}
             - name: SETTINGS_ADMIN_USER_ID

diff --git a/charts/ocis/templates/sharing/deployment.yaml b/charts/ocis/templates/sharing/deployment.yaml
@@ -51,7 +51,7 @@ spec:
               value: 0.0.0.0:9151
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
             - name: SHARING_EVENTS_ENDPOINT
             {{- if not .Values.messagingSystem.external.enabled }}
               value: {{ .appNameNats }}:9233
@@ -84,7 +84,7 @@ spec:
             - name: SHARING_USER_DRIVER
               value: jsoncs3
             - name: SHARING_USER_JSONCS3_PROVIDER_ADDR
-              value: {{ .appNameStorageSystem }}:9215
+              value: com.owncloud.api.storage-system
             - name: SHARING_USER_JSONCS3_SYSTEM_USER_API_KEY
               valueFrom:
                 secretKeyRef:
@@ -100,7 +100,7 @@ spec:
             - name: SHARING_PUBLIC_DRIVER
               value: jsoncs3
             - name: SHARING_PUBLIC_JSONCS3_PROVIDER_ADDR
-              value: {{ .appNameStorageSystem }}:9215
+              value: com.owncloud.api.storage-system
             - name: SHARING_PUBLIC_JSONCS3_SYSTEM_USER_API_KEY
               valueFrom:
                 secretKeyRef:

diff --git a/charts/ocis/templates/storagepubliclink/deployment.yaml b/charts/ocis/templates/storagepubliclink/deployment.yaml
@@ -51,7 +51,7 @@ spec:
               value: 0.0.0.0:9179
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: STORAGE_PUBLICLINK_JWT_SECRET
               valueFrom:

diff --git a/charts/ocis/templates/storageshares/deployment.yaml b/charts/ocis/templates/storageshares/deployment.yaml
@@ -51,10 +51,10 @@ spec:
               value: 0.0.0.0:9156
 
             - name: STORAGE_SHARES_USER_SHARE_PROVIDER_ENDPOINT
-              value: {{ .appNameSharing }}:9150
+              value: com.owncloud.api.sharing
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: STORAGE_SHARES_JWT_SECRET
               valueFrom:

diff --git a/charts/ocis/templates/storagesystem/deployment.yaml b/charts/ocis/templates/storagesystem/deployment.yaml
@@ -71,7 +71,7 @@ spec:
               value: http://{{ .appName }}:9216/data
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: STORAGE_SYSTEM_DRIVER
               value: ocis

diff --git a/charts/ocis/templates/storageusers/deployment.yaml b/charts/ocis/templates/storageusers/deployment.yaml
@@ -71,7 +71,7 @@ spec:
               value: "http://{{ .appName }}:9158/data"
 
             - name: STORAGE_USERS_PERMISSION_ENDPOINT
-              value: {{ .appNameSettings }}:9191
+              value: com.owncloud.api.settings
 
             # oCIS storage driver (decomposed filesystem)
             {{- if  eq .Values.services.storageusers.storageBackend.driver "ocis" }}
@@ -146,7 +146,7 @@ spec:
                   key: machine-auth-api-key
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             # cache
             - name: STORAGE_USERS_FILEMETADATA_CACHE_STORE

diff --git a/charts/ocis/templates/thumbnails/deployment.yaml b/charts/ocis/templates/thumbnails/deployment.yaml
@@ -74,7 +74,7 @@ spec:
               value: {{ .Values.insecure.ocisHttpApiInsecure | quote }}
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: THUMBNAILS_TRANSFER_TOKEN
               valueFrom:

diff --git a/charts/ocis/templates/userlog/deployment.yaml b/charts/ocis/templates/userlog/deployment.yaml
@@ -78,7 +78,7 @@ spec:
             {{- end }}
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: USERLOG_MACHINE_AUTH_API_KEY
               valueFrom:

diff --git a/charts/ocis/templates/users/deployment.yaml b/charts/ocis/templates/users/deployment.yaml
@@ -147,7 +147,7 @@ spec:
             {{ end }}
 
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: USERS_JWT_SECRET
               valueFrom:

diff --git a/charts/ocis/templates/web/deployment.yaml b/charts/ocis/templates/web/deployment.yaml
@@ -88,7 +88,7 @@ spec:
             {{- end }}
 
             - name: WEB_GATEWAY_GRPC_ADDR #TODO: does not support fallback to REVA_GATEWAY as of oCIS 3.0.0-rc.1
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             - name: WEB_JWT_SECRET
               valueFrom:

diff --git a/charts/ocis/templates/webdav/deployment.yaml b/charts/ocis/templates/webdav/deployment.yaml
@@ -53,7 +53,7 @@ spec:
             - name: OCIS_PUBLIC_URL
               value: "https://{{ .Values.externalDomain }}"
             - name: OCIS_REVA_GATEWAY
-              value: {{ .appNameGateway }}:9142
+              value: com.owncloud.api.gateway
 
             {{- include "ocis.cors" . |nindent 12 }}