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

🌱 update upstream k8s CI image store reference #4922

Closed

Conversation

jackfrancis
Copy link
Contributor

What this PR does / why we need it:

This PR updates a cluster-api CI reference to a deprecated upstream with the new URI.

We did this in capz as well, as described here:

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 #

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 12, 2021
@jackfrancis
Copy link
Contributor Author

cc @CecileRobertMichon

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 12, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign fabriziopandini after the PR has been reviewed.
You can assign the PR to them by writing /assign @fabriziopandini in a comment when ready.

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

Needs approval from an approver in each of these files:

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

@sbueringer
Copy link
Member

@jackfrancis @CecileRobertMichon Do you know where we reference those images?

@CecileRobertMichon
Copy link
Contributor

@jackfrancis @CecileRobertMichon Do you know where we reference those images?

Looks like #4107 already addressed most references

@sbueringer
Copy link
Member

@jackfrancis @CecileRobertMichon Do you know where we reference those images?

Looks like #4107 already addressed most references

Ah thx, that explains why I couldn't find it.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 12, 2021
@sbueringer
Copy link
Member

sbueringer commented Jul 12, 2021

@jackfrancis @CecileRobertMichon Do you know where we reference those images?

Looks like #4107 already addressed most references

Ah thx, that explains why I couldn't find it.

/lgtm

Although that's only the conformance image. At least in CAPD I would assume we're not using them https://storage.googleapis.com/kubernetes-jenkins/pr-logs/pull/kubernetes-sigs_cluster-api/4823/pull-cluster-api-e2e-workload-upgrade-1-21-latest-main/1405626529181863936/artifacts/clusters/bootstrap/resources/k8s-upgrade-and-conformance-j6duuy/KubeadmControlPlane/k8s-upgrade-and-conformance-xipfvw-control-plane.yaml. (But this change is for other providers anyway)

@@ -95,7 +95,7 @@ if [[ "$${KUBERNETES_VERSION}" != "" ]]; then
$${GSUTIL} cp "$${CI_URL}/$${CI_CONTAINER}.$${CONTAINER_EXT}" "$${CI_DIR}/$${CI_CONTAINER}.$${CONTAINER_EXT}"
$${SUDO} ctr -n k8s.io images import "$${CI_DIR}/$${CI_CONTAINER}.$${CONTAINER_EXT}" || echo "* ignoring expected 'ctr images import' result"
$${SUDO} ctr -n k8s.io images tag "k8s.gcr.io/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "k8s.gcr.io/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
$${SUDO} ctr -n k8s.io images tag "k8s.gcr.io/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/kubernetes-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
$${SUDO} ctr -n k8s.io images tag "k8s.gcr.io/$${CI_CONTAINER}-amd64:$${KUBERNETES_VERSION//+/_}" "gcr.io/k8s-staging-ci-images/$${CI_CONTAINER}:$${KUBERNETES_VERSION//+/_}"
Copy link
Member

Choose a reason for hiding this comment

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

In case you want to try out my suggestion here: https://github.com/kubernetes-sigs/cluster-api-provider-azure/pull/1512/files#r668146228

I would wait for the results of testing this before we merge.

Copy link
Member

@sbueringer sbueringer Jul 12, 2021

Choose a reason for hiding this comment

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

As seen in the other PR. We need the tags as kubeadm will try to pull images from there (the repo is hard-coded in kubeadm). The repo was changed in kubeadm for all versions >= 1.18.

@jackfrancis jackfrancis force-pushed the k8s-staging-ci-images branch from 58b265e to 248460e Compare July 12, 2021 19:17
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 12, 2021
@sbueringer
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 12, 2021
@randomvariable
Copy link
Member

randomvariable commented Jul 13, 2021

Tested on CAPA, and conformance suite started successfully.

/lgtm

/assign @fabriziopandini

@randomvariable
Copy link
Member

#4420 now includes these changes, so let's get that one in.

@randomvariable
Copy link
Member

/lgtm cancel

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 13, 2021
@CecileRobertMichon
Copy link
Contributor

/close

@k8s-ci-robot
Copy link
Contributor

@CecileRobertMichon: Closed this PR.

In response to this:

/close

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.

@jackfrancis jackfrancis deleted the k8s-staging-ci-images branch July 13, 2021 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants