Sitelet https://github.com/kubernetes/kops/commit/f336152672adaa587e543387d01f8c5da04ebbe9
Skip to content

Commit f336152

Browse files
hakmanhakman
authored
Release 1.36.2 (#18674)
1 parent 33cc5c1 commit f336152

24 files changed

Lines changed: 62 additions & 62 deletions

File tree

‎kops-version.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func KopsVersionImageTag() string {
3030

3131
// These constants are parsed by build tooling - be careful about changing the formats
3232
const (
33-
KOPS_RELEASE_VERSION = "1.36.1"
34-
KOPS_CI_VERSION = "1.36.2"
33+
KOPS_RELEASE_VERSION = "1.36.2"
34+
KOPS_CI_VERSION = "1.36.3"
3535
)
3636

3737
// GitVersion should be replaced by the makefile

‎pkg/model/components/channels/tests/container_registry/tasks.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Contents: |
2828
value: /tmp
2929
- name: AWS_REGION
3030
value: us-test-1
31-
image: my-mirror.example.com/kops-channels:1.36.1
31+
image: my-mirror.example.com/kops-channels:1.36.2
3232
name: kops-channels
3333
readinessProbe:
3434
failureThreshold: 2

‎pkg/model/components/channels/tests/minimal/tasks.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Contents: |
2828
value: /tmp
2929
- name: AWS_REGION
3030
value: us-test-1
31-
image: registry.k8s.io/kops/channels:1.36.1
31+
image: registry.k8s.io/kops/channels:1.36.2
3232
name: kops-channels
3333
readinessProbe:
3434
failureThreshold: 2

‎pkg/model/components/etcdmanager/tests/interval/tasks.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Contents: |
125125
- --src=/ko-app/kops-utils-cp
126126
command:
127127
- /ko-app/kops-utils-cp
128-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
128+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
129129
name: kops-utils-cp
130130
resources: {}
131131
volumeMounts:
@@ -192,7 +192,7 @@ Contents: |
192192
- --src=/opt/etcd-v3.5.31/etcdctl
193193
command:
194194
- /opt/kops-utils/kops-utils-cp
195-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
195+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
196196
name: init-etcd-symlinks-3-5-31
197197
resources: {}
198198
volumeMounts:
@@ -216,7 +216,7 @@ Contents: |
216216
- --src=/opt/etcd-v3.6.12/etcdctl
217217
command:
218218
- /opt/kops-utils/kops-utils-cp
219-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
219+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
220220
name: init-etcd-symlinks-3-6-12
221221
resources: {}
222222
volumeMounts:
@@ -314,7 +314,7 @@ Contents: |
314314
- --src=/ko-app/kops-utils-cp
315315
command:
316316
- /ko-app/kops-utils-cp
317-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
317+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
318318
name: kops-utils-cp
319319
resources: {}
320320
volumeMounts:
@@ -381,7 +381,7 @@ Contents: |
381381
- --src=/opt/etcd-v3.5.31/etcdctl
382382
command:
383383
- /opt/kops-utils/kops-utils-cp
384-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
384+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
385385
name: init-etcd-symlinks-3-5-31
386386
resources: {}
387387
volumeMounts:
@@ -405,7 +405,7 @@ Contents: |
405405
- --src=/opt/etcd-v3.6.12/etcdctl
406406
command:
407407
- /opt/kops-utils/kops-utils-cp
408-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
408+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
409409
name: init-etcd-symlinks-3-6-12
410410
resources: {}
411411
volumeMounts:

‎pkg/model/components/etcdmanager/tests/overwrite_settings/tasks.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Contents: |
126126
- --src=/ko-app/kops-utils-cp
127127
command:
128128
- /ko-app/kops-utils-cp
129-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
129+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
130130
name: kops-utils-cp
131131
resources: {}
132132
volumeMounts:
@@ -193,7 +193,7 @@ Contents: |
193193
- --src=/opt/etcd-v3.5.31/etcdctl
194194
command:
195195
- /opt/kops-utils/kops-utils-cp
196-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
196+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
197197
name: init-etcd-symlinks-3-5-31
198198
resources: {}
199199
volumeMounts:
@@ -217,7 +217,7 @@ Contents: |
217217
- --src=/opt/etcd-v3.6.12/etcdctl
218218
command:
219219
- /opt/kops-utils/kops-utils-cp
220-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
220+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
221221
name: init-etcd-symlinks-3-6-12
222222
resources: {}
223223
volumeMounts:
@@ -315,7 +315,7 @@ Contents: |
315315
- --src=/ko-app/kops-utils-cp
316316
command:
317317
- /ko-app/kops-utils-cp
318-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
318+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
319319
name: kops-utils-cp
320320
resources: {}
321321
volumeMounts:
@@ -382,7 +382,7 @@ Contents: |
382382
- --src=/opt/etcd-v3.5.31/etcdctl
383383
command:
384384
- /opt/kops-utils/kops-utils-cp
385-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
385+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
386386
name: init-etcd-symlinks-3-5-31
387387
resources: {}
388388
volumeMounts:
@@ -406,7 +406,7 @@ Contents: |
406406
- --src=/opt/etcd-v3.6.12/etcdctl
407407
command:
408408
- /opt/kops-utils/kops-utils-cp
409-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
409+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
410410
name: init-etcd-symlinks-3-6-12
411411
resources: {}
412412
volumeMounts:

‎pkg/model/components/etcdmanager/tests/proxy/tasks.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Contents: |
132132
- --src=/ko-app/kops-utils-cp
133133
command:
134134
- /ko-app/kops-utils-cp
135-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
135+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
136136
name: kops-utils-cp
137137
resources: {}
138138
volumeMounts:
@@ -199,7 +199,7 @@ Contents: |
199199
- --src=/opt/etcd-v3.5.31/etcdctl
200200
command:
201201
- /opt/kops-utils/kops-utils-cp
202-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
202+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
203203
name: init-etcd-symlinks-3-5-31
204204
resources: {}
205205
volumeMounts:
@@ -223,7 +223,7 @@ Contents: |
223223
- --src=/opt/etcd-v3.6.12/etcdctl
224224
command:
225225
- /opt/kops-utils/kops-utils-cp
226-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
226+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
227227
name: init-etcd-symlinks-3-6-12
228228
resources: {}
229229
volumeMounts:
@@ -327,7 +327,7 @@ Contents: |
327327
- --src=/ko-app/kops-utils-cp
328328
command:
329329
- /ko-app/kops-utils-cp
330-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
330+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
331331
name: kops-utils-cp
332332
resources: {}
333333
volumeMounts:
@@ -394,7 +394,7 @@ Contents: |
394394
- --src=/opt/etcd-v3.5.31/etcdctl
395395
command:
396396
- /opt/kops-utils/kops-utils-cp
397-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
397+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
398398
name: init-etcd-symlinks-3-5-31
399399
resources: {}
400400
volumeMounts:
@@ -418,7 +418,7 @@ Contents: |
418418
- --src=/opt/etcd-v3.6.12/etcdctl
419419
command:
420420
- /opt/kops-utils/kops-utils-cp
421-
image: registry.k8s.io/kops/kops-utils-cp:1.36.1
421+
image: registry.k8s.io/kops/kops-utils-cp:1.36.2
422422
name: init-etcd-symlinks-3-6-12
423423
resources: {}
424424
volumeMounts:

‎pkg/model/components/kubeapiserver/tests/minimal/tasks.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Contents: |
99
- --ca-cert=/secrets/ca.crt
1010
- --client-cert=/secrets/client.crt
1111
- --client-key=/secrets/client.key
12-
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.36.1
12+
image: registry.k8s.io/kops/kube-apiserver-healthcheck:1.36.2
1313
livenessProbe:
1414
httpGet:
1515
host: 127.0.0.1

‎pkg/nodemodel/wellknownassets/kopsassets_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ func TestBaseURL_OverridesVersionFromKopsBaseurl(/sitelet?url=https%3A%2F%2Fgithub.com%2Fkubernetes%2Fkops%2Fcommit%2Ft%2520*testing.T) {
4141
}{
4242
{
4343
name: "postsubmit URL",
44-
kopsBaseURL: "https://storage.googleapis.com/k8s-staging-kops/kops/releases/1.35.0-beta.2+v1.36.1-384-gf369c3ab16",
45-
expectedVersion: "1.35.0-beta.2+v1.36.1-384-gf369c3ab16",
44+
kopsBaseURL: "https://storage.googleapis.com/k8s-staging-kops/kops/releases/1.35.0-beta.2+v1.36.2-384-gf369c3ab16",
45+
expectedVersion: "1.35.0-beta.2+v1.36.2-384-gf369c3ab16",
4646
},
4747
{
4848
name: "postsubmit URL with trailing slash",
49-
kopsBaseURL: "https://storage.googleapis.com/k8s-staging-kops/kops/releases/1.35.0-beta.2+v1.36.1-384-gf369c3ab16/",
50-
expectedVersion: "1.35.0-beta.2+v1.36.1-384-gf369c3ab16",
49+
kopsBaseURL: "https://storage.googleapis.com/k8s-staging-kops/kops/releases/1.35.0-beta.2+v1.36.2-384-gf369c3ab16/",
50+
expectedVersion: "1.35.0-beta.2+v1.36.2-384-gf369c3ab16",
5151
},
5252
{
5353
name: "CI URL",

‎upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc-containerd/manifest.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ spec:
55
addons:
66
- id: k8s-1.16
77
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
8-
manifestHash: f9279ff0ee3caed534b38d68bd7ea43a666f78c7a008fe698071fcee7e94dc00
8+
manifestHash: 068e04e973952eb893b310cb2035f8a67de168b2dddbe76eda6f5047fde25d82
99
name: kops-controller.addons.k8s.io
1010
needsRollingUpdate: control-plane
1111
selector:
@@ -29,7 +29,7 @@ spec:
2929
k8s-addon: limit-range.addons.k8s.io
3030
- id: k8s-1.12
3131
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
32-
manifestHash: 705e533c8b61c094dbbcb9c80fb412c450b639aa8d3744d691434542e1000db3
32+
manifestHash: 0ee8bf3c1f387b8c7ab22b88a1052753f109a4472772899e69efb49893c19b6d
3333
name: dns-controller.addons.k8s.io
3434
selector:
3535
k8s-addon: dns-controller.addons.k8s.io

‎upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/amazonvpc/manifest.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ spec:
55
addons:
66
- id: k8s-1.16
77
manifest: kops-controller.addons.k8s.io/k8s-1.16.yaml
8-
manifestHash: f9279ff0ee3caed534b38d68bd7ea43a666f78c7a008fe698071fcee7e94dc00
8+
manifestHash: 068e04e973952eb893b310cb2035f8a67de168b2dddbe76eda6f5047fde25d82
99
name: kops-controller.addons.k8s.io
1010
needsRollingUpdate: control-plane
1111
selector:
@@ -29,7 +29,7 @@ spec:
2929
k8s-addon: limit-range.addons.k8s.io
3030
- id: k8s-1.12
3131
manifest: dns-controller.addons.k8s.io/k8s-1.12.yaml
32-
manifestHash: 705e533c8b61c094dbbcb9c80fb412c450b639aa8d3744d691434542e1000db3
32+
manifestHash: 0ee8bf3c1f387b8c7ab22b88a1052753f109a4472772899e69efb49893c19b6d
3333
name: dns-controller.addons.k8s.io
3434
selector:
3535
k8s-addon: dns-controller.addons.k8s.io

0 commit comments

Comments
 (0)