Support for Gimlet metadata annotations

This reverts commit c4b19f2801.

.github/workflows/release.yml

@@ -96,6 +96,7 @@ jobs:
 
         sed -i "s/version: $CHART_VERSION/version: $increased_version/" charts/onechart/Chart.yaml
         sed -i "s/version: $CHART_VERSION/version: $increased_version/" charts/cron-job/Chart.yaml
+        sed -i "s/version: $CHART_VERSION/version: $increased_version/" charts/static-site/Chart.yaml
 
         git status
         git add .

charts/common/Chart.yaml

@@ -15,4 +15,4 @@ type: library
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.3.1

charts/common/templates/_envFromRef.yaml

@@ -1,5 +1,5 @@
 {{- define "common.envFromRef.tpl" -}}
-{{- if or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName }}
+{{- if or (or (or (.Values.vars) (.Values.secretEnabled)) .Values.sealedSecrets) .Values.secretName -}}
 envFrom: &envFrom
 {{- if .Values.vars }}
   - configMapRef:
@@ -18,4 +18,4 @@ envFrom: &envFrom
       name: {{ template "common.robustName" .Release.Name }}
 {{- end }}
 {{- end }}
-{{- end }}
+{{- end }}

charts/common/templates/_volumeMountsRef.yaml

@@ -1,5 +1,5 @@
 {{- define "common.volumeMountsRef.tpl" -}}
-{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets }}
+{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets -}}
 volumeMounts: &volumeMounts
 {{- range .Values.volumes }}
 {{- if not (hasPrefix "init-" .name) }}

charts/common/templates/_volumesRef.yaml

@@ -1,5 +1,5 @@
 {{- define "common.volumesRef.tpl" -}}
-{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets }}
+{{- if or (or (or (.Values.volumes) (.Values.sealedFileSecrets)) .Values.fileSecrets) .Values.existingFileSecrets -}}
 volumes:
   {{- range .Values.volumes }}
   - name: {{ .name }}

charts/cron-job/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.3.0
-digest: sha256:4f1fb49a840753587de0b15ccd8ae83f655fc8043d0a71a4cbec228365713b0d
-generated: "2023-06-08T16:30:30.656437+02:00"
+  version: 0.3.1
+digest: sha256:64689b29ef8b2262efbd5d49bccf40f798698d426dcfdc7c632aaf183a8cc681
+generated: "2023-08-18T08:34:24.144108449+02:00"

charts/cron-job/Chart.yaml

@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.50.0
+version: 0.57.0
 
 dependencies:
   - name: common
-    version: 0.3.0
+    version: 0.3.1
     repository: file://../common

charts/onechart/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: file://../common
-  version: 0.3.0
-digest: sha256:4f1fb49a840753587de0b15ccd8ae83f655fc8043d0a71a4cbec228365713b0d
-generated: "2023-06-08T16:30:30.052037+02:00"
+  version: 0.3.1
+digest: sha256:64689b29ef8b2262efbd5d49bccf40f798698d426dcfdc7c632aaf183a8cc681
+generated: "2023-08-18T08:31:18.469039683+02:00"

charts/onechart/Chart.yaml

@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.50.0
+version: 0.57.0
 
 dependencies:
   - name: common
-    version: 0.3.0
+    version: 0.3.1
     repository: file://../common

charts/onechart/templates/deployment.yaml

@@ -63,11 +63,15 @@ spec:
           {{- end }}
           volumeMounts:
           {{- range $.Values.volumes }}  
-          {{if (or (hasPrefix "shared-" .name) (hasPrefix "init-" .name))}}
+          {{- if (or (hasPrefix "shared-" .name) (hasPrefix "init-" .name))}}
           - mountPath: {{ .path }}
             name: {{ .name }}
           {{- end }}
-          {{- end }}   
+          {{- end }}
+          {{- if .securityContext }}
+          securityContext:
+          {{- toYaml .securityContext | nindent 12 }}
+          {{- end}}
         {{- end }}      
       containers:
         - name: {{ template "robustName" .Release.Name }}
@@ -87,7 +91,7 @@ spec:
             - name: http
               containerPort: {{ .Values.containerPort }}
               protocol: TCP
-            {{ else }}
+            {{- else }}
             {{- range .Values.ports }}
             - name: {{ .name }}
               containerPort: {{ .containerPort }}

charts/onechart/templates/service.yaml

@@ -31,7 +31,7 @@ spec:
       {{- if .Values.nodePort }}
       nodePort: {{ .Values.nodePort }}
       {{- end }}
-    {{ else }}
+    {{- else }}
     {{- range .Values.ports }}
     - name: {{ .name }}
       port: {{ if .svcPort }}{{ .svcPort }}{{ else }}{{ .containerPort }}{{ end }}

charts/onechart/tests/deployment_initcontainers_test.yaml

@@ -26,6 +26,13 @@ tests:
       - equal:
           path: spec.template.spec.initContainers[0].command
           value: ['/bin/sh', '-c', 'while true; do date; sleep 2; done && ls /data && printf something']
-         
-     
-  
+
+  - it: Should set security context
+    set:
+      initContainers:
+          - securityContext:
+              runAsNonRoot: true
+    asserts:
+      - equal:
+          path: spec.template.spec.initContainers[0].securityContext.runAsNonRoot
+          value: true

charts/static-site/Chart.yaml

@@ -14,5 +14,5 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
+version: 0.57.0
 

charts/static-site/helm-ui.json

@@ -3,14 +3,13 @@
     "schemaIDs": [
       "#/properties/gitCloneUrl",
       "#/properties/buildImage",
-      "#/properties/buildTag",
       "#/properties/buildScript",
       "#/properties/builtAssets"
-
     ],
     "uiSchema": {
-      "#/properties/buildScript":{
-        "ui:widget": "textarea"
+      "#/properties/buildScript": {
+        "ui:widget": "textarea",
+        "ui:rows": 10
       }
     },
     "metaData": {

charts/static-site/templates/deployment.yaml

@@ -5,6 +5,15 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "staticSite.labels" . | nindent 4 }}
+  {{- if or .Values.gitRepository .Values.gitSha }}
+  annotations:
+    {{- if .Values.gitRepository }}
+    gimlet.io/git-repository: {{ .Values.gitRepository }}
+    {{- end }}
+    {{- if .Values.gitSha }}
+    gimlet.io/git-sha: {{ .Values.gitSha }}
+    {{- end }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
@@ -23,7 +32,9 @@ spec:
       imagePullSecrets:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      serviceAccountName: {{ template "robustName" .Release.Name  }}
+      {{- if .Values.serviceAccount }}
+      serviceAccountName: {{ .Values.serviceAccount }}
+      {{- end }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }} 
       volumes:
@@ -31,7 +42,7 @@ spec:
         emptyDir: {}  
       initContainers:
       - name: init-con
-        image: {{ .Values.buildImage }}:{{ .Values.buildTag }}
+        image: {{ .Values.buildImage }}
         {{- if .Values.buildScript }}
         command:
         - sh 

charts/static-site/templates/service.yaml

@@ -2,8 +2,18 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "robustName" .Release.Name  }}
+  namespace: {{ .Release.Namespace }}
   labels:
     {{- include "staticSite.labels" . | nindent 4 }}
+  {{- if or .Values.gitRepository .Values.gitSha }}
+  annotations:
+    {{- if .Values.gitRepository }}
+    gimlet.io/git-repository: {{ .Values.gitRepository }}
+    {{- end }}
+    {{- if .Values.gitSha }}
+    gimlet.io/git-sha: {{ .Values.gitSha }}
+    {{- end }}
+  {{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

charts/static-site/templates/serviceaccount.yaml

@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "robustName" .Release.Name  }}
-  labels:
-    {{- include "staticSite.labels" . | nindent 4 }}
-  {{- with .Values.serviceAccount.annotations }}
-  annotations:
-    {{- toYaml . | nindent 4 }}
-  {{- end }}
-{{- end }}

charts/static-site/tests/deployment_test.yaml

@@ -5,11 +5,8 @@ tests:
   - it: Should set image, tag and command
     set:
       gitCloneUrl: https:/github.com/mycompany/myrepo.git
-      buildImage: nginx
-      buildTag: x.y.z
+      buildImage: nginx:x.y.z
     asserts:
       - equal:
           path: spec.template.spec.initContainers[0].image
           value: nginx:x.y.z
-
-

charts/static-site/values.schema.json

@@ -8,8 +8,7 @@
   "examples": [
     {
       "gitCloneUrl": "https://github.com/gimlet-io/hugo-site.git",
-      "buildImage": "node",
-      "buildTag": "latest",
+      "buildImage": "node:latest",
       "buildScript": "npm install && npm install -g gatsby-cli && gatsby build",
       "builtAssets": "public/"
     }
@@ -17,7 +16,6 @@
   "required": [
     "gitCloneUrl",
     "buildImage",
-    "buildTag",
     "buildScript",
     "builtAssets"
   ],
@@ -27,27 +25,21 @@
       "type": "string",
       "title": "Repo url",
       "description": "The static site's git repository",
-      "default": "https://github.com/gimlet-io/hugo-site.git"
+      "default": "https://github.com/gimlet-io/reactjs-test-app.git"
     },
     "buildImage": {
       "$id": "#/properties/buildImage",
       "type": "string",
       "title": "Build image",
       "description": "The image that will be used for the build proccess",
-      "default":"bitnami/git"
-    },
-    "buildTag": {
-      "$id": "#/properties/buildTag",
-      "type": "string",
-      "title": "Image tag",
-      "default": "latest"
+      "default": "node:latest"
     },
     "buildScript": {
       "$id": "#/properties/buildScript",
       "type": "string",
       "title": "Build script",
       "description": "Commands required for the build to be completed",
-      "default": "# !/usr/bin/env bash\n# pre -reqs\napt-get update && apt-get install -y wget\n\n# Setting up Hugo \nwget https://github.com/gohugoio/hugo/releases/download/v0.111.3/hugo_0.111.3_Linux-64bit.tar.gz &&\ntar -xzf hugo_0.111.3_Linux-64bit.tar.gz &&\nchmod +x hugo\n\n./hugo"
+      "default": "# !/usr/bin/env bash\n\nnpm install\nnpm run build"
 
     },
     "builtAssets": {
@@ -55,7 +47,7 @@
       "type": "string",
       "title": "Built assets",
       "description": "The folder containing the build's generated files",
-      "default": "public/"
+      "default": "build/"
     },
     "ingress": {
       "$id": "#/properties/ingress",
@@ -119,7 +111,6 @@
         }
       }
     }
-
   },
   "additionalProperties": true
 }

charts/static-site/values.yaml

@@ -13,15 +13,6 @@ imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
 
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
 podAnnotations: {}
 
 podSecurityContext: {}
@@ -62,18 +53,8 @@ tolerations: []
 affinity: {}
 
 # values to build and deploy static sites
-gitCloneUrl: https://github.com/gimlet-io/hugo-site.git
-buildImage: bitnami/git # the image must have git installed
-buildTag: latest
+gitCloneUrl: https://github.com/gimlet-io/reactjs-test-app.git
+buildImage: "node:latest"
 buildScript: |
-    # !/usr/bin/env bash
-    # pre -reqs
-    apt-get update && apt-get install -y wget
-
-    # Setting up Hugo 
-    wget https://github.com/gohugoio/hugo/releases/download/v0.111.3/hugo_0.111.3_Linux-64bit.tar.gz &&
-    tar -xzf hugo_0.111.3_Linux-64bit.tar.gz &&
-    chmod +x hugo
-
-    ./hugo
-builtAssets: public/ 
+  npm install && npm run build
+builtAssets: build/ 

values.yaml

@@ -5,8 +5,6 @@ ingress:
 gitRepository: github.com/laszlocph/demo-app
 gitSha: xyz
 
-vars:
-  MY_VAR: "value"
 
 volumes:
   - name: testing
@@ -15,4 +13,8 @@ volumes:
       path: /deleteme
   - name: empty
     path: /deleteme2
-    emptyDir: true 
+    emptyDir: true
+
+vars:
+  var1: value1
+  var2: value2