feat(sidecar-terminator): Sync with improvements from 1.3.0 (#459)

* feat(sidecar-terminator): Sync with improvements from 1.3.0 * feat(sidecar-terminator): Sync with improvements from 1.3.0 --------- Co-authored-by: will.hearn <[email protected]>
StatCan · Nov 30, 2023 · a5cc48f · a5cc48f
1 parent dda6a2b
commit a5cc48f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/stable/sidecar-terminator/Chart.yaml b/stable/sidecar-terminator/Chart.yaml
@@ -3,12 +3,13 @@ appVersion: "1.0.0"
 description: |-
   A chart used for easily configuring kubernetes-sidecar-terminator in a cluster.
 name: sidecar-terminator
-version: 1.2.1
+version: 1.2.2
 keywords:
 - sidecar-terminator
 sources:
-- https://gitlab.k8s.cloud.statcan.ca/cloudnative/terraform/modules/terraform-kubernetes-sidecar-terminator
+- https://github.com/statcan/kubernetes-sidecar-terminator
 maintainers:
 - name: Mohamed Dahrouj
   email: [email protected]
 home: https://www.statcan.gc.ca
+kubeVersion: ">= 1.23"
diff --git a/stable/sidecar-terminator/templates/deployment.yaml b/stable/sidecar-terminator/templates/deployment.yaml
@@ -12,8 +12,15 @@ spec:
   strategy: {}
   template:
     metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       labels:
-        app.kubernetes.io/name: {{ include "sidecar-terminator.fullname" . }}
+        {{- include "sidecar-terminator.labels" . | nindent 8 }}
+        {{- with .Values.podLabels }}
+          {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -24,7 +31,7 @@ spec:
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}
       containers:
-      - image: {{ .Values.image.repository }}
+      - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         name: sidecar-terminator
         args:
           - '--lock-namespace'

diff --git a/stable/sidecar-terminator/values.yaml b/stable/sidecar-terminator/values.yaml
@@ -4,8 +4,13 @@
 
 replicaCount: 1
 
+# Annotations to add to the Pod
+podAnnotations: {}
+# Labels to add to the Pod
+podLabels: {}
+
 image:
-  repository: zachomedia/kubernetes-sidecar-terminator
+  repository: statcan/kubernetes-sidecar-terminator
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""