update to debian bullseye, buster EOL soon #4066

jackfrancis · 2023-06-07T19:01:30Z

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Debian buster has been EOL for a while and its LTS is soon to be over. Reference:

https://wiki.debian.org/DebianReleases

This PR updates Dockerfile references to build from buster + 1 --> bullseye.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

build images from debian bullseye

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

netlify · 2023-06-07T19:01:35Z

✅ Deploy Preview for kubernetes-sigs-cloud-provide-azure canceled.

Name	Link
🔨 Latest commit	`ba74d4e`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cloud-provide-azure/deploys/648a72858915b4000854a1f7

sozercan · 2023-06-07T19:08:49Z

Makefile

@@ -125,7 +125,7 @@ $(BIN_DIR)/azure-acr-credential-provider.exe: $(PKG_CONFIG) $(wildcard cmd/acr-c
 .PHONY: docker-pull-prerequisites
 docker-pull-prerequisites: ## Pull prerequisite images.
 	docker pull docker/dockerfile:1
-	docker pull docker.io/library/golang:buster
+	docker pull docker.io/library/golang:bullseye


i am not sure why it's being pre-pulled here, but if you are prepulling I would set this as a variable instead of defining in multiple places, and then pass in as docker build args. However, dependabot won't be able to update the image.

Also not sure, just trying to get this update process started. @feiskyer @lzhecheng feel free to offer a better path forward that doesn't require refactoring all of the existing CI.

It doesn't seem necessary to me. Can we get rid of this target? @feiskyer

@lodrem can we remove this target?

let's get this step removed.

@jackfrancis confirmed with Pengfei and we think this target can be removed. Could you please update the PR and rebase? Thank you!

Rebased and removed docker-pull-prerequisites entirely. Let me know if that's not what you meant!

Thank you!
There's a merge conflict and a typo (not from this PR) blocking this PR from merging. Since the change is small, I pushed by myself to this PR.

Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>

lzhecheng · 2023-06-15T02:14:11Z

/lgtm
/approve

k8s-ci-robot · 2023-06-15T02:14:22Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis, lzhecheng

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~~ [lzhecheng]

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

MartinForReal · 2023-06-15T05:53:22Z

/cherrypick release-1.27

MartinForReal · 2023-06-15T05:53:33Z

/cherrypick release-1.26

MartinForReal · 2023-06-15T05:53:40Z

/cherrypick release-1.25

MartinForReal · 2023-06-15T05:53:46Z

/cherrypick release-1.24

k8s-infra-cherrypick-robot · 2023-06-15T05:54:16Z

@MartinForReal: #4066 failed to apply on top of branch "release-1.27":

Applying: update to debian bullseye, buster EOL sool
Using index info to reconstruct a base tree...
M	Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update to debian bullseye, buster EOL sool
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.27

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-infra-cherrypick-robot · 2023-06-15T05:54:20Z

@MartinForReal: #4066 failed to apply on top of branch "release-1.26":

Applying: update to debian bullseye, buster EOL sool
Using index info to reconstruct a base tree...
M	Dockerfile
M	Makefile
M	cloud-node-manager.Dockerfile
M	e2e.Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging e2e.Dockerfile
CONFLICT (content): Merge conflict in e2e.Dockerfile
Auto-merging cloud-node-manager.Dockerfile
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update to debian bullseye, buster EOL sool
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.26

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-infra-cherrypick-robot · 2023-06-15T05:54:23Z

@MartinForReal: #4066 failed to apply on top of branch "release-1.25":

Applying: update to debian bullseye, buster EOL sool
Using index info to reconstruct a base tree...
M	Dockerfile
M	Makefile
M	cloud-node-manager.Dockerfile
M	e2e.Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging e2e.Dockerfile
CONFLICT (content): Merge conflict in e2e.Dockerfile
Auto-merging cloud-node-manager.Dockerfile
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update to debian bullseye, buster EOL sool
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.25

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-infra-cherrypick-robot · 2023-06-15T05:54:26Z

@MartinForReal: #4066 failed to apply on top of branch "release-1.24":

Applying: update to debian bullseye, buster EOL sool
Using index info to reconstruct a base tree...
M	Dockerfile
M	Makefile
M	cloud-node-manager.Dockerfile
M	e2e.Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging e2e.Dockerfile
CONFLICT (content): Merge conflict in e2e.Dockerfile
Auto-merging cloud-node-manager.Dockerfile
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 update to debian bullseye, buster EOL sool
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.24

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 added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Jun 7, 2023

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 7, 2023

k8s-ci-robot requested review from jwtty and MartinForReal June 7, 2023 19:01

k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 7, 2023

sozercan reviewed Jun 7, 2023

View reviewed changes

MartinForReal changed the title ~~update to debian bullseye, buster EOL sool~~ update to debian bullseye, buster EOL soon Jun 8, 2023

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 9, 2023

jackfrancis force-pushed the docker-image-bullseye branch from 1aa6987 to f4eee98 Compare June 14, 2023 21:44

jackfrancis and others added 2 commits June 15, 2023 02:03

update to debian bullseye, buster EOL sool

7ae98aa

Fix Service typo

ba74d4e

Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>

jackfrancis force-pushed the docker-image-bullseye branch from 10f1980 to 7f94750 Compare June 15, 2023 02:06

k8s-ci-robot removed the do-not-merge/contains-merge-commits label Jun 15, 2023

lzhecheng force-pushed the docker-image-bullseye branch from 7f94750 to ba74d4e Compare June 15, 2023 02:08

k8s-ci-robot assigned lzhecheng Jun 15, 2023

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 15, 2023

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 15, 2023

k8s-ci-robot merged commit 1d18fd0 into kubernetes-sigs:master Jun 15, 2023
18 of 19 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update to debian bullseye, buster EOL soon #4066

update to debian bullseye, buster EOL soon #4066

jackfrancis commented Jun 7, 2023

netlify bot commented Jun 7, 2023 •

edited

sozercan Jun 7, 2023 •

edited

jackfrancis Jun 7, 2023

lzhecheng Jun 9, 2023

MartinForReal Jun 9, 2023

feiskyer Jun 13, 2023

lzhecheng Jun 13, 2023

jackfrancis Jun 14, 2023

lzhecheng Jun 15, 2023

lzhecheng commented Jun 15, 2023

k8s-ci-robot commented Jun 15, 2023

MartinForReal commented Jun 15, 2023

MartinForReal commented Jun 15, 2023

MartinForReal commented Jun 15, 2023

MartinForReal commented Jun 15, 2023

k8s-infra-cherrypick-robot commented Jun 15, 2023

k8s-infra-cherrypick-robot commented Jun 15, 2023

k8s-infra-cherrypick-robot commented Jun 15, 2023

k8s-infra-cherrypick-robot commented Jun 15, 2023

update to debian bullseye, buster EOL soon #4066

update to debian bullseye, buster EOL soon #4066

Conversation

jackfrancis commented Jun 7, 2023

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

netlify bot commented Jun 7, 2023 • edited

✅ Deploy Preview for kubernetes-sigs-cloud-provide-azure canceled.

sozercan Jun 7, 2023 • edited

Choose a reason for hiding this comment

jackfrancis Jun 7, 2023

Choose a reason for hiding this comment

lzhecheng Jun 9, 2023

Choose a reason for hiding this comment

MartinForReal Jun 9, 2023

Choose a reason for hiding this comment

feiskyer Jun 13, 2023

Choose a reason for hiding this comment

lzhecheng Jun 13, 2023

Choose a reason for hiding this comment

jackfrancis Jun 14, 2023

Choose a reason for hiding this comment

lzhecheng Jun 15, 2023

Choose a reason for hiding this comment

lzhecheng commented Jun 15, 2023

k8s-ci-robot commented Jun 15, 2023

MartinForReal commented Jun 15, 2023

MartinForReal commented Jun 15, 2023

MartinForReal commented Jun 15, 2023

MartinForReal commented Jun 15, 2023

k8s-infra-cherrypick-robot commented Jun 15, 2023

k8s-infra-cherrypick-robot commented Jun 15, 2023

k8s-infra-cherrypick-robot commented Jun 15, 2023

k8s-infra-cherrypick-robot commented Jun 15, 2023

netlify bot commented Jun 7, 2023 •

edited

sozercan Jun 7, 2023 •

edited