Merge pull request #10564 from bjhaid/master

Make cluster proportional autoscaler image configurable.

k8s/crds/kops.k8s.io_clusters.yaml

@@ -1875,6 +1875,10 @@ spec:
                     description: CoreDNSImage is used to override the default image
                       used for CoreDNS
                     type: string
+                  cpaImage:
+                    description: CPAImage is used to override the default image used
+                      for Cluster Proportional Autoscaler
+                    type: string
                   cpuRequest:
                     anyOf:
                     - type: integer

pkg/apis/kops/cluster.go

@@ -405,6 +405,8 @@ type KubeDNSConfig struct {
 	CacheMaxConcurrent int `json:"cacheMaxConcurrent,omitempty"`
 	// CoreDNSImage is used to override the default image used for CoreDNS
 	CoreDNSImage string `json:"coreDNSImage,omitempty"`
+	// CPAImage is used to override the default image used for Cluster Proportional Autoscaler
+	CPAImage string `json:"cpaImage,omitempty"`
 	// Domain is the dns domain
 	Domain string `json:"domain,omitempty"`
 	// ExternalCoreFile is used to provide a complete CoreDNS CoreFile by the user - ignores other provided flags which modify the CoreFile.

pkg/apis/kops/v1alpha2/cluster.go

@@ -407,6 +407,8 @@ type KubeDNSConfig struct {
 	CacheMaxConcurrent int `json:"cacheMaxConcurrent,omitempty"`
 	// CoreDNSImage is used to override the default image used for CoreDNS
 	CoreDNSImage string `json:"coreDNSImage,omitempty"`
+	// CPAImage is used to override the default image used for Cluster Proportional Autoscaler
+	CPAImage string `json:"cpaImage,omitempty"`
 	// Domain is the dns domain
 	Domain string `json:"domain,omitempty"`
 	// ExternalCoreFile is used to provide a complete CoreDNS CoreFile by the user - ignores other provided flags which modify the CoreFile.

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

@@ -4590,6 +4590,7 @@ func autoConvert_v1alpha2_KubeDNSConfig_To_kops_KubeDNSConfig(in *KubeDNSConfig,
 	out.CacheMaxSize = in.CacheMaxSize
 	out.CacheMaxConcurrent = in.CacheMaxConcurrent
 	out.CoreDNSImage = in.CoreDNSImage
+	out.CPAImage = in.CPAImage
 	out.Domain = in.Domain
 	out.ExternalCoreFile = in.ExternalCoreFile
 	out.Image = in.Image
@@ -4622,6 +4623,7 @@ func autoConvert_kops_KubeDNSConfig_To_v1alpha2_KubeDNSConfig(in *kops.KubeDNSCo
 	out.CacheMaxSize = in.CacheMaxSize
 	out.CacheMaxConcurrent = in.CacheMaxConcurrent
 	out.CoreDNSImage = in.CoreDNSImage
+	out.CPAImage = in.CPAImage
 	out.Domain = in.Domain
 	out.ExternalCoreFile = in.ExternalCoreFile
 	out.Image = in.Image

upup/models/bindata.go

@@ -28220,7 +28220,7 @@ spec:
     spec:
       containers:
       - name: autoscaler
-        image: k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.3
+        image: {{ if KubeDNS.CPAImage }}{{ KubeDNS.CPAImage }}{{ else }}k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.3{{ end }}
         resources:
             requests:
                 cpu: "20m"
@@ -29197,7 +29197,7 @@ spec:
     spec:
       containers:
       - name: autoscaler
-        image: k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.3
+        image: {{ if KubeDNS.CPAImage }}{{ KubeDNS.CPAImage }}{{ else }}k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.3{{ end }}
         resources:
             requests:
                 cpu: "20m"

upup/models/cloudup/resources/addons/coredns.addons.k8s.io/k8s-1.12.yaml.template

@@ -104,7 +104,7 @@ spec:
     spec:
       containers:
       - name: autoscaler
-        image: k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.3
+        image: {{ if KubeDNS.CPAImage }}{{ KubeDNS.CPAImage }}{{ else }}k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.3{{ end }}
         resources:
             requests:
                 cpu: "20m"

upup/models/cloudup/resources/addons/kube-dns.addons.k8s.io/k8s-1.12.yaml.template

@@ -53,7 +53,7 @@ spec:
     spec:
       containers:
       - name: autoscaler
-        image: k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.3
+        image: {{ if KubeDNS.CPAImage }}{{ KubeDNS.CPAImage }}{{ else }}k8s.gcr.io/cpa/cluster-proportional-autoscaler:1.8.3{{ end }}
         resources:
             requests:
                 cpu: "20m"