🌱 Prepare main branch for v1.8 development

[Nivedita-coder]

What this PR does / why we need it:

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

[k8s-ci-robot]

Welcome @Nivedita-coder!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[k8s-ci-robot]

Hi @Nivedita-coder. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

[Nivedita-coder]

/area release

[sbueringer]

/ok-to-test

[adilGhaffarDev]

Since k8s v1.30.0 is supported now on 1.7, let's change that too.

[Nivedita-coder]

/ok-to-test

[chrischdi]

Currently missing:

• v0.3=>v1.5=>current should be v0.3=>v1.6=>current
• v0.4=>v1.6=>current should be v0.4=>v1.7=>current
• v1.5=>current should go away (both clusterclass and non-clusterclass)
• Changes to test/e2e/config/docker.yaml:
  • Add v1.7 entry for all three providers
  • Remove v1.5 entry from all three providers
  • Change v1.7.99 to v1.8.99
• Remove test/e2e/data/shared/v1.5
• Remove test/e2e/data/infrastructure-docker/v1.5
• Remove references to the above from test/e2e/config/docker.yaml

Note: not checked by me yet (will do so afte rthe above):

5. Modify the test specs in test/e2e/clusterctl_upgrade_test.go (according to the versions we want to test described above).
   Please note that both InitWithKubernetesVersion and WorkloadKubernetesVersion should be the highest mgmt cluster version supported by the respective Cluster API version.

[Nivedita-coder]

• Remove references to the above from test/e2e/config/docker.yaml

Hey @chrischdi, what do you mean by this line? :)

[chrischdi]

• test/e2e/config/docker.yaml

Hey :-)

The file e.g. contains:

  - name: "{go://sigs.k8s.io/cluster-api@v1.5}" # supported release in the v1beta1 series; this is used for v1beta1 --> main clusterctl upgrades test only.
    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/{go://sigs.k8s.io/cluster-api@v1.5}/infrastructure-components-development.yaml"
    type: "url"
    contract: v1beta1
    replacements:
    - old: --metrics-addr=127.0.0.1:8080
      new: --metrics-addr=:8080
    files:
    - sourcePath: "../data/shared/v1.5/metadata.yaml"
    - sourcePath: "../data/infrastructure-docker/v1.5/cluster-template.yaml"
    - sourcePath: "../data/infrastructure-docker/v1.5/cluster-template-topology.yaml"
    - sourcePath: "../data/infrastructure-docker/v1.5/clusterclass-quick-start.yaml"

This also refers the templates and similar lines. This whole thing (which refers v1.5) sould go away, also the others which refer v1.5.

[sbueringer]

(I'll review once @chrischdi lgtm'ed & all tests are green)

[sbueringer]

Please also fix this finding: #10524 (comment)

[Nivedita-coder]

Hey @sbueringer @chrischdi,
If no further changes are needed, let me know I'll squash the commits so we can merge this PR! :)

[sbueringer]

@Nivedita-coder Thx, all good!

Please go ahead and squash (as mentioned above, please only squash the commits without also rebasing on top of main)

[sbueringer]

I rebased the PR, wanted to make sure it is merged correctly with changes we made on main in the meantime

[sbueringer]

/assign @fabriziopandini @chrischdi
for final approval

(all good from my side, I just already did the rebase so I don't want to self-approve)

[sbueringer]

/test ?

[k8s-ci-robot]

@sbueringer: The following commands are available to trigger required jobs:

• /test pull-cluster-api-build-main
• /test pull-cluster-api-e2e-blocking-main
• /test pull-cluster-api-e2e-conformance-ci-latest-main
• /test pull-cluster-api-e2e-conformance-main
• /test pull-cluster-api-e2e-main
• /test pull-cluster-api-e2e-mink8s-main
• /test pull-cluster-api-e2e-upgrade-1-30-1-31-main
• /test pull-cluster-api-test-main
• /test pull-cluster-api-test-mink8s-main
• /test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

• /test pull-cluster-api-apidiff-main

Use /test all to run the following jobs that were automatically triggered:

• pull-cluster-api-apidiff-main
• pull-cluster-api-build-main
• pull-cluster-api-e2e-blocking-main
• pull-cluster-api-test-main
• pull-cluster-api-verify-main

In response to this:

/test ?

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.

[sbueringer]

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-30-1-31-main

[sbueringer]

e2e-mink8s is expected to fail at this point, we'll fix that independently. I'll look into e2e-main

[sbueringer]

Ah e2e-main is still running, it is just showing the failure of a previous run in the comment above

[sbueringer]

/test pull-cluster-api-e2e-mink8s-main

[sbueringer]

All tests green, good to merge :)

(cc @killianmuldoon @fabriziopandini @chrischdi)

[fabriziopandini]

great job @Nivedita-coder
and thanks to @sbueringer and @chrischdi who helped in getting this through the finish line
/lgtm
/approve

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 12ce9a0f787d564c39d98d1c83fe12c785661974

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

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 [fabriziopandini]

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

[sbueringer]

Thx @Nivedita-coder and everyone who helped! :)