Remove mentions of K8s v1.24

kubernetes · May 11, 2024 · 3bf0a15 · 3bf0a15
1 parent 38c16c7
commit 3bf0a15
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 13 deletions.
diff --git a/pkg/model/components/awscloudcontrollermanager.go b/pkg/model/components/awscloudcontrollermanager.go
@@ -75,8 +75,6 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(o interface{}) er
 	if eccm.Image == "" {
 		// See https://us.gcr.io/k8s-artifacts-prod/provider-aws/cloud-controller-manager
 		switch b.KubernetesVersion.Minor {
-		case 24:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.24.19"
 		case 25:
 			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.25.15"
 		case 26:

diff --git a/pkg/model/components/clusterautoscaler.go b/pkg/model/components/clusterautoscaler.go
@@ -43,8 +43,6 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
 		v, err := util.ParseKubernetesVersion(clusterSpec.KubernetesVersion)
 		if err == nil {
 			switch v.Minor {
-			case 24:
-				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.3"
 			case 25:
 				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.3"
 			case 26:

diff --git a/pkg/model/components/containerd.go b/pkg/model/components/containerd.go
@@ -42,9 +42,7 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o interface{}) error {
 	// Set version based on Kubernetes version
 	if fi.ValueOf(containerd.Version) == "" {
 		switch {
-		case b.IsKubernetesLT("1.24.14"):
-			fallthrough
-		case b.IsKubernetesGTE("1.25") && b.IsKubernetesLT("1.25.10"):
+		case b.IsKubernetesLT("1.25.10"):
 			fallthrough
 		case b.IsKubernetesGTE("1.26") && b.IsKubernetesLT("1.26.5"):
 			fallthrough

diff --git a/upup/pkg/fi/cloudup/template_functions.go b/upup/pkg/fi/cloudup/template_functions.go
@@ -888,9 +888,7 @@ func (tf *TemplateFunctions) OpenStackCCMTag() string {
 	if err != nil {
 		tag = "latest"
 	} else {
-		if parsed.Minor == 24 {
-			tag = "v1.24.6"
-		} else if parsed.Minor == 25 {
+		if parsed.Minor == 25 {
 			tag = "v1.25.5"
 		} else if parsed.Minor == 26 {
 			tag = "v1.26.2"
@@ -912,9 +910,7 @@ func (tf *TemplateFunctions) OpenStackCSITag() string {
 	if err != nil {
 		tag = "latest"
 	} else {
-		if parsed.Minor == 24 {
-			tag = "v1.24.6"
-		} else if parsed.Minor == 25 {
+		if parsed.Minor == 25 {
 			tag = "v1.25.5"
 		} else if parsed.Minor == 26 {
 			tag = "v1.26.2"