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

more upgrades for v0.26.0 #3818

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Conversation

BenTheElder
Copy link
Member

  1. pickup new base image (but not new node image yet, less disruptive when we're in-flight upgrading the rest, and we already tested a staging node image)

  2. bump local-path-provisioner to build v0.0.30, I looked over this and will do an upgrade as the next PR, after the image builds. there are some nice improvements and it should be compatible based on release notes and the manifest etc.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder

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 cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 12, 2024
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 12, 2024
@aojea
Copy link
Contributor

aojea commented Dec 12, 2024

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 12, 2024
@stmcginnis
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot merged commit 3246515 into kubernetes-sigs:main Dec 12, 2024
30 checks passed
@BenTheElder BenTheElder deleted the more-upgrdaes branch December 12, 2024 21:36
@BenTheElder
Copy link
Member Author

they started building with $arch suffix, and it builds all of them, which we don't need. will have to patch that. rancher/local-path-provisioner@16f15cc#diff-cc1bc65976b3ec6248bb0079f2f78eeab12f1f9da665739637b0cb576f816c06R13

@BenTheElder
Copy link
Member Author

Huh:

$ REGISTRY=gcr.io/k8s-staging-kind ~/go/src/sigs.k8s.io/kind/hack/release/build/push-node.sh 
go build -v -o "/usr/local/google/home/bentheelder/go/src/sigs.k8s.io/kind/bin/kind" -trimpath -ldflags="-buildid= -w -X=sigs.k8s.io/kind/pkg/cmd/kind/version.gitCommit=e7cf72980d4a189f3d564929270b7c8415dd56cb -X=sigs.k8s.io/kind/pkg/cmd/kind/version.gitCommitCount=30"
+ cd /usr/local/google/home/bentheelder/go/src/k8s.io/kubernetes
+ make clean
+++ [1213 16:47:22] Verifying Prerequisites....
+++ [1213 16:47:27] Removing _output directory
++ cd /usr/local/google/home/bentheelder/go/src/k8s.io/kubernetes
++ ./hack/print-workspace-status.sh
++ grep STABLE_DOCKER_TAG
+ version_line='STABLE_DOCKER_TAG v1.32.0'
+ kube_version=v1.32.0
+ GOFLAGS=
+ '[' -z '' ']'
+ case "${kube_version}" in
+ GOFLAGS=-tags=providerless,dockerless
+ export GOFLAGS
+ IMAGE=gcr.io/k8s-staging-kind/node:v1.32.0
+ images=()
+ for arch in "${__arches__[@]}"
+ image=gcr.io/k8s-staging-kind/node-amd64:v1.32.0
+ /usr/local/google/home/bentheelder/go/src/sigs.k8s.io/kind/bin/kind build node-image --image=gcr.io/k8s-staging-kind/node-amd64:v1.32.0 --arch=amd64 /usr/local/google/home/bentheelder/go/src/k8s.io/kubernetes
Detected build type: "source"
Building using source: "/usr/local/google/home/bentheelder/go/src/k8s.io/kubernetes"
Starting to build Kubernetes
+++ [1213 16:47:29] Verifying Prerequisites....
+++ [1213 16:47:30] Building Docker image kube-build:build-27a7a8a458-5-v1.32.0-go1.23.3-bullseye.0
+++ [1213 16:47:41] Creating data container kube-build-data-27a7a8a458-5-v1.32.0-go1.23.3-bullseye.0
+++ [1213 16:47:42] Syncing sources to container
+++ [1213 16:48:01] Running build command...
+++ [1213 16:48:10] Building go targets for linux/amd64
    k8s.io/kubernetes/cmd/kube-apiserver (static)
    k8s.io/kubernetes/cmd/kube-controller-manager (static)
    k8s.io/kubernetes/cmd/kube-proxy (static)
    k8s.io/kubernetes/cmd/kube-scheduler (static)
    k8s.io/kubernetes/cmd/kubeadm (static)
    k8s.io/kubernetes/cmd/kubectl (static)
    k8s.io/kubernetes/cmd/kubelet (non-static)
+++ [1213 16:49:23] Syncing out of container
+++ [1213 16:49:27] Building images: linux-amd64
+++ [1213 16:49:27] Starting docker build for image: kube-apiserver-amd64
+++ [1213 16:49:27] Starting docker build for image: kube-controller-manager-amd64
+++ [1213 16:49:27] Starting docker build for image: kube-scheduler-amd64
+++ [1213 16:49:27] Starting docker build for image: kube-proxy-amd64
+++ [1213 16:49:27] Starting docker build for image: kubectl-amd64
+++ [1213 16:49:35] Deleting docker image registry.k8s.io/kubectl-amd64:v1.32.0
+++ [1213 16:49:35] Deleting docker image registry.k8s.io/kube-scheduler-amd64:v1.32.0
+++ [1213 16:49:35] Deleting docker image registry.k8s.io/kube-proxy-amd64:v1.32.0
+++ [1213 16:49:36] Deleting docker image registry.k8s.io/kube-controller-manager-amd64:v1.32.0
+++ [1213 16:49:38] Deleting docker image registry.k8s.io/kube-apiserver-amd64:v1.32.0
+++ [1213 16:49:38] Docker builds done
Finished building Kubernetes
Building node image ...
Building in container: kind-build-1734108584-1594990670
Image "gcr.io/k8s-staging-kind/node-amd64:v1.32.0" build completed.
+ images+=("${image}")
+ for arch in "${__arches__[@]}"
+ image=gcr.io/k8s-staging-kind/node-arm64:v1.32.0
+ /usr/local/google/home/bentheelder/go/src/sigs.k8s.io/kind/bin/kind build node-image --image=gcr.io/k8s-staging-kind/node-arm64:v1.32.0 --arch=arm64 /usr/local/google/home/bentheelder/go/src/k8s.io/kubernetes
Detected build type: "source"
Building using source: "/usr/local/google/home/bentheelder/go/src/k8s.io/kubernetes"
Starting to build Kubernetes
+++ [1213 16:50:02] Verifying Prerequisites....
+++ [1213 16:50:03] Building Docker image kube-build:build-27a7a8a458-5-v1.32.0-go1.23.3-bullseye.0
+++ [1213 16:50:14] Syncing sources to container
+++ [1213 16:50:17] Running build command...
+++ [1213 16:50:27] Building go targets for linux/arm64
    k8s.io/kubernetes/cmd/kube-apiserver (static)
    k8s.io/kubernetes/cmd/kube-controller-manager (static)
    k8s.io/kubernetes/cmd/kube-proxy (static)
    k8s.io/kubernetes/cmd/kube-scheduler (static)
    k8s.io/kubernetes/cmd/kubeadm (static)
    k8s.io/kubernetes/cmd/kubectl (static)
    k8s.io/kubernetes/cmd/kubelet (non-static)
+++ [1213 16:51:41] Syncing out of container
+++ [1213 16:51:45] Building images: linux-arm64
+++ [1213 16:51:45] Starting docker build for image: kube-apiserver-arm64
+++ [1213 16:51:45] Starting docker build for image: kube-controller-manager-arm64
+++ [1213 16:51:45] Starting docker build for image: kube-scheduler-arm64
+++ [1213 16:51:45] Starting docker build for image: kube-proxy-arm64
+++ [1213 16:51:45] Starting docker build for image: kubectl-arm64
+++ [1213 16:51:53] Deleting docker image registry.k8s.io/kubectl-arm64:v1.32.0
+++ [1213 16:51:53] Deleting docker image registry.k8s.io/kube-scheduler-arm64:v1.32.0
+++ [1213 16:51:53] Deleting docker image registry.k8s.io/kube-controller-manager-arm64:v1.32.0
+++ [1213 16:51:53] Deleting docker image registry.k8s.io/kube-proxy-arm64:v1.32.0
+++ [1213 16:51:56] Deleting docker image registry.k8s.io/kube-apiserver-arm64:v1.32.0
+++ [1213 16:51:56] Docker builds done
Finished building Kubernetes
Building node image ...
Building in container: kind-build-1734108722-580198265
ERROR: error building node image: command "docker exec --privileged kind-build-1734108722-580198265 chmod +x /usr/bin/kubeadm" failed with error: exit status 1
Command Output: Error response from daemon: Container 890f6a732a2e5bcf07308b3af38781b4203932d4c6a5ebeff1d0132a0daf7c2e is not running

This happens consistently, I think I broke arm64 somehow (and most likely this PR).

Will dig more soon ...

@BenTheElder
Copy link
Member Author

OK it was an issue with the host:

$ docker run --rm --platform=linux/arm64 hello-world
Unable to find image 'hello-world:latest' locally
latest: Pulling from library/hello-world
478afc919002: Pull complete 
Digest: sha256:5b3cc85e16e3058003c13b7821318369dad01dac3dbb877aac3c28182255c724
Status: Downloaded newer image for hello-world:latest
exec /hello: exec format error

Works after running docker run --rm --privileged tonistiigi/binfmt:qemu-v7.0.0-28@sha256:66e11bea77a5ea9d6f0fe79b57cd2b189b5d15b93a2bdb925be22949232e4e55 --install all

the cross build script needs to ensure this as well

@BenTheElder
Copy link
Member Author

ahhh it attempts to, but it does it by setting up buildx, and there's some quirk now where buildx has it's own qemu so that doesn't guarantee that we have cross-arch image running setup for non-buildx contexts.

@BenTheElder
Copy link
Member Author

#3823

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. 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/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.

4 participants