From a74f42dc392a080bd295cd8a7e326d99b98b705e Mon Sep 17 00:00:00 2001 From: Kubermatic Bot <41968677+kubermatic-bot@users.noreply.github.com> Date: Tue, 7 Nov 2023 22:53:22 +0100 Subject: [PATCH] Fix globbing for apt-get install (#2960) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marko Mudrinić Co-authored-by: Marko Mudrinić --- pkg/scripts/os_debian.go | 6 +++--- .../testdata/TestKubeadmDebian-cilium_cluster.golden | 6 +++--- .../testdata/TestKubeadmDebian-nutanix_cluster.golden | 6 +++--- .../testdata/TestKubeadmDebian-overwrite_registry.golden | 6 +++--- .../TestKubeadmDebian-overwrite_registry_insecure.golden | 6 +++--- pkg/scripts/testdata/TestKubeadmDebian-simple.golden | 6 +++--- .../testdata/TestKubeadmDebian-with_containerd.golden | 6 +++--- ...eadmDebian-with_containerd_with_insecure_registry.golden | 6 +++--- pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden | 6 +++--- .../testdata/TestUpgradeKubeletAndKubectlDebian.golden | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkg/scripts/os_debian.go b/pkg/scripts/os_debian.go index 02430823d..000e45e18 100644 --- a/pkg/scripts/os_debian.go +++ b/pkg/scripts/os_debian.go @@ -70,9 +70,9 @@ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs. sudo apt-get update {{- end }} -kube_ver="{{ .KUBERNETES_VERSION }}*" -cni_ver="{{ .KUBERNETES_CNI_VERSION }}*" -cri_ver="{{ .CRITOOLS_VERSION }}*" +kube_ver="{{ .KUBERNETES_VERSION }}-*" +cni_ver="{{ .KUBERNETES_CNI_VERSION }}-*" +cri_ver="{{ .CRITOOLS_VERSION }}-*" {{- if or .FORCE .UPGRADE }} sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni cri-tools diff --git a/pkg/scripts/testdata/TestKubeadmDebian-cilium_cluster.golden b/pkg/scripts/testdata/TestKubeadmDebian-cilium_cluster.golden index f9a719417..8facc918a 100644 --- a/pkg/scripts/testdata/TestKubeadmDebian-cilium_cluster.golden +++ b/pkg/scripts/testdata/TestKubeadmDebian-cilium_cluster.golden @@ -71,9 +71,9 @@ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs. sudo apt-get update -kube_ver="1.26.0*" -cni_ver="1.2.0*" -cri_ver="1.26.0*" +kube_ver="1.26.0-*" +cni_ver="1.2.0-*" +cri_ver="1.26.0-*" diff --git a/pkg/scripts/testdata/TestKubeadmDebian-nutanix_cluster.golden b/pkg/scripts/testdata/TestKubeadmDebian-nutanix_cluster.golden index dbd197528..3dd6f940a 100644 --- a/pkg/scripts/testdata/TestKubeadmDebian-nutanix_cluster.golden +++ b/pkg/scripts/testdata/TestKubeadmDebian-nutanix_cluster.golden @@ -68,9 +68,9 @@ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs. sudo apt-get update -kube_ver="1.26.0*" -cni_ver="1.2.0*" -cri_ver="1.26.0*" +kube_ver="1.26.0-*" +cni_ver="1.2.0-*" +cri_ver="1.26.0-*" diff --git a/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden b/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden index dcce46011..cb4d93543 100644 --- a/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden +++ b/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden @@ -65,9 +65,9 @@ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs. sudo apt-get update -kube_ver="1.26.0*" -cni_ver="1.2.0*" -cri_ver="1.26.0*" +kube_ver="1.26.0-*" +cni_ver="1.2.0-*" +cri_ver="1.26.0-*" diff --git a/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden b/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden index f90386ef7..be3960538 100644 --- a/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden +++ b/pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden @@ -65,9 +65,9 @@ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs. sudo apt-get update -kube_ver="1.26.0*" -cni_ver="1.2.0*" -cri_ver="1.26.0*" +kube_ver="1.26.0-*" +cni_ver="1.2.0-*" +cri_ver="1.26.0-*" diff --git a/pkg/scripts/testdata/TestKubeadmDebian-simple.golden b/pkg/scripts/testdata/TestKubeadmDebian-simple.golden index dcce46011..cb4d93543 100644 --- a/pkg/scripts/testdata/TestKubeadmDebian-simple.golden +++ b/pkg/scripts/testdata/TestKubeadmDebian-simple.golden @@ -65,9 +65,9 @@ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs. sudo apt-get update -kube_ver="1.26.0*" -cni_ver="1.2.0*" -cri_ver="1.26.0*" +kube_ver="1.26.0-*" +cni_ver="1.2.0-*" +cri_ver="1.26.0-*" diff --git a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden index e1a215e82..8bbc42778 100644 --- a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden +++ b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden @@ -65,9 +65,9 @@ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs. sudo apt-get update -kube_ver="1.26.0*" -cni_ver="1.2.0*" -cri_ver="1.26.0*" +kube_ver="1.26.0-*" +cni_ver="1.2.0-*" +cri_ver="1.26.0-*" diff --git a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden index c9f0b09e6..ae0f88c16 100644 --- a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden +++ b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden @@ -65,9 +65,9 @@ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs. sudo apt-get update -kube_ver="1.26.0*" -cni_ver="1.2.0*" -cri_ver="1.26.0*" +kube_ver="1.26.0-*" +cni_ver="1.2.0-*" +cri_ver="1.26.0-*" diff --git a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden index c75b7d84f..7ea516c74 100644 --- a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden +++ b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden @@ -65,9 +65,9 @@ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs. sudo apt-get update -kube_ver="1.26.0*" -cni_ver="1.2.0*" -cri_ver="1.26.0*" +kube_ver="1.26.0-*" +cni_ver="1.2.0-*" +cri_ver="1.26.0-*" sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni cri-tools diff --git a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden index a72d3081d..c5431f204 100644 --- a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden +++ b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden @@ -65,9 +65,9 @@ echo "deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs. sudo apt-get update -kube_ver="1.26.0*" -cni_ver="1.2.0*" -cri_ver="1.26.0*" +kube_ver="1.26.0-*" +cni_ver="1.2.0-*" +cri_ver="1.26.0-*" sudo apt-mark unhold kubelet kubeadm kubectl kubernetes-cni cri-tools