Skip to content

Commit

Permalink
Support for Kubernetes 1.28 (#307)
Browse files Browse the repository at this point in the history 
Signed-off-by: Waleed Malik <[email protected]>
  • Loading branch information
@ahmedwaleedmalik
ahmedwaleedmalik authored Aug 16, 2023
1 parent ab8caf4 commit 0ddfc60
Show file tree
Hide file tree
Showing 23 changed files with 23 additions and 22 deletions.
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-amzn2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ spec:
cd -
{{- /* # cri-tools variables */}}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-centos.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ spec:
cd -
{{- /* # cri-tools variables */}}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-flatcar-cloud-init.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ spec:
cd -
{{- /* # cri-tools variables */}}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-flatcar.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ spec:
cd -
{{- /* # cri-tools variables */}}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-rhel.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
cd -
{{- /* # cri-tools variables */}}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-rockylinux.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ spec:
cd -
{{- /* # cri-tools variables */}}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion deploy/osps/default/osp-ubuntu.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ spec:
cd -
{{- /* # cri-tools variables */}}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
1 change: 1 addition & 0 deletions docs/compatibility-matrix.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

Currently supported K8S versions are:

- 1.28
- 1.27
- 1.26
- 1.25
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/osc-flatcar-aws-containerd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ spec:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/osc-kubelet-configuration-containerd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ spec:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/osc-rhel-8.x-azure-containerd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ spec:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/osc-rhel-8.x-cloud-init-modules.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ spec:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/osc-ubuntu-aws-containerd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ spec:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack-IPv6+IPv4.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ spec:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/osc-ubuntu-aws-dualstack.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ spec:
tar xvf "$cni_filename"
rm -f "$cni_filename"
cd -
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/osp-rhel-aws-cloud-init-modules.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ spec:
cd -
{{- /* # cri-tools variables */}}
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.27.0}"
CRI_TOOLS_RELEASE="${CRI_TOOLS_RELEASE:-v1.28.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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-flatcar-aws-containerd-provisioning.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-kubelet-configuration-containerd-provisioning.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-osc-rhel-8.x-cloud-init-modules-provisioning.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-rhel-8.x-azure-containerd-provisioning.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-ubuntu-aws-containerd-provisioning.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-IPv6+IPv4-provisioning.yaml
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pkg/controllers/osc/testdata/secret-ubuntu-aws-dualstack-provisioning.yaml
View file

Large diffs are not rendered by default.

0 comments on commit 0ddfc60

Please sign in to comment.