-
Notifications
You must be signed in to change notification settings - Fork 430
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
simplify ci-entrypoint.sh #2325
simplify ci-entrypoint.sh #2325
Conversation
/hold until kubernetes/test-infra#26397 merges |
I think that specifying That would cause this envsubst to container a pre-release tag and therefore not match to any of the kubeproxy images for windows that we currently maintain. cluster-api-provider-azure/templates/test/ci/cluster-template-prow-ci-version.yaml Line 624 in 0298a7d
I'll try testing this out manually by checking out from this PR branch and trying to build a cluster. |
I was mis-informed and it looks like this DOES work for Windows. cluster-api-provider-azure/templates/test/ci/prow-ci-version/patches/kubeadm-bootstrap-windows.yaml Line 33 in ecb2562
|
since kubernetes/test-infra#26397 already merged, is this ready to go? |
CI_VERSION_URL="https://dl.k8s.io/ci/latest-${KUBERNETES_BRANCH/release-}.txt" | ||
elif [[ "${KUBERNETES_VERSION:-}" =~ "latest" ]]; then | ||
export CLUSTER_TEMPLATE="test/ci/cluster-template-prow-ci-version.yaml" | ||
if [[ "${KUBERNETES_VERSION:-}" =~ "latest" ]]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can add another elif here if we want to support stable
versions and resolve to CI_VERSION_URL="https://dl.k8s.io/release/${KUBERNETES_VERSION}.txt
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually for stable- versions we don't need the ci-version template since it will just resolve to the latest released patch version, example https://storage.googleapis.com/kubernetes-release/release/stable-1.23.txt is v1.23.7 right now, so it needs to be outside the if statement that sets the template to cluster-template-prow-ci-version.yaml.
We can do this in a separate PR too.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, you're right, see my latest change
I think this is a simple enough addition that is makes sense to incorporate it in here
I've audited tests since kubernetes/test-infra#26397 merged and I don't observe any regressions. This PR is ready for final review/merge. /assign @CecileRobertMichon |
937b858
to
563a5c6
Compare
563a5c6
to
c61d331
Compare
6dd6366
to
3b4561c
Compare
3b4561c
to
1ebc2c3
Compare
1ebc2c3
to
8c3ee4f
Compare
8c3ee4f
to
504593c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/assign @mboersma @jackfrancis ready to remove the hold? |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mboersma 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:
Approvers can indicate their approval by writing |
/hold cancel |
/cherry-pick release-1.3 |
@jackfrancis: new pull request created: #2363 In response to this:
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. |
What type of PR is this?
/kind cleanup
What this PR does / why we need it:
This PR removes the
USE_CI_ARTIFACTS
option (by conventionUSE_CI_ARTIFACTS=true
is supported; any non-zero value toUSE_CI_ARTIFACTS
effectively means boolean true) as the existingKUBERNETES_VERSION=latest
interface provides the same functionality with more semantic expressiveness.Additionally, we remove the inferential check to see if k/k is in the GOPATH, and to use the checked out sha as the
KUBERNETES_VERSION
. Going forward we will require usages ofci-entrypoint.sh
to declare the desired version of Kubernetes to build via theKUBERNETES_VERSION
environment variable (this is already the practice in the vast majority of test-infra jobs).This test-infra PR needs to merge first so that we are sure we remove any automated usages of the deprecated config interface!:
kubernetes/test-infra#26397
Finally, we add support for using the "stable" prefix to automatically gather the latest patch release. Using 1.23 as an example, "stable-1.23" will yield "v1.23.7" at the time of this writing. Simply using "stable" yields "v1.24.1" at the time of this writing.
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 #
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:
Release note: