Skip to content

Commit fca59eb

Browse files
jimmidysonjimmidyson
authored
feat: Bump sigs.k8s.io/cluster-api to v1.7.2 (#661)
Including updating `clusterctl`.
1 parent 07f8481 commit fca59eb

File tree

13 files changed

+47
-25
lines changed

13 files changed

+47
-25
lines changed

‎api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
k8s.io/apiextensions-apiserver v0.29.3
1919
k8s.io/apimachinery v0.29.3
2020
k8s.io/utils v0.0.0-20231127182322-b307cd553661
21-
sigs.k8s.io/cluster-api v1.7.1
21+
sigs.k8s.io/cluster-api v1.7.2
2222
sigs.k8s.io/controller-runtime v0.17.3
2323
)
2424

‎api/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A
220220
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
221221
k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6RxQGZDnzuLcrUTI=
222222
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
223-
sigs.k8s.io/cluster-api v1.7.1 h1:JkMAbAMzBM+WBHxXLTJXTiCisv1PAaHRzld/3qrmLYY=
224-
sigs.k8s.io/cluster-api v1.7.1/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
223+
sigs.k8s.io/cluster-api v1.7.2 h1:bRE8zoao7ajuLC0HijqfZVcubKQCPlZ04HMgcA53FGE=
224+
sigs.k8s.io/cluster-api v1.7.2/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
225225
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
226226
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
227227
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎cluster-api-runtime-extensions-nutanix.code-workspace

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
"url": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
2525
},
2626
],
27+
"ginkgotestexplorer.buildTags": "e2e",
2728
},
2829
}

‎common/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ require (
2222
k8s.io/apiextensions-apiserver v0.29.3
2323
k8s.io/apimachinery v0.29.3
2424
k8s.io/utils v0.0.0-20231127182322-b307cd553661
25-
sigs.k8s.io/cluster-api v1.7.1
26-
sigs.k8s.io/cluster-api/test v1.7.1
25+
sigs.k8s.io/cluster-api v1.7.2
26+
sigs.k8s.io/cluster-api/test v1.7.2
2727
sigs.k8s.io/controller-runtime v0.17.3
2828
)
2929

‎common/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,10 +283,10 @@ k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6R
283283
k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
284284
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
285285
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
286-
sigs.k8s.io/cluster-api v1.7.1 h1:JkMAbAMzBM+WBHxXLTJXTiCisv1PAaHRzld/3qrmLYY=
287-
sigs.k8s.io/cluster-api v1.7.1/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
288-
sigs.k8s.io/cluster-api/test v1.7.1 h1:QDru2586ZjIFBTW1Z7VVXVtauzR/yANm4tglUNLm9iE=
289-
sigs.k8s.io/cluster-api/test v1.7.1/go.mod h1:yG0g5Mdq73fMn9JP4akgRQPSne973L+Qx6iVH+LjtSM=
286+
sigs.k8s.io/cluster-api v1.7.2 h1:bRE8zoao7ajuLC0HijqfZVcubKQCPlZ04HMgcA53FGE=
287+
sigs.k8s.io/cluster-api v1.7.2/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
288+
sigs.k8s.io/cluster-api/test v1.7.2 h1:muacGu5G/DGz2uTv3CUxml2QLi8fxbIra4CxA2S31KE=
289+
sigs.k8s.io/cluster-api/test v1.7.2/go.mod h1:yG0g5Mdq73fMn9JP4akgRQPSne973L+Qx6iVH+LjtSM=
290290
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
291291
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
292292
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ require (
3333
k8s.io/klog/v2 v2.120.1
3434
k8s.io/kubelet v0.29.3
3535
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
36-
sigs.k8s.io/cluster-api v1.7.1
37-
sigs.k8s.io/cluster-api/test v1.7.1
36+
sigs.k8s.io/cluster-api v1.7.2
37+
sigs.k8s.io/cluster-api/test v1.7.2
3838
sigs.k8s.io/controller-runtime v0.17.3
3939
sigs.k8s.io/yaml v1.4.0
4040
)

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -429,10 +429,10 @@ k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCf
429429
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
430430
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
431431
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
432-
sigs.k8s.io/cluster-api v1.7.1 h1:JkMAbAMzBM+WBHxXLTJXTiCisv1PAaHRzld/3qrmLYY=
433-
sigs.k8s.io/cluster-api v1.7.1/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
434-
sigs.k8s.io/cluster-api/test v1.7.1 h1:QDru2586ZjIFBTW1Z7VVXVtauzR/yANm4tglUNLm9iE=
435-
sigs.k8s.io/cluster-api/test v1.7.1/go.mod h1:yG0g5Mdq73fMn9JP4akgRQPSne973L+Qx6iVH+LjtSM=
432+
sigs.k8s.io/cluster-api v1.7.2 h1:bRE8zoao7ajuLC0HijqfZVcubKQCPlZ04HMgcA53FGE=
433+
sigs.k8s.io/cluster-api v1.7.2/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
434+
sigs.k8s.io/cluster-api/test v1.7.2 h1:muacGu5G/DGz2uTv3CUxml2QLi8fxbIra4CxA2S31KE=
435+
sigs.k8s.io/cluster-api/test v1.7.2/go.mod h1:yG0g5Mdq73fMn9JP4akgRQPSne973L+Qx6iVH+LjtSM=
436436
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
437437
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
438438
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

‎hack/flakes/flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hack/flakes/flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@
112112

113113
clusterctl = buildGo122Module rec {
114114
pname = "clusterctl";
115-
version = "1.7.1";
115+
version = "1.7.2";
116116

117117
src = fetchFromGitHub {
118118
owner = "kubernetes-sigs";
119119
repo = "cluster-api";
120120
rev = "v${version}";
121-
hash = "sha256-e+Ut6xoNUY9cJjjJ43P0siEa+G1igllcb8veirk1UX0=";
121+
hash = "sha256-ZZkDc5INjUoNc9zcwbOa9WRIkkLr9bm3mohsSe3tKI4=";
122122
};
123123
doCheck = false;
124124
subPackages = [ "cmd/clusterctl" ];

‎pkg/handlers/generic/lifecycle/clusterautoscaler/template.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ func templateValues(cluster *clusterv1.Cluster, text string) (string, error) {
4545
var b bytes.Buffer
4646
err = clusterAutoscalerTemplate.Execute(&b, templateInput)
4747
if err != nil {
48-
return "", fmt.Errorf("failed setting target Cluster name and namespace in template: %w", err)
48+
return "", fmt.Errorf(
49+
"failed setting target Cluster name and namespace in template: %w",
50+
err,
51+
)
4952
}
5053

5154
return b.String(), nil

‎test/e2e/e2e_suite_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ func init() {
7676
func TestE2E(t *testing.T) {
7777
ctrl.SetLogger(klog.Background())
7878
RegisterFailHandler(Fail)
79-
RunSpecs(t, "caren-e2e")
79+
suiteConfig, reporterConfig := GinkgoConfiguration()
80+
suiteConfig.LabelFilter = "provider:Docker && cni:Cilium && addonStrategy:ClusterResourceSet"
81+
suiteConfig.FocusStrings = []string{"Quick start"}
82+
RunSpecs(t, "caren-e2e", suiteConfig, reporterConfig)
8083
}
8184

8285
// Using a SynchronizedBeforeSuite for controlling how to create resources shared across ParallelNodes (~ginkgo

‎test/e2e/ownerreference_helpers.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ const (
4040
helmChartProxyKind = "HelmChartProxy"
4141
helmReleaseProxyKind = "HelmReleaseProxy"
4242

43-
secretKind = "Secret"
43+
secretKind = "Secret"
44+
configMapKind = "ConfigMap"
4445
)
4546

4647
var (
@@ -158,11 +159,22 @@ var (
158159
// NutanixClusterTemplate must be owned by a ClusterClass.
159160
return framework.HasExactOwners(owners, clusterClassOwner)
160161
},
162+
}
163+
164+
// KubernetesReferenceAssertions maps Kubernetes types to functions which return an error if the passed OwnerReferences
165+
// aren't as expected.
166+
// Note: These relationships are documented in
167+
// https://github.com/kubernetes-sigs/cluster-api/tree/main/docs/book/src/reference/owner_references.md.
168+
KubernetesReferenceAssertions = map[string]func([]metav1.OwnerReference) error{
161169
secretKind: func(owners []metav1.OwnerReference) error {
162170
// TODO:deepakm-ntnx Currently pc-creds, pc-creds-for-csi, dockerhub-credentials
163171
// and registry-creds have unexpected owners which needs more investigation
164172
return nil
165173
},
174+
configMapKind: func(owners []metav1.OwnerReference) error {
175+
// The only configMaps considered here are those owned by a ClusterResourceSet.
176+
return framework.HasExactOwners(owners, clusterResourceSetOwner)
177+
},
166178
}
167179
)
168180

‎test/e2e/quick_start_test.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
. "github.com/onsi/ginkgo/v2"
1414
. "github.com/onsi/gomega"
1515
"k8s.io/utils/ptr"
16+
clusterctlcluster "sigs.k8s.io/cluster-api/cmd/clusterctl/client/cluster"
1617
capie2e "sigs.k8s.io/cluster-api/test/e2e"
1718
"sigs.k8s.io/cluster-api/test/framework"
1819

@@ -85,15 +86,17 @@ var _ = Describe("Quick start", Serial, func() {
8586
framework.AssertOwnerReferences(
8687
namespace,
8788
proxy.GetKubeconfigPath(),
89+
clusterctlcluster.FilterClusterObjectsWithNameFilter(
90+
clusterName,
91+
),
8892
framework.CoreOwnerReferenceAssertion,
89-
framework.ExpOwnerReferenceAssertions,
9093
framework.DockerInfraOwnerReferenceAssertions,
9194
framework.KubeadmBootstrapOwnerReferenceAssertions,
9295
framework.KubeadmControlPlaneOwnerReferenceAssertions,
9396
framework.KubernetesReferenceAssertions,
94-
AWSInfraOwnerReferenceAssertions,
9597
NutanixInfraOwnerReferenceAssertions,
9698
AddonReferenceAssertions,
99+
KubernetesReferenceAssertions,
97100
)
98101

99102
By("Waiting until nodes are ready")

0 commit comments

Comments
 (0)