From 43efccf73fb327015c983dd65c436c1fd1263f0e Mon Sep 17 00:00:00 2001 From: nimistry Date: Wed, 27 Oct 2021 15:07:50 +0100 Subject: [PATCH] Added in description to the README.md Bumped up the chart version of the controller manager Bumped up the dependency version Added a new annotation and left the existing one incase it breaks any other previous changes. But not sure if the previous one created was done correctly, so have left it intact. --- charts/kubefed/Chart.yaml | 4 ++-- charts/kubefed/README.md | 1 + charts/kubefed/charts/controllermanager/Chart.yaml | 4 ++-- .../charts/controllermanager/templates/deployments.yaml | 9 +++++++-- charts/kubefed/values.yaml | 1 + 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/charts/kubefed/Chart.yaml b/charts/kubefed/Chart.yaml index 196c6b1b68..8154f2aa50 100644 --- 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 index 2c6f4d497c..b188022b24 100644 --- 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 index bc4469fe51..e74b79d213 100644 --- 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 index 8d92584b22..e249bc02a2 100644 --- 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 index c7362882b3..310094b020 100644 --- 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