Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

helm: renamed podsAnnotations variable into podAnnotations #13458

Merged
merged 2 commits into from
Oct 13, 2020
Merged

helm: renamed podsAnnotations variable into podAnnotations #13458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b92b7c6
helm: configurable annotations for agent and operator pods
mvisonneau Oct 10, 2020
548cf75
helm: renamed podsAnnotations variable into podAnnotations
mvisonneau Oct 10, 2020
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
1 change: 1 addition & 0 deletions install/kubernetes/cilium/charts/agent/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ spec:
# gets priority scheduling.
# https://kubernetes.io/docs/tasks/administer-cluster/guaranteed-scheduling-critical-addon-pods/
scheduler.alpha.kubernetes.io/critical-pod: ""
{{- with .Values.podAnnotations }}{{- toYaml . | nindent 8 }}{{- end }}
sayboras marked this conversation as resolved.
Show resolved Hide resolved
labels:
k8s-app: cilium
{{- if .Values.keepDeprecatedLabels }}
Expand Down
3 changes: 3 additions & 0 deletions install/kubernetes/cilium/charts/agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ image: cilium
# update process.
maxUnavailable: 2

# Additional annotations for the agent pods
podAnnotations: {}

# Specifies annotation for service accounts
serviceAccount:
annotations: {}
Expand Down
1 change: 1 addition & 0 deletions install/kubernetes/cilium/charts/operator/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ spec:
prometheus.io/port: {{ .Values.global.operatorPrometheus.port | quote }}
prometheus.io/scrape: "true"
{{- end }}
{{- with .Values.podAnnotations }}{{- toYaml . | nindent 8 }}{{- end }}
labels:
io.cilium/app: operator
name: cilium-operator
Expand Down
2 changes: 2 additions & 0 deletions install/kubernetes/cilium/charts/operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ serviceAccount:
# Specifies the resources for the operator container
resources: {}

# Additional annotations for the operator pods
podAnnotations: {}

# Number of replicas to run for cilium operator deployment.
numReplicas: 2
Expand Down