Skip to content
This repository was archived by the owner on Apr 25, 2023. It is now read-only.

Add pod level annotations #1468

Merged
merged 1 commit into from
Nov 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/kubefed/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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

1 change: 1 addition & 0 deletions charts/kubefed/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
4 changes: 2 additions & 2 deletions charts/kubefed/charts/controllermanager/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions charts/kubefed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ controllermanager:

controller:
annotations: {}
podAnnotations: {}
replicaCount: 2
repository: quay.io/kubernetes-multicluster
image: kubefed
Expand Down