Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Resolve release markers #9265

Merged
merged 1 commit into from
Dec 13, 2023

Conversation

adilGhaffarDev
Copy link
Contributor

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 #5008

/area testing

@k8s-ci-robot k8s-ci-robot added area/testing Issues or PRs related to testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Aug 22, 2023
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 22, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @adilGhaffarDev. 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.

@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 22, 2023
@killianmuldoon
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Aug 22, 2023
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/go.mod Outdated Show resolved Hide resolved
@furkatgofurov7
Copy link
Member

Current CI failures should be fixed after #9275 is merged

@furkatgofurov7
Copy link
Member

/retest

@furkatgofurov7
Copy link
Member

@adilGhaffarDev FYI, now, CI failures are related to the changes in the PR itself, #9275 is merged and jobs went past the previous failure step.

@killianmuldoon
Copy link
Contributor

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

Copy link
Contributor

@killianmuldoon killianmuldoon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good!

I think there's one edge case we want to enable - mentioned here: #5008 (comment)

Basically we need to also call the version resolution function somewhere around here:

Expect(input.E2EConfig.Variables).To(HaveKey(initWithBinaryVariableName), "Invalid argument. %s variable must be defined when calling %s spec", initWithBinaryVariableName, specName)
to ensure that it's called when INIT_WITH_BINARY is passed in as an environmental variable.

Copy link
Member

@furkatgofurov7 furkatgofurov7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few nits, overall LGTM:

test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
@adilGhaffarDev adilGhaffarDev force-pushed the resolve-releases/adil branch 2 times, most recently from fbbede4 to c79a6ae Compare August 25, 2023 13:12
@furkatgofurov7
Copy link
Member

cc @kubernetes-sigs/cluster-api-release-team

To make sure it is still passing

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

test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
Copy link
Member

@sbueringer sbueringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall looks good. Nice work!

test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
test/framework/clusterctl/e2e_config.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 12, 2023
@adilGhaffarDev adilGhaffarDev force-pushed the resolve-releases/adil branch 2 times, most recently from f0f6e1c to 52d85f3 Compare December 12, 2023 19:44
@adilGhaffarDev
Copy link
Contributor Author

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

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Dec 12, 2023
@adilGhaffarDev
Copy link
Contributor Author

@sbueringer I have addressed the comments, please check when you get time.

@sbueringer
Copy link
Member

Thank you! One final point

Signed-off-by: muhammad adil ghaffar <muhammad.adil.ghaffar@est.tech>
@adilGhaffarDev
Copy link
Contributor Author

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

@sbueringer
Copy link
Member

Thank you very much!! Really nice feature and will help us to test the latest and greatest without toil :)

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: killianmuldoon, sbueringer

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 [killianmuldoon,sbueringer]

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

@chrischdi
Copy link
Member

chrischdi commented Dec 13, 2023

/retest

kubeadm init failed:

[init] Using Kubernetes version: v1.23.17
[preflight] Running pre-flight checks
[preflight] Pulling images required for setting up a Kubernetes cluster
[preflight] This might take a minute or two, depending on the speed of your internet connection
[preflight] You can also perform this action in beforehand using 'kubeadm config images pull'
[certs] Using certificateDir folder "/etc/kubernetes/pki"
[certs] Using existing ca certificate authority
[certs] Generating "apiserver" certificate and key
[certs] apiserver serving cert is signed for DNS names [clusterctl-upgrade-et2f7i-hrp48-97lpc host.docker.internal kubernetes kubernetes.default kubernetes.default.svc kubernetes.default.svc.cluster.local localhost] and IPs [10.128.0.1 172.18.0.6 172.18.0.4 :: ::1 127.0.0.1 0.0.0.0]
[certs] Generating "apiserver-kubelet-client" certificate and key
[certs] Using existing front-proxy-ca certificate authority
[certs] Generating "front-proxy-client" certificate and key
[certs] Using existing etcd/ca certificate authority
[certs] Generating "etcd/server" certificate and key
[certs] etcd/server serving cert is signed for DNS names [clusterctl-upgrade-et2f7i-hrp48-97lpc localhost] and IPs [172.18.0.6 127.0.0.1 ::1]
[certs] Generating "etcd/peer" certificate and key
[certs] etcd/peer serving cert is signed for DNS names [clusterctl-upgrade-et2f7i-hrp48-97lpc localhost] and IPs [172.18.0.6 127.0.0.1 ::1]
[certs] Generating "etcd/healthcheck-client" certificate and key
[certs] Generating "apiserver-etcd-client" certificate and key
[certs] Using the existing "sa" key
[kubeconfig] Using kubeconfig folder "/etc/kubernetes"
[kubeconfig] Writing "admin.conf" kubeconfig file
[kubeconfig] Writing "kubelet.conf" kubeconfig file
[kubeconfig] Writing "controller-manager.conf" kubeconfig file
[kubeconfig] Writing "scheduler.conf" kubeconfig file
[kubelet-start] Writing kubelet environment file with flags to file "/var/lib/kubelet/kubeadm-flags.env"
[kubelet-start] Writing kubelet configuration to file "/var/lib/kubelet/config.yaml"
[kubelet-start] Starting the kubelet
[control-plane] Using manifest folder "/etc/kubernetes/manifests"
[control-plane] Creating static Pod manifest for "kube-apiserver"
[control-plane] Creating static Pod manifest for "kube-controller-manager"
[control-plane] Creating static Pod manifest for "kube-scheduler"
[etcd] Creating static Pod manifest for local etcd in "/etc/kubernetes/manifests"
[wait-control-plane] Waiting for the kubelet to boot up the control plane as static Pods from directory "/etc/kubernetes/manifests". This can take up to 4m0s
[kubelet-check] Initial timeout of 40s passed.

Copy link
Member

@chrischdi chrischdi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found one small typo, lgtm as of that :-)


// resolveReleaseMarker resolves releaseMarker string to verion string e.g.
// - Resolves "go://sigs.k8s.io/cluster-api@v1.0" to the latest stable patch release of v1.0.
// - Resolves "go://sigs.k8s.io/cluster-api@latest-v1.0" to the latest patch release of v.1.0 including rc and pre releases.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// - Resolves "go://sigs.k8s.io/cluster-api@latest-v1.0" to the latest patch release of v.1.0 including rc and pre releases.
// - Resolves "go://sigs.k8s.io/cluster-api@latest-v1.0" to the latest patch release of v1.0 including rc and pre releases.

@chrischdi
Copy link
Member

Let's merge this to unblock #9799 .

I'll follow-up with the typo in a separate PR.

/lgtm
/hold cancel

@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Dec 13, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 062c4300d870ac831e061d142efe5c3d496ff03d

@k8s-ci-robot k8s-ci-robot merged commit 36e9aba into kubernetes-sigs:main Dec 13, 2023
20 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.7 milestone Dec 13, 2023
@adilGhaffarDev
Copy link
Contributor Author

@sbueringer should I backport it too v1.6?

@sbueringer
Copy link
Member

I think I would not backport, should be fine if folks can adopt it with v1.7. And we can run it for some time on main to see if it's stable

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/testing Issues or PRs related to testing cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Resolve release series labels in e2e config
7 participants