Apply suggestions from code review

Co-authored-by: Ciprian Hacman <[email protected]>
kubernetes · Feb 11, 2021 · e106e5f · e106e5f
1 parent 5633018
commit e106e5f
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 19 deletions.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -209,8 +209,8 @@ spec:
                     description: 'Enabled enables the loadbalancer controller. Default:
                       false'
                     type: boolean
-                  image:
-                    description: 'Image is the docker container used. Default: v2.0.0'
+                  version:
+                    description: Version is the container image tag used.
                     type: string
                 type: object
               certManager:

diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
@@ -912,9 +912,8 @@ type AWSLoadBalancerControllerConfig struct {
 	// Enabled enables the loadbalancer controller.
 	// Default: false
 	Enabled *bool `json:"enabled,omitempty"`
-	// Image is the docker container used.
-	// Default: v2.0.0
-	Image *string `json:"image,omitempty"`
+	// Version is the container image tag used.
+	Version *string `json:"version,omitempty"`
 }
 
 // HasAdmissionController checks if a specific admission controller is enabled

diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -911,9 +911,8 @@ type AWSLoadBalancerControllerConfig struct {
 	// Enabled enables the loadbalancer controller.
 	// Default: false
 	Enabled *bool `json:"enabled,omitempty"`
-	// Image is the docker container used.
-	// Default: v2.0.0
-	Image *string `json:"image,omitempty"`
+	// Version is the container image tag used.
+	Version *string `json:"version,omitempty"`
 }
 
 // HasAdmissionController checks if a specific admission controller is enabled

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/validation/validation.go b/pkg/apis/kops/validation/validation.go
@@ -168,6 +168,7 @@ func validateClusterSpec(spec *kops.ClusterSpec, c *kops.Cluster, fieldPath *fie
 		allErrs = append(allErrs, validateAWSLoadBalancerController(c, spec.AWSLoadBalancerController, fieldPath.Child("awsLoadBalanceController"))...)
 
 	}
+
 	// IAM additional policies
 	if spec.AdditionalPolicies != nil {
 		for k, v := range *spec.AdditionalPolicies {
@@ -1296,7 +1297,7 @@ func validateMetricsServer(cluster *kops.Cluster, spec *kops.MetricsServerConfig
 func validateAWSLoadBalancerController(cluster *kops.Cluster, spec *kops.AWSLoadBalancerControllerConfig, fldPath *field.Path) (allErrs field.ErrorList) {
 	if spec != nil && fi.BoolValue(spec.Enabled) {
 		if !components.IsCertManagerEnabled(cluster) {
-			allErrs = append(allErrs, field.Forbidden(fldPath.Child("insecure"), "AWS Load Balancer Controller requires that cert manager is enabled"))
+			allErrs = append(allErrs, field.Forbidden(fldPath, "AWS Load Balancer Controller requires that cert manager is enabled"))
 		}
 	}
 	return allErrs

diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
diff --git a/upup/models/bindata.go b/upup/models/bindata.go
diff --git a/...cloudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.9.yaml.template b/...cloudup/resources/addons/aws-load-balancer-controller.addons.k8s.io/k8s-1.9.yaml.template
@@ -1,3 +1,5 @@
+# sourced from https://github.com/kubernetes-sigs/aws-load-balancer-controller/blob/main/docs/install/v2_1_2_full.yaml
+---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
@@ -485,7 +487,7 @@ spec:
             - --enable-wafv2=false
             - --enable-shield=false
             - --ingress-class=alb
-          image: amazon/aws-alb-ingress-controller:v2.1.0
+          image: amazon/aws-alb-ingress-controller:{{ or .AWSLoadBalancerController.Version "v2.1.2" }}
           livenessProbe:
             failureThreshold: 2
             httpGet:

diff --git a/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go b/upup/pkg/fi/cloudup/bootstrapchannelbuilder/bootstrapchannelbuilder.go
@@ -560,7 +560,7 @@ func (b *BootstrapChannelBuilder) buildAddons(c *fi.ModelBuilderContext) (*chann
 	if b.Cluster.Spec.AWSLoadBalancerController != nil && fi.BoolValue(b.Cluster.Spec.AWSLoadBalancerController.Enabled) {
 
 		key := "aws-load-balancer-controller.addons.k8s.io"
-		version := "2.0.0"
+		version := "2.1.2"
 
 		{
 			location := key + "/k8s-1.9.yaml"