Skip to content

Commit 0ce6ac1

Browse files
committed
1 parent 6cccd52 commit 0ce6ac1

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

upup/models/cloudup/resources/addons/networking.weave/k8s-1.12.yaml.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ spec:
163163
name: weave-net
164164
key: network-password
165165
{{- end }}
166-
image: 'weaveworks/weave-kube:2.5.1'
166+
image: 'weaveworks/weave-kube:2.5.2'
167167
livenessProbe:
168168
httpGet:
169169
host: 127.0.0.1
@@ -201,7 +201,7 @@ spec:
201201
fieldRef:
202202
apiVersion: v1
203203
fieldPath: spec.nodeName
204-
image: 'weaveworks/weave-npc:2.5.1'
204+
image: 'weaveworks/weave-npc:2.5.2'
205205
resources:
206206
requests:
207207
cpu: 50m

upup/models/cloudup/resources/addons/networking.weave/k8s-1.7.yaml.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ spec:
155155
name: weave-net
156156
key: network-password
157157
{{- end }}
158-
image: 'weaveworks/weave-kube:2.5.1'
158+
image: 'weaveworks/weave-kube:2.5.2'
159159
livenessProbe:
160160
httpGet:
161161
host: 127.0.0.1
@@ -193,7 +193,7 @@ spec:
193193
fieldRef:
194194
apiVersion: v1
195195
fieldPath: spec.nodeName
196-
image: 'weaveworks/weave-npc:2.5.1'
196+
image: 'weaveworks/weave-npc:2.5.2'
197197
resources:
198198
requests:
199199
cpu: 50m

upup/models/cloudup/resources/addons/networking.weave/k8s-1.8.yaml.template

+2-2
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ spec:
159159
name: weave-net
160160
key: network-password
161161
{{- end }}
162-
image: 'weaveworks/weave-kube:2.5.1'
162+
image: 'weaveworks/weave-kube:2.5.2'
163163
livenessProbe:
164164
httpGet:
165165
host: 127.0.0.1
@@ -197,7 +197,7 @@ spec:
197197
fieldRef:
198198
apiVersion: v1
199199
fieldPath: spec.nodeName
200-
image: 'weaveworks/weave-npc:2.5.1'
200+
image: 'weaveworks/weave-npc:2.5.2'
201201
resources:
202202
requests:
203203
cpu: 50m

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -687,9 +687,9 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
687687
versions := map[string]string{
688688
"pre-k8s-1.6": "2.3.0-kops.2",
689689
"k8s-1.6": "2.3.0-kops.2",
690-
"k8s-1.7": "2.5.1-kops.1",
691-
"k8s-1.8": "2.5.1-kops.1",
692-
"k8s-1.12": "2.5.1-kops.1",
690+
"k8s-1.7": "2.5.2-kops.1",
691+
"k8s-1.8": "2.5.2-kops.1",
692+
"k8s-1.12": "2.5.2-kops.1",
693693
}
694694

695695
{

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/weave/manifest.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,18 @@ spec:
111111
name: networking.weave
112112
selector:
113113
role.kubernetes.io/networking: "1"
114-
version: 2.5.1-kops.1
114+
version: 2.5.2-kops.1
115115
- id: k8s-1.8
116116
kubernetesVersion: '>=1.8.0 <1.12.0'
117117
manifest: networking.weave/k8s-1.8.yaml
118118
name: networking.weave
119119
selector:
120120
role.kubernetes.io/networking: "1"
121-
version: 2.5.1-kops.1
121+
version: 2.5.2-kops.1
122122
- id: k8s-1.12
123123
kubernetesVersion: '>=1.12.0'
124124
manifest: networking.weave/k8s-1.12.yaml
125125
name: networking.weave
126126
selector:
127127
role.kubernetes.io/networking: "1"
128-
version: 2.5.1-kops.1
128+
version: 2.5.2-kops.1

0 commit comments

Comments
 (0)