From 96c8daf3547d82c47b5e004a9d9c6f9dc61ba307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Wed, 2 Feb 2022 12:01:59 +0100 Subject: [PATCH 1/5] Change CentOS baseurl to vault.centos.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- pkg/scripts/os_centos.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/scripts/os_centos.go b/pkg/scripts/os_centos.go index fabc408d4..26f2c6c4e 100644 --- a/pkg/scripts/os_centos.go +++ b/pkg/scripts/os_centos.go @@ -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 {{ end }} sudo yum install -y \ From 5edfd5fdf0c89877134a2fe30ab1407d8a777afe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Mudrini=C4=87?= Date: Wed, 2 Feb 2022 12:02:04 +0100 Subject: [PATCH 2/5] Update fixtures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić --- pkg/scripts/testdata/TestKubeadmCentOS-force.golden | 6 ++++++ .../testdata/TestKubeadmCentOS-nutanix_cluster.golden | 6 ++++++ .../testdata/TestKubeadmCentOS-overwrite_registry.golden | 6 ++++++ .../TestKubeadmCentOS-overwrite_registry_insecure.golden | 6 ++++++ pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden | 6 ++++++ pkg/scripts/testdata/TestKubeadmCentOS-simple.golden | 6 ++++++ pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden | 6 ++++++ .../testdata/TestKubeadmCentOS-with_containerd.golden | 6 ++++++ ...eadmCentOS-with_containerd_with_insecure_registry.golden | 6 ++++++ pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden | 6 ++++++ .../testdata/TestUpgradeKubeletAndKubectlCentOS.golden | 6 ++++++ 11 files changed, 66 insertions(+) diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-force.golden b/pkg/scripts/testdata/TestKubeadmCentOS-force.golden index fd9207646..6a4e67059 100644 --- a/pkg/scripts/testdata/TestKubeadmCentOS-force.golden +++ b/pkg/scripts/testdata/TestKubeadmCentOS-force.golden @@ -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 \ diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-nutanix_cluster.golden b/pkg/scripts/testdata/TestKubeadmCentOS-nutanix_cluster.golden index 730a94d86..34e69447e 100644 --- a/pkg/scripts/testdata/TestKubeadmCentOS-nutanix_cluster.golden +++ b/pkg/scripts/testdata/TestKubeadmCentOS-nutanix_cluster.golden @@ -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 \ diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden b/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden index 80894e813..1aec9a06c 100644 --- a/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden +++ b/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry.golden @@ -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 \ diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden b/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden index 76abc4f65..0a348ee79 100644 --- a/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden +++ b/pkg/scripts/testdata/TestKubeadmCentOS-overwrite_registry_insecure.golden @@ -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 \ diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden b/pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden index b67c6fd3c..34516b11c 100644 --- a/pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden +++ b/pkg/scripts/testdata/TestKubeadmCentOS-proxy.golden @@ -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 \ diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-simple.golden b/pkg/scripts/testdata/TestKubeadmCentOS-simple.golden index 80894e813..1aec9a06c 100644 --- a/pkg/scripts/testdata/TestKubeadmCentOS-simple.golden +++ b/pkg/scripts/testdata/TestKubeadmCentOS-simple.golden @@ -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 \ diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden b/pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden index 16f346523..58ed8663c 100644 --- a/pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden +++ b/pkg/scripts/testdata/TestKubeadmCentOS-v1.16.1.golden @@ -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 \ diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden index c6429166f..f939162e9 100644 --- a/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden +++ b/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd.golden @@ -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 \ diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden index 25b930ed3..32ba0d5f3 100644 --- a/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden +++ b/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden @@ -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 \ diff --git a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden index b82eef84f..a872ff9ba 100644 --- a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden +++ b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNICentOS.golden @@ -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 \ diff --git a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden index 780295c34..7f13fa429 100644 --- a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden +++ b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlCentOS.golden @@ -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 \ From fb13417d8e269211ac0334eb4506eb00cd77248a Mon Sep 17 00:00:00 2001 From: Artiom Diomin Date: Wed, 2 Feb 2022 23:28:55 +0200 Subject: [PATCH 3/5] OSM v0.4.1 with new centos8 OS Profile Signed-off-by: Artiom Diomin --- examples/terraform/aws/output.tf | 9 +++++++++ examples/terraform/aws/variables.tf | 8 +++++++- pkg/templates/images/images.go | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/examples/terraform/aws/output.tf b/examples/terraform/aws/output.tf index 02e31f4ff..a2d845c8e 100644 --- a/examples/terraform/aws/output.tf +++ b/examples/terraform/aws/output.tf @@ -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 = { @@ -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 = { @@ -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 = { diff --git a/examples/terraform/aws/variables.tf b/examples/terraform/aws/variables.tf index 9fdcce1f9..f047d7351 100644 --- a/examples/terraform/aws/variables.tf +++ b/examples/terraform/aws/variables.tf @@ -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" } } } diff --git a/pkg/templates/images/images.go b/pkg/templates/images/images.go index 27d215026..4db446c08 100644 --- a/pkg/templates/images/images.go +++ b/pkg/templates/images/images.go @@ -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"}, } } From 974a24a957076dc47bd462996aed9b620e13410a Mon Sep 17 00:00:00 2001 From: Artiom Diomin Date: Thu, 3 Feb 2022 11:12:19 +0200 Subject: [PATCH 4/5] Update machine-controller Signed-off-by: Artiom Diomin --- pkg/templates/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/templates/images/images.go b/pkg/templates/images/images.go index 4db446c08..cd3517632 100644 --- a/pkg/templates/images/images.go +++ b/pkg/templates/images/images.go @@ -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.3"}, MetricsServer: {"*": "k8s.gcr.io/metrics-server/metrics-server:v0.5.0"}, } } From e92bd67278dc44a51daf386194af388dd8e4d9f3 Mon Sep 17 00:00:00 2001 From: Artiom Diomin Date: Thu, 3 Feb 2022 13:50:41 +0200 Subject: [PATCH 5/5] Upgrade machine-controller with OSM centos8 fix Signed-off-by: Artiom Diomin --- pkg/templates/images/images.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/templates/images/images.go b/pkg/templates/images/images.go index cd3517632..abb405387 100644 --- a/pkg/templates/images/images.go +++ b/pkg/templates/images/images.go @@ -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.3"}, + MachineController: {"*": "docker.io/kubermatic/machine-controller:v1.42.4"}, MetricsServer: {"*": "k8s.gcr.io/metrics-server/metrics-server:v0.5.0"}, } }