⚠️ Remove v1alpha5 API Version #1525

kashifest · 2024-03-13T12:39:40Z

Remove the v1alpha5 version across the CAPM3 codebase.
Related to #971

kashifest · 2024-03-13T12:44:27Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main
/test-ubuntu-feature-main

kashifest · 2024-03-13T12:46:30Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main
/test-ubuntu-feature-main

@adilGhaffarDev @mboukhalfa which other tests should I run ?

kashifest · 2024-03-13T12:46:57Z

/test-ubuntu-features-main

kashifest · 2024-03-13T12:47:35Z

/test-ubuntu-e2e-feature-main

mboukhalfa · 2024-03-13T12:49:24Z

/test-e2e-upgrade-main-from-release-1-6

mboukhalfa · 2024-03-13T12:53:59Z

seems not triggered 🙅

kashifest · 2024-03-13T13:06:06Z

/hold

There are more places in e2e where we need to drop alpha api

adilGhaffarDev · 2024-03-13T14:30:46Z

If we want to add the new clusterctl upgrade tests(v0.3=>v1.5=>current) that CAPI has added, we should keep these APIs in our code.
ref: kubernetes-sigs/cluster-api#10147

kashifest · 2024-03-14T07:17:46Z

If we want to add the new clusterctl upgrade tests(v0.3=>v1.5=>current) that CAPI has added, we should keep these APIs in our code. ref: kubernetes-sigs/cluster-api#10147

ok interesting, I was following this, kubernetes-sigs/cluster-api#9939. Are you sure that we are going to test (v0.3=>v1.5=>current) we dont have 0.3 APIs either, perhaps you meant (v0.4=>v1.5=>current) for CAPI and (v0.5=>v1.5=>current) for us? But then, I am also thinking didnt we decide to drop upgrade from alpha versions ?

The reason I started to work on this now is when I bump to CAPI v1.7.0-beta.0 , I am getting the following error

sigs.k8s.io/cluster-api/api/v1alpha4: package sigs.k8s.io/cluster-api/api/v1alpha4 provided by sigs.k8s.io/cluster-api at latest version v1.6.3 but not at required version v1.7.0-beta.0

adilGhaffarDev · 2024-03-14T07:52:06Z

ok interesting, I was following this, kubernetes-sigs/cluster-api#9939. Are you sure that we are going to test (v0.3=>v1.5=>current) we dont have 0.3 APIs either, perhaps you meant (v0.4=>v1.5=>current) for CAPI and (v0.5=>v1.5=>current) for us? But then, I am also thinking didnt we decide to drop upgrade from alpha versions ?

In CAPI they moved alpha APIs to an internal folder, they removed it from the API folder that is on root.
Also, CAPI didn't ask providers to add these tests, they only asked to uplift, so we are fine. These tests are running in CAPI already and the edge case where the upgrade fails is already covered there we don't need to test it on our side. We can remove alpha APIs for now. Sorry for the confusion.

kashifest · 2024-03-14T14:13:59Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main
/test-ubuntu-feature-main

kashifest · 2024-03-14T14:19:15Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main
/test-ubuntu-feature-main

kashifest · 2024-03-14T14:19:45Z

/test-ubuntu-e2e-feature-main

kashifest · 2024-03-15T06:40:04Z

/test-centos-e2e-integration-main

kashifest · 2024-03-15T07:08:11Z

/test-centos-e2e-integration-main

kashifest · 2024-03-15T07:10:31Z

/test-centos-e2e-integration-main

kashifest · 2024-03-15T08:03:44Z

/test-ubuntu-e2e-integration-main

kashifest · 2024-03-15T08:06:23Z

/test-ubuntu-integration-main
/test-ubuntu-e2e-integration-main
/test-ubuntu-e2e-feature-main

kashifest · 2024-03-15T08:10:47Z

/test-ubuntu-e2e-feature-main

kashifest · 2024-03-15T08:12:02Z

/test-ubuntu-integration-main

kashifest · 2024-03-15T08:12:30Z

/test-e2e-upgrade-main-from-release-1-6

kashifest · 2024-03-15T08:15:20Z

/test-e2e-upgrade-main-from-release-1-6
/test-e2e-upgrade-main-from-release-1-5
/test-e2e-upgrade-main-from-release-1-4
/test-e2e-upgrade-main-from-release-1-3
/test-e2e-upgrade-main-from-release-1-2

kashifest · 2024-03-15T08:36:52Z

/test-ubuntu-integration-main

kashifest · 2024-03-15T08:52:32Z

/test-e2e-upgrade-main-from-release-1-6

kashifest · 2024-03-18T06:30:59Z

/override test-ubuntu-e2e-feature-main
ubuntu feature test is failing for unrrelated reason, centos has passed

metal3-io-bot · 2024-03-18T06:31:03Z

@kashifest: Overrode contexts on behalf of kashifest: test-ubuntu-e2e-feature-main

In response to this:

/override test-ubuntu-e2e-feature-main
ubuntu feature test is failing for unrrelated reason, centos has passed

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/test-infra repository.

kashifest · 2024-03-18T06:31:21Z

/hold cancel

kashifest · 2024-03-18T12:52:14Z

/cc @furkatgofurov7

kashifest · 2024-03-19T06:30:01Z

Passed tests:

Signed-off-by: Kashif Khan <[email protected]>

kashifest · 2024-03-19T06:33:35Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main

kashifest · 2024-03-19T06:36:51Z

/test-centos-e2e-integration-main
/test-ubuntu-integration-main

kashifest · 2024-03-19T12:54:54Z

/cc @mboukhalfa @Sunnatillo @adilGhaffarDev @lentzi90 @tuminoid

mboukhalfa · 2024-03-19T13:13:40Z

test/e2e/upgrade_clusterctl_test.go

+	os.Setenv("CAPI_VERSION", "v1beta1")
+	os.Setenv("CAPM3_VERSION", "v1beta1")


Wondering if this needed I think in the previous we were overriding the v1beta1 with v1alpha5

also overriding the format is in line 283

I dont think I understood your 2nd comment , if these vars are not needed, we need to do cleanup in a followup.

furkatgofurov7 · 2024-03-19T13:33:15Z

test/e2e/config/e2e_conf.yaml

@@ -39,7 +39,7 @@ providers:
 - name: kubeadm
  type: BootstrapProvider
  versions:
-  - name: ${CAPI_FROM_RELEASE} # latest published release in the v1alpha4 series; this is used for v1alpha4 --> v1beta1 clusterctl upgrades test only.
+  - name: ${CAPI_FROM_RELEASE}


I can't directly comment on the line, but what I am not understanding is why this is so much complicated rather then just using hardcoded values for CAPI_FROM and CAP_TO releases. That is not my main question though, but it is this line:

files: - sourcePath: "../data/shared/${CAPI_FROM_RELEASE:0:4}/metadata.yaml"

how it used to work AND will work as is? you have v0.4, v1.2, v1.3, v1.4, v1.5, v1.6 folders under data/shared folders and script does sub string extraction to set CONTRACT_FROM, but how they are related to each other? I mean v0.4 is not the contract but CAPM3 minor version, contract should be v1alpha4/v1beta1, no?

I agree this is hard to follow and confusing as well. We have another PR where we are hardcoding these values for simplifications, #1465, as for how it works, @mboukhalfa can clarify more, we are exporting CAPI_TO_RELEASE inherits its value from CAPIRELEASE which is set in dev-env. I think I have to also do a cleanup of the line you pointed out.

that line is extract the the minor release and removing the patch chars to set the correct path based on the release exported in dev-env

mboukhalfa · 2024-03-20T11:53:18Z

/approve

metal3-io-bot · 2024-03-20T11:53:25Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mboukhalfa

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [mboukhalfa]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sunnatillo

/lgtm

metal3-io-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 13, 2024

kashifest force-pushed the remove/v1alpha5 branch from 21594e7 to 800fbe7 Compare March 13, 2024 12:41

metal3-io-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 13, 2024

kashifest force-pushed the remove/v1alpha5 branch from 800fbe7 to 9bb3d2e Compare March 14, 2024 14:12

kashifest force-pushed the remove/v1alpha5 branch from 9bb3d2e to dea3454 Compare March 15, 2024 06:39

kashifest force-pushed the remove/v1alpha5 branch from dea3454 to 9a53d2a Compare March 15, 2024 07:07

metal3-io-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 18, 2024

metal3-io-bot requested a review from furkatgofurov7 March 18, 2024 12:52

kashifest mentioned this pull request Mar 18, 2024

🌱 Bump CAPI to v1.7.0-beta.0 #1530

Merged

metal3-io-bot added the needs-rebase Indicates that a PR cannot be merged because it has merge conflicts with HEAD. label Mar 18, 2024

Remove v1alpha5 API Version

79d1d93

Signed-off-by: Kashif Khan <[email protected]>

kashifest force-pushed the remove/v1alpha5 branch from 9a53d2a to 79d1d93 Compare March 19, 2024 06:32

metal3-io-bot removed the needs-rebase Indicates that a PR cannot be merged because it has merge conflicts with HEAD. label Mar 19, 2024

metal3-io-bot requested review from adilGhaffarDev, lentzi90, mboukhalfa, Sunnatillo and tuminoid March 19, 2024 12:54

mboukhalfa reviewed Mar 19, 2024

View reviewed changes

furkatgofurov7 reviewed Mar 19, 2024

View reviewed changes

metal3-io-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 20, 2024

Sunnatillo reviewed Mar 20, 2024

View reviewed changes

metal3-io-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 20, 2024

metal3-io-bot merged commit bec1704 into metal3-io:main Mar 20, 2024
19 checks passed

metal3-io-bot deleted the remove/v1alpha5 branch March 20, 2024 12:27

kashifest mentioned this pull request May 8, 2024

Removal of v1alpha5 apiversion #971

Closed

10 tasks

		os.Setenv("CAPI_VERSION", "v1beta1")
		os.Setenv("CAPM3_VERSION", "v1beta1")

⚠️ Remove v1alpha5 API Version #1525

⚠️ Remove v1alpha5 API Version #1525

Conversation

kashifest commented Mar 13, 2024

kashifest commented Mar 13, 2024

kashifest commented Mar 13, 2024

kashifest commented Mar 13, 2024

kashifest commented Mar 13, 2024

mboukhalfa commented Mar 13, 2024

mboukhalfa commented Mar 13, 2024

kashifest commented Mar 13, 2024

adilGhaffarDev commented Mar 13, 2024

kashifest commented Mar 14, 2024

adilGhaffarDev commented Mar 14, 2024

kashifest commented Mar 14, 2024

kashifest commented Mar 14, 2024

kashifest commented Mar 14, 2024

kashifest commented Mar 15, 2024

kashifest commented Mar 15, 2024

kashifest commented Mar 15, 2024

kashifest commented Mar 15, 2024

kashifest commented Mar 15, 2024

kashifest commented Mar 15, 2024

kashifest commented Mar 15, 2024

kashifest commented Mar 15, 2024

kashifest commented Mar 15, 2024

kashifest commented Mar 15, 2024

kashifest commented Mar 15, 2024

kashifest commented Mar 18, 2024

metal3-io-bot commented Mar 18, 2024

kashifest commented Mar 18, 2024

kashifest commented Mar 18, 2024

kashifest commented Mar 19, 2024

kashifest commented Mar 19, 2024

kashifest commented Mar 19, 2024

kashifest commented Mar 19, 2024

mboukhalfa Mar 19, 2024

Choose a reason for hiding this comment

mboukhalfa Mar 19, 2024

Choose a reason for hiding this comment

kashifest Mar 19, 2024

Choose a reason for hiding this comment

mboukhalfa Mar 20, 2024

Choose a reason for hiding this comment

furkatgofurov7 Mar 19, 2024 • edited Loading

Choose a reason for hiding this comment

kashifest Mar 19, 2024

Choose a reason for hiding this comment

mboukhalfa Mar 20, 2024

Choose a reason for hiding this comment

mboukhalfa commented Mar 20, 2024

metal3-io-bot commented Mar 20, 2024

Sunnatillo left a comment

Choose a reason for hiding this comment

furkatgofurov7 Mar 19, 2024 •

edited

Loading