Skip to content

Commit

Permalink
Fix globbing for apt-get install (#2960)
Browse files Browse the repository at this point in the history 
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
Co-authored-by: Marko Mudrinić <mudrinic.mare@gmail.com>
  • Loading branch information
@kubermatic-bot @xmudrii
kubermatic-bot and xmudrii authored Nov 7, 2023
1 parent a3ad409 commit a74f42d
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 30 deletions.
6 changes: 3 additions & 3 deletions pkg/scripts/os_debian.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions pkg/scripts/testdata/TestKubeadmDebian-cilium_cluster.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-*"



Expand Down
6 changes: 3 additions & 3 deletions pkg/scripts/testdata/TestKubeadmDebian-nutanix_cluster.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-*"



Expand Down
6 changes: 3 additions & 3 deletions pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-*"



Expand Down
6 changes: 3 additions & 3 deletions pkg/scripts/testdata/TestKubeadmDebian-overwrite_registry_insecure.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-*"



Expand Down
6 changes: 3 additions & 3 deletions pkg/scripts/testdata/TestKubeadmDebian-simple.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-*"



Expand Down
6 changes: 3 additions & 3 deletions pkg/scripts/testdata/TestKubeadmDebian-with_containerd.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-*"



Expand Down
6 changes: 3 additions & 3 deletions pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-*"



Expand Down
6 changes: 3 additions & 3 deletions pkg/scripts/testdata/TestUpgradeKubeadmAndCNIDebian.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
6 changes: 3 additions & 3 deletions pkg/scripts/testdata/TestUpgradeKubeletAndKubectlDebian.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down

0 comments on commit a74f42d

Please sign in to comment.