diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index 806138ec3bbbd..c0ae08226ff4b 100644 --- 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 index 47bc3c76d7754..35747d55d0e82 100644 --- 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 index 3db3cf3cd0de3..1389cd95fecd3 100644 --- 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 index 26d59a64cb32f..bf74575138ee5 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -5770,6 +5770,7 @@ func autoConvert_v1alpha2_WeaveNetworkingSpec_To_kops_WeaveNetworkingSpec(in *We out.NPCMemoryLimit = in.NPCMemoryLimit out.NPCCPULimit = in.NPCCPULimit out.NPCExtraArgs = in.NPCExtraArgs + out.Version = in.Version return nil } @@ -5792,6 +5793,7 @@ func autoConvert_kops_WeaveNetworkingSpec_To_v1alpha2_WeaveNetworkingSpec(in *ko out.NPCMemoryLimit = in.NPCMemoryLimit out.NPCCPULimit = in.NPCCPULimit out.NPCExtraArgs = in.NPCExtraArgs + out.Version = in.Version return nil } diff --git a/upup/models/bindata.go b/upup/models/bindata.go index fd9f013f8a767..9fcef55e9ac47 100644 --- a/upup/models/bindata.go +++ b/upup/models/bindata.go @@ -13577,7 +13577,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 @@ -13624,7 +13624,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 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 index 63358e79c0e30..4248fd21ca3b6 100644 --- 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