Skip to content

Commit

Permalink
[release/v0.4] Update containerd, docker, kubernetes-cni, and cri-too…
Browse files Browse the repository at this point in the history 
…ls (#260)

* Update containerd and Docker

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

* Update cri-tools and kubernetes-cni

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

* Fix lib.sh

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

* Bump OSP version

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

---------

Signed-off-by: Marko Mudrinić <[email protected]>
  • Loading branch information
@xmudrii
xmudrii authored Jan 31, 2023
1 parent 399d80f commit a4e2785
Show file tree
Hide file tree
Showing 23 changed files with 120 additions and 100 deletions.
15 changes: 8 additions & 7 deletions deploy/osps/default/osp-amzn2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
spec:
osName: "amzn2"
osVersion: "2.0"
version: "v0.1.3"
version: "v0.1.4"
supportedCloudProviders:
- name: "aws"
supportedContainerRuntimes:
Expand Down Expand Up @@ -50,7 +50,7 @@ spec:
templates:
containerRuntimeInstallation: |-
yum install -y \
containerd-1.4* \
containerd-1.6* \
yum-plugin-versionlock
yum versionlock add containerd
Expand Down Expand Up @@ -94,7 +94,7 @@ spec:
templates:
containerRuntimeInstallation: |-
yum install -y \
containerd-1.4* \
containerd-1.6* \
docker-19.03* \
yum-plugin-versionlock
yum versionlock add docker containerd
Expand Down Expand Up @@ -133,7 +133,7 @@ spec:
fi
{{- /* # CNI variables */}}
CNI_VERSION="${CNI_VERSION:-v0.8.7}"
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"
Expand All @@ -153,16 +153,17 @@ spec:
cd -
{{- /* # cri-tools variables */}}
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"
{{- /* download cri-tools */}}
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
{{- /* download cri-tools checksum */}}
{{- /* the cri-tools checksum file has a filename prefix that breaks sha256sum so we need to drop it with sed */}}
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
{{- /* the cri-tools checksum file provides only the checksum without the file name, so we need to handle it specially */}}
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"
{{- /* verify cri-tools checksum */}}
Expand Down
19 changes: 10 additions & 9 deletions deploy/osps/default/osp-centos.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
spec:
osName: "centos"
osVersion: "7.7"
version: "v0.1.3"
version: "v0.1.4"
supportedCloudProviders:
- name: "aws"
- name: "azure"
Expand Down Expand Up @@ -65,7 +65,7 @@ spec:
*/}}
yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
yum install -y containerd.io-1.5* yum-plugin-versionlock
yum install -y containerd.io-1.6* yum-plugin-versionlock
yum versionlock add containerd.io
systemctl daemon-reload
Expand Down Expand Up @@ -112,9 +112,9 @@ spec:
yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
yum install -y \
docker-ce-cli-19.03* \
containerd.io-1.5* \
docker-ce-19.03* \
docker-ce-cli-20.10* \
containerd.io-1.6* \
docker-ce-20.10* \
yum-plugin-versionlock
yum versionlock add docker-ce* containerd.io
Expand Down Expand Up @@ -152,7 +152,7 @@ spec:
fi
{{- /* # CNI variables */}}
CNI_VERSION="${CNI_VERSION:-v0.8.7}"
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"
Expand All @@ -172,16 +172,17 @@ spec:
cd -
{{- /* # cri-tools variables */}}
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"
{{- /* download cri-tools */}}
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
{{- /* download cri-tools checksum */}}
{{- /* the cri-tools checksum file has a filename prefix that breaks sha256sum so we need to drop it with sed */}}
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
{{- /* the cri-tools checksum file provides only the checksum without the file name, so we need to handle it specially */}}
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"
{{- /* verify cri-tools checksum */}}
Expand Down
19 changes: 10 additions & 9 deletions deploy/osps/default/osp-centos8.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
spec:
osName: "centos"
osVersion: "8"
version: "v0.1.3"
version: "v0.1.4"
supportedCloudProviders:
- name: "aws"
- name: "azure"
Expand Down Expand Up @@ -65,7 +65,7 @@ spec:
*/}}
yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
yum install -y containerd.io-1.5* yum-plugin-versionlock
yum install -y containerd.io-1.6* yum-plugin-versionlock
yum versionlock add containerd.io
systemctl daemon-reload
Expand Down Expand Up @@ -112,9 +112,9 @@ spec:
yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
yum install -y \
docker-ce-cli-19.03* \
containerd.io-1.4* \
docker-ce-19.03* \
docker-ce-cli-20.10* \
containerd.io-1.6* \
docker-ce-20.10* \
yum-plugin-versionlock
yum versionlock add docker-ce* containerd.io
Expand Down Expand Up @@ -152,7 +152,7 @@ spec:
fi
{{- /* # CNI variables */}}
CNI_VERSION="${CNI_VERSION:-v0.8.7}"
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"
Expand All @@ -172,16 +172,17 @@ spec:
cd -
{{- /* # cri-tools variables */}}
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"
{{- /* download cri-tools */}}
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
{{- /* download cri-tools checksum */}}
{{- /* the cri-tools checksum file has a filename prefix that breaks sha256sum so we need to drop it with sed */}}
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
{{- /* the cri-tools checksum file provides only the checksum without the file name, so we need to handle it specially */}}
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"
{{- /* verify cri-tools checksum */}}
Expand Down
11 changes: 6 additions & 5 deletions deploy/osps/default/osp-flatcar.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
osName: flatcar
## Flatcar Stable (09/11/2021)
osVersion: "2983.2.0"
version: "v0.1.3"
version: "v0.1.4"
supportedCloudProviders:
- name: aws
- name: azure
Expand Down Expand Up @@ -126,7 +126,7 @@ spec:
fi
{{- /* # CNI variables */}}
CNI_VERSION="${CNI_VERSION:-v0.8.7}"
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"
Expand All @@ -146,16 +146,17 @@ spec:
cd -
{{- /* # cri-tools variables */}}
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"
{{- /* download cri-tools */}}
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
{{- /* download cri-tools checksum */}}
{{- /* the cri-tools checksum file has a filename prefix that breaks sha256sum so we need to drop it with sed */}}
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
{{- /* the cri-tools checksum file provides only the checksum without the file name, so we need to handle it specially */}}
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"
{{- /* verify cri-tools checksum */}}
Expand Down
19 changes: 10 additions & 9 deletions deploy/osps/default/osp-rhel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
spec:
osName: "rhel"
osVersion: "8.5"
version: "v0.1.3"
version: "v0.1.4"
supportedCloudProviders:
- name: "aws"
- name: "azure"
Expand Down Expand Up @@ -61,7 +61,7 @@ spec:
*/}}
yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
yum install -y containerd.io-1.5* yum-plugin-versionlock
yum install -y containerd.io-1.6* yum-plugin-versionlock
yum versionlock add containerd.io
systemctl daemon-reload
Expand Down Expand Up @@ -108,9 +108,9 @@ spec:
yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
yum install -y \
docker-ce-cli-19.03* \
containerd.io-1.5* \
docker-ce-19.03* \
docker-ce-cli-20.10* \
containerd.io-1.6* \
docker-ce-20.10* \
yum-plugin-versionlock
yum versionlock add docker-ce* containerd.io
Expand Down Expand Up @@ -148,7 +148,7 @@ spec:
fi
{{- /* # CNI variables */}}
CNI_VERSION="${CNI_VERSION:-v0.8.7}"
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"
Expand All @@ -168,16 +168,17 @@ spec:
cd -
{{- /* # cri-tools variables */}}
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"
{{- /* download cri-tools */}}
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
{{- /* download cri-tools checksum */}}
{{- /* the cri-tools checksum file has a filename prefix that breaks sha256sum so we need to drop it with sed */}}
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
{{- /* the cri-tools checksum file provides only the checksum without the file name, so we need to handle it specially */}}
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"
{{- /* verify cri-tools checksum */}}
Expand Down
19 changes: 10 additions & 9 deletions deploy/osps/default/osp-rockylinux.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
spec:
osName: "rockylinux"
osVersion: "8.6"
version: "v0.1.0"
version: "v0.1.1"
supportedCloudProviders:
- name: "aws"
- name: "azure"
Expand Down Expand Up @@ -63,7 +63,7 @@ spec:
*/}}
yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
yum install -y containerd.io-1.5* yum-plugin-versionlock
yum install -y containerd.io-1.6* yum-plugin-versionlock
yum versionlock add containerd.io
systemctl daemon-reload
Expand Down Expand Up @@ -110,9 +110,9 @@ spec:
yum-config-manager --save --setopt=docker-ce-stable.module_hotfixes=true
yum install -y \
docker-ce-cli-19.03* \
containerd.io-1.5* \
docker-ce-19.03* \
docker-ce-cli-20.10* \
containerd.io-1.6* \
docker-ce-20.10* \
yum-plugin-versionlock
yum versionlock add docker-ce* containerd.io
Expand Down Expand Up @@ -148,7 +148,7 @@ spec:
fi
{{- /* # CNI variables */}}
CNI_VERSION="${CNI_VERSION:-v0.8.7}"
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"
Expand All @@ -168,16 +168,17 @@ spec:
cd -
{{- /* # cri-tools variables */}}
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"
{{- /* download cri-tools */}}
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
{{- /* download cri-tools checksum */}}
{{- /* the cri-tools checksum file has a filename prefix that breaks sha256sum so we need to drop it with sed */}}
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
{{- /* the cri-tools checksum file provides only the checksum without the file name, so we need to handle it specially */}}
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"
{{- /* verify cri-tools checksum */}}
Expand Down
11 changes: 6 additions & 5 deletions deploy/osps/default/osp-sles.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ metadata:
spec:
osName: sles
osVersion: "15-SP-1"
version: "v0.1.3"
version: "v0.1.4"
supportedCloudProviders:
- name: aws
supportedContainerRuntimes:
Expand Down Expand Up @@ -88,7 +88,7 @@ spec:
fi
{{- /* # CNI variables */}}
CNI_VERSION="${CNI_VERSION:-v0.8.7}"
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"
Expand All @@ -108,16 +108,17 @@ spec:
cd -
{{- /* # cri-tools variables */}}
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"
{{- /* download cri-tools */}}
curl -Lfo "$opt_bin/$cri_tools_filename" "$cri_tools_base_url/$cri_tools_filename"
{{- /* download cri-tools checksum */}}
{{- /* the cri-tools checksum file has a filename prefix that breaks sha256sum so we need to drop it with sed */}}
cri_tools_sum=$(curl -Lf "$cri_tools_base_url/$cri_tools_filename.sha256" | sed 's/\*\///')
{{- /* the cri-tools checksum file provides only the checksum without the file name, so we need to handle it specially */}}
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"
{{- /* verify cri-tools checksum */}}
Expand Down
Loading

0 comments on commit a4e2785

Please sign in to comment.