Remove dead code

nodeup/pkg/model/protokube.go

@@ -237,15 +237,13 @@ func (t *ProtokubeBuilder) ProtokubeFlags(k8sVersion semver.Version) (*Protokube
 		f.DNSInternalSuffix = fi.String(".internal." + t.Cluster.ObjectMeta.Name)
 	}
 
-	if k8sVersion.Major == 1 && k8sVersion.Minor >= 16 {
-		f.BootstrapMasterNodeLabels = true
+	f.BootstrapMasterNodeLabels = true
 
-		nodeName, err := t.NodeName()
-		if err != nil {
-			return nil, fmt.Errorf("error getting NodeName: %v", err)
-		}
-		f.NodeName = nodeName
+	nodeName, err := t.NodeName()
+	if err != nil {
+		return nil, fmt.Errorf("error getting NodeName: %v", err)
 	}
+	f.NodeName = nodeName
 
 	return f, nil
 }

pkg/apis/kops/validation/legacy.go

@@ -441,9 +441,6 @@ func validateServiceAccountIssuerDiscovery(c *kops.Cluster, said *kops.ServiceAc
 	}
 	if said.EnableAWSOIDCProvider {
 		enableOIDCField := fieldSpec.Child("serviceAccountIssuerDiscovery", "enableAWSOIDCProvider")
-		if c.IsKubernetesLT("1.18") {
-			allErrs = append(allErrs, field.Forbidden(enableOIDCField, "AWS OIDC Provider requires kubernetes 1.18 or greates"))
-		}
 		if saidStore == "" {
 			allErrs = append(allErrs, field.Forbidden(enableOIDCField, "AWS OIDC Provider requires a discovery store"))
 		}

pkg/model/components/awscloudcontrollermanager.go

@@ -87,8 +87,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 20:
-			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.20.1"
 		case 21:
 			eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.21.3"
 		case 22:

pkg/model/components/clusterautoscaler.go

@@ -53,8 +53,6 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error {
 				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.3"
 			case 21:
 				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.3"
-			case 20:
-				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.20.3"
 			default:
 				image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0"
 			}

upup/models/cloudup/resources/addons/cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml.template

@@ -331,10 +331,7 @@ spec:
             - --scale-down-unready-time={{ .ScaleDownUnreadyTime }}
             - --new-pod-scale-up-delay={{ .NewPodScaleUpDelay }}
             - --max-node-provision-time={{ .MaxNodeProvisionTime }}
-            # This flag does not exist before CAS 1.21
-            {{ if IsKubernetesGTE "1.21" }}
             - --cordon-node-before-terminating={{ WithDefaultBool .CordonNodeBeforeTerminating true }}
-            {{ end }}
             - --logtostderr=true
             - --stderrthreshold=info
             - --v=4