From baa81ec16252e06cbfa4fe484a844742627a1bb1 Mon Sep 17 00:00:00 2001 From: Linas Ramanauskas Date: Wed, 3 Dec 2025 13:41:58 +0200 Subject: [PATCH] chart update --- helm/{metaverse => }/Chart.lock | 0 helm/{metaverse => }/Chart.yaml | 0 helm/argocd/metaverse-app.yaml | 23 ------------------- helm/{metaverse => }/charts/nebula/Chart.yaml | 0 .../charts/nebula/templates/_helpers.tpl | 0 .../charts/nebula/templates/deployment.yaml | 8 ++++--- .../charts/nebula/templates/ingress.yaml | 0 .../charts/nebula/templates/service.yaml | 0 .../{metaverse => }/charts/nebula/values.yaml | 2 +- .../charts/singularity/Chart.yaml | 0 .../charts/singularity/templates/_helpers.tpl | 0 .../singularity/templates/deployment.yaml | 20 ++++++++-------- .../charts/singularity/templates/ingress.yaml | 0 .../charts/singularity/templates/service.yaml | 0 .../charts/singularity/values.yaml | 10 ++------ .../charts/singularity/templates/secret.yaml | 15 ------------ helm/{metaverse => }/values.yaml | 17 ++++---------- 17 files changed, 23 insertions(+), 72 deletions(-) rename helm/{metaverse => }/Chart.lock (100%) rename helm/{metaverse => }/Chart.yaml (100%) delete mode 100644 helm/argocd/metaverse-app.yaml rename helm/{metaverse => }/charts/nebula/Chart.yaml (100%) rename helm/{metaverse => }/charts/nebula/templates/_helpers.tpl (100%) rename helm/{metaverse => }/charts/nebula/templates/deployment.yaml (84%) rename helm/{metaverse => }/charts/nebula/templates/ingress.yaml (100%) rename helm/{metaverse => }/charts/nebula/templates/service.yaml (100%) rename helm/{metaverse => }/charts/nebula/values.yaml (98%) rename helm/{metaverse => }/charts/singularity/Chart.yaml (100%) rename helm/{metaverse => }/charts/singularity/templates/_helpers.tpl (100%) rename helm/{metaverse => }/charts/singularity/templates/deployment.yaml (77%) rename helm/{metaverse => }/charts/singularity/templates/ingress.yaml (100%) rename helm/{metaverse => }/charts/singularity/templates/service.yaml (100%) rename helm/{metaverse => }/charts/singularity/values.yaml (88%) delete mode 100644 helm/metaverse/charts/singularity/templates/secret.yaml rename helm/{metaverse => }/values.yaml (61%) diff --git a/helm/metaverse/Chart.lock b/helm/Chart.lock similarity index 100% rename from helm/metaverse/Chart.lock rename to helm/Chart.lock diff --git a/helm/metaverse/Chart.yaml b/helm/Chart.yaml similarity index 100% rename from helm/metaverse/Chart.yaml rename to helm/Chart.yaml diff --git a/helm/argocd/metaverse-app.yaml b/helm/argocd/metaverse-app.yaml deleted file mode 100644 index 454db78..0000000 --- a/helm/argocd/metaverse-app.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: metaverse - namespace: argocd -spec: - project: default - source: - repoURL: "git@github.ibm.com:cicbaltic/metaverse.git" - targetRevision: HEAD - path: helm/metaverse - helm: - valueFiles: - - values.yaml - destination: - server: "https://kubernetes.default.svc" - namespace: metaverse - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - CreateNamespace=true diff --git a/helm/metaverse/charts/nebula/Chart.yaml b/helm/charts/nebula/Chart.yaml similarity index 100% rename from helm/metaverse/charts/nebula/Chart.yaml rename to helm/charts/nebula/Chart.yaml diff --git a/helm/metaverse/charts/nebula/templates/_helpers.tpl b/helm/charts/nebula/templates/_helpers.tpl similarity index 100% rename from helm/metaverse/charts/nebula/templates/_helpers.tpl rename to helm/charts/nebula/templates/_helpers.tpl diff --git a/helm/metaverse/charts/nebula/templates/deployment.yaml b/helm/charts/nebula/templates/deployment.yaml similarity index 84% rename from helm/metaverse/charts/nebula/templates/deployment.yaml rename to helm/charts/nebula/templates/deployment.yaml index a8c9dc4..268df55 100644 --- a/helm/metaverse/charts/nebula/templates/deployment.yaml +++ b/helm/charts/nebula/templates/deployment.yaml @@ -20,9 +20,11 @@ spec: labels: {{- include "nebula.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.imagePullSecrets }} imagePullSecrets: - {{- toYaml . | nindent 8 }} + {{- if .Values.imagePullSecrets }} + {{- toYaml .Values.imagePullSecrets | nindent 8 }} + {{- else if .Values.global.imagePullSecrets }} + {{- toYaml .Values.global.imagePullSecrets | nindent 8 }} {{- end }} serviceAccountName: {{ include "nebula.serviceAccountName" . }} securityContext: @@ -31,7 +33,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.imageRegistry | default "" }}{{ if and .Values.global.imageRegistry (not (hasSuffix "/" .Values.global.imageRegistry)) }}/{{ end }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: https diff --git a/helm/metaverse/charts/nebula/templates/ingress.yaml b/helm/charts/nebula/templates/ingress.yaml similarity index 100% rename from helm/metaverse/charts/nebula/templates/ingress.yaml rename to helm/charts/nebula/templates/ingress.yaml diff --git a/helm/metaverse/charts/nebula/templates/service.yaml b/helm/charts/nebula/templates/service.yaml similarity index 100% rename from helm/metaverse/charts/nebula/templates/service.yaml rename to helm/charts/nebula/templates/service.yaml diff --git a/helm/metaverse/charts/nebula/values.yaml b/helm/charts/nebula/values.yaml similarity index 98% rename from helm/metaverse/charts/nebula/values.yaml rename to helm/charts/nebula/values.yaml index 2388f15..c3012ca 100644 --- a/helm/metaverse/charts/nebula/values.yaml +++ b/helm/charts/nebula/values.yaml @@ -3,7 +3,7 @@ replicaCount: 1 image: repository: metaverse/nebula pullPolicy: IfNotPresent - tag: "" + tag: "latest" imagePullSecrets: [] nameOverride: "" diff --git a/helm/metaverse/charts/singularity/Chart.yaml b/helm/charts/singularity/Chart.yaml similarity index 100% rename from helm/metaverse/charts/singularity/Chart.yaml rename to helm/charts/singularity/Chart.yaml diff --git a/helm/metaverse/charts/singularity/templates/_helpers.tpl b/helm/charts/singularity/templates/_helpers.tpl similarity index 100% rename from helm/metaverse/charts/singularity/templates/_helpers.tpl rename to helm/charts/singularity/templates/_helpers.tpl diff --git a/helm/metaverse/charts/singularity/templates/deployment.yaml b/helm/charts/singularity/templates/deployment.yaml similarity index 77% rename from helm/metaverse/charts/singularity/templates/deployment.yaml rename to helm/charts/singularity/templates/deployment.yaml index dc3f551..07544d2 100644 --- a/helm/metaverse/charts/singularity/templates/deployment.yaml +++ b/helm/charts/singularity/templates/deployment.yaml @@ -20,9 +20,11 @@ spec: labels: {{- include "singularity.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.imagePullSecrets }} imagePullSecrets: - {{- toYaml . | nindent 8 }} + {{- if .Values.imagePullSecrets }} + {{- toYaml .Values.imagePullSecrets | nindent 8 }} + {{- else if .Values.global.imagePullSecrets }} + {{- toYaml .Values.global.imagePullSecrets | nindent 8 }} {{- end }} serviceAccountName: {{ include "singularity.serviceAccountName" . }} securityContext: @@ -31,7 +33,7 @@ spec: - name: {{ .Chart.Name }} securityContext: {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.global.imageRegistry | default "" }}{{ if and .Values.global.imageRegistry (not (hasSuffix "/" .Values.global.imageRegistry)) }}/{{ end }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: https @@ -75,32 +77,32 @@ spec: - name: W3_OIDC_CLIENT_ID valueFrom: secretKeyRef: - name: {{ include "singularity.fullname" . }}-secrets + name: {{ .Values.config.secretName | default (printf "%s-secrets" (include "singularity.fullname" .)) }} key: w3-oidc-client-id - name: W3_OIDC_CLIENT_SECRET valueFrom: secretKeyRef: - name: {{ include "singularity.fullname" . }}-secrets + name: {{ .Values.config.secretName | default (printf "%s-secrets" (include "singularity.fullname" .)) }} key: w3-oidc-client-secret - name: JWT_SECRET valueFrom: secretKeyRef: - name: {{ include "singularity.fullname" . }}-secrets + name: {{ .Values.config.secretName | default (printf "%s-secrets" (include "singularity.fullname" .)) }} key: jwt-secret - name: JWT_REFRESH_SECRET valueFrom: secretKeyRef: - name: {{ include "singularity.fullname" . }}-secrets + name: {{ .Values.config.secretName | default (printf "%s-secrets" (include "singularity.fullname" .)) }} key: jwt-refresh-secret - name: COOKIE_SECRET valueFrom: secretKeyRef: - name: {{ include "singularity.fullname" . }}-secrets + name: {{ .Values.config.secretName | default (printf "%s-secrets" (include "singularity.fullname" .)) }} key: cookie-secret - name: SESSION_SECRET valueFrom: secretKeyRef: - name: {{ include "singularity.fullname" . }}-secrets + name: {{ .Values.config.secretName | default (printf "%s-secrets" (include "singularity.fullname" .)) }} key: session-secret volumeMounts: - name: ssl diff --git a/helm/metaverse/charts/singularity/templates/ingress.yaml b/helm/charts/singularity/templates/ingress.yaml similarity index 100% rename from helm/metaverse/charts/singularity/templates/ingress.yaml rename to helm/charts/singularity/templates/ingress.yaml diff --git a/helm/metaverse/charts/singularity/templates/service.yaml b/helm/charts/singularity/templates/service.yaml similarity index 100% rename from helm/metaverse/charts/singularity/templates/service.yaml rename to helm/charts/singularity/templates/service.yaml diff --git a/helm/metaverse/charts/singularity/values.yaml b/helm/charts/singularity/values.yaml similarity index 88% rename from helm/metaverse/charts/singularity/values.yaml rename to helm/charts/singularity/values.yaml index a3c0c28..cc23e4c 100644 --- a/helm/metaverse/charts/singularity/values.yaml +++ b/helm/charts/singularity/values.yaml @@ -3,7 +3,7 @@ replicaCount: 1 image: repository: metaverse/singularity pullPolicy: IfNotPresent - tag: "" + tag: "latest" imagePullSecrets: [] nameOverride: "" @@ -60,13 +60,7 @@ config: backendUrl: "https://singularity.local" frontendUrl: "https://nebula.local" w3OIDCDiscoveryURL: "https://preprod.login.w3.ibm.com/oidc/endpoint/default/.well-known/openid-configuration" - secrets: - jwtSecret: "" - jwtRefreshSecret: "" - cookieSecret: "" - sessionSecret: "" - oidcClientId: "" - oidcClientSecret: "" + secretName: "singularity-secrets" ssl: enabled: true diff --git a/helm/metaverse/charts/singularity/templates/secret.yaml b/helm/metaverse/charts/singularity/templates/secret.yaml deleted file mode 100644 index d6d2e09..0000000 --- a/helm/metaverse/charts/singularity/templates/secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "singularity.fullname" . }}-secrets - labels: - {{- include "singularity.labels" . | nindent 4 }} -type: Opaque -stringData: - # Should be taken from secret manager later on - jwt-secret: {{ .Values.config.secrets.jwtSecret | default "override-me-with-secure-value" | quote }} - jwt-refresh-secret: {{ .Values.config.secrets.jwtRefreshSecret | default "override-me-with-secure-value" | quote }} - cookie-secret: {{ .Values.config.secrets.cookieSecret | default "override-me-with-secure-value" | quote }} - session-secret: {{ .Values.config.secrets.sessionSecret | default "override-me-with-secure-value" | quote }} - w3-oidc-client-id: {{ .Values.config.secrets.oidcClientId | default "override-me-with-secure-value" | quote }} - w3-oidc-client-secret: {{ .Values.config.secrets.oidcClientSecret | default "override-me-with-secure-value" | quote }} diff --git a/helm/metaverse/values.yaml b/helm/values.yaml similarity index 61% rename from helm/metaverse/values.yaml rename to helm/values.yaml index cb310b0..8f07d42 100644 --- a/helm/metaverse/values.yaml +++ b/helm/values.yaml @@ -1,11 +1,12 @@ global: - imageRegistry: "" - imagePullSecrets: [] + imageRegistry: "de.icr.io" + imagePullSecrets: + - name: "ibm-cr-pull-secret" storageClass: "" environment: production postgresql: - enabled: true + enabled: false auth: username: metaverse password: metaverse @@ -24,13 +25,3 @@ singularity: nebula: enabled: true - -argocd: - enabled: true - project: default - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - CreateNamespace=true