Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Default image in the cluster-autoscaler addon #1552

Merged
merged 1 commit into from
Sep 29, 2021
Merged

Default image in the cluster-autoscaler addon #1552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/cluster-autoscaler/cluster-autoscaler.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ spec:
app: cluster-autoscaler
spec:
containers:
- image: {{ Registry "k8s.gcr.io" }}/autoscaling/cluster-autoscaler:${AUTOSCALER_VERSION}
- image: {{ default (.InternalImages.Get "ClusterAutoscaler") .Params.CLUSTER_AUTOSCALER_IMAGE }}
name: cluster-autoscaler
command:
- /cluster-autoscaler
Expand Down
9 changes: 9 additions & 0 deletions pkg/templates/images/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ const (
CalicoCNI
CalicoController
CalicoNode
ClusterAutoscaler
CSIAttacher
CSINodeDriverRegistar
CSIProvisioner
Expand Down Expand Up @@ -153,6 +154,14 @@ func optionalResources() map[Resource]map[string]string {
// WeaveNet CNI plugin
WeaveNetCNIKube: {"*": "docker.io/weaveworks/weave-kube:2.8.1"},
WeaveNetCNINPC: {"*": "docker.io/weaveworks/weave-npc:2.8.1"},

// Cluster-autoscaler addon
ClusterAutoscaler: {
"1.19.x": "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.19.0",
"1.20.x": "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.20.0",
"1.21.x": "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.21.0",
">= 1.22.0": "k8s.gcr.io/autoscaling/cluster-autoscaler:v1.22.0",
},
}
}

Expand Down
47 changes: 24 additions & 23 deletions pkg/templates/images/resource_string.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.