feat!(mirrorbits-parent) use global values for umbrella storage and i…

…ngress. Breaking Change. Signed-off-by: Damien Duportal <[email protected]>
jenkins-infra · Oct 1, 2023 · 954f8fa · 954f8fa
1 parent 9b112a8
commit 954f8fa
Show file tree

Hide file tree

Showing 9 changed files with 185 additions and 172 deletions.
diff --git a/charts/mirrorbits-parent/Chart.yaml b/charts/mirrorbits-parent/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: mirrorbits-parent
 description: A mirrorbits parent chart for Kubernetes
 type: application
-version: 0.2.3
+version: 1.0.0
 dependencies:
 - name: mirrorbits-lite
   condition: mirrorbits-lite.enabled

diff --git a/charts/mirrorbits-parent/templates/ingress.yaml b/charts/mirrorbits-parent/templates/ingress.yaml
@@ -1,21 +1,21 @@
-{{- if .Values.ingress.enabled -}}
+{{- if .Values.global.ingress.enabled -}}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "mirrorbits-parent.name" . }}
   labels:
 {{ include "mirrorbits-parents.labels" . | indent 4 }}
-  {{- with .Values.ingress.annotations }}
+  {{- with .Values.global.ingress.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-{{- if .Values.ingress.className }}
-  ingressClassName: {{ .Values.ingress.className }}
+{{- if .Values.global.ingress.className }}
+  ingressClassName: {{ .Values.global.ingress.className }}
 {{- end }}
-{{- if .Values.ingress.tls }}
+{{- if .Values.global.ingress.tls }}
   tls:
-  {{- range .Values.ingress.tls }}
+  {{- range .Values.global.ingress.tls }}
     - hosts:
       {{- range .hosts }}
         - {{ . | quote }}
@@ -24,7 +24,7 @@ spec:
   {{- end }}
 {{- end }}
   rules:
-  {{- range .Values.ingress.hosts }}
+  {{- range .Values.global.ingress.hosts }}
     - host: {{ .host | quote }}
       http:
         paths:

diff --git a/charts/mirrorbits-parent/templates/persistentvolume.yaml b/charts/mirrorbits-parent/templates/persistentvolume.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.storage.enabled }}
+{{- if .Values.global.storage.enabled }}
 ---
 apiVersion: v1
 kind: PersistentVolume
@@ -8,11 +8,11 @@ metadata:
 {{- include "mirrorbits-parents.labels" . | nindent 4 }}
 spec:
   accessModes:
-    {{- toYaml .Values.storage.accessModes | nindent 4 }}
+    {{- toYaml .Values.global.storage.accessModes | nindent 4 }}
   capacity:
-    storage: {{ .Values.storage.storageSize }}
-  storageClassName: {{ .Values.storage.storageClassName }}
-  {{- with .Values.storage.persistentVolume.azureFile }}
+    storage: {{ .Values.global.storage.storageSize }}
+  storageClassName: {{ .Values.global.storage.storageClassName }}
+  {{- with .Values.global.storage.persistentVolume.azureFile }}
   csi:
     driver: file.csi.azure.com
     nodeStageSecretRef:
@@ -24,7 +24,7 @@ spec:
     volumeHandle: {{ include "mirrorbits-parent.name" $ }}
     readOnly: {{ .readOnly | default false }}
   {{- end }}
-  {{- with .Values.storage.persistentVolume.additionalSpec }}
+  {{- with .Values.global.storage.persistentVolume.additionalSpec }}
     {{- toYaml . | nindent 2 }}
   {{- end }}
 {{- end }}
diff --git a/charts/mirrorbits-parent/templates/persistentvolumeclaim.yaml b/charts/mirrorbits-parent/templates/persistentvolumeclaim.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.storage.enabled }}
+{{- if .Values.global.storage.enabled }}
 ---
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -9,12 +9,12 @@ metadata:
 spec:
   volumeName: {{ include "mirrorbits-parent.name" . }}
   accessModes:
-    {{- toYaml .Values.storage.accessModes | nindent 4 }}
+    {{- toYaml .Values.global.storage.accessModes | nindent 4 }}
   resources:
     requests:
-      storage: {{ .Values.storage.storageSize }}
-  storageClassName: {{ .Values.storage.storageClassName }}
-  {{- with .Values.storage.persistentVolumeClaim.additionalSpec }}
+      storage: {{ .Values.global.storage.storageSize }}
+  storageClassName: {{ .Values.global.storage.storageClassName }}
+  {{- with .Values.global.storage.persistentVolumeClaim.additionalSpec }}
     {{- toYaml . | nindent 2 }}
   {{- end }}
 {{- end }}
diff --git a/charts/mirrorbits-parent/templates/persistentvolumesecret.yaml b/charts/mirrorbits-parent/templates/persistentvolumesecret.yaml
@@ -1,4 +1,4 @@
-{{ with .Values.storage.persistentVolume.azureFile -}}
+{{ with .Values.global.storage.persistentVolume.azureFile -}}
 ---
 apiVersion: v1
 kind: Secret

diff --git a/charts/mirrorbits-parent/tests/custom_values_ingress_test.yaml b/charts/mirrorbits-parent/tests/custom_values_ingress_test.yaml
@@ -10,13 +10,14 @@ set:
     service:
       port: 8080
   ## End of subchart mocked values
-  ingress:
-    enabled: true
-    hosts:
-      - host: company.org
-        paths:
-          - path: /
-            backendService: mirrorbits
+  global:
+    ingress:
+      enabled: true
+      hosts:
+        - host: company.org
+          paths:
+            - path: /
+              backendService: mirrorbits
 templates:
   - ingress.yaml
 tests:
@@ -56,27 +57,28 @@ tests:
   - it: should create ingress with multiple hosts and multiple paths with full customized values
     template: ingress.yaml
     set:
-      ingress:
-        className: my-ingress-class
-        annotations:
-          'app.kubernetes/whatever-with-chars': 'same/here-right'
-        hosts:
-          - host: company.org
-            paths:
-              - path: /.*[.](deb|hpi|war|rpm|msi|pkg|sha256|md5sum|zip|gz|pdf|json|svg|sh|jpeg|ico|png|html)$
-                backendService: httpd
-              - path: /
-                backendService: mirrorbits
-                pathType: ImplementationSpecific
-          - host: fallback.company.org
-            paths:
-              - path: /
-                backendService: httpd
-        tls:
-          - secretName: ingress-tls
-            hosts:
-              - company.org
-              - fallback.company.org
+      global:
+        ingress:
+          className: my-ingress-class
+          annotations:
+            'app.kubernetes/whatever-with-chars': 'same/here-right'
+          hosts:
+            - host: company.org
+              paths:
+                - path: /.*[.](deb|hpi|war|rpm|msi|pkg|sha256|md5sum|zip|gz|pdf|json|svg|sh|jpeg|ico|png|html)$
+                  backendService: httpd
+                - path: /
+                  backendService: mirrorbits
+                  pathType: ImplementationSpecific
+            - host: fallback.company.org
+              paths:
+                - path: /
+                  backendService: httpd
+          tls:
+            - secretName: ingress-tls
+              hosts:
+                - company.org
+                - fallback.company.org
     asserts:
       - hasDocuments:
           count: 1
@@ -135,23 +137,25 @@ tests:
   - it: should fail the ingress when a host's path does not have backendService
     template: ingress.yaml
     set:
-      ingress:
-        hosts:
-          - host: company.org
-            paths:
-              - path: /
+      global:
+        ingress:
+          hosts:
+            - host: company.org
+              paths:
+                - path: /
     asserts:
       - failedTemplate:
           errorMessage: "Required key: backendService for ingress.hosts[].paths[] objects must have the value 'httpd' or 'mirrorbits'."
   - it: should fail the ingress when a host's path has an unknown backendService
     template: ingress.yaml
     set:
-      ingress:
-        hosts:
-          - host: company.org
-            paths:
-              - path: /
-                backendService: yipikai
+      global:
+        ingress:
+          hosts:
+            - host: company.org
+              paths:
+                - path: /
+                  backendService: yipikai
     asserts:
       - failedTemplate:
           errorMessage: "Required key: backendService for ingress.hosts[].paths[] objects must have the value 'httpd' or 'mirrorbits'."
@@ -160,12 +164,13 @@ tests:
     set:
       httpd:
         enabled: false
-      ingress:
-        hosts:
-          - host: company.org
-            paths:
-              - path: /
-                backendService: httpd
+      global:
+        ingress:
+          hosts:
+            - host: company.org
+              paths:
+                - path: /
+                  backendService: httpd
     asserts:
       - failedTemplate:
           errorMessage: "Cannot use httpd as backend if it is disabled."
@@ -174,12 +179,13 @@ tests:
     set:
       mirrorbits-lite:
         enabled: false
-      ingress:
-        hosts:
-          - host: company.org
-            paths:
-              - path: /
-                backendService: mirrorbits
+      global:
+        ingress:
+          hosts:
+            - host: company.org
+              paths:
+                - path: /
+                  backendService: mirrorbits
     asserts:
       - failedTemplate:
           errorMessage: "Cannot use mirrorbits(-lite) as backend if it is disabled."
diff --git a/charts/mirrorbits-parent/tests/custom_values_storage_test.yaml b/charts/mirrorbits-parent/tests/custom_values_storage_test.yaml
@@ -1,21 +1,22 @@
 suite: Tests with custom values
 set:
-  storage:
-    enabled: true
-    storageClassName: super-fast-storage
-    storageSize: 510Gi
-    accessModes:
-      - ReadWriteMany
-      - ReadOnlyMany
-      - ReadWriteOnce
-    persistentVolume:
-      additionalSpec:
-        persistentVolumeReclaimPolicy: Retain
-        mountOptions:
-          - dir_mode=0755
-    persistentVolumeClaim:
-      additionalSpec:
-        volumeMode: Block
+  global:
+    storage:
+      enabled: true
+      storageClassName: super-fast-storage
+      storageSize: 510Gi
+      accessModes:
+        - ReadWriteMany
+        - ReadOnlyMany
+        - ReadWriteOnce
+      persistentVolume:
+        additionalSpec:
+          persistentVolumeReclaimPolicy: Retain
+          mountOptions:
+            - dir_mode=0755
+      persistentVolumeClaim:
+        additionalSpec:
+          volumeMode: Block
 templates:
   - persistentvolume.yaml
   - persistentvolumeclaim.yaml
@@ -88,14 +89,15 @@ tests:
   - it: should provide an azurefile CSI PV with customized values if specified
     template: persistentvolume.yaml
     set:
-      storage:
-        persistentVolume:
-          azureFile:
-            resourceGroup: storage-rg
-            storageAccountName: storage-account
-            shareName: storage-share
-            storageAccountKey: StorageAccountSuperSecretKey
-            readOnly: true
+      global:
+        storage:
+          persistentVolume:
+            azureFile:
+              resourceGroup: storage-rg
+              storageAccountName: storage-account
+              shareName: storage-share
+              storageAccountKey: StorageAccountSuperSecretKey
+              readOnly: true
     asserts:
       - hasDocuments:
           count: 1
@@ -131,14 +133,15 @@ tests:
   - it: should not create any persistent volume secret
     template: persistentvolumesecret.yaml
     set:
-      storage:
-        persistentVolume:
-          azureFile:
-            resourceGroup: storage-rg
-            storageAccountName: storage-account
-            shareName: storage-share
-            storageAccountKey: 'StorageAccountSuperSecretKey!2023'
-            readOnly: true
+      global:
+        storage:
+          persistentVolume:
+            azureFile:
+              resourceGroup: storage-rg
+              storageAccountName: storage-account
+              shareName: storage-share
+              storageAccountKey: 'StorageAccountSuperSecretKey!2023'
+              readOnly: true
     asserts:
       - hasDocuments:
           count: 1
@@ -158,11 +161,12 @@ tests:
     release:
       name: rindfleischetikettierunguberwachungsaufgabenubertrags # 53 chars is the longest possible release name
     set:
-      storage:
-        persistentVolume:
-          azureFile:
-            storageAccountName: storage-account
-            storageAccountKey: 'StorageAccountSuperSecretKey!2023'
+      global:
+        storage:
+          persistentVolume:
+            azureFile:
+              storageAccountName: storage-account
+              storageAccountKey: 'StorageAccountSuperSecretKey!2023'
     asserts:
       - hasDocuments:
           count: 1

diff --git a/charts/mirrorbits-parent/tests/defaults_storage_test.yaml b/charts/mirrorbits-parent/tests/defaults_storage_test.yaml
@@ -5,8 +5,9 @@ templates:
   - persistentvolumesecret.yaml
 ## Only enable storage
 set:
-  storage:
-    enabled: true
+  global:
+    storage:
+      enabled: true
 tests:
   - it: should not create any persistent volume secret
     template: persistentvolumesecret.yaml