Skip to content

Commit c88a5d6

Browse files
committed
feat: allow to setup CoreDNS pod annotations
1 parent 52833b5 commit c88a5d6

File tree

10 files changed

+47
-0
lines changed

10 files changed

+47
-0
lines changed

k8s/crds/kops.k8s.io_clusters.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3684,6 +3684,13 @@ spec:
36843684
Default: none
36853685
type: object
36863686
type: object
3687+
podAnnotations:
3688+
additionalProperties:
3689+
type: string
3690+
description: |-
3691+
PodAnnotations makes possible to add additional annotations to CoreDNS Pods.
3692+
Default: none
3693+
type: object
36873694
provider:
36883695
description: Provider indicates whether CoreDNS or kube-dns will
36893696
be the default service discovery.

pkg/apis/kops/cluster.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,9 @@ type KubeDNSConfig struct {
599599
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
600600
// NodeLocalDNS specifies the configuration for the node-local-dns addon
601601
NodeLocalDNS *NodeLocalDNSConfig `json:"nodeLocalDNS,omitempty"`
602+
// PodAnnotations makes possible to add additional annotations to CoreDNS Pods.
603+
// Default: none
604+
PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
602605
}
603606

604607
// NodeLocalDNSConfig are options of the node-local-dns

pkg/apis/kops/v1alpha2/cluster.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,9 @@ type KubeDNSConfig struct {
578578
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
579579
// NodeLocalDNS specifies the configuration for the node-local-dns addon
580580
NodeLocalDNS *NodeLocalDNSConfig `json:"nodeLocalDNS,omitempty"`
581+
// PodAnnotations makes possible to add additional annotations to CoreDNS Pods.
582+
// Default: none
583+
PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
581584
}
582585

583586
// NodeLocalDNSConfig are options of the node-local-dns

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha3/cluster.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,9 @@ type KubeDNSConfig struct {
564564
MemoryLimit *resource.Quantity `json:"memoryLimit,omitempty"`
565565
// NodeLocalDNS specifies the configuration for the node-local-dns addon
566566
NodeLocalDNS *NodeLocalDNSConfig `json:"nodeLocalDNS,omitempty"`
567+
// PodAnnotations makes possible to add additional annotations to CoreDNS Pods.
568+
// Default: none
569+
PodAnnotations map[string]string `json:"podAnnotations,omitempty"`
567570
}
568571

569572
// NodeLocalDNSConfig are options of the node-local-dns

pkg/apis/kops/v1alpha3/zz_generated.conversion.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/kops/zz_generated.deepcopy.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,12 @@ spec:
122122
metadata:
123123
labels:
124124
k8s-app: kube-dns
125+
{{- if KubeDNS.PodAnnotations }}
126+
annotations:
127+
{{- range $key, $value := KubeDNS.PodAnnotations }}
128+
{{ $key }}: "{{ $value }}"
129+
{{- end }}
130+
{{- end }}
125131
spec:
126132
priorityClassName: system-cluster-critical
127133
serviceAccountName: coredns

0 commit comments

Comments
 (0)