diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index e64942944a25a..e376fc07a06aa 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/k8s/crds/kops.k8s.io_clusters.yaml @@ -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 diff --git a/pkg/apis/kops/cluster.go b/pkg/apis/kops/cluster.go index ed335706c2074..cac2b282cba9a 100644 --- a/pkg/apis/kops/cluster.go +++ b/pkg/apis/kops/cluster.go @@ -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 diff --git a/pkg/apis/kops/v1alpha2/cluster.go b/pkg/apis/kops/v1alpha2/cluster.go index b3029989dbd78..1c556734999fa 100644 --- a/pkg/apis/kops/v1alpha2/cluster.go +++ b/pkg/apis/kops/v1alpha2/cluster.go @@ -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 diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index c4225c4243dab..ce3b773cd1c6e 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -6026,6 +6026,7 @@ func Convert_kops_NodeAuthorizerSpec_To_v1alpha2_NodeAuthorizerSpec(in *kops.Nod func autoConvert_v1alpha2_NodeLocalDNSConfig_To_kops_NodeLocalDNSConfig(in *NodeLocalDNSConfig, out *kops.NodeLocalDNSConfig, s conversion.Scope) error { out.Enabled = in.Enabled + out.Image = in.Image out.LocalIP = in.LocalIP out.ForwardToKubeDNS = in.ForwardToKubeDNS out.MemoryRequest = in.MemoryRequest @@ -6040,6 +6041,7 @@ func Convert_v1alpha2_NodeLocalDNSConfig_To_kops_NodeLocalDNSConfig(in *NodeLoca func autoConvert_kops_NodeLocalDNSConfig_To_v1alpha2_NodeLocalDNSConfig(in *kops.NodeLocalDNSConfig, out *NodeLocalDNSConfig, s conversion.Scope) error { out.Enabled = in.Enabled + out.Image = in.Image out.LocalIP = in.LocalIP out.ForwardToKubeDNS = in.ForwardToKubeDNS out.MemoryRequest = in.MemoryRequest diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go index 63e0530cbe67a..7e3ec3bc20140 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go @@ -3986,6 +3986,11 @@ func (in *NodeLocalDNSConfig) DeepCopyInto(out *NodeLocalDNSConfig) { *out = new(bool) **out = **in } + if in.Image != nil { + in, out := &in.Image, &out.Image + *out = new(string) + **out = **in + } if in.ForwardToKubeDNS != nil { in, out := &in.ForwardToKubeDNS, &out.ForwardToKubeDNS *out = new(bool) diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go index 40ba0f8edea3c..c3c0f9df629b4 100644 --- a/pkg/apis/kops/zz_generated.deepcopy.go +++ b/pkg/apis/kops/zz_generated.deepcopy.go @@ -4168,6 +4168,11 @@ func (in *NodeLocalDNSConfig) DeepCopyInto(out *NodeLocalDNSConfig) { *out = new(bool) **out = **in } + if in.Image != nil { + in, out := &in.Image, &out.Image + *out = new(string) + **out = **in + } if in.ForwardToKubeDNS != nil { in, out := &in.ForwardToKubeDNS, &out.ForwardToKubeDNS *out = new(bool) diff --git a/pkg/model/components/kubedns.go b/pkg/model/components/kubedns.go index f26bcd994abed..51a1ee5d88617 100644 --- a/pkg/model/components/kubedns.go +++ b/pkg/model/components/kubedns.go @@ -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 } diff --git a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content index 0f20acddf21bc..3ce6cc40c0405 100644 --- a/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content index d671f4e24843b..3687cc352a969 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content index 4c34db2dfcd05..18666e3bfb26a 100644 --- a/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content index b9bc1dc076d26..3d0b7386d3444 100644 --- a/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content index 2d1ca6589cad3..c1a2b1a630e85 100644 --- a/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content index a6a1e51bca788..168d47982a907 100644 --- a/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content index 494aec523f2cd..0a1f6bc03a8d4 100644 --- a/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content index 006199e752c5f..03bb51b0dc683 100644 --- a/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index 048cbc7ebed56..dc7bf1a2256e5 100644 --- a/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content index d1a0463e30d3d..95816de4c8d9f 100644 --- a/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content index a40b66f595acb..bf520d0de521b 100644 --- a/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content index 5ac9678e4ba65..d5522d8263542 100644 --- a/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content index 7aacb03b11e74..ebe569fd894a1 100644 --- a/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index 58417bd151630..62639e9036436 100644 --- a/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content index 586ee5ee35d03..6c2fbf728bd6c 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content index 6cc4581a4656d..f76022247bba0 100644 --- a/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content index f31cf167a5f8c..1557aa824e817 100644 --- a/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content index 76345030bb5f3..accbe57cf960f 100644 --- a/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content index ee7c6b5657e42..a7ecaf4a51065 100644 --- a/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_cluster-completed.spec_content index d96c337a00929..6e91c4de63e53 100644 --- a/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content index d75fbe3ae7e00..365a8a91861e1 100644 --- a/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content index 897048005e09d..de54b2d55da94 100644 --- a/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content index a078436d9fc7e..1648d87ffa843 100644 --- a/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content index 74501130783d6..a6a0ac2838220 100644 --- a/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content index e7b23b05ea9f2..5668883e3ca02 100644 --- a/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content index 9657cb2d7e290..baa5b22af456f 100644 --- a/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content index 9657cb2d7e290..baa5b22af456f 100644 --- a/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content index d7025316b525b..9a1764cd78427 100644 --- a/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content index 2a52af2be4f90..2faf5bed06107 100644 --- a/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content index 897dc653d10fd..ec12a1cfe27f3 100644 --- a/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content index 90faaf3b9eb02..d120f637fc7b7 100644 --- a/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content index f7237e2e53939..70c394511b116 100644 --- a/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content index 173156e136283..9c6457307f98a 100644 --- a/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content index 980429521bb8d..39337b269cc37 100644 --- a/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content index cdabe70bc3e88..192ae87ef0d76 100644 --- a/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content index 9b2c7ae239f45..649d8441ebd14 100644 --- a/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content index 28da78de41daa..801da827698ac 100644 --- a/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content index 223d27de936ae..f54f907aa5e92 100644 --- a/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content index 0124438b6393c..3505202a6e9aa 100644 --- a/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content index 3517bfa737baf..c7f30d56464f8 100644 --- a/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content index 6f262cc55f4db..c0f26dd44e720 100644 --- a/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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: KubeDNS replicas: 2 diff --git a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content index 33af67e66a8b3..6b73270f4d1eb 100644 --- a/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content index da08a5f1b2212..13556213e732a 100644 --- a/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content index b92cc954713e2..292ae86cefa6e 100644 --- a/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content index 1627c52865254..314c070de9d19 100644 --- a/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content @@ -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 diff --git a/upup/models/cloudup/resources/addons/nodelocaldns.addons.k8s.io/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/nodelocaldns.addons.k8s.io/k8s-1.12.yaml.template index 671ba5ee7e012..c122ff751522e 100644 --- a/upup/models/cloudup/resources/addons/nodelocaldns.addons.k8s.io/k8s-1.12.yaml.template +++ b/upup/models/cloudup/resources/addons/nodelocaldns.addons.k8s.io/k8s-1.12.yaml.template @@ -139,7 +139,7 @@ spec: operator: "Exists" containers: - name: node-cache - image: k8s.gcr.io/dns/k8s-dns-node-cache:1.17.4 + image: {{ KubeDNS.NodeLocalDNS.Image }} resources: requests: cpu: {{ KubeDNS.NodeLocalDNS.CPURequest }}