From 86b4cf81da08c5483ca90cfde61f24fbf8fcd647 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Fri, 22 Aug 2025 13:35:12 +0800 Subject: [PATCH] auth in magic change --- .../authentication/freeleapssecret.yaml | 2 +- .../helm-pkg/authentication/values.alpha.yaml | 22 +++++++++---------- .../helm-pkg/authentication/values.prod.yaml | 22 +++++++++---------- .../helm-pkg/authentication/values.yaml | 22 +++++++++---------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/magicleaps/helm-pkg/authentication/templates/authentication/freeleapssecret.yaml b/magicleaps/helm-pkg/authentication/templates/authentication/freeleapssecret.yaml index ec7729fa..9f3e9ea4 100644 --- a/magicleaps/helm-pkg/authentication/templates/authentication/freeleapssecret.yaml +++ b/magicleaps/helm-pkg/authentication/templates/authentication/freeleapssecret.yaml @@ -1,7 +1,7 @@ apiVersion: freeleaps.com/v1alpha1 kind: FreeleapsSecret metadata: - name: magicleaps-authentication-alpha-secrets + name: {{ .Values.authentication.secrets.target.name }} namespace: {{ .Release.Namespace }} spec: secretStoreRef: diff --git a/magicleaps/helm-pkg/authentication/values.alpha.yaml b/magicleaps/helm-pkg/authentication/values.alpha.yaml index c800811a..2176705c 100644 --- a/magicleaps/helm-pkg/authentication/values.alpha.yaml +++ b/magicleaps/helm-pkg/authentication/values.alpha.yaml @@ -18,11 +18,11 @@ authentication: registry: docker.io repository: null name: magicleaps-authentication - tag: snapshot-0000000 + tag: snapshot-c93ce6b imagePullPolicy: IfNotPresent ports: - name: http - containerPort: 8004 + containerPort: 8015 protocol: TCP resources: requests: @@ -36,7 +36,7 @@ authentication: type: httpGet config: path: /api/_/readyz - port: 8004 + port: 8015 initialDelaySeconds: 5 periodSeconds: 30 timeoutSeconds: 3 @@ -46,7 +46,7 @@ authentication: type: httpGet config: path: /api/_/livez - port: 8004 + port: 8015 initialDelaySeconds: 5 periodSeconds: 15 timeoutSeconds: 3 @@ -56,8 +56,8 @@ authentication: services: - name: magicleaps-authentication-service type: ClusterIP - port: 8004 - targetPort: 8004 + port: 8015 + targetPort: 8015 serviceMonitor: enabled: false ingresses: @@ -71,7 +71,7 @@ authentication: service: name: magicleaps-authentication-service port: - number: 8004 + number: 8015 tls: exists: false issuerRef: @@ -81,11 +81,11 @@ authentication: configs: tz: America/Settle appName: magicleaps-authentication - devsvcWebapiUrlBase: http://devsvc-service.magicleaps-alpha.svc.cluster:8007/api/devsvc/ + devsvcWebapiUrlBase: http://devsvc-service.freeleaps-alpha.svc.cluster:8007/api/devsvc/ notificationWebapiUrlBase: http://notification-service.freeleaps-alpha.svc.freeleaps.cluster:8003/api/notification/ jwtAlgorithm: HS256 serviceApiAccessHost: 0.0.0.0 - serviceApiAccessPort: 8004 + serviceApiAccessPort: 8015 mongodbName: interview mongodbPort: 27017 metricsEnabled: 'false' @@ -95,13 +95,13 @@ authentication: kind: FreeleapsSecretStore name: freeleaps-main-secret-store target: - name: "magicleaps-authentication-alpha-secrets" + name: "freeleaps-authentication-alpha-secrets" creationPolicy: "Owner" refreshInterval: 30s data: - key: jwtSecretKey remoteRef: - key: "magicleaps-alpha-jwt-secret-key" + key: "freeleaps-alpha-jwt-secret-key" type: Secret - key: mongodbUri remoteRef: diff --git a/magicleaps/helm-pkg/authentication/values.prod.yaml b/magicleaps/helm-pkg/authentication/values.prod.yaml index f831258d..4888936d 100644 --- a/magicleaps/helm-pkg/authentication/values.prod.yaml +++ b/magicleaps/helm-pkg/authentication/values.prod.yaml @@ -18,11 +18,11 @@ authentication: registry: docker.io repository: null name: magicleaps-authentication - tag: snapshot-0000000 + tag: snapshot-c93ce6b imagePullPolicy: IfNotPresent ports: - name: http - containerPort: 8004 + containerPort: 8015 protocol: TCP resources: requests: @@ -36,7 +36,7 @@ authentication: type: httpGet config: path: /api/_/readyz - port: 8004 + port: 8015 initialDelaySeconds: 5 periodSeconds: 30 timeoutSeconds: 3 @@ -46,7 +46,7 @@ authentication: type: httpGet config: path: /api/_/livez - port: 8004 + port: 8015 initialDelaySeconds: 5 periodSeconds: 15 timeoutSeconds: 3 @@ -56,8 +56,8 @@ authentication: services: - name: magicleaps-authentication-service type: ClusterIP - port: 8004 - targetPort: 8004 + port: 8015 + targetPort: 8015 serviceMonitor: enabled: false ingresses: @@ -71,7 +71,7 @@ authentication: service: name: magicleaps-authentication-service port: - number: 8004 + number: 8015 tls: exists: false issuerRef: @@ -81,11 +81,11 @@ authentication: configs: tz: America/Settle appName: magicleaps-authentication - devsvcWebapiUrlBase: http://devsvc-service.magicleaps.svc.cluster:8007/api/devsvc/ + devsvcWebapiUrlBase: http://devsvc-service.freeleaps.svc.freeleaps.cluster:8007/api/devsvc/ notificationWebapiUrlBase: http://notification-service.freeleaps.svc.freeleaps.cluster:8003/api/notification/ jwtAlgorithm: HS256 serviceApiAccessHost: 0.0.0.0 - serviceApiAccessPort: 8004 + serviceApiAccessPort: 8015 mongodbName: interview mongodbPort: 27017 metricsEnabled: 'false' @@ -95,13 +95,13 @@ authentication: kind: FreeleapsSecretStore name: freeleaps-main-secret-store target: - name: "magicleaps-authentication-prod-secrets" + name: "freeleaps-authentication-prod-secrets" creationPolicy: "Owner" refreshInterval: 30s data: - key: jwtSecretKey remoteRef: - key: "magicleaps-prod-jwt-secret-key" + key: "freeleaps-prod-jwt-secret-key" type: Secret - key: mongodbUri remoteRef: diff --git a/magicleaps/helm-pkg/authentication/values.yaml b/magicleaps/helm-pkg/authentication/values.yaml index a5ad10b7..773a5801 100644 --- a/magicleaps/helm-pkg/authentication/values.yaml +++ b/magicleaps/helm-pkg/authentication/values.yaml @@ -18,11 +18,11 @@ authentication: registry: docker.io repository: null name: magicleaps-authentication - tag: snapshot-0000000 + tag: snapshot-c93ce6b imagePullPolicy: IfNotPresent ports: - name: http - containerPort: 8004 + containerPort: 8015 protocol: TCP resources: requests: @@ -36,7 +36,7 @@ authentication: type: httpGet config: path: /api/_/readyz - port: 8004 + port: 8015 initialDelaySeconds: 5 periodSeconds: 30 timeoutSeconds: 3 @@ -46,7 +46,7 @@ authentication: type: httpGet config: path: /api/_/livez - port: 8004 + port: 8015 initialDelaySeconds: 5 periodSeconds: 15 timeoutSeconds: 3 @@ -56,8 +56,8 @@ authentication: services: - name: magicleaps-authentication-service type: ClusterIP - port: 8004 - targetPort: 8004 + port: 8015 + targetPort: 8015 serviceMonitor: enabled: false ingresses: @@ -71,7 +71,7 @@ authentication: service: name: magicleaps-authentication-service port: - number: 8004 + number: 8015 tls: exists: false issuerRef: @@ -81,11 +81,11 @@ authentication: configs: tz: America/Settle appName: magicleaps-authentication - devsvcWebapiUrlBase: http://devsvc-service.magicleaps.svc.cluster:8007/api/devsvc/ + devsvcWebapiUrlBase: http://devsvc-service.freeleaps.svc.freeleaps.cluster:8007/api/devsvc/ notificationWebapiUrlBase: http://notification-service.freeleaps.svc.freeleaps.cluster:8003/api/notification/ jwtAlgorithm: HS256 serviceApiAccessHost: 0.0.0.0 - serviceApiAccessPort: 8004 + serviceApiAccessPort: 8015 mongodbName: interview mongodbPort: 27017 metricsEnabled: 'false' @@ -95,13 +95,13 @@ authentication: kind: FreeleapsSecretStore name: freeleaps-main-secret-store target: - name: "magicleaps-authentication-secrets" + name: "freeleaps-authentication-secrets" creationPolicy: "Owner" refreshInterval: 30s data: - key: jwtSecretKey remoteRef: - key: "magicleaps-jwt-secret-key" + key: "freeleaps-jwt-secret-key" type: Secret - key: mongodbUri remoteRef: