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.

Sign up for GitHub

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

Jump to bottom

🌱 KCP: use new registry for Kubernetes >= v1.22 #7471

Merged
merged 1 commit into from
Nov 4, 2022
Merged

🌱 KCP: use new registry for Kubernetes >= v1.22 #7471

merged 1 commit into from
Nov 4, 2022

Conversation

sbueringer
Copy link
Member

@sbueringer sbueringer commented Oct 31, 2022 •
edited
Loading

Signed-off-by: Stefan Büringer [email protected]

What this PR does / why we need it:
Before this PR we started using the new registry with Kubernetes 1.25.

Given:

  • that the new registry is cheaper for the project and
  • there's an upstream effort (kubeadm) to backport the registry change back until v1.22

let's align and already use the new registry for Kubernetes >= v1.22

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

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 31, 2022
@sbueringer
Copy link
Member Author

/assign @fabriziopandini

@sbueringer sbueringer changed the title 🌱 KCP: use new registry with Kubernetes >= v1.22 🌱 KCP: use new registry for Kubernetes >= v1.22 Oct 31, 2022
@sbueringer
Copy link
Member Author

/test ?

@k8s-ci-robot

This comment was marked as outdated.

Sign in to view
@sbueringer
Copy link
Member Author

/test pull-cluster-api-e2e-full-main
/test pull-cluster-api-e2e-workload-upgrade-1-25-latest-main

chrischdi
chrischdi reviewed Oct 31, 2022
View reviewed changes
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.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 31, 2022
@ameukam
Copy link
Member

ameukam commented Oct 31, 2022

/lgtm

killianmuldoon
killianmuldoon approved these changes Nov 1, 2022
View reviewed changes
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.

/lgtm

CecileRobertMichon
CecileRobertMichon reviewed Nov 2, 2022
View reviewed changes
controlplane/kubeadm/internal/workload_cluster.go
@@ -87,7 +87,7 @@ var (

// minKubernetesVersionImageRegistryMigration is first kubernetes version where
// the default image registry is registry.k8s.io instead of k8s.gcr.io.
minKubernetesVersionImageRegistryMigration = semver.MustParse("1.25.0")
minKubernetesVersionImageRegistryMigration = semver.MustParse("1.22.0")
Copy link
Contributor

Choose a reason for hiding this comment

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

are the images available for all 1.22 patches (ie. not starting at a specific patch)?

Copy link
Member Author

Choose a reason for hiding this comment

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

for i in {0..15}
do
  docker pull registry.k8s.io/kube-apiserver:v1.22.${i}
  docker pull registry.k8s.io/kube-controller-manager:v1.22.${i}
  docker pull registry.k8s.io/kube-scheduler:v1.22.${i}
  docker pull registry.k8s.io/kube-proxy:v1.22.${i}
done

Worked for me.

Tried a few etcd images. Seem to be there as well.

@neolit123 Do you have some information about which related images should be available in the new registry? I guess there was some kind of sync effort?

Copy link
Member

@fabriziopandini fabriziopandini Nov 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

might be @ameukam can help here
the same question applies for older patch release of newer K8s versions

Copy link
Member Author

Choose a reason for hiding this comment

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

Let's wait for an answer. I don't have a good way to verify that all images exist

Copy link
Member

Choose a reason for hiding this comment

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

All the images present in k8s.gcr.io will be available in registry.k8s.io. the promotion process covert both endpoints.

@sbueringer you can use crane or imgpkg to verify this.

imgpkg tag list -i registry.k8s.io/kube-proxy | grep '1.22.'                                                                    12:55:05 AM
sha256-b137918392d06ed92c521d93c105b12224604e8e425c1e30ec194d665e1db9a8.sig
v1.22.0
v1.22.0-alpha.0
v1.22.0-alpha.1
v1.22.0-alpha.2
v1.22.0-alpha.3
v1.22.0-beta.0
v1.22.0-beta.1
v1.22.0-beta.2
v1.22.0-rc.0
v1.22.1
v1.22.1-rc.0
v1.22.10
v1.22.10-rc.0
v1.22.11
v1.22.11-rc.0
v1.22.12
v1.22.12-rc.0
v1.22.13
v1.22.13-rc.0
v1.22.14
v1.22.14-rc.0
v1.22.15
v1.22.15-rc.0
v1.22.16-rc.0
v1.22.2
v1.22.2-rc.0
v1.22.3
v1.22.3-rc.0
v1.22.4
v1.22.4-rc.0
v1.22.5
v1.22.5-rc.0
v1.22.6
v1.22.6-rc.0
v1.22.7
v1.22.7-rc.0
v1.22.8
v1.22.8-rc.0
v1.22.9
v1.22.9-rc.0

Copy link
Member Author

@sbueringer sbueringer Nov 4, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I think our concern was mostly about old images as we assumed the image promotion process was changed a lot later then the 1.22, ... releases and we didn't know if there was some sort of additional sync.

But I assume this

All the images present in k8s.gcr.io will be available in registry.k8s.io

means there was a full sync from k8s.gcr.io to registry.k8s.io

This was referenced Nov 2, 2022
Closed
Closed
@fabriziopandini
Copy link
Member

lgtm pending answer to the comment about image availability for the entire 1.22 series (as well as for newer series)

@CecileRobertMichon
Copy link
Contributor

lgtm pending answer to the comment about image availability for the entire 1.22 series (as well as for newer series)

same ^

@ameukam
Copy link
Member

ameukam commented Nov 3, 2022

@fabriziopandini @CecileRobertMichon #7471 (comment)

@sbueringer
Copy link
Member Author

Based on #7471 (comment) let's merge

@fabriziopandini can you approve? (don't want to merge my own PR without lgtm from another maintainer in this case)

@fabriziopandini
Copy link
Member

All the images present in k8s.gcr.io will be available in registry.k8s.io. the promotion process covert both endpoints.

thanks @ameukam for context!

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[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:

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 4, 2022
@k8s-ci-robot k8s-ci-robot merged commit 5b4efa1 into kubernetes-sigs:main Nov 4, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.3 milestone Nov 4, 2022
@sbueringer
Copy link
Member Author

/cherry-pick release-1.2

@sbueringer sbueringer deleted the pr-use-new-registry-with-v1.22 branch November 7, 2022 10:36
@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Nov 7, 2022
Merged
@k8s-infra-cherrypick-robot
Copy link

@sbueringer: new pull request created: #7505

In response to this:

/cherry-pick release-1.2

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.

@CecileRobertMichon CecileRobertMichon mentioned this pull request Nov 17, 2022
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CecileRobertMichon CecileRobertMichon CecileRobertMichon left review comments

@fabriziopandini fabriziopandini fabriziopandini left review comments

@ameukam ameukam ameukam left review comments

@chrischdi chrischdi chrischdi left review comments

@killianmuldoon killianmuldoon killianmuldoon approved these changes

@JoelSpeed JoelSpeed Awaiting requested review from JoelSpeed

@stmcginnis stmcginnis Awaiting requested review from stmcginnis

Assignees

@chrischdi chrischdi

@ameukam ameukam

@fabriziopandini fabriziopandini

@killianmuldoon killianmuldoon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.3
Development

Successfully merging this pull request may close these issues.

Use new Kubernetes registry for Kubernetes >= v1.22
8 participants
@sbueringer @k8s-ci-robot @ameukam @fabriziopandini @CecileRobertMichon @k8s-infra-cherrypick-robot @chrischdi @killianmuldoon