Update genius core admin

VersesTech · Jun 24, 2024 · 0dfdf28 · 0dfdf28
1 parent 170b3f5
commit 0dfdf28
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 22 deletions.
diff --git a/charts/genius-core-admin/Chart.yaml b/charts/genius-core-admin/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2.0.60"
+appVersion: "2.0.63"
diff --git a/charts/genius-core-admin/README.md b/charts/genius-core-admin/README.md
@@ -1,6 +1,6 @@
 # genius-core-admin
 
-![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.60](https://img.shields.io/badge/AppVersion-2.0.60-informational?style=flat-square)
+![Version: 0.1.0](https://img.shields.io/badge/Version-0.1.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.63](https://img.shields.io/badge/AppVersion-2.0.63-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -45,8 +45,8 @@ You can also use an existing secret if you are templating your own secret:
 ```yaml
 configExistingSecret:
   name: my-secret-with-env-config
-  key: .env.production
 ```
+The key inside the secret must be `.env.production`.
 
 ## Values
 
@@ -64,9 +64,8 @@ configExistingSecret:
 | autoscaling.minReplicas | int | `1` |  |
 | autoscaling.targetCPUUtilizationPercentage | int | `80` |  |
 | config | string | `"NEXT_PUBLIC_APP_GENIUS_DB_URL={{ .Values.geniusCoreUrl | squote }}\nAUTH_URL={{ printf \"https://%s/api/auth\" .Values.externalDomain | squote }}\nAUTH_SECRET={{ randAlphaNum 32 | squote }}\nCLIENT_ID={{ .Values.auth.clientId | squote }}\nCLIENT_SECRET={{ .Values.auth.clientSecret | squote }}\nISSUER_BASE_URL={{ .Values.auth.issuerUrl | squote }}\nAUDIENCE={{ .Values.auth.audience | squote }}\nAUTH_SCOPE={{ .Values.auth.scopes | squote }}\n"` | Secret configuration |
-| configExistingSecret | object | `{"key":".env.production","name":""}` | Reference an existing secret containing the env configuration |
-| configExistingSecret.key | string | `".env.production"` | Key inside the secret |
-| configExistingSecret.name | string | `""` | Name of the secret |
+| configExistingSecret | object | `{"name":""}` | Reference an existing secret containing the env configuration |
+| configExistingSecret.name | string | `""` | Name of the secret. The key inside the secret must be `.env.production` |
 | externalDomain | string | `"chart-example.local"` | Externally reachable domain |
 | extraObjects | list | `[]` | Extra K8s manifests to deploy # Note: Supports use of custom Helm templates |
 | fullnameOverride | string | `""` |  |
@@ -102,12 +101,12 @@ configExistingSecret:
 | pdb.maxUnavailable | string | `""` |  |
 | pdb.minAvailable | string | `""` |  |
 | podAnnotations | object | `{}` |  |
-| podSecurityContext.fsGroup | int | `1001` |  |
+| podSecurityContext.fsGroup | int | `65532` |  |
 | replicaCount | int | `1` |  |
 | resources | object | `{}` |  |
-| securityContext.runAsGroup | int | `1001` |  |
+| securityContext.runAsGroup | int | `65532` |  |
 | securityContext.runAsNonRoot | bool | `true` |  |
-| securityContext.runAsUser | int | `1001` |  |
+| securityContext.runAsUser | int | `65532` |  |
 | service.port | int | `3000` |  |
 | service.type | string | `"ClusterIP"` |  |
 | serviceAccount.annotations | object | `{}` |  |

diff --git a/charts/genius-core-admin/README.md.gotmpl b/charts/genius-core-admin/README.md.gotmpl
@@ -51,8 +51,8 @@ You can also use an existing secret if you are templating your own secret:
 ```yaml
 configExistingSecret:
   name: my-secret-with-env-config
-  key: .env.production
 ```
+The key inside the secret must be `.env.production`.
 
 {{ template "chart.sourcesSection" . }}
 

diff --git a/charts/genius-core-admin/templates/deployment.yaml b/charts/genius-core-admin/templates/deployment.yaml
@@ -51,13 +51,8 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
             - name: env-config
-              {{- if .Values.configExistingSecret.name }}
-              mountPath: "/app/{{ .Values.configExistingSecret.key }}"
-              subPath: {{ .Values.configExistingSecret.key | quote }}
-              {{- else if .Values.config }}
-              mountPath: /app/.env.production
+              mountPath: /app/run/.env.production
               subPath: .env.production
-              {{- end }}
               readOnly: true
       volumes:
         - name: env-config

diff --git a/charts/genius-core-admin/values.yaml b/charts/genius-core-admin/values.yaml
@@ -29,10 +29,8 @@ config: |
 
 # -- Reference an existing secret containing the env configuration
 configExistingSecret:
-  # -- Name of the secret
+  # -- Name of the secret. The key inside the secret must be `.env.production`
   name: ""
-  # -- Key inside the secret
-  key: .env.production
 
 replicaCount: 1
 
@@ -58,16 +56,16 @@ serviceAccount:
 podAnnotations: {}
 
 podSecurityContext:
-  fsGroup: 1001
+  fsGroup: 65532
 
 securityContext:
   # capabilities:
   #   drop:
   #   - ALL
   # readOnlyRootFilesystem: true
   runAsNonRoot: true
-  runAsUser: 1001
-  runAsGroup: 1001
+  runAsUser: 65532
+  runAsGroup: 65532
 
 service:
   type: ClusterIP