kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump image to latest stable v1.20.0 

As per
 3b17e06879,
 node-local-dns addon is now builded with latest coreDNS base v1.8 and
 that brings great consistency between cache and upstream servers in a
 manner of configuration, metrics name convention, etc.

 So in this commit, we bump node-local-dns image to latest v1.20.0 which
 is build upon latest coreDNS and also add support for overriding this
 field.

Signed-off-by: dntosas <ntosas@gmail.com>
This commit is contained in:
dntosas 2021-08-31 14:07:19 +03:00
parent cdb33dd4c0
commit 7bda091682
53 changed files with 73 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -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

4
pkg/apis/kops/cluster.go
View File

@ -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

4
pkg/apis/kops/v1alpha2/cluster.go
View File

@ -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

2
pkg/apis/kops/v1alpha2/zz_generated.conversion.go generated
View File

@ -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

5
pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go generated
View File

@ -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)

5
pkg/apis/kops/zz_generated.deepcopy.go generated
View File

@ -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)

4
pkg/model/components/kubedns.go
View File

@ -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
tests/integration/update_cluster/aws-lb-controller/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/complex/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/compress/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/digit/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/existing_iam/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/existing_sg/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/external_dns/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/external_dns_irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/externallb/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/externalpolicies/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/ha/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/ha_gce/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/many-addons-ccm-irsa/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/many-addons-ccm/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/many-addons/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/minimal-gp3/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/minimal-ipv6/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/minimal-json/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/minimal-warmpool/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/minimal/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/minimal_gce/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/minimal_gce_private/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/minimal_gossip/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/mixed_instances/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/mixed_instances_spot/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/nth_sqs_resources/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/private-shared-ip/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/private-shared-subnet/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/privatecalico/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/privatecanal/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/privatecilium/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/privateciliumadvanced/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/privatedns1/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/privatedns2/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/privateflannel/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/privatekopeio/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/privateweave/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/shared_subnet/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/shared_vpc/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/unmanaged/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

1
tests/integration/update_cluster/vfs-said/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -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

2
upup/models/cloudup/resources/addons/nodelocaldns.addons.k8s.io/k8s-1.12.yaml.template
View File

@ -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 }}