[addons/nodelocaldns] Bump image to latest stable v1.20.0

As per kubernetes/dns@3b17e06, 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>
kubernetes · Aug 29, 2021 · 31f49ae · 31f49ae
1 parent 44c07e2
commit 31f49ae
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 5 deletions.
diff --git a/docs/addons.md b/docs/addons.md
@@ -129,7 +129,9 @@ NodeLocal DNSCache can be enabled if you are using CoreDNS. It is used to improv
 
 `memoryRequest` and `cpuRequest` for the `node-local-dns` pods can also be configured. If not set, they will be configured by default to `5Mi` and `25m` respectively.
 
-If `forwardToKubeDNS` is enabled, kubedns will be used as a default upstream
+If `forwardToKubeDNS` is enabled, kubedns will be used as a default upstream.
+
+There is also an option to override the default image used by Kops by defining `image`.
 
 ```yaml
 spec:
@@ -139,6 +141,7 @@ spec:
       enabled: true
       memoryRequest: 5Mi
       cpuRequest: 25m
+      image: "k8s.gcr.io/dns/k8s-dns-node-cache:1.20.0"
 ```
 
 #### Node termination handler

diff --git 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
@@ -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
@@ -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
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.defaults.go b/pkg/apis/kops/v1alpha2/zz_generated.defaults.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
diff --git 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/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 }}