chart update

helm/argocd/metaverse-app.yaml

@@ -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

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

helm/charts/nebula/values.yaml

@@ -3,7 +3,7 @@ replicaCount: 1
 image:
   repository: metaverse/nebula
   pullPolicy: IfNotPresent
-  tag: ""
+  tag: "latest"
 
 imagePullSecrets: []
 nameOverride: ""

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

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

helm/metaverse/charts/singularity/templates/secret.yaml

@@ -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 }}

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