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

Merge pull request #10564 from bjhaid/master 

Make cluster proportional autoscaler image configurable.
This commit is contained in:
Kubernetes Prow Robot 2021-01-15 11:03:52 -08:00 committed by GitHub
parent 71d208fe5e f299566822
commit a051af8dc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
k8s/crds/kops.k8s.io_clusters.yaml
View File

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

2
pkg/apis/kops/cluster.go
View File

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

2
pkg/apis/kops/v1alpha2/cluster.go
View File

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

2
pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View File

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

4
upup/models/bindata.go
View File

@ -28220,7 +28220,7 @@ spec:
spec: spec:
containers: containers:
- name: autoscaler - 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: resources:
requests: requests:
cpu: "20m" cpu: "20m"
@ -29197,7 +29197,7 @@ spec:
spec: spec:
containers: containers:
- name: autoscaler - 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: resources:
requests: requests:
cpu: "20m" cpu: "20m"

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

@ -104,7 +104,7 @@ spec:
spec: spec:
containers: containers:
- name: autoscaler - 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: resources:
requests: requests:
cpu: "20m" cpu: "20m"

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

@ -53,7 +53,7 @@ spec:
spec: spec:
containers: containers:
- name: autoscaler - 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: resources:
requests: requests:
cpu: "20m" cpu: "20m"