Skip to content

Commit a1c3433

Browse files
committed
Update cluster autoscaler version
1 parent 998fccb commit a1c3433

File tree

3 files changed

+46
-52
lines changed

3 files changed

+46
-52
lines changed

dev/versions.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ Note: overriding horizontal-pod-autoscaler-sync-period on EKS is currently not s
135135

136136
## Cluster autoscaler
137137

138-
1. Find the latest release on [GitHub](https://github.com/kubernetes/autoscaler/releases) and check the changelog
139-
1. In the [GitHub Repo](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws), set the tree to the tag for the latest release, and open `cloudprovider/aws/examples/cluster-autoscaler-autodiscover.yaml` (e.g. <https://github.com/kubernetes/autoscaler/blob/cluster-autoscaler-release-1.16/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-autodiscover.yaml>)
138+
1. Find the latest patch release for our current version of k8s (e.g. k8s v1.14 -> cluster-autocluster v1.14.5) on [GitHub](https://github.com/kubernetes/autoscaler/releases) and check the changelog
139+
1. In the [GitHub Repo](https://github.com/kubernetes/autoscaler/blob/master/cluster-autoscaler/cloudprovider/aws), set the tree to the tag for the chosen release, and open `cloudprovider/aws/examples/cluster-autoscaler-autodiscover.yaml` (e.g. <https://github.com/kubernetes/autoscaler/blob/cluster-autoscaler-1.14.5/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-autodiscover.yaml>)
140140
1. Copy the contents to `manager/manifests/cluster-autoscaler.yaml`
141141
1. Update this line of config:
142142

@@ -147,7 +147,7 @@ Note: overriding horizontal-pod-autoscaler-sync-period on EKS is currently not s
147147
1. Replace `<YOUR CLUSTER NAME>` with `$CORTEX_CLUSTER`
148148
1. Update the link at the top of the file to the URL you copied from
149149
1. Check that your diff is reasonable
150-
1. Update the version of the base image in `images/cluster-autoscaler/Dockerfile` to whatever the value for `image` was before you replaced it with `$CORTEX_IMAGE_CLUSTER_AUTOSCALER`
150+
1. Update the version of the base image in `images/cluster-autoscaler/Dockerfile` to the tag of the chosen release
151151

152152
## Fluentd
153153

images/cluster-autoscaler/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM k8s.gcr.io/cluster-autoscaler:v1.12.3
1+
FROM gcr.io/google-containers/cluster-autoscaler:v1.14.5

manager/manifests/cluster-autoscaler.yaml

Lines changed: 42 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# Source: https://github.com/kubernetes/autoscaler/blob/cluster-autoscaler-1.15.1/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-autodiscover.yaml
16-
# README: https://github.com/kubernetes/autoscaler/blob/cluster-autoscaler-1.15.1/cluster-autoscaler/cloudprovider/aws
15+
# Source: https://github.com/kubernetes/autoscaler/blob/cluster-autoscaler-1.14.5/cluster-autoscaler/cloudprovider/aws/examples/cluster-autoscaler-autodiscover.yaml
1716

1817
---
1918
apiVersion: v1
@@ -33,45 +32,40 @@ metadata:
3332
k8s-addon: cluster-autoscaler.addons.k8s.io
3433
k8s-app: cluster-autoscaler
3534
rules:
36-
- apiGroups: [""]
37-
resources: ["events", "endpoints"]
38-
verbs: ["create", "patch"]
39-
- apiGroups: [""]
40-
resources: ["pods/eviction"]
41-
verbs: ["create"]
42-
- apiGroups: [""]
43-
resources: ["pods/status"]
44-
verbs: ["update"]
45-
- apiGroups: [""]
46-
resources: ["endpoints"]
47-
resourceNames: ["cluster-autoscaler"]
48-
verbs: ["get", "update"]
49-
- apiGroups: [""]
50-
resources: ["nodes"]
51-
verbs: ["watch", "list", "get", "update"]
52-
- apiGroups: [""]
53-
resources:
54-
- "pods"
55-
- "services"
56-
- "replicationcontrollers"
57-
- "persistentvolumeclaims"
58-
- "persistentvolumes"
59-
verbs: ["watch", "list", "get"]
60-
- apiGroups: ["extensions"]
61-
resources: ["replicasets", "daemonsets"]
62-
verbs: ["watch", "list", "get"]
63-
- apiGroups: ["policy"]
64-
resources: ["poddisruptionbudgets"]
65-
verbs: ["watch", "list"]
66-
- apiGroups: ["apps"]
67-
resources: ["statefulsets", "replicasets", "daemonsets"]
68-
verbs: ["watch", "list", "get"]
69-
- apiGroups: ["storage.k8s.io"]
70-
resources: ["storageclasses"]
71-
verbs: ["watch", "list", "get"]
72-
- apiGroups: ["batch", "extensions"]
73-
resources: ["jobs"]
74-
verbs: ["get", "list", "watch", "patch"]
35+
- apiGroups: [""]
36+
resources: ["events","endpoints"]
37+
verbs: ["create", "patch"]
38+
- apiGroups: [""]
39+
resources: ["pods/eviction"]
40+
verbs: ["create"]
41+
- apiGroups: [""]
42+
resources: ["pods/status"]
43+
verbs: ["update"]
44+
- apiGroups: [""]
45+
resources: ["endpoints"]
46+
resourceNames: ["cluster-autoscaler"]
47+
verbs: ["get","update"]
48+
- apiGroups: [""]
49+
resources: ["nodes"]
50+
verbs: ["watch","list","get","update"]
51+
- apiGroups: [""]
52+
resources: ["pods","services","replicationcontrollers","persistentvolumeclaims","persistentvolumes"]
53+
verbs: ["watch","list","get"]
54+
- apiGroups: ["extensions"]
55+
resources: ["replicasets","daemonsets"]
56+
verbs: ["watch","list","get"]
57+
- apiGroups: ["policy"]
58+
resources: ["poddisruptionbudgets"]
59+
verbs: ["watch","list"]
60+
- apiGroups: ["apps"]
61+
resources: ["statefulsets", "replicasets", "daemonsets"]
62+
verbs: ["watch","list","get"]
63+
- apiGroups: ["storage.k8s.io"]
64+
resources: ["storageclasses"]
65+
verbs: ["watch","list","get"]
66+
- apiGroups: ["batch", "extensions"]
67+
resources: ["jobs"]
68+
verbs: ["get", "list", "watch", "patch"]
7569

7670
---
7771
apiVersion: rbac.authorization.k8s.io/v1
@@ -83,13 +77,13 @@ metadata:
8377
k8s-addon: cluster-autoscaler.addons.k8s.io
8478
k8s-app: cluster-autoscaler
8579
rules:
86-
- apiGroups: [""]
87-
resources: ["configmaps"]
88-
verbs: ["create","list","watch"]
89-
- apiGroups: [""]
90-
resources: ["configmaps"]
91-
resourceNames: ["cluster-autoscaler-status", "cluster-autoscaler-priority-expander"]
92-
verbs: ["delete", "get", "update", "watch"]
80+
- apiGroups: [""]
81+
resources: ["configmaps"]
82+
verbs: ["create"]
83+
- apiGroups: [""]
84+
resources: ["configmaps"]
85+
resourceNames: ["cluster-autoscaler-status"]
86+
verbs: ["delete","get","update"]
9387

9488
---
9589
apiVersion: rbac.authorization.k8s.io/v1

0 commit comments

Comments
 (0)