Skip to content

Commit

Permalink
Merge pull request #636 from kkonnov/add-daemonset-template-annotation
Browse files Browse the repository at this point in the history
Add template annotations to daemonset
  • Loading branch information
k8s-ci-robot authored Aug 16, 2023
2 parents e8ccd65 + f47aefe commit cd8015c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
4 changes: 4 additions & 0 deletions charts/aws-cloud-controller-manager/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ spec:
type: RollingUpdate
template:
metadata:
{{- if .Values.podAnnotations }}
annotations:
{{- toYaml .Values.podAnnotations | nindent 8 }}
{{- end }}
name: {{ template "cloud-controller-manager.name" . }}
labels:
k8s-app: {{ template "cloud-controller-manager.name" . }}
Expand Down
5 changes: 4 additions & 1 deletion charts/aws-cloud-controller-manager/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ securityContext: {}
# podSecurityContext -- Pods Security Context.
podSecurityContext: {}

# podAnnotations -- Pods Annotations.
podAnnotations: {}

# tolerations -- List of node taints to tolerate (requires Kubernetes >= 1.6).
tolerations:
- key: node.cloudprovider.kubernetes.io/uninitialized
Expand All @@ -120,7 +123,7 @@ tolerations:
- key: node-role.kubernetes.io/master
effect: NoSchedule
- key: node-role.kubernetes.io/control-plane
effect: NoSchedule
effect: NoSchedule

# dnsPolicy -- dnsPolicy of deamonset pods. Should be set to Default if deployed as a deamonset on control-plane nodes to resolve properly
dnsPolicy: Default
Expand Down

0 comments on commit cd8015c

Please sign in to comment.