Skip to content

Commit

Permalink
[release/v1.54] Update kubernetes-cni to v1.2.0 and cri-tools to v1.2…
Browse files Browse the repository at this point in the history
…6.0 (#1540)

* Update kubernetes-cni to v1.2.0 and cri-tools to v1.26.0

Signed-off-by: Marko Mudrinić <[email protected]>

* Update OSM to v1.1.2

Signed-off-by: Marko Mudrinić <[email protected]>

Signed-off-by: Marko Mudrinić <[email protected]>
  • Loading branch information
xmudrii authored Jan 25, 2023
1 parent 714b1c4 commit e8ab3f5
Show file tree
Hide file tree
Showing 72 changed files with 278 additions and 210 deletions.
4 changes: 2 additions & 2 deletions examples/operating-system-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ spec:
spec:
serviceAccountName: operating-system-manager-webhook
containers:
- image: quay.io/kubermatic/operating-system-manager:v1.0.0
- image: quay.io/kubermatic/operating-system-manager:v1.1.2
imagePullPolicy: IfNotPresent
name: webhook
command:
Expand Down Expand Up @@ -1377,7 +1377,7 @@ spec:
spec:
serviceAccountName: operating-system-manager
containers:
- image: quay.io/kubermatic/operating-system-manager:v1.0.0
- image: quay.io/kubermatic/operating-system-manager:v1.1.2
imagePullPolicy: IfNotPresent
name: operating-system-manager
command:
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/amzn2/testdata/kubelet-v1.22-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -128,11 +128,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/amzn2/testdata/kubelet-v1.23-aws-external.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -128,11 +128,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/amzn2/testdata/kubelet-v1.23-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -128,11 +128,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -141,11 +141,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/amzn2/testdata/kubelet-v1.23-vsphere-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -141,11 +141,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/amzn2/testdata/kubelet-v1.23-vsphere.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -133,11 +133,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/amzn2/testdata/kubelet-v1.24-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -131,11 +131,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/centos/testdata/kubelet-v1.22-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -138,11 +138,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/centos/testdata/kubelet-v1.23-aws-external.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -138,11 +138,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/centos/testdata/kubelet-v1.23-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -138,11 +138,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/centos/testdata/kubelet-v1.23-nutanix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -145,11 +145,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -151,11 +151,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/centos/testdata/kubelet-v1.23-vsphere-proxy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -151,11 +151,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/centos/testdata/kubelet-v1.23-vsphere.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -143,11 +143,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
7 changes: 4 additions & 3 deletions pkg/userdata/centos/testdata/kubelet-v1.24-aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ write_files:
;;
esac
fi
CNI_VERSION="${CNI_VERSION:-v1.1.1}"
CNI_VERSION="${CNI_VERSION:-v1.2.0}"
cni_base_url="https://github.com/containernetworking/plugins/releases/download/$CNI_VERSION"
cni_filename="cni-plugins-linux-$arch-$CNI_VERSION.tgz"
curl -Lfo "$cni_bin_dir/$cni_filename" "$cni_base_url/$cni_filename"
Expand All @@ -137,11 +137,12 @@ write_files:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.22.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.26.0}"
cri_tools_base_url="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRI_TOOLS_RELEASE}"
cri_tools_filename="crictl-${CRI_TOOLS_RELEASE}-linux-${arch}.tar.gz"
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
cri_tools_sum_value=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256")
cri_tools_sum="$cri_tools_sum_value $cri_tools_filename"
cd "$opt_bin"
sha256sum -c <<<"$cri_tools_sum"
tar xvf "$cri_tools_filename"
Expand Down
Loading

0 comments on commit e8ab3f5

Please sign in to comment.