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

Use RHEL upstream docker repo instead of abandoned centos #3316

Merged
merged 1 commit into from
Jul 24, 2024

Conversation

kron4eg
Copy link
Member

@kron4eg kron4eg commented Jul 24, 2024

What this PR does / why we need it:
CentOS upstream docker repo being abandoned (naturally as CentOS8 is long time dead). This leads to errors where on rocky8 and rhel8 containerd 1.7 is not found. But it's actually present in RHEL repo!

What type of PR is this?
/kind bug

Special notes for your reviewer:

Does this PR introduce a user-facing change? Then add your Release Note here:

Use RHEL upstream docker repo instead of abandoned centos

Documentation:

NONE

@kron4eg kron4eg requested a review from xmudrii July 24, 2024 08:47
@kubermatic-bot kubermatic-bot added docs/none Denotes a PR that doesn't need documentation (changes). release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 24, 2024
@kron4eg
Copy link
Member Author

kron4eg commented Jul 24, 2024

/test pull-kubeone-e2e-aws-rockylinux-install-containerd-external-v1.30.1

@kron4eg
Copy link
Member Author

kron4eg commented Jul 24, 2024

/test pull-kubeone-e2e-aws-rhel-install-containerd-external-v1.30.1

Copy link
Member

@xmudrii xmudrii left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@kubermatic-bot kubermatic-bot added the lgtm Indicates that a PR is ready to be merged. label Jul 24, 2024
@kubermatic-bot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 289d089497395c9a5c2f43e4422e891c6c3f5f51

@kubermatic-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: xmudrii

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

@kubermatic-bot kubermatic-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 24, 2024
@kubermatic-bot kubermatic-bot merged commit eb03e94 into kubermatic:main Jul 24, 2024
15 checks passed
@kubermatic-bot kubermatic-bot added this to the KubeOne 1.9 milestone Jul 24, 2024
@kron4eg kron4eg deleted the centos_rip_containerd_1.7 branch July 24, 2024 09:49
kron4eg added a commit to kron4eg/operating-system-manager that referenced this pull request Jul 25, 2024
kubermatic-bot pushed a commit to kubermatic/operating-system-manager that referenced this pull request Jul 25, 2024
@xmudrii
Copy link
Member

xmudrii commented Aug 7, 2024

/cherrypick release/v1.8

@xmudrii
Copy link
Member

xmudrii commented Aug 7, 2024

/cherrypick release/v1.7

@kubermatic-bot
Copy link
Contributor

@xmudrii: new pull request created: #3336

In response to this:

/cherrypick release/v1.8

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.

@kubermatic-bot
Copy link
Contributor

@xmudrii: #3316 failed to apply on top of branch "release/v1.7":

Applying: CentOS docker repo being abandoned, replaced with RHEL
Using index info to reconstruct a base tree...
M	pkg/scripts/render.go
M	pkg/scripts/testdata/TestKubeadmCentOS-cilium_cluster.golden
M	pkg/scripts/testdata/TestKubeadmCentOS-nutanix_cluster.golden
M	pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden
M	pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden
M	pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
M	pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
M	pkg/tasks/prerequisites.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/tasks/prerequisites.go
Auto-merging pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
CONFLICT (content): Merge conflict in pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
Auto-merging pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
CONFLICT (content): Merge conflict in pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
Auto-merging pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden
Auto-merging pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden
Auto-merging pkg/scripts/testdata/TestKubeadmCentOS-nutanix_cluster.golden
CONFLICT (content): Merge conflict in pkg/scripts/testdata/TestKubeadmCentOS-nutanix_cluster.golden
Auto-merging pkg/scripts/testdata/TestKubeadmCentOS-cilium_cluster.golden
CONFLICT (content): Merge conflict in pkg/scripts/testdata/TestKubeadmCentOS-cilium_cluster.golden
Auto-merging pkg/scripts/render.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 CentOS docker repo being abandoned, replaced with RHEL
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/v1.7

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.

xmudrii pushed a commit that referenced this pull request Aug 7, 2024
kubermatic-bot pushed a commit that referenced this pull request Aug 7, 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. dco-signoff: yes Denotes that all commits in the pull request have the valid DCO signoff message. docs/none Denotes a PR that doesn't need documentation (changes). kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants