Add ability to specify pod labels to all deployments and upgraded Dex…

… dependency to 0.16.0 (#94)
AzBuilder · Feb 15, 2024 · b7f23a9 · b7f23a9
1 parent a1526fe
commit b7f23a9
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 5 deletions.
diff --git a/charts/terrakube/Chart.lock b/charts/terrakube/Chart.lock
@@ -7,9 +7,9 @@ dependencies:
   version: 12.2.1
 - name: dex
   repository: https://charts.dexidp.io
-  version: 0.13.0
+  version: 0.16.0
 - name: redis
   repository: https://charts.bitnami.com/bitnami
   version: 17.10.1
-digest: sha256:b585024374038198da33c7e8484d7a6e4738e0418cec205a0e91ac1b85f3b91e
-generated: "2023-11-10T09:50:04.812420216-06:00"
+digest: sha256:c162d1108dcb874659cf0eabb02ecd016d4ee9157f140a44fb9f99200c1ea9fa
+generated: "2024-02-08T17:41:25.9940401Z"
diff --git a/charts/terrakube/Chart.yaml b/charts/terrakube/Chart.yaml
@@ -15,7 +15,7 @@ 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: 3.12.0
+version: 3.13.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -35,7 +35,7 @@ dependencies:
   repository: "https://charts.bitnami.com/bitnami"
 
 - name: dex
-  version: "0.13.0"
+  version: "0.16.0"
   condition: dex.enabled
   repository: "https://charts.dexidp.io"
 

diff --git a/charts/terrakube/charts/dex-0.13.0.tgz b/charts/terrakube/charts/dex-0.13.0.tgz
diff --git a/charts/terrakube/charts/dex-0.16.0.tgz b/charts/terrakube/charts/dex-0.16.0.tgz
diff --git a/charts/terrakube/templates/deployment-api.yaml b/charts/terrakube/templates/deployment-api.yaml
@@ -14,6 +14,9 @@ spec:
     metadata:
       labels:
         app: terrakube-api
+        {{- with .Values.api.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/secrets-api.yaml") . | sha256sum }}
     spec:

diff --git a/charts/terrakube/templates/deployment-executor.yaml b/charts/terrakube/templates/deployment-executor.yaml
@@ -14,6 +14,9 @@ spec:
     metadata:
       labels:
         app: terrakube-executor
+        {{- with .Values.executor.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/secrets-executor.yaml") . | sha256sum }}
     spec:

diff --git a/charts/terrakube/templates/deployment-openldap.yaml b/charts/terrakube/templates/deployment-openldap.yaml
@@ -14,6 +14,9 @@ spec:
     metadata:
       labels:
         app: terrakube-openldap
+        {{- with .Values.openldap.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/secret-openldap.yaml") . | sha256sum }}
     spec:

diff --git a/charts/terrakube/templates/deployment-registry.yaml b/charts/terrakube/templates/deployment-registry.yaml
@@ -14,6 +14,9 @@ spec:
     metadata:
       labels:
         app: terrakube-registry
+        {{- with .Values.registry.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/secrets-registry.yaml") . | sha256sum }}
     spec:

diff --git a/charts/terrakube/templates/deployment-ui.yaml b/charts/terrakube/templates/deployment-ui.yaml
@@ -14,6 +14,9 @@ spec:
     metadata:
       labels:
         app: terrakube-ui
+        {{- with .Values.ui.podLabels }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/secrets-ui.yaml") . | sha256sum }}
     spec:

diff --git a/charts/terrakube/values.schema.json b/charts/terrakube/values.schema.json
@@ -195,6 +195,9 @@
               "type": "object"
             }
           },
+          "podLabels": {
+            "type": "object"
+          },
           "env": {
             "type": "array",
             "items": {
@@ -249,6 +252,14 @@
           }
         }
       },
+      "openldap": {
+        "type": "object",
+        "properties": {
+          "podLabels": {
+            "type": "object"
+          }
+        }
+      },
       "executor": {
         "type": "object",
         "required": ["enabled", "replicaCount", "properties"],
@@ -284,6 +295,9 @@
               "type": "object"
             }
           },
+          "podLabels": {
+            "type": "object"
+          },
           "env": {
             "type": "array",
             "items": {
@@ -347,6 +361,9 @@
           "nodeSelector": {
             "type": "object"
           },
+          "podLabels": {
+            "type": "object"
+          },
           "tolerations": {
             "type": "array",
             "items": {
@@ -417,6 +434,9 @@
             "items": {
               "type": "object"
             }
+          },
+          "podLabels": {
+            "type": "object"
           }
         }
       },