Merge pull request #1400 from adberger/main

feat(helm-chart): Add additionalLabels for deployments
flux-iac · Sep 15, 2024 · 867f896 · 867f896
2 parents 5a0c70a + f1495c1
commit 867f896
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/charts/tofu-controller/README.md b/charts/tofu-controller/README.md
@@ -39,12 +39,13 @@ __Note__: If you need to use the `imagePullSecrets` it would be best to set `ser
 | awsPackage.install | bool | `true` |  |
 | awsPackage.repository | string | `"ghcr.io/flux-iac/aws-primitive-modules"` |  |
 | awsPackage.tag | string | `"v4.38.0-v1alpha11"` |  |
-| branchPlanner | object | `{"configMap":"branch-planner","enabled":false,"image":{"pullPolicy":"IfNotPresent","repository":"ghcr.io/flux-iac/branch-planner","tag":""},"podSecurityContext":{"fsGroup":1337},"pollingInterval":"30s","resources":{"limits":{"cpu":"1000m","memory":"1Gi"},"requests":{"cpu":"200m","memory":"64Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"runAsUser":65532,"seccompProfile":{"type":"RuntimeDefault"}},"sourceInterval":"30s"}` | Branch Planner-specific configurations |
+| branchPlanner | object | `{"configMap":"branch-planner","deploymentLabels":{},"enabled":false,"image":{"pullPolicy":"IfNotPresent","repository":"ghcr.io/flux-iac/branch-planner","tag":""},"podSecurityContext":{"fsGroup":1337},"pollingInterval":"30s","resources":{"limits":{"cpu":"1000m","memory":"1Gi"},"requests":{"cpu":"200m","memory":"64Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]},"readOnlyRootFilesystem":true,"runAsNonRoot":true,"runAsUser":65532,"seccompProfile":{"type":"RuntimeDefault"}},"sourceInterval":"30s"}` | Branch Planner-specific configurations |
 | caCertValidityDuration | string | `"168h0m"` | Argument for `--ca-cert-validity-duration` (Controller) |
 | certRotationCheckFrequency | string | `"30m0s"` | Argument for `--cert-rotation-check-frequency` (Controller) |
 | certValidityDuration | string | `"6h0m"` | Argument for `--cert-validity-duration` (Controller) |
 | clusterDomain | string | `"cluster.local"` | Argument for `--cluster-domain` (Controller).  ClusterDomain indicates the cluster domain, defaults to cluster.local. |
 | concurrency | int | `24` | Concurrency of the controller (Controller) |
+| deploymentLabels | object | `{}` | Additional deployment labels for the controller |
 | eksSecurityGroupPolicy | object | `{"create":false,"ids":[]}` | Create an AWS EKS Security Group Policy with the supplied Security Group IDs [See](https://docs.aws.amazon.com/eks/latest/userguide/security-groups-for-pods.html#deploy-securitygrouppolicy) |
 | eksSecurityGroupPolicy.create | bool | `false` | Create the EKS SecurityGroupPolicy |
 | eksSecurityGroupPolicy.ids | list | `[]` | List of AWS Security Group IDs |
@@ -99,4 +100,4 @@ __Note__: If you need to use the `imagePullSecrets` it would be best to set `ser
 | watchAllNamespaces | bool | `true` | If `true`, controller will watch all namespaces for Terraform resources |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.13.0](https://github.com/norwoodj/helm-docs/releases/v1.13.0)
+Autogenerated from chart metadata using [helm-docs v1.14.2](https://github.com/norwoodj/helm-docs/releases/v1.14.2)
diff --git a/charts/tofu-controller/templates/deployment.yaml b/charts/tofu-controller/templates/deployment.yaml
@@ -3,6 +3,9 @@ kind: Deployment
 metadata:
   labels:
     {{- include "tofu-controller.labels" . | nindent 4 }}
+    {{- with .Values.deploymentLabels }}
+    {{ toYaml . }}
+    {{- end }}
   name: {{ include "tofu-controller.fullname" . }}
   namespace: {{ .Release.Namespace }}
 

diff --git a/charts/tofu-controller/templates/planner-deployment.yaml b/charts/tofu-controller/templates/planner-deployment.yaml
@@ -4,6 +4,9 @@ kind: Deployment
 metadata:
   labels:
     {{- include "planner.labels" . | nindent 4 }}
+    {{- with .Values.branchPlanner.deploymentLabels }}
+    {{ toYaml . }}
+    {{- end }}
   name: {{ include "planner.fullname" . }}
   namespace: {{ .Release.Namespace }}
 spec:

diff --git a/charts/tofu-controller/values.yaml b/charts/tofu-controller/values.yaml
@@ -16,6 +16,8 @@ serviceAccount:
 nameOverride: ""
 # -- Provide a fullname
 fullnameOverride: ""
+# -- Additional deployment labels for the controller
+deploymentLabels: {}
 # -- Additional pod annotations
 podAnnotations: {}
 # -- Additional pod labels
@@ -181,6 +183,8 @@ branchPlanner:
     repository: ghcr.io/flux-iac/branch-planner
     pullPolicy: IfNotPresent
     tag: ""
+  # Additional deployment labels for the branch-planner
+  deploymentLabels: {}
   configMap: branch-planner
   pollingInterval: 30s
   # Interval value to use for Source objects for branch planner Terraform objects.