feat(helm): New oada chart version

Author: awlayton

.editorconfig

@@ -6,7 +6,10 @@ root = true
 [*]
 indent_style = space
 indent_size = 2
+tab_width = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
-insert_final_newline = false
+insert_final_newline = false
+max_line_length = 80
+spelling_language = en-US

.vscode/launch.json

@@ -1,3 +1,4 @@
+// vim: set ft=jsonc :
 {
   // Use IntelliSense to learn about possible attributes.
   // Hover to view descriptions of existing attributes.
@@ -69,7 +70,7 @@
       "remoteRoot": "/oada/"
     },
     {
-      "type": "node",
+      "type": "pwa-node",
       "request": "attach",
       "name": "Attach to service",
       "smartStep": true,
@@ -103,4 +104,4 @@
       "default": "9229"
     }
   ]
-}
+}

charts/oada/Chart.yaml

@@ -1,3 +1,4 @@
+# vim: set ft=helm :
 apiVersion: v2
 name: oada
 description: A Helm chart for the OADA API server
@@ -13,11 +14,11 @@ keywords:
   - oauth 2.0
   - oidc
   - oada
-version: 4.0.0
+version: 5.0.0
 appVersion: 4.0.0
 annotations:
   artifacthub.io/recommendations: |
     - url: https://artifacthub.io/packages/helm/cert-manager/cert-manager
     - url: https://artifacthub.io/packages/helm/redpanda-data/operator
     - url: https://github.com/arangodb/kube-arangodb#installation-of-latest-release-using-helm
-    - url: https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx
+    - url: https://artifacthub.io/packages/helm/ingress-nginx/ingress-nginx

charts/oada/templates/_helpers.tpl

@@ -1,3 +1,4 @@
+{{/* vim: set ft=helm : */}}
 {{/*
    * Copyright 2022 Open Ag Data Alliance
    *

charts/oada/templates/auth.yaml

@@ -1,3 +1,4 @@
+{{/* vim: set ft=helm : */}}
 {{/*
    * Copyright 2022 Open Ag Data Alliance
    *
@@ -36,6 +37,7 @@ kind: Secret
 immutable: true
 metadata:
   annotations:
+    helm.sh/hook: pre-install
     helm.sh/resource-policy: keep
   namespace: {{ .Release.Namespace }}
   name: auth-keys-{{ .Release.Name }}

charts/oada/templates/configmap.yaml

@@ -1,3 +1,4 @@
+{{/* vim: set ft=helm : */}}
 {{/*
    * Copyright 2022 Open Ag Data Alliance
    *

charts/oada/templates/deployment.yaml

@@ -1,4 +1,4 @@
-# vim: set ft=helm :
+{{/* vim: set ft=helm : */}}
 {{/*
    * Copyright 2022 Open Ag Data Alliance
    *
@@ -18,6 +18,7 @@
 {{- range $k, $v := .Values.oada.services -}}
 {{/* Deploy the OADA uservice `$k` */}}
 {{- $name := print $k "-" $.Release.Name -}}
+{{- if ne $v.enabled false }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -87,7 +88,7 @@ spec:
                   name: {{ include "oada.arango.rootPassword" $ }}
                   key: password
                   optional: {{ $.Values.global.development }}
-          image: {{ print "oada/" $k ":" $tag }}
+          image: {{ print $.Values.oada.namespace $k ":" $tag }}
           imagePullPolicy: {{ $.Values.oada.imagePullPolicy }}
           command: ["/usr/bin/dumb-init", "--rewrite", "15:2", "--", "/bin/sh"]
           args: ["-c", "yarn workspace @oada/{{ $k }} run start"]
@@ -196,4 +197,5 @@ spec:
     any: false
 {{- end }}
 ---
+{{ end -}}
 {{ end -}}

charts/oada/templates/init.yaml

@@ -1,3 +1,4 @@
+# vim: set ft=helm :
 {{/*
    * Copyright 2022 Open Ag Data Alliance
    *
@@ -13,8 +14,6 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */}}
-{{- $initName := print "init-" .Release.Name -}}
-{{- if empty (lookup "batch/v1" "Job" .Release.Namespace $initName) -}}
 {{- $tag := default .Chart.AppVersion .Values.oada.tag -}}
 apiVersion: batch/v1
 kind: Job
@@ -24,6 +23,12 @@ metadata:
   labels:
     app.kubernetes.io/component: init
     {{- include "oada.chart.labels" . | nindent 4 }}
+  annotations:
+    # This is what defines this resource as a hook. Without this line, the
+    # job is considered part of the release.
+    "helm.sh/hook": post-install
+    #"helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "-5"
 spec:
   backoffLimit: 10
   template:
@@ -88,7 +93,7 @@ spec:
             - name: inspect
               containerPort: 9229
           {{- end }}
-          image: oada/startup:{{ $tag }}
+          image: {{ .Values.oada.namespace }}startup:{{ $tag }}
           imagePullPolicy: {{ .Values.oada.imagePullPolicy }}
           resources:
             limits: {{- toYaml $.Values.oada.resources.limits | nindent 14 }}
@@ -104,5 +109,4 @@ spec:
         - name: tmp
           emptyDir:
             sizeLimit: 1Gi
-            #medium: Memory
-{{- end -}}
+            #medium: Memory

charts/oada/templates/users.yaml

@@ -1,3 +1,4 @@
+# vim: set ft=helm :
 {{/*
    * Copyright 2022 Open Ag Data Alliance
    *
@@ -34,7 +35,6 @@ stringData:
 {{- end }}
 ---
 {{- $jobName := print "user-add-" .name "-" $.Release.Name -}}
-{{- if empty (lookup "batch/v1" "Job" $.Release.Namespace $jobName) }}
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -43,6 +43,12 @@ metadata:
   labels:
     app.kubernetes.io/component: init
     {{- include "oada.chart.labels" $ | nindent 4 }}
+  annotations:
+    # This is what defines this resource as a hook. Without this line, the
+    # job is considered part of the release.
+    "helm.sh/hook": post-install
+    #"helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-weight": "5"
 spec:
   backoffLimit: 10
   template:
@@ -101,7 +107,7 @@ spec:
             - name: inspect
               containerPort: 9229
           {{- end }}
-          image: oada/users:{{ $tag }}
+          image: {{ $.Values.oada.namespace }}users:{{ $tag }}
           #imagePullPolicy: {{ $.Values.global.development | ternary "Always" "IfNotPresent" }}
           command:
             - /usr/bin/dumb-init
@@ -154,7 +160,7 @@ spec:
             - name: inspect
               containerPort: 9229
           {{- end }}
-          image: oada/auth:{{ $tag }}
+          image: {{ $.Values.oada.namespace }}auth:{{ $tag }}
           imagePullPolicy: {{ $.Values.oada.imagePullPolicy }}
           command: ["/usr/bin/dumb-init", "--rewrite", "15:2", "--", "/bin/sh"]
           args:
@@ -171,5 +177,4 @@ spec:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
 ---
-{{- end -}}
 {{- end }}

charts/oada/templates/uservice.yaml

@@ -1,3 +1,4 @@
+{{/* vim: set ft=helm : */}}
 {{/*
    * Copyright 2023 Open Ag Data Alliance
    *
@@ -16,6 +17,7 @@
 {{- range $k, $v := .Values.oada.externalServices -}}
 {{/* Deploy external OADA services `$k` */}}
 {{- $name := print $k "-" $.Release.Name -}}
+{{- if ne $v.enabled false }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -48,8 +50,14 @@ spec:
             - service
             - http-handler-{{ $.Release.Name }}
           resources:
-            limits: {{- toYaml $.Values.k8sWaitFor.resources.limits | nindent 14 }}
-            requests: {{- toYaml $.Values.k8sWaitFor.resources.limits | nindent 14 }}
+            limits:
+              {{- toYaml $.Values.k8sWaitFor.resources.limits | nindent 14 }}
+            requests:
+              {{- toYaml $.Values.k8sWaitFor.resources.limits | nindent 14 }}
+          securityContext:
+            #runAsUser: 1000 # run as user node (uid 1000)
+            allowPrivilegeEscalation: false
+            readOnlyRootFilesystem: true
       containers:
         - envFrom:
             - configMapRef:
@@ -73,7 +81,7 @@ spec:
             periodSeconds: 10
           securityContext:
             runAsNonRoot: true
-            runAsUser: 1000 # run as user node (uid 1000)
+            # runAsUser: 1000 # run as user node (uid 1000)
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: true
           name: {{ $name }}
@@ -147,4 +155,5 @@ spec:
     any: false
 {{- end }}
 ---
+{{ end -}}
 {{ end -}}