Skip to content

Commit 28bc9b8

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3903 from k8s-infra-cherrypick-robot/cherry-pick-3893-to-release-2.0
[release-2.0] chore: Bump CAPI to v1.2.7
2 parents f6532d8 + 0d0c4aa commit 28bc9b8

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

‎go.mod‎

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

33
go 1.18
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.6
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.7
66

77
require (
88
github.com/alessio/shellescape v1.4.1
@@ -38,8 +38,8 @@ require (
3838
k8s.io/klog/v2 v2.80.0
3939
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
4040
sigs.k8s.io/aws-iam-authenticator v0.5.10
41-
sigs.k8s.io/cluster-api v1.2.6
42-
sigs.k8s.io/cluster-api/test v1.2.6
41+
sigs.k8s.io/cluster-api v1.2.7
42+
sigs.k8s.io/cluster-api/test v1.2.7
4343
sigs.k8s.io/controller-runtime v0.12.3
4444
sigs.k8s.io/kustomize/api v0.12.1
4545
sigs.k8s.io/yaml v1.3.0
@@ -60,7 +60,7 @@ require (
6060
github.com/beorn7/perks v1.0.1 // indirect
6161
github.com/cespare/xxhash/v2 v2.1.2 // indirect
6262
github.com/coredns/caddy v1.1.0 // indirect
63-
github.com/coredns/corefile-migration v1.0.17 // indirect
63+
github.com/coredns/corefile-migration v1.0.18 // indirect
6464
github.com/coreos/go-semver v0.3.0 // indirect
6565
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
6666
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
139139
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
140140
github.com/coredns/caddy v1.1.0 h1:ezvsPrT/tA/7pYDBZxu0cT0VmWk75AfIaf6GSYCNMf0=
141141
github.com/coredns/caddy v1.1.0/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
142-
github.com/coredns/corefile-migration v1.0.17 h1:tNwh8+4WOANV6NjSljwgW7qViJfhvPUt1kosj4rR8yg=
143-
github.com/coredns/corefile-migration v1.0.17/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
142+
github.com/coredns/corefile-migration v1.0.18 h1:zs5PJm/VGZVje1ESRj6ZqyUuVsVfagExkbLU2QKV5mI=
143+
github.com/coredns/corefile-migration v1.0.18/go.mod h1:XnhgULOEouimnzgn0t4WPuFDN2/PJQcTxdWKC5eXNGE=
144144
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
145145
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
146146
github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc=
@@ -1266,10 +1266,10 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
12661266
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw=
12671267
sigs.k8s.io/aws-iam-authenticator v0.5.10 h1:YGPh/SpRxNkWXfGkURKGsgWvz70x41SB4QazrU7R3Wk=
12681268
sigs.k8s.io/aws-iam-authenticator v0.5.10/go.mod h1:3oJI6vy91KxVSb9g+v9gtJsFnFDJoq+ySJhGDBKpKFk=
1269-
sigs.k8s.io/cluster-api v1.2.6 h1:wueslUK8LdTH8rOI697WIj1jutbaGY3a24t4XjZvLI8=
1270-
sigs.k8s.io/cluster-api v1.2.6/go.mod h1:Ye5gn15u+q6VcE+Se7nBMSo6INm55F+zBcCiWzrjxFc=
1271-
sigs.k8s.io/cluster-api/test v1.2.6 h1:QGcLuLsKkjnd6bEAQ9DKVpZJ4PbgvHe8pFV1Nt5dUGA=
1272-
sigs.k8s.io/cluster-api/test v1.2.6/go.mod h1:uDGdxAADhTIuQoHoGSYehqMWKQ9sR4/LGE8y2k0Y2LM=
1269+
sigs.k8s.io/cluster-api v1.2.7 h1:LjdToomKcAaOh71b2TSKbOucZgkw6NQhwiVaGuidI6E=
1270+
sigs.k8s.io/cluster-api v1.2.7/go.mod h1:qLMSP/QUb0zwBXoXo2MmzV+YLyNQBkK7OwYEUDOQyQA=
1271+
sigs.k8s.io/cluster-api/test v1.2.7 h1:bHn9e2cOeX4tQcCPUQgw2oA8iFC6eZgRUs4+UUwCyZY=
1272+
sigs.k8s.io/cluster-api/test v1.2.7/go.mod h1:j7i8GyZTzGA6aLZXIAF94Cnixuy5ziXrn3z8z/vZ91E=
12731273
sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=
12741274
sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
12751275
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y=

‎test/e2e/data/e2e_conf.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ images:
2727
loadBehavior: tryLoad
2828
- name: quay.io/jetstack/cert-manager-controller:v1.7.2
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.6
30+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.7
3131
loadBehavior: tryLoad
32-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.6
32+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.7
3333
loadBehavior: tryLoad
34-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.6
34+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.7
3535
loadBehavior: tryLoad
3636

3737
providers:
3838
- name: cluster-api
3939
type: CoreProvider
4040
versions:
41-
- name: v1.2.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
42-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/core-components.yaml"
41+
- name: v1.2.7 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
42+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.7/core-components.yaml"
4343
type: "url"
4444
contract: v1beta1
4545
files:
@@ -54,8 +54,8 @@ providers:
5454
files:
5555
- sourcePath: "./shared/v1beta1/metadata.yaml"
5656
versions:
57-
- name: v1.2.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
58-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/bootstrap-components.yaml"
57+
- name: v1.2.7 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
58+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.7/bootstrap-components.yaml"
5959
type: "url"
6060
contract: v1beta1
6161
files:
@@ -70,8 +70,8 @@ providers:
7070
files:
7171
- sourcePath: "./shared/v1beta1/metadata.yaml"
7272
versions:
73-
- name: v1.2.6 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
74-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/control-plane-components.yaml"
73+
- name: v1.2.7 # latest published release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
74+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.7/control-plane-components.yaml"
7575
type: "url"
7676
contract: v1beta1
7777
files:

‎test/e2e/data/e2e_eks_conf.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ images:
2323
loadBehavior: tryLoad
2424
- name: quay.io/jetstack/cert-manager-controller:v1.7.2
2525
loadBehavior: tryLoad
26-
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.6
26+
- name: registry.k8s.io/cluster-api/cluster-api-controller:v1.2.7
2727
loadBehavior: tryLoad
28-
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.6
28+
- name: registry.k8s.io/cluster-api/kubeadm-bootstrap-controller:v1.2.7
2929
loadBehavior: tryLoad
30-
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.6
30+
- name: registry.k8s.io/cluster-api/kubeadm-control-plane-controller:v1.2.7
3131
loadBehavior: tryLoad
3232

3333
providers:
3434
- name: cluster-api
3535
type: CoreProvider
3636
versions:
37-
- name: v1.2.6
38-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/core-components.yaml"
37+
- name: v1.2.7
38+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.7/core-components.yaml"
3939
type: "url"
4040
contract: v1beta1
4141
files:
@@ -50,8 +50,8 @@ providers:
5050
files:
5151
- sourcePath: "./shared/v1beta1/metadata.yaml"
5252
versions:
53-
- name: v1.2.6
54-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/bootstrap-components.yaml"
53+
- name: v1.2.7
54+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.7/bootstrap-components.yaml"
5555
type: "url"
5656
contract: v1beta1
5757
files:
@@ -66,8 +66,8 @@ providers:
6666
files:
6767
- sourcePath: "./shared/v1beta1/metadata.yaml"
6868
versions:
69-
- name: v1.2.6
70-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.6/control-plane-components.yaml"
69+
- name: v1.2.7
70+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.7/control-plane-components.yaml"
7171
type: "url"
7272
contract: v1beta1
7373
files:

‎test/e2e/suites/unmanaged/unmanaged_functional_clusterclass_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ var _ = ginkgo.Context("[unmanaged] [functional] [ClusterClass]", func() {
131131
ginkgo.Describe("Workload cluster with external infrastructure [ClusterClass]", func() {
132132
var namespace *corev1.Namespace
133133
var requiredResources *shared.TestResource
134-
specName := "functional-test-extinfra-clusterclass"
134+
specName := "functional-test-extinfra-cc"
135135
mgmtClusterName := fmt.Sprintf("%s-%s", specName, util.RandomString(6))
136136
mgmtClusterInfra := new(shared.AWSInfrastructure)
137137

0 commit comments

Comments
 (0)