Skip to content

Commit 0d0bc0d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3219 from sedefsavas/capi-v1.1.1
Bump CAPI to v1.1.1
2 parents d1c461e + decd406 commit 0d0bc0d

File tree

4 files changed

+32
-32
lines changed

4 files changed

+32
-32
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-aws
22

33
go 1.17
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.0
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.1.1
66

77
require (
88
github.com/alessio/shellescape v1.4.1
@@ -35,8 +35,8 @@ require (
3535
k8s.io/klog/v2 v2.40.1
3636
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
3737
sigs.k8s.io/aws-iam-authenticator v0.5.4
38-
sigs.k8s.io/cluster-api v1.1.0
39-
sigs.k8s.io/cluster-api/test v1.1.0
38+
sigs.k8s.io/cluster-api v1.1.1
39+
sigs.k8s.io/cluster-api/test v1.1.1
4040
sigs.k8s.io/controller-runtime v0.11.0
4141
sigs.k8s.io/yaml v1.3.0
4242
)

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1842,10 +1842,10 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyz
18421842
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.25/go.mod h1:Mlj9PNLmG9bZ6BHFwFKDo5afkpWyUISkb9Me0GnK66I=
18431843
sigs.k8s.io/aws-iam-authenticator v0.5.4 h1:WH/HMr9H45tWtjJ8F2Z8veA6d6HZZdc3qK01Mc9mEkk=
18441844
sigs.k8s.io/aws-iam-authenticator v0.5.4/go.mod h1:yJT7wNdiE+3Ib112cCFAmSzaUECXrWEuV2Y/Ms2TuM4=
1845-
sigs.k8s.io/cluster-api v1.1.0 h1:zJJzIUezEveYK3Ljmk/jku+DYd96RP5bZ181l2W9gVg=
1846-
sigs.k8s.io/cluster-api v1.1.0/go.mod h1:aSxmmNwDjmg9rDaL0RhRELpGX9uSTTwLF02AMtk/XGY=
1847-
sigs.k8s.io/cluster-api/test v1.1.0 h1:eBVFCWxu9/fb/By02uFjOreG9GAd9eax9uZKsCXP58s=
1848-
sigs.k8s.io/cluster-api/test v1.1.0/go.mod h1:ct7zQrWXsYIAhL/lMLFPfCAqGLDBTEzx+AtwIXpI45o=
1845+
sigs.k8s.io/cluster-api v1.1.1 h1:wU1J+Yyu9xDC5M2uACH4Ii8vrIk37oZiCKeMEfyL0pk=
1846+
sigs.k8s.io/cluster-api v1.1.1/go.mod h1:aSxmmNwDjmg9rDaL0RhRELpGX9uSTTwLF02AMtk/XGY=
1847+
sigs.k8s.io/cluster-api/test v1.1.1 h1:ic4dlDDY4wNUF5MaAb8mBryihtjCs/77fP/yzLUE8rc=
1848+
sigs.k8s.io/cluster-api/test v1.1.1/go.mod h1:ct7zQrWXsYIAhL/lMLFPfCAqGLDBTEzx+AtwIXpI45o=
18491849
sigs.k8s.io/controller-runtime v0.6.3/go.mod h1:WlZNXcM0++oyaQt4B7C2lEE5JYRs8vJUzRP4N4JpdAY=
18501850
sigs.k8s.io/controller-runtime v0.11.0 h1:DqO+c8mywcZLFJWILq4iktoECTyn30Bkj0CwgqMpZWQ=
18511851
sigs.k8s.io/controller-runtime v0.11.0/go.mod h1:KKwLiTooNGu+JmLZGn9Sl3Gjmfj66eMbCQznLP5zcqA=

‎test/e2e/data/e2e_conf.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ images:
2727
loadBehavior: tryLoad
2828
- name: quay.io/jetstack/cert-manager-controller:v1.5.3
2929
loadBehavior: tryLoad
30-
- name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.0
30+
- name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.1
3131
loadBehavior: tryLoad
32-
- name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.0
32+
- name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.1
3333
loadBehavior: tryLoad
34-
- name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.0
34+
- name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.1
3535
loadBehavior: tryLoad
3636

3737
providers:
@@ -60,8 +60,8 @@ providers:
6060
new: "imagePullPolicy: IfNotPresent"
6161
- old: --metrics-bind-addr=127.0.0.1:8080
6262
new: --metrics-bind-addr=:8080
63-
- name: v1.1.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
64-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/core-components.yaml"
63+
- name: v1.1.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
64+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/core-components.yaml"
6565
type: "url"
6666
contract: v1beta1
6767
files:
@@ -72,7 +72,7 @@ providers:
7272
- old: --metrics-bind-addr=127.0.0.1:8080
7373
new: --metrics-bind-addr=:8080
7474
- name: v1.1.99 # next; use manifest from source files
75-
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220201/core-components.yaml"
75+
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/core-components.yaml"
7676
type: "url"
7777
contract: v1beta1
7878
files:
@@ -107,8 +107,8 @@ providers:
107107
new: "imagePullPolicy: IfNotPresent"
108108
- old: --metrics-bind-addr=127.0.0.1:8080
109109
new: --metrics-bind-addr=:8080
110-
- name: v1.1.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
111-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/bootstrap-components.yaml"
110+
- name: v1.1.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
111+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/bootstrap-components.yaml"
112112
type: "url"
113113
contract: v1beta1
114114
files:
@@ -119,7 +119,7 @@ providers:
119119
- old: --metrics-bind-addr=127.0.0.1:8080
120120
new: --metrics-bind-addr=:8080
121121
- name: v1.1.99 # next; use manifest from source files
122-
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220201/bootstrap-components.yaml"
122+
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/bootstrap-components.yaml"
123123
type: "url"
124124
contract: v1beta1
125125
files:
@@ -156,8 +156,8 @@ providers:
156156
new: "imagePullPolicy: IfNotPresent"
157157
- old: --metrics-bind-addr=127.0.0.1:8080
158158
new: --metrics-bind-addr=:8080
159-
- name: v1.1.0 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
160-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/control-plane-components.yaml"
159+
- name: v1.1.1 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
160+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/control-plane-components.yaml"
161161
type: "url"
162162
contract: v1beta1
163163
files:
@@ -168,7 +168,7 @@ providers:
168168
- old: --metrics-bind-addr=127.0.0.1:8080
169169
new: --metrics-bind-addr=:8080
170170
- name: v1.1.99 # next; use manifest from source files
171-
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220201/control-plane-components.yaml"
171+
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/control-plane-components.yaml"
172172
type: "url"
173173
contract: v1beta1
174174
files:
@@ -267,7 +267,7 @@ variables:
267267
EXP_CLUSTER_RESOURCE_SET: "true"
268268
EXP_MACHINE_POOL: "true"
269269
CLUSTER_TOPOLOGY: "true"
270-
INIT_WITH_BINARY_V1BETA1: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/clusterctl-{OS}-{ARCH}"
270+
INIT_WITH_BINARY_V1BETA1: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/clusterctl-{OS}-{ARCH}"
271271
INIT_WITH_BINARY_V1ALPHA3: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.23/clusterctl-{OS}-{ARCH}"
272272
INIT_WITH_BINARY_V1ALPHA4: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.7/clusterctl-{OS}-{ARCH}"
273273
# INIT_WITH_KUBERNETES_VERSION are only used by the clusterctl upgrade test to initialize

‎test/e2e/data/e2e_eks_conf.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ images:
2525
loadBehavior: tryLoad
2626
- name: quay.io/jetstack/cert-manager-controller:v1.5.3
2727
loadBehavior: tryLoad
28-
- name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.0
28+
- name: k8s.gcr.io/cluster-api/cluster-api-controller:v1.1.1
2929
loadBehavior: tryLoad
30-
- name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.0
30+
- name: k8s.gcr.io/cluster-api/kubeadm-bootstrap-controller:v1.1.1
3131
loadBehavior: tryLoad
32-
- name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.0
32+
- name: k8s.gcr.io/cluster-api/kubeadm-control-plane-controller:v1.1.1
3333
loadBehavior: tryLoad
3434

3535

@@ -59,8 +59,8 @@ providers:
5959
new: "imagePullPolicy: IfNotPresent"
6060
- old: --metrics-bind-addr=127.0.0.1:8080
6161
new: --metrics-bind-addr=:8080
62-
- name: v1.1.0
63-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/core-components.yaml"
62+
- name: v1.1.1
63+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/core-components.yaml"
6464
type: "url"
6565
contract: v1beta1
6666
files:
@@ -71,7 +71,7 @@ providers:
7171
- old: --metrics-bind-addr=127.0.0.1:8080
7272
new: --metrics-bind-addr=:8080
7373
- name: v1.1.99 # next;
74-
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220201/core-components.yaml"
74+
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/core-components.yaml"
7575
type: "url"
7676
contract: v1beta1
7777
files:
@@ -106,8 +106,8 @@ providers:
106106
new: "imagePullPolicy: IfNotPresent"
107107
- old: --metrics-bind-addr=127.0.0.1:8080
108108
new: --metrics-bind-addr=:8080
109-
- name: v1.1.0
110-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/bootstrap-components.yaml"
109+
- name: v1.1.1
110+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/bootstrap-components.yaml"
111111
type: "url"
112112
contract: v1beta1
113113
files:
@@ -118,7 +118,7 @@ providers:
118118
- old: --metrics-bind-addr=127.0.0.1:8080
119119
new: --metrics-bind-addr=:8080
120120
- name: v1.1.99 # next;
121-
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220201/bootstrap-components.yaml"
121+
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/bootstrap-components.yaml"
122122
type: "url"
123123
contract: v1beta1
124124
files:
@@ -154,8 +154,8 @@ providers:
154154
new: "imagePullPolicy: IfNotPresent"
155155
- old: --metrics-bind-addr=127.0.0.1:8080
156156
new: --metrics-bind-addr=:8080
157-
- name: v1.1.0
158-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/control-plane-components.yaml"
157+
- name: v1.1.1
158+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.1/control-plane-components.yaml"
159159
type: "url"
160160
contract: v1beta1
161161
files:
@@ -166,7 +166,7 @@ providers:
166166
- old: --metrics-bind-addr=127.0.0.1:8080
167167
new: --metrics-bind-addr=:8080
168168
- name: v1.1.99 # next;
169-
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220201/control-plane-components.yaml"
169+
value: "https://storage.googleapis.com/artifacts.k8s-staging-cluster-api.appspot.com/components/nightly_main_20220214/control-plane-components.yaml"
170170
type: "url"
171171
contract: v1beta1
172172
files:

0 commit comments

Comments
 (0)