✨ Add e2e tests & clusterctl changes for cross-ns CC ref #11395

Danil-Grigorev · 2024-11-11T10:19:06Z

What this PR does / why we need it:
This PR allows clusterctl to create a template with a reference to CC located in a different namespace.
This change allows to perform e2e tests in a multi-ns environment.

Added e2e tests to verify cluster-class quick-start scenario and runtime extension scenario in a cross-namespaced context.

The PR is built on top of:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #5673

fabriziopandini · 2024-11-25T14:02:50Z

Renamed wip since it builds on a PR not yet merged

fabriziopandini

Made first pass, I will get back to this when the PR it builds on top are merged

test/e2e/data/infrastructure-docker/main/cluster-template-cross-ns-topology/cluster.yaml

test/e2e/cross-ns-quick-start.go

cmd/clusterctl/client/clusterclass.go

cmd/clusterctl/client/clusterclass_test.go

Danil-Grigorev · 2025-01-23T16:31:52Z

/test pull-cluster-api-e2e-main

sbueringer · 2025-01-23T18:18:19Z

/test pull-cluster-api-e2e-main

sbueringer · 2025-01-24T06:31:05Z

/test pull-cluster-api-e2e-main

sbueringer · 2025-01-24T07:54:24Z

Failing again. Probably we should look into why the cluster breaks. It shouldn't 😅 I would probably have time for that next week

test/e2e/quick_start.go

sbueringer · 2025-01-28T19:14:13Z

Just fyi, Christian is currently looking into this. We're probably hitting an edge case in KCP

test/e2e/clusterclass_changes.go

chrischdi · 2025-01-30T11:32:13Z

cc @Danil-Grigorev the above comments should help to get this one green :-)

- Prevent duplicate CC creation in template processing - Test runtimextension integration - Add changes to CC rebase e2e test - Add a note CLUSTER_CLASS_NAMESPACE to the clusterctl contract Co-authored-by: Christian Schlotter <[email protected]> Signed-off-by: Danil-Grigorev <[email protected]>

sbueringer · 2025-01-30T13:01:50Z

/test pull-cluster-api-e2e-main

sbueringer · 2025-01-30T16:38:06Z

Nice, only another test failed. I call this a win! :)

/test pull-cluster-api-e2e-main

sbueringer · 2025-01-31T06:45:42Z

/test pull-cluster-api-e2e-main

sbueringer · 2025-01-31T16:38:17Z

/test pull-cluster-api-e2e-main

sbueringer · 2025-02-04T10:12:09Z

/test pull-cluster-api-e2e-main

k8s-ci-robot · 2025-02-04T10:34:12Z

@Danil-Grigorev: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-e2e-main	`0c1c5b9`	link	true	`/test pull-cluster-api-e2e-main`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

sbueringer

Very last round of findings I hope.

Didn't realize the overlap with #11780 when merging #11780

sbueringer · 2025-02-04T10:40:59Z

test/e2e/clusterclass_changes.go

+			g.Expect(ok).To(BeTrue())
+			g.Expect(controlPlane.GetGeneration()).To(BeComparableTo(observedGeneration))


Suggested change

g.Expect(ok).To(BeTrue())

g.Expect(controlPlane.GetGeneration()).To(BeComparableTo(observedGeneration))

if ok {

g.Expect(controlPlane.GetGeneration()).To(BeComparableTo(observedGeneration))

}

I think (observedGeneration is not part of the contract, so we can't expect it exists)

sbueringer · 2025-02-04T10:41:21Z

test/e2e/clusterclass_changes.go

+			scaling, err := contract.ControlPlane().IsScaling(controlPlane)
+			g.Expect(err).ToNot(HaveOccurred())
+			g.Expect(scaling).To(BeFalse())
+		}, input.WaitForControlPlaneIntervals...).Should(BeNil())


Suggested change

}, input.WaitForControlPlaneIntervals...).Should(BeNil())

}, input.WaitForControlPlaneIntervals...).Should(Succeed())

sbueringer · 2025-02-04T10:50:14Z

test/e2e/quick_start.go

@@ -44,6 +44,9 @@ type QuickStartSpecInput struct {
 	// If not set, a random one will be generated.
 	ClusterName *string

+	// DeployClusterClassInSeparateNamespace defines if the ClusterClass should be deployed in a separate namespace.


We have to rebase onto main. In the meantime ClusterctlVariables was added as an input field and we have to add to that map (I would simply overwrite the CLUSTER_CLASS_NAMESPACE key)
(#11780)

Note: we also have to handle the case where input.ClusterctlVariables is nil

chrischdi

One nit from my side :-)

chrischdi · 2025-02-04T11:44:57Z

test/e2e/cluster_upgrade_runtimesdk_test.go

+		version, err := semver.ParseTolerant(e2eConfig.GetVariable(KubernetesVersionUpgradeFrom))
+		Expect(err).ToNot(HaveOccurred(), "Invalid argument, KUBERNETES_VERSION_UPGRADE_FROM is not a valid version")
+		if version.LT(semver.MustParse("1.24.0")) {
+			Fail("This test only supports upgrades from Kubernetes >= v1.24.0")
+		}
+


Suggested change

version, err := semver.ParseTolerant(e2eConfig.GetVariable(KubernetesVersionUpgradeFrom))

Expect(err).ToNot(HaveOccurred(), "Invalid argument, KUBERNETES_VERSION_UPGRADE_FROM is not a valid version")

if version.LT(semver.MustParse("1.24.0")) {

Fail("This test only supports upgrades from Kubernetes >= v1.24.0")

}

We can drop this constraint as 1.24 is rotated out of our tests/support range :-)

k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-area PR is missing an area label labels Nov 11, 2024

k8s-ci-robot requested a review from elmiko November 11, 2024 10:19

k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Nov 11, 2024

k8s-ci-robot requested a review from jackfrancis November 11, 2024 10:19

Danil-Grigorev force-pushed the standardize-references-full branch 5 times, most recently from d92a5c2 to 7560e66 Compare November 12, 2024 11:33

Danil-Grigorev mentioned this pull request Nov 12, 2024

🐛 Use namespace of the reference on external.Get #11361

Merged

Danil-Grigorev changed the title ~~[WIP] ✨ E2E test for the classNamespace usage~~ [WIP] ✨ Add clusterctl changes for cross-ns CC ref Nov 12, 2024

Danil-Grigorev changed the title ~~[WIP] ✨ Add clusterctl changes for cross-ns CC ref~~ ✨ Add clusterctl changes for cross-ns CC ref Nov 12, 2024

k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Nov 12, 2024

Danil-Grigorev force-pushed the standardize-references-full branch from 7560e66 to 09ce978 Compare November 18, 2024 19:46

k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 18, 2024

fabriziopandini mentioned this pull request Nov 21, 2024

Enabling option to ignore namespaces #11193

Open

fabriziopandini changed the title ~~✨ Add clusterctl changes for cross-ns CC ref~~ [WIP] ✨ Add clusterctl changes for cross-ns CC ref Nov 25, 2024

k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 25, 2024

fabriziopandini reviewed Nov 25, 2024

View reviewed changes

Danil-Grigorev force-pushed the standardize-references-full branch from 09ce978 to 2d4a64e Compare December 4, 2024 14:34

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 4, 2024

Danil-Grigorev force-pushed the standardize-references-full branch from 2d4a64e to c181e3e Compare December 4, 2024 15:22

k8s-ci-robot removed the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Dec 4, 2024

Danil-Grigorev force-pushed the standardize-references-full branch 4 times, most recently from b74fdb8 to 0ddc544 Compare January 23, 2025 16:31

Danil-Grigorev mentioned this pull request Jan 23, 2025

✨ clusterctl move support for a cross namespace ClusterClass reference #11649

Open

sbueringer mentioned this pull request Jan 23, 2025

✨ Extend scale test and make ExtensionConfig name in RuntimeSDK test configurable #11667

Merged

Danil-Grigorev force-pushed the standardize-references-full branch from 0ddc544 to ef9f745 Compare January 23, 2025 17:38

chrischdi reviewed Jan 24, 2025

View reviewed changes

test/e2e/quick_start.go Outdated Show resolved Hide resolved

Danil-Grigorev mentioned this pull request Jan 28, 2025

[e2e] Implement ClusterClass cross-namespace rebase e2e tests rancher/turtles#1059

Open

chrischdi reviewed Jan 30, 2025

View reviewed changes

test/e2e/clusterclass_changes.go Outdated Show resolved Hide resolved

chrischdi reviewed Jan 30, 2025

View reviewed changes

test/e2e/clusterclass_changes.go Outdated Show resolved Hide resolved

test/e2e/clusterclass_changes.go Outdated Show resolved Hide resolved

Danil-Grigorev force-pushed the standardize-references-full branch from 231fcd7 to 5d11aa7 Compare January 30, 2025 12:49

Danil-Grigorev force-pushed the standardize-references-full branch from 5d11aa7 to 0c1c5b9 Compare January 30, 2025 12:54

sbueringer added tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. and removed tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. labels Feb 4, 2025

sbueringer reviewed Feb 4, 2025

View reviewed changes

chrischdi reviewed Feb 4, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

✨ Add e2e tests & clusterctl changes for cross-ns CC ref #11395

✨ Add e2e tests & clusterctl changes for cross-ns CC ref #11395

Danil-Grigorev commented Nov 11, 2024 •

edited

Loading

fabriziopandini commented Nov 25, 2024

fabriziopandini left a comment

Danil-Grigorev commented Jan 23, 2025

sbueringer commented Jan 23, 2025

sbueringer commented Jan 24, 2025

sbueringer commented Jan 24, 2025

sbueringer commented Jan 28, 2025

chrischdi commented Jan 30, 2025

sbueringer commented Jan 30, 2025

sbueringer commented Jan 30, 2025

sbueringer commented Jan 31, 2025

sbueringer commented Jan 31, 2025

sbueringer commented Feb 4, 2025

k8s-ci-robot commented Feb 4, 2025

sbueringer left a comment •

edited

Loading

sbueringer Feb 4, 2025 •

edited

Loading

sbueringer Feb 4, 2025

sbueringer Feb 4, 2025 •

edited

Loading

chrischdi left a comment

chrischdi Feb 4, 2025

		g.Expect(ok).To(BeTrue())
		g.Expect(controlPlane.GetGeneration()).To(BeComparableTo(observedGeneration))

	}, input.WaitForControlPlaneIntervals...).Should(BeNil())
	}, input.WaitForControlPlaneIntervals...).Should(Succeed())

✨ Add e2e tests & clusterctl changes for cross-ns CC ref #11395

Are you sure you want to change the base?

✨ Add e2e tests & clusterctl changes for cross-ns CC ref #11395

Conversation

Danil-Grigorev commented Nov 11, 2024 • edited Loading

fabriziopandini commented Nov 25, 2024

fabriziopandini left a comment

Choose a reason for hiding this comment

Danil-Grigorev commented Jan 23, 2025

sbueringer commented Jan 23, 2025

sbueringer commented Jan 24, 2025

sbueringer commented Jan 24, 2025

sbueringer commented Jan 28, 2025

chrischdi commented Jan 30, 2025

sbueringer commented Jan 30, 2025

sbueringer commented Jan 30, 2025

sbueringer commented Jan 31, 2025

sbueringer commented Jan 31, 2025

sbueringer commented Feb 4, 2025

k8s-ci-robot commented Feb 4, 2025

sbueringer left a comment • edited Loading

Choose a reason for hiding this comment

sbueringer Feb 4, 2025 • edited Loading

Choose a reason for hiding this comment

sbueringer Feb 4, 2025

Choose a reason for hiding this comment

sbueringer Feb 4, 2025 • edited Loading

Choose a reason for hiding this comment

chrischdi left a comment

Choose a reason for hiding this comment

chrischdi Feb 4, 2025

Choose a reason for hiding this comment

Danil-Grigorev commented Nov 11, 2024 •

edited

Loading

sbueringer left a comment •

edited

Loading

sbueringer Feb 4, 2025 •

edited

Loading

sbueringer Feb 4, 2025 •

edited

Loading