kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not allow docker on k8s 1.24+ 

Update pkg/apis/kops/validation/validation.go

Co-authored-by: Ciprian Hacman <ciprianhacman@gmail.com>
This commit is contained in:
Ole Markus With 2021-12-11 08:04:42 +01:00
parent 942d80801d
commit 2f3b683ca0
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/releases/1.24-NOTES.md
View File

@ -14,6 +14,8 @@ This is a document to gather the release notes prior to the release.
* Support for Aliyun/Alibaba Cloud has been removed. * Support for Aliyun/Alibaba Cloud has been removed.
* Support for Docker has been removed for Kubernetes 1.24+. See https://kubernetes.io/blog/2020/12/02/dockershim-faq
# Required actions # Required actions
# Deprecations # Deprecations
@ -28,6 +30,8 @@ This is a document to gather the release notes prior to the release.
* Due to lack of maintainers, the CloudFormation support has been deprecated. The current implementation will be left as-is until the implementation needs updates or otherwise becomes incompatible. At that point, it will be removed. We very much welcome anyone willing to contribute to this target. * Due to lack of maintainers, the CloudFormation support has been deprecated. The current implementation will be left as-is until the implementation needs updates or otherwise becomes incompatible. At that point, it will be removed. We very much welcome anyone willing to contribute to this target.
* Support for Docker has been removed for Kubernetes 1.24+. See https://kubernetes.io/blog/2020/12/02/dockershim-faq
# Other changes of note # Other changes of note
# Full change list since 1.23.0 release # Full change list since 1.23.0 release

10
pkg/apis/kops/validation/validation.go
View File

@ -209,7 +209,7 @@ func validateClusterSpec(spec *kops.ClusterSpec, c *kops.Cluster, fieldPath *fie
} }
if spec.ContainerRuntime != "" { if spec.ContainerRuntime != "" {
allErrs = append(allErrs, validateContainerRuntime(&spec.ContainerRuntime, fieldPath.Child("containerRuntime"))...) allErrs = append(allErrs, validateContainerRuntime(c, spec.ContainerRuntime, fieldPath.Child("containerRuntime"))...)
} }
if spec.Containerd != nil { if spec.Containerd != nil {
@ -1296,11 +1296,15 @@ func validateCalicoEncapsulationMode(mode string, fldPath *field.Path) field.Err
return allErrs return allErrs
} }
func validateContainerRuntime(runtime *string, fldPath *field.Path) field.ErrorList { func validateContainerRuntime(c *kops.Cluster, runtime string, fldPath *field.Path) field.ErrorList {
valid := []string{"containerd", "docker"} valid := []string{"containerd", "docker"}
allErrs := field.ErrorList{} allErrs := field.ErrorList{}
allErrs = append(allErrs, IsValidValue(fldPath, runtime, valid)...) allErrs = append(allErrs, IsValidValue(fldPath, &runtime, valid)...)
if runtime == "docker" && c.IsKubernetesGTE("1.24") {
allErrs = append(allErrs, field.Forbidden(fldPath, "Docker CRI support was removed in Kubernetes 1.24: https://kubernetes.io/blog/2020/12/02/dockershim-faq"))
}
return allErrs return allErrs
} }