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

[release/v1.8] Use RHEL upstream docker repo instead of abandoned centos #3336

Merged
merged 1 commit into from
Aug 7, 2024
Merged

[release/v1.8] Use RHEL upstream docker repo instead of abandoned centos #3336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions pkg/scripts/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,7 @@ var containerRuntimeTemplates = map[string]string{
"yum-containerd": heredoc.Docf(`
{{ if .CONFIGURE_REPOSITORIES }}
sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
{{- /*
Due to DNF modules we have to do this on docker-ce repo
More info at: https://bugzilla.redhat.com/show_bug.cgi?id=1756473
*/}}
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
sudo yum-config-manager --add-repo=https://download.docker.com/linux/rhel/docker-ce.repo
{{ end }}

sudo yum versionlock delete containerd.io || true
Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestKubeadmCentOS-cilium_cluster.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ sudo yum install -y \


sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
sudo yum-config-manager --add-repo=https://download.docker.com/linux/rhel/docker-ce.repo


sudo yum versionlock delete containerd.io || true
Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestKubeadmCentOS-nutanix_cluster.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,7 @@ sudo systemctl enable --now iscsid


sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
sudo yum-config-manager --add-repo=https://download.docker.com/linux/rhel/docker-ce.repo


sudo yum versionlock delete containerd.io || true
Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ sudo yum install -y \


sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
sudo yum-config-manager --add-repo=https://download.docker.com/linux/rhel/docker-ce.repo


sudo yum versionlock delete containerd.io || true
Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ sudo yum install -y \


sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
sudo yum-config-manager --add-repo=https://download.docker.com/linux/rhel/docker-ce.repo


sudo yum versionlock delete containerd.io || true
Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ sudo yum install -y \


sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
sudo yum-config-manager --add-repo=https://download.docker.com/linux/rhel/docker-ce.repo


sudo yum versionlock delete containerd.io || true
Expand Down
3 changes: 1 addition & 2 deletions pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ sudo yum install -y \


sudo yum install -y yum-utils
sudo yum-config-manager --add-repo=https://download.docker.com/linux/centos/docker-ce.repo
sudo yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
sudo yum-config-manager --add-repo=https://download.docker.com/linux/rhel/docker-ce.repo


sudo yum versionlock delete containerd.io || true
Expand Down
8 changes: 4 additions & 4 deletions pkg/tasks/prerequisites.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,11 @@ func disableNMCloudSetup(s *state.State, node *kubeoneapi.HostConfig, _ executor
func installKubeadm(s *state.State, node kubeoneapi.HostConfig) error {
return runOnOS(s, node.OperatingSystem, map[kubeoneapi.OperatingSystemName]runOnOSFn{
kubeoneapi.OperatingSystemNameAmazon: installKubeadmAmazonLinux,
kubeoneapi.OperatingSystemNameCentOS: installKubeadmCentOS,
kubeoneapi.OperatingSystemNameCentOS: installKubeadmRHELAndAlike,
kubeoneapi.OperatingSystemNameDebian: installKubeadmDebian,
kubeoneapi.OperatingSystemNameFlatcar: installKubeadmFlatcar,
kubeoneapi.OperatingSystemNameRHEL: installKubeadmCentOS,
kubeoneapi.OperatingSystemNameRockyLinux: installKubeadmCentOS,
kubeoneapi.OperatingSystemNameRHEL: installKubeadmRHELAndAlike,
kubeoneapi.OperatingSystemNameRockyLinux: installKubeadmRHELAndAlike,
kubeoneapi.OperatingSystemNameUbuntu: installKubeadmDebian,
})
}
Expand All @@ -216,7 +216,7 @@ func installKubeadmDebian(s *state.State) error {
return fail.SSH(err, "installing kubeadm")
}

func installKubeadmCentOS(s *state.State) error {
func installKubeadmRHELAndAlike(s *state.State) error {
cmd, err := scripts.KubeadmCentOS(s.Cluster, s.ForceInstall)
if err != nil {
return err
Expand Down