Merge pull request #1468 from nitinatgh/add_annotations

Add pod level annotations
kubernetes-retired · Nov 2, 2021 · 753e332 · 753e332
2 parents 224fe95 + 43efccf
commit 753e332
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/charts/kubefed/Chart.yaml b/charts/kubefed/Chart.yaml
@@ -1,11 +1,11 @@
 apiVersion: v2
 description: KubeFed helm chart
 name: kubefed
-version: 0.0.3
+version: 0.0.4
 kubeVersion: ">= 1.16.0-0"
 dependencies:
 - name: controllermanager
-  version: 0.0.3
+  version: 0.0.4
   repository: "https://localhost/" # Required but unused.
   condition: controllermanager.enabled
 
diff --git a/charts/kubefed/README.md b/charts/kubefed/README.md
@@ -104,6 +104,7 @@ chart and their default values.
 | controllermanager.controller.repository        | Repo of the KubeFed image.                                                                                                                                                         | quay.io/kubernetes-multicluster |
 | controllermanager.controller.image             | Name of the KubeFed image.                                                                                                                                                         | kubefed                         |
 | controllermanager.controller.tag               | Tag of the KubeFed image.                                                                                                                                                          | canary                          |
+| controllermanager.controller.podAnnotations    | Pod level annotations for the KubeFed controller.                                                                                                                                  | {}                              |
 | controllermanager.controller.replicaCount      | Number of replicas for KubeFed controller manager.                                                                                                                                 | 2                          |
 | controllermanager.controller.imagePullPolicy   | Image pull policy.                                                                                                                                                                 | IfNotPresent                          |
 | controllermanager.webhook.repository           | Repo of the KubeFed image.                                                                                                                                                         | quay.io/kubernetes-multicluster |

diff --git a/charts/kubefed/charts/controllermanager/Chart.yaml b/charts/kubefed/charts/controllermanager/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: "0.0.3"
+appVersion: "0.8.1"
 description: A Helm chart for KubeFed Controller Manager
 name: controllermanager
-version: 0.0.3
+version: 0.0.4
diff --git a/charts/kubefed/charts/controllermanager/templates/deployments.yaml b/charts/kubefed/charts/controllermanager/templates/deployments.yaml
@@ -19,10 +19,15 @@ spec:
     metadata:
       labels:
         kubefed-control-plane: controller-manager
-      {{- if .Values.controller.forceRedeployment }}
+      {{- if or .Values.controller.forceRedeployment .Values.controller.podAnnotations }}
       annotations:
+        {{- if .Values.controller.forceRedeployment }}
         rollme: {{ randAlphaNum 5 | quote }}
-      {{- end }}
+        {{- end }}
+{{- if .Values.controller.podAnnotations }}
+{{ toYaml .Values.controller.podAnnotations | indent 8 }}
+{{- end }}
+{{- end }}
     spec:
       {{- if .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/charts/kubefed/values.yaml b/charts/kubefed/values.yaml
@@ -47,6 +47,7 @@ controllermanager:
 
   controller:
     annotations: {}
+    podAnnotations: {}
     replicaCount: 2
     repository: quay.io/kubernetes-multicluster
     image: kubefed