Fix Statefulset and Daemonset objects (#35)

Lowess · Jun 23, 2023 · a52ed38 · a52ed38
1 parent 3befbfa
commit a52ed38
Show file tree

Hide file tree

Showing 9 changed files with 70 additions and 11 deletions.
diff --git a/charts/monochart/.helmignore b/charts/monochart/.helmignore
@@ -1,6 +1,8 @@
 # Patterns to ignore when building packages.
 # This supports shell glob matching, relative path matching, and
 # negation (prefixed with !). Only one pattern per line.
+tests/
+
 .DS_Store
 # Common VCS dirs
 .git/

diff --git a/charts/monochart/Chart.yaml b/charts/monochart/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 description: A declarative helm chart for deploying common types of services on Kubernetes
 name: monochart
-version: 1.0.0
-appVersion: 1.0.0
+version: 1.0.1
+appVersion: 1.0.1
 home: https://github.com/Lowess/charts/tree/master/charts/monochart
 icon: https://raw.githubusercontent.com/cloudposse/charts/master/incubator/monochart/logo.png
 maintainers:

diff --git a/charts/monochart/templates/daemonset.yaml b/charts/monochart/templates/daemonset.yaml
@@ -54,12 +54,15 @@ spec:
         securityContext:
 {{ toYaml . | indent 10 }}
 {{- end }}
+{{- $defaultService := (get .Values.service "default") }}
+{{ if $defaultService }}
         ports:
-{{- range $name, $port := .Values.service.ports }}
+{{- range $name, $port := (get $defaultService "ports") }}
 {{- if $port }}
-        - name: {{ $name }}
-          containerPort: {{ $port.internal }}
-          protocol: {{ default "TCP" $port.protocol  }}
+          - name: {{ $name }}
+            containerPort: {{ $port.internal }}
+            protocol: {{ default "TCP" $port.protocol  }}
+{{- end }}
 {{- end }}
 {{- end }}
         volumeMounts:

diff --git a/charts/monochart/templates/statefulset.yaml b/charts/monochart/templates/statefulset.yaml
@@ -42,6 +42,10 @@ spec:
 {{ toYaml . | indent 8 }}
 {{- end }}
     spec:
+{{- with .Values.statefulset.securityContext }}
+      securityContext:
+{{ toYaml . | indent 8 }}
+{{- end }}
 {{- if index .Values "serviceAccountName" }}
       serviceAccountName: {{ .Values.serviceAccountName }}
 {{- end }}
@@ -87,12 +91,15 @@ spec:
         securityContext:
 {{ toYaml . | indent 10 }}
 {{- end }}
+{{- $defaultService := (get .Values.service "default") }}
+{{ if $defaultService }}
         ports:
-{{- range $name, $port := .Values.service.ports }}
+{{- range $name, $port := (get $defaultService "ports") }}
 {{- if $port }}
-        - name: {{ $name }}
-          containerPort: {{ $port.internal }}
-          protocol: {{ default "TCP" $port.protocol  }}
+          - name: {{ $name }}
+            containerPort: {{ $port.internal }}
+            protocol: {{ default "TCP" $port.protocol  }}
+{{- end }}
 {{- end }}
 {{- end }}
         volumeMounts:

diff --git a/charts/monochart/tests/service_test.yaml b/charts/monochart/tests/service_test.yaml
@@ -0,0 +1,20 @@
+suite: Test monochart Service
+templates:
+  - templates/service.yaml
+values:
+  - values/service.yaml
+release:
+  name: my-release
+
+tests:
+  - it: should pass
+    release:
+      name: my-release
+
+  - it: assert type
+    asserts:
+      - hasDocuments:
+          count: 2
+      - containsDocument:
+          kind: Service
+          apiVersion: v1
diff --git a/charts/monochart/test/full.yaml → charts/monochart/tests/values/full_test.yaml b/charts/monochart/test/full.yaml → charts/monochart/tests/values/full_test.yaml
diff --git a/charts/monochart/tests/values/service.yaml b/charts/monochart/tests/values/service.yaml
@@ -0,0 +1,5 @@
+service:
+  default:
+    enabled: true
+  stable:
+    enabled: true
diff --git a/charts/monochart/values.example.yaml b/charts/monochart/values.example.yaml
@@ -112,7 +112,7 @@ deployment:
             - va-verity-eks--stage-vng-public
 
 rollout:
-  enabled: true
+  enabled: false
   labels: {}
   pod:
     annotations: {}
@@ -155,6 +155,21 @@ rollout:
           rootService: default
           servicePort: 443
 
+statefulset:
+  enabled: true
+  persistence:
+    enabled: true
+    useVolumeClaimTemplates: true
+    mountPath: /tmp
+    accessMode: ReadWriteOnce
+    size: 30Gi
+    storageClass: gp3
+  securityContext:
+    runAsUser: 1000
+    runAsGroup: 1000
+    fsGroup: 1000
+
+
 service:
   default:
     enabled: true

diff --git a/charts/monochart/values.yaml b/charts/monochart/values.yaml
@@ -4,6 +4,13 @@ replicaCount: 1
 
 # serviceAccountName: my-service-account
 
+dockercfg:
+  enabled: false
+  # image:
+  #   pullSecret:
+  #     registry: https://index.docker.io/v1/
+  #     username: example
+  #     password: password
 
 image:
   repository: scratch