[weave] Add support for default version override

In this commit, we enable users to override default version of networking/Weave specs. Signed-off-by: dntosas <ntosas@gmail.com>
kubernetes · Nov 20, 2020 · 7d579c1 · 7d579c1
1 parent 27f9114
commit 7d579c1
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -2684,6 +2684,9 @@ spec:
                         description: NPCMemoryRequest memory request of weave npc container. Default 200Mi
                         pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
                         x-kubernetes-int-or-string: true
+                      version:
+                        description: Version overrides the default tag of Weave container image.
+                        type: string
                     type: object
                 type: object
               nodeAuthorization:

diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go
@@ -86,6 +86,9 @@ type WeaveNetworkingSpec struct {
 	NPCCPULimit *resource.Quantity `json:"npcCPULimit,omitempty"`
 	// NPCExtraArgs are extra arguments that are passed to weave-npc.
 	NPCExtraArgs string `json:"npcExtraArgs,omitempty"`
+
+	// Version overrides the default tag of Weave container image.
+	Version string `json:"version,omitempty"`
 }
 
 // FlannelNetworkingSpec declares that we want Flannel networking

diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go
@@ -86,6 +86,9 @@ type WeaveNetworkingSpec struct {
 	NPCCPULimit *resource.Quantity `json:"npcCPULimit,omitempty"`
 	// NPCExtraArgs are extra arguments that are passed to weave-npc.
 	NPCExtraArgs string `json:"npcExtraArgs,omitempty"`
+
+	// Version overrides the default tag of Weave container image.
+	Version string `json:"version,omitempty"`
 }
 
 // FlannelNetworkingSpec declares that we want Flannel networking

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template b/upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template
@@ -177,7 +177,7 @@ spec:
                   name: weave-net
                   key: network-password
             {{- end }}
-          image: 'weaveworks/weave-kube:2.7.0'
+          image: 'weaveworks/weave-kube:{{ or .Networking.Weave.Version "2.7.0" }}'
           ports:
             - name: metrics
               containerPort: 6782
@@ -224,7 +224,7 @@ spec:
             - name: EXTRA_ARGS
               value: "{{ .Networking.Weave.NPCExtraArgs }}"
             {{- end }}
-          image: 'weaveworks/weave-npc:2.7.0'
+          image: 'weaveworks/weave-npc:{{ or .Networking.Weave.Version "2.7.0" }}'
           ports:
             - name: metrics
               containerPort: 6781