From 30b1cd069d9c9afec166ea6bd93d9c5094e4c4a9 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Mon, 1 Feb 2021 23:12:13 +0200 Subject: [PATCH 1/2] Update k8s from 1.17 to 1.18 --- cli/cmd/cluster_gcp.go | 2 +- images/cluster-autoscaler/Dockerfile | 2 +- images/manager/Dockerfile | 2 +- manager/generate_eks.py | 2 +- manager/manifests/cluster-autoscaler.yaml.j2 | 3 +++ 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cli/cmd/cluster_gcp.go b/cli/cmd/cluster_gcp.go index df1a071b1f..c59ecb64ed 100644 --- a/cli/cmd/cluster_gcp.go +++ b/cli/cmd/cluster_gcp.go @@ -454,7 +454,7 @@ func createGKECluster(clusterConfig *clusterconfig.GCPConfig, gcpClient *gcp.Cli gkeClusterConfig := containerpb.Cluster{ Name: clusterConfig.ClusterName, - InitialClusterVersion: "1.17", + InitialClusterVersion: "1.18", LoggingService: "none", NodePools: []*containerpb.NodePool{ { diff --git a/images/cluster-autoscaler/Dockerfile b/images/cluster-autoscaler/Dockerfile index f7bc8e18cc..3cebf331e2 100644 --- a/images/cluster-autoscaler/Dockerfile +++ b/images/cluster-autoscaler/Dockerfile @@ -1 +1 @@ -FROM k8s.gcr.io/autoscaling/cluster-autoscaler:v1.17.3 +FROM k8s.gcr.io/autoscaling/cluster-autoscaler:v1.18.3 diff --git a/images/manager/Dockerfile b/images/manager/Dockerfile index 0f399b29b0..7a9ecd4b96 100644 --- a/images/manager/Dockerfile +++ b/images/manager/Dockerfile @@ -15,7 +15,7 @@ RUN pip install --upgrade pip && \ RUN apk add --no-cache bash curl gettext jq openssl -RUN curl --location "https://github.com/weaveworks/eksctl/releases/download/0.27.0/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp && \ +RUN curl --location "https://github.com/weaveworks/eksctl/releases/download/0.36.2/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp && \ mv /tmp/eksctl /usr/local/bin RUN curl -o aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.9/2020-08-04/bin/linux/amd64/aws-iam-authenticator && \ diff --git a/manager/generate_eks.py b/manager/generate_eks.py index 3bfaca902f..c174eea062 100644 --- a/manager/generate_eks.py +++ b/manager/generate_eks.py @@ -192,7 +192,7 @@ def generate_eks(cluster_config_path): "metadata": { "name": cluster_config["cluster_name"], "region": cluster_config["region"], - "version": "1.17", + "version": "1.18", "tags": cluster_config["tags"], }, "vpc": {"nat": {"gateway": nat_gateway}}, diff --git a/manager/manifests/cluster-autoscaler.yaml.j2 b/manager/manifests/cluster-autoscaler.yaml.j2 index db6cdaba8c..471b03b62a 100644 --- a/manager/manifests/cluster-autoscaler.yaml.j2 +++ b/manager/manifests/cluster-autoscaler.yaml.j2 @@ -168,6 +168,9 @@ spec: metadata: labels: app: cluster-autoscaler + annotations: + prometheus.io/scrape: 'true' + prometheus.io/port: '8085' spec: serviceAccountName: cluster-autoscaler containers: From 99f9151437665041280eff15bd81244f60991974 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Mon, 1 Feb 2021 23:54:05 +0200 Subject: [PATCH 2/2] Remove prometheus annotations in CA --- manager/manifests/cluster-autoscaler.yaml.j2 | 3 --- 1 file changed, 3 deletions(-) diff --git a/manager/manifests/cluster-autoscaler.yaml.j2 b/manager/manifests/cluster-autoscaler.yaml.j2 index 471b03b62a..db6cdaba8c 100644 --- a/manager/manifests/cluster-autoscaler.yaml.j2 +++ b/manager/manifests/cluster-autoscaler.yaml.j2 @@ -168,9 +168,6 @@ spec: metadata: labels: app: cluster-autoscaler - annotations: - prometheus.io/scrape: 'true' - prometheus.io/port: '8085' spec: serviceAccountName: cluster-autoscaler containers: