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

Jump to bottom

Change baseurl to vault.centos.org for CentOS 8 #1767

Merged
merged 5 commits into from
Feb 3, 2022
Merged

Change baseurl to vault.centos.org for CentOS 8 #1767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96c8daf
Change CentOS baseurl to vault.centos.org
xmudrii Feb 2, 2022
5edfd5f
Update fixtures
xmudrii Feb 2, 2022
fb13417
OSM v0.4.1 with new centos8 OS Profile
kron4eg Feb 2, 2022
974a24a
Update machine-controller
kron4eg Feb 3, 2022
e92bd67
Upgrade machine-controller with OSM centos8 fix
kron4eg Feb 3, 2022
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
9 changes: 9 additions & 0 deletions examples/terraform/aws/output.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ output "kubeone_workers" {
"${var.cluster_name}-${local.zoneA}" = {
replicas = var.initial_machinedeployment_replicas
providerSpec = {
annotations = {
"k8c.io/operating-system-profile" = var.ami_filters[var.os].osp_name
}
sshPublicKeys = local.worker_deploy_ssh_key
operatingSystem = local.worker_os
operatingSystemSpec = {
Expand Down Expand Up @@ -119,6 +122,9 @@ output "kubeone_workers" {
"${var.cluster_name}-${local.zoneB}" = {
replicas = var.initial_machinedeployment_replicas
providerSpec = {
annotations = {
"k8c.io/operating-system-profile" = var.ami_filters[var.os].osp_name
}
sshPublicKeys = local.worker_deploy_ssh_key
operatingSystem = local.worker_os
operatingSystemSpec = {
Expand Down Expand Up @@ -157,6 +163,9 @@ output "kubeone_workers" {
"${var.cluster_name}-${local.zoneC}" = {
replicas = var.initial_machinedeployment_replicas
providerSpec = {
annotations = {
"k8c.io/operating-system-profile" = var.ami_filters[var.os].osp_name
}
sshPublicKeys = local.worker_deploy_ssh_key
operatingSystem = local.worker_os
operatingSystemSpec = {
Expand Down
8 changes: 7 additions & 1 deletion examples/terraform/aws/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,31 +147,37 @@ variable "ami_filters" {
type = map(object({
owners = list(string)
image_name = list(string)
osp_name = string
}))
default = {
ubuntu = {
owners = ["099720109477"] # Canonical
image_name = ["ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*"]
osp_name = "osp-ubuntu"
}

centos = {
owners = ["125523088429"] # CentOS
image_name = ["CentOS 8.2.* x86_64"]
image_name = ["CentOS 8.* x86_64"]
osp_name = "osp-centos8"
}

flatcar = {
owners = ["075585003325"] # Kinvolk
image_name = ["Flatcar-stable-*-hvm"]
osp_name = "osp-flatcar"
}

rhel = {
owners = ["309956199498"] # Red Hat
image_name = ["RHEL-8*_HVM-*-x86_64-*"]
osp_name = "osp-rhel"
}

amzn2 = {
owners = ["137112412989"] # Amazon
image_name = ["amzn2-ami-hvm-2.0.*-x86_64-gp2"]
osp_name = "osp-amzn2"
}
}
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/os_centos.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ gpgcheck=1
repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF
source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi
kron4eg marked this conversation as resolved.
Show resolved Hide resolved
{{ end }}
sudo yum install -y \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-force.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF

source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi


sudo yum install -y \
yum-plugin-versionlock \
Expand Down
6 changes: 6 additions & 0 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 @@ -58,6 +58,12 @@ repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF

source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi


sudo yum install -y \
yum-plugin-versionlock \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF

source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi


sudo yum install -y \
yum-plugin-versionlock \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF

source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi


sudo yum install -y \
yum-plugin-versionlock \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF

source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi


sudo yum install -y \
yum-plugin-versionlock \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-simple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF

source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi


sudo yum install -y \
yum-plugin-versionlock \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF

source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi


sudo yum install -y \
yum-plugin-versionlock \
Expand Down
6 changes: 6 additions & 0 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 @@ -58,6 +58,12 @@ repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF

source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi


sudo yum install -y \
yum-plugin-versionlock \
Expand Down
6 changes: 6 additions & 0 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 @@ -58,6 +58,12 @@ repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF

source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi


sudo yum install -y \
yum-plugin-versionlock \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF

source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi


sudo yum install -y \
yum-plugin-versionlock \
Expand Down
6 changes: 6 additions & 0 deletions pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ repo_gpgcheck=0
gpgkey=https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg
EOF

source /etc/os-release
if [ "$ID" == "centos" ] && [ "$VERSION_ID" == "8" ]; then
sudo sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
sudo sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
fi


sudo yum install -y \
yum-plugin-versionlock \
Expand Down
4 changes: 2 additions & 2 deletions pkg/templates/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ func baseResources() map[Resource]map[string]string {
CalicoNode: {"*": "docker.io/calico/node:v3.19.1"},
DNSNodeCache: {"*": "k8s.gcr.io/k8s-dns-node-cache:1.15.13"},
Flannel: {"*": "quay.io/coreos/flannel:v0.13.0"},
MachineController: {"*": "docker.io/kubermatic/machine-controller:v1.42.2"},
MachineController: {"*": "docker.io/kubermatic/machine-controller:v1.42.4"},
MetricsServer: {"*": "k8s.gcr.io/metrics-server/metrics-server:v0.5.0"},
}
}
Expand Down Expand Up @@ -333,7 +333,7 @@ func optionalResources() map[Resource]map[string]string {
">= 1.23.0": "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.23.0",
},
// operating-system-manager addon
OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:v0.4.0"},
OperatingSystemManager: {"*": "quay.io/kubermatic/operating-system-manager:v0.4.1"},
}
}

Expand Down