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

fix: Remove the archived debian apt repository when installing docker-engine #11088

Merged

Conversation

yankay
Copy link
Member

@yankay yankay commented Apr 15, 2024

What type of PR is this?

/kind failing-test

What this PR does / why we need it:

After buster-backports going into archived, which is related to this announcement.
https://lists.debian.org/debian-devel-announce/2024/03/msg00003.html

It causes error.
Remove the archived debian apt repository when installing docker-engine

Which issue(s) this PR fixes:

Fixes #11086

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Remove the archived debian apt repository when installing docker-engine

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 15, 2024
@yankay yankay changed the title fix: Allow apt-get update error in installing docker-engine fix: Allow apt-get update error when installing docker-engine Apr 15, 2024
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 15, 2024
@yankay yankay changed the title fix: Allow apt-get update error when installing docker-engine [wip]fix: Allow apt-get update error when installing docker-engine Apr 15, 2024
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 15, 2024
@yankay yankay force-pushed the allow-error-for-apt-update-docker branch from 0129a16 to 9647c32 Compare April 15, 2024 08:27
@yankay yankay changed the title [wip]fix: Allow apt-get update error when installing docker-engine fix: Allow apt-get update error when installing docker-engine Apr 15, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 15, 2024
@yankay yankay changed the title fix: Allow apt-get update error when installing docker-engine [wip]fix: Allow apt-get update error when installing docker-engine Apr 15, 2024
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 15, 2024
@yankay yankay force-pushed the allow-error-for-apt-update-docker branch 3 times, most recently from 4d6fbc5 to ac43683 Compare April 16, 2024 05:13
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 16, 2024
@yankay yankay force-pushed the allow-error-for-apt-update-docker branch from ac43683 to 616bf9e Compare April 16, 2024 05:20
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
@yankay yankay force-pushed the allow-error-for-apt-update-docker branch from 616bf9e to 32c2578 Compare April 16, 2024 05:27
@yankay yankay changed the title [wip]fix: Allow apt-get update error when installing docker-engine [wip]fix: Remove the archived debian apt repository when installing docker-engine Apr 16, 2024
@yankay yankay changed the title [wip]fix: Remove the archived debian apt repository when installing docker-engine fix: Remove the archived debian apt repository when installing docker-engine Apr 16, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 16, 2024
@yankay
Copy link
Member Author

yankay commented Apr 16, 2024

HI @mzaian @MrFreezeex @VannTen

Would you please review it to fix the the blocking CI :-)

Copy link
Contributor

@mzaian mzaian left a comment

Choose a reason for hiding this comment

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

Thanks @yankay

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mzaian, yankay

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 merged commit ed20593 into kubernetes-sigs:master Apr 16, 2024
60 checks passed
dabeck pushed a commit to fino-digital/kubespray that referenced this pull request May 7, 2024
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
pedro-peter pushed a commit to pedro-peter/kubespray that referenced this pull request May 8, 2024
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
@VannTen
Copy link
Contributor

VannTen commented May 19, 2024

/cherrypick release-2.24 release-2.23 release-2.22

@k8s-infra-cherrypick-robot

@VannTen: new pull request created: #11215

In response to this:

/cherrypick release-2.24 release-2.23 release-2.22

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-sigs/prow repository.

@VannTen
Copy link
Contributor

VannTen commented May 21, 2024

/label cherrypick/release-2.23 cherrypick/release-2.22

@VannTen
Copy link
Contributor

VannTen commented May 21, 2024

/cherrypick release-2.23
/cherrypick release-2.22

@k8s-infra-cherrypick-robot

@VannTen: new pull request created: #11220

In response to this:

/cherrypick release-2.23
/cherrypick release-2.22

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-sigs/prow repository.

@VannTen
Copy link
Contributor

VannTen commented May 21, 2024

/cherrypick release-2.22

@k8s-infra-cherrypick-robot

@VannTen: #11088 failed to apply on top of branch "release-2.22":

Applying: Remove the archived debian apt repository
Using index info to reconstruct a base tree...
M	roles/container-engine/docker/tasks/main.yml
Falling back to patching base and 3-way merge...
Auto-merging roles/container-engine/docker/tasks/main.yml
CONFLICT (content): Merge conflict in roles/container-engine/docker/tasks/main.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove the archived debian apt repository
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-2.22

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-sigs/prow repository.

@VannTen
Copy link
Contributor

VannTen commented May 21, 2024

I'm not going to manually backport this one in 2.22, given 2.25 is near and it's not super critical (only concern debian 10)

Rickkwa pushed a commit to Rickkwa/kubespray that referenced this pull request Jun 26, 2024
Signed-off-by: Kay Yan <kay.yan@daocloud.io>
@VannTen
Copy link
Contributor

VannTen commented Jul 9, 2024

/kind cleanup

@k8s-ci-robot k8s-ci-robot added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Jul 9, 2024
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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CI Fail in Ensure docker-ce repository is enabled in packet_debian10-docker
5 participants