✨ Bump CAPI to v1.3.0 by tobiasgiese · Pull Request #1406 · kubernetes-sigs/cluster-api-provider-openstack

tobiasgiese · 2022-12-03T11:49:07Z

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):
Fixes #1315

This PR bumps the CAPI version to v1.3.0 and respects the version migration guide.

Non-obvious ginkgo v2 changes:

updated setup-envtest (i.e., controller-runtime) in Makefile to the most recent master.
Otherwise, the etcd and kube-apiserver binaries are not available in our unit tests with ginkgo v2
changed deprecated ginkgo parameter -progress to -show-node-events
move By() inside It() to fix ginkgo errors (see Documenting Complex Specs: By)
Added -timeout=3h to the e2e tests because the default timeout has been reduced from 24h down to 1h

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

squashed commits
if necessary:
- includes documentation
- adds unit tests

/hold

netlify · 2022-12-03T11:49:13Z

✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Name	Link
🔨 Latest commit	`031966f`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/6390d20c243b9f0009046a49
😎 Deploy Preview	https://deploy-preview-1406--kubernetes-sigs-cluster-api-openstack.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

k8s-ci-robot · 2022-12-03T11:49:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tobiasgiese

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [tobiasgiese]

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

tobiasgiese · 2022-12-05T14:14:49Z

Waiting for #1408 to be merged

tobiasgiese · 2022-12-06T12:11:01Z

Waiting for #1408 to be merged

e2e tests are green

tobiasgiese · 2022-12-06T12:56:40Z

Do we want to add CAPI v1.3.0 support to our v0.7 release? WDYT @mdbooth?

tobiasgiese · 2022-12-06T13:28:43Z

/cherry-pick release-0.7

k8s-infra-cherrypick-robot · 2022-12-06T13:28:44Z

@tobiasgiese: once the present PR merges, I will cherry-pick it on top of release-0.7 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-0.7

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.

jichenjc · 2022-12-06T13:59:04Z

/lgtm

tobiasgiese · 2022-12-06T14:00:47Z

Feel free to remove the hold @mdbooth

seanschneeweiss · 2022-12-06T14:27:00Z

/lgtm
thanks a lot @tobiasgiese 👍

test/e2e/data/kubetest/conformance-fast.yaml

mdbooth

Looks good.

I'm confused about the inclusion of E2E_IMAGE_URL, though. Was this broken before? If not, what is included in this PR which requires it?

Containerfile

mdbooth · 2022-12-07T15:22:18Z

test/e2e/data/e2e_conf.yaml

  CONFORMANCE_WORKER_MACHINE_COUNT: "5"
  CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
  INIT_WITH_KUBERNETES_VERSION: "v1.25.0"
+  E2E_IMAGE_URL: "http://10.0.3.15/capo-e2e-image.tar"


Why was this needed?

This was moved from

cluster-api-provider-openstack/test/e2e/suites/e2e/clusterctl_upgrade_test.go

Line 40 in 31f7c9c

shared.SetEnvVar("E2E_IMAGE_URL", "http://10.0.3.15/capo-e2e-image.tar", false)

If we don't specify it in the e2e_conf.yaml the following error occurs

[FAILED] Failed to run clusterctl config cluster Unexpected error: <*yamlprocessor.errMissingVariables | 0xc00121d740>: { Missing: ["E2E_IMAGE_URL"], } value for variables [E2E_IMAGE_URL] is not set. Please set the value using os environment variables or the clusterctl config file occurred In [It] at: /root/go/pkg/mod/sigs.k8s.io/cluster-api/test@v1.3.0/framework/clusterctl/client.go:302 @ 12/04/22 11:36:50.414

Prow job that failed with this error: https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api-provider-openstack/1406/pull-cluster-api-provider-openstack-e2e-test/1599355701279330304

As it was introduced in #1371 maybe @lentzi90 can say something about this?

But according to the comment

cluster-api-provider-openstack/test/e2e/suites/e2e/clusterctl_upgrade_test.go

Lines 31 to 35 in 31f7c9c

// Note: There isn't really anything fixing this to the v0.6 release. The test will

// simply pick the latest release with the correct contract from the E2EConfig, as seen here

// https://github.com/kubernetes-sigs/cluster-api/blob/3abb9089485f51d46054096c17ccb8b59f0f7331/test/e2e/clusterctl_upgrade.go#L265

// When new minor releases are added (with the same contract) we will need to work on this

// if we want to continue testing v0.6.

We need the e2e image to "pick the latest release with the correct contract"

It looks like it was a bug in the previous PR: we're including ci-hack-hc(p|t).yaml unconditionally in all the E2E tests, and they reference E2E_IMAGE_URL. However, we're only setting the environment variable in the cluster upgrade test. Presumably the undefined variable error is a change of behaviour in CAPI 1.3, or we'd have noticed this before.

@lentzi90 I wonder if we want to be consistent in the use of e2eCtx here:

cluster-api-provider-openstack/test/e2e/suites/e2e/clusterctl_upgrade_test.go

Lines 40 to 41 in 31f7c9c

shared.SetEnvVar("E2E_IMAGE_URL", "http://10.0.3.15/capo-e2e-image.tar", false)

Right now we're setting the same value in 2 places. It doesn't look like the clusterctl upgrade tests reads e2e_conf.yaml, so we likely can't remove the other one. I'd prefer to do this the same way in both places.

I don't think we need to hold up this PR, though. I'll open an issue to track it a tidy up.

Ah, nm. It is initialised and you already fixed it 🤦

test/e2e/suites/conformance/conformance_test.go

tobiasgiese · 2022-12-07T17:39:08Z

I'm confused about the inclusion of E2E_IMAGE_URL, though. Was this broken before? If not, what is included in this PR which requires it?

This was just moved from the clusterctl_upgrade_test.go -- see #1406 (comment)

During this bump we must upgrade Golang to 1.19 as well. Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>

Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>

This reverts commit 32a9fc9. Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>

Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>

mdbooth · 2022-12-08T11:37:58Z

/lgtm
/hold cancel

k8s-infra-cherrypick-robot · 2022-12-08T11:39:17Z

@tobiasgiese: new pull request created: #1411

Details

In response to this:

/cherry-pick release-0.7

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.

k8s-ci-robot requested review from mdbooth and seanschneeweiss December 3, 2022 11:49

k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Dec 3, 2022

tobiasgiese force-pushed the tobiasgiese/bump-capi-v1.3.0 branch 6 times, most recently from 5039b0f to b4f18ad Compare December 3, 2022 12:28

tobiasgiese mentioned this pull request Dec 3, 2022

🌱Release 0.7 patches #1405

Merged

tobiasgiese force-pushed the tobiasgiese/bump-capi-v1.3.0 branch 6 times, most recently from 356efa7 to e5b754c Compare December 4, 2022 16:02

tobiasgiese mentioned this pull request Dec 5, 2022

WIP: add configmap for calico sec group rules #1403

Closed

3 tasks

tobiasgiese force-pushed the tobiasgiese/bump-capi-v1.3.0 branch from e5b754c to 19a2546 Compare December 6, 2022 10:04

tobiasgiese changed the title ~~[WIP] ✨ Bump CAPI to v1.3.0~~ ✨ Bump CAPI to v1.3.0 Dec 6, 2022

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 6, 2022

k8s-ci-robot assigned jichenjc Dec 6, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 6, 2022

k8s-ci-robot assigned seanschneeweiss Dec 6, 2022

furkatgofurov7 reviewed Dec 6, 2022

View reviewed changes

test/e2e/data/kubetest/conformance-fast.yaml Outdated Show resolved Hide resolved

tobiasgiese force-pushed the tobiasgiese/bump-capi-v1.3.0 branch from 19a2546 to 642ae97 Compare December 6, 2022 16:31

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 6, 2022

tobiasgiese force-pushed the tobiasgiese/bump-capi-v1.3.0 branch 2 times, most recently from 9338897 to 76a5c22 Compare December 6, 2022 21:04

mdbooth reviewed Dec 7, 2022

View reviewed changes

tobiasgiese added 4 commits December 7, 2022 18:43

Bump CAPI to v1.3.0

35d221f

During this bump we must upgrade Golang to 1.19 as well. Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>

Change default k8s registry

f94a6af

Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>

Revert "Fix ginkgov2 conformance tests"

e47f6aa

This reverts commit 32a9fc9. Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>

Bump Ginkgo to v2

031966f

Signed-off-by: Tobias Giese <tobias.giese@mercedes-benz.com>

tobiasgiese force-pushed the tobiasgiese/bump-capi-v1.3.0 branch from 76a5c22 to 031966f Compare December 7, 2022 17:48

k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 8, 2022

k8s-ci-robot assigned mdbooth Dec 8, 2022

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 8, 2022

k8s-ci-robot merged commit ec27461 into kubernetes-sigs:main Dec 8, 2022

k8s-infra-cherrypick-robot mentioned this pull request Dec 8, 2022

[release-0.7] ✨ Bump CAPI to v1.3.0 #1411

Merged

tobiasgiese deleted the tobiasgiese/bump-capi-v1.3.0 branch December 8, 2022 17:38

tobiasgiese mentioned this pull request Dec 12, 2022

🌱 Remove It block from clusterctl upgrade #1412

Merged

3 tasks

tobiasgiese mentioned this pull request Jan 9, 2023

switch from k8s.gcr.io to registery.k8s.io #1436

Closed

	// Note: There isn't really anything fixing this to the v0.6 release. The test will
	// simply pick the latest release with the correct contract from the E2EConfig, as seen here
	// https://github.com/kubernetes-sigs/cluster-api/blob/3abb9089485f51d46054096c17ccb8b59f0f7331/test/e2e/clusterctl_upgrade.go#L265
	// When new minor releases are added (with the same contract) we will need to work on this
	// if we want to continue testing v0.6.

	shared.SetEnvVar("E2E_IMAGE_URL", "http://10.0.3.15/capo-e2e-image.tar", false)

Conversation

tobiasgiese commented Dec 3, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify bot commented Dec 3, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Uh oh!

k8s-ci-robot commented Dec 3, 2022

Uh oh!

tobiasgiese commented Dec 5, 2022

Uh oh!

tobiasgiese commented Dec 6, 2022

Uh oh!

tobiasgiese commented Dec 6, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tobiasgiese commented Dec 6, 2022

Uh oh!

k8s-infra-cherrypick-robot commented Dec 6, 2022

Uh oh!

jichenjc commented Dec 6, 2022

Uh oh!

tobiasgiese commented Dec 6, 2022

Uh oh!

seanschneeweiss commented Dec 6, 2022

Uh oh!

Uh oh!

mdbooth left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mdbooth Dec 7, 2022

Choose a reason for hiding this comment

Uh oh!

tobiasgiese Dec 7, 2022

Choose a reason for hiding this comment

Uh oh!

tobiasgiese Dec 7, 2022

Choose a reason for hiding this comment

Uh oh!

tobiasgiese Dec 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tobiasgiese Dec 8, 2022

Choose a reason for hiding this comment

Uh oh!

mdbooth Dec 8, 2022

Choose a reason for hiding this comment

Uh oh!

mdbooth Dec 8, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

tobiasgiese commented Dec 7, 2022

Uh oh!

mdbooth commented Dec 8, 2022

Uh oh!

k8s-infra-cherrypick-robot commented Dec 8, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

tobiasgiese commented Dec 3, 2022 •

edited

Loading

netlify bot commented Dec 3, 2022 •

edited

Loading

tobiasgiese commented Dec 6, 2022 •

edited

Loading

tobiasgiese Dec 7, 2022 •

edited

Loading