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

[addons/node-local-dns] Bump version and make image field configurable #12219

Merged
merged 1 commit into from
Sep 1, 2021
Merged

[addons/node-local-dns] Bump version and make image field configurable #12219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion k8s/crds/kops.k8s.io_clusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2104,12 +2104,16 @@ spec:
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
enabled:
description: Enabled activates the node-local-dns addon
description: Enabled activates the node-local-dns addon.
type: boolean
forwardToKubeDNS:
description: If enabled, nodelocal dns will use kubedns as
a default upstream
type: boolean
image:
description: Image overrides the default docker image used
for node-local-dns addon.
type: string
localIP:
description: Local listen IP address. It can be any IP in
the 169.254.20.0/16 space or any other IP address that can
Expand Down
4 changes: 3 additions & 1 deletion pkg/apis/kops/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,8 +502,10 @@ type KubeDNSConfig struct {

// NodeLocalDNSConfig are options of the node-local-dns
type NodeLocalDNSConfig struct {
// Enabled activates the node-local-dns addon
// Enabled activates the node-local-dns addon.
Enabled *bool `json:"enabled,omitempty"`
// Image overrides the default docker image used for node-local-dns addon.
Image *string `json:"image,omitempty"`
// Local listen IP address. It can be any IP in the 169.254.20.0/16 space or any other IP address that can be guaranteed to not collide with any existing IP.
LocalIP string `json:"localIP,omitempty"`
// If enabled, nodelocal dns will use kubedns as a default upstream
Expand Down
4 changes: 3 additions & 1 deletion pkg/apis/kops/v1alpha2/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,10 @@ type KubeDNSConfig struct {

// NodeLocalDNSConfig are options of the node-local-dns
type NodeLocalDNSConfig struct {
// Enabled activates the node-local-dns addon
// Enabled activates the node-local-dns addon.
Enabled *bool `json:"enabled,omitempty"`
// Image overrides the default docker image used for node-local-dns addon.
Image *string `json:"image,omitempty"`
// Local listen IP address. It can be any IP in the 169.254.20.0/16 space or any other IP address that can be guaranteed to not collide with any existing IP.
LocalIP string `json:"localIP,omitempty"`
// If enabled, nodelocal dns will use kubedns as a default upstream
Expand Down
2 changes: 2 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pkg/apis/kops/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions pkg/model/components/kubedns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,5 +100,9 @@ func (b *KubeDnsOptionsBuilder) BuildOptions(o interface{}) error {
nodeLocalDNS.CPURequest = &defaultCPURequest
}

if nodeLocalDNS.Image == nil {
nodeLocalDNS.Image = fi.String("k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0")
}

return nil
}
1 change: 1 addition & 0 deletions ...update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...tegration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...egration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...tion/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ation/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...tion/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions .../update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ntegration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions .../integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ate_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...n/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ation/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ation/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...tion/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...tion/update_cluster/minimal-json/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions .../update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...tegration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ation/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...date_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...on/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...n/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ate_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...te_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ion/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...tion/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ion/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...on/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: KubeDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...te_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ation/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...ation/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
1 change: 1 addition & 0 deletions ...on/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ spec:
nodeLocalDNS:
cpuRequest: 25m
enabled: false
image: k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0
memoryRequest: 5Mi
provider: CoreDNS
replicas: 2
Expand Down
Loading