Update metrics-server from upstream

bin/update.sh

@@ -2,7 +2,7 @@
 
 METRICS_SERVER_FILE="vars/metrics_server_files_list.yml"
 
-wget https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.3.6/components.yaml
+wget https://github.com/kubernetes-sigs/metrics-server/releases/download/v0.4.4/components.yaml
 kubernetes-split-yaml components.yaml > generated.log
 rm -f files/*.yaml
 mv generated/*.yaml files/
@@ -10,3 +10,4 @@ echo -e "---\nmetrics_server_files:" > "${METRICS_SERVER_FILE}"
 cat generated.log | while read LIGNE; do if [ $(echo "${LIGNE}" | grep -c ^File) -eq 1 ]; then echo -n "${LIGNE} "; else echo "${LIGNE}"; fi; done | grep ^File | sort -V | sed 's|.*\(generated/\)\(.*\.yaml\)|      - "\2"|' >> "${METRICS_SERVER_FILE}"
 rm -fr generated generated.log components.yaml
 
+sed '/ args:/ a\        - --kubelet-insecure-tls' -i files/metrics-server-Deployment.yaml

defaults/main.yml

@@ -1 +1,3 @@
 my_context: minikube
+metrics_server_version: "v0.4.4"
+metrics_server_url: "https://github.com/kubernetes-sigs/metrics-server/releases/download/{{ metrics_server_version }}/components.yaml"

files/metrics-server-Deployment.yaml

@@ -1,43 +1,61 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: metrics-server
-  namespace: kube-system
   labels:
     k8s-app: metrics-server
+  name: metrics-server
+  namespace: kube-system
 spec:
   selector:
     matchLabels:
       k8s-app: metrics-server
+  strategy:
+    rollingUpdate:
+      maxUnavailable: 0
   template:
     metadata:
-      name: metrics-server
       labels:
         k8s-app: metrics-server
     spec:
-      serviceAccountName: metrics-server
-      volumes:
-      # mount in tmp so we can safely use from-scratch images and/or read-only containers
-      - name: tmp-dir
-        emptyDir: {}
       containers:
-      - name: metrics-server
+      - args:
-        image: k8s.gcr.io/metrics-server-amd64:v0.3.6
+        - --kubelet-insecure-tls
-        imagePullPolicy: IfNotPresent
-        args:
         - --cert-dir=/tmp
         - --secure-port=4443
+        - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
+        - --kubelet-use-node-status-port
+        image: k8s.gcr.io/metrics-server/metrics-server:v0.4.4
+        imagePullPolicy: IfNotPresent
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /livez
+            port: https
+            scheme: HTTPS
+          periodSeconds: 10
+        name: metrics-server
         ports:
-        - name: main-port
+        - containerPort: 4443
-          containerPort: 4443
+          name: https
           protocol: TCP
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /readyz
+            port: https
+            scheme: HTTPS
+          periodSeconds: 10
         securityContext:
           readOnlyRootFilesystem: true
           runAsNonRoot: true
           runAsUser: 1000
         volumeMounts:
-        - name: tmp-dir
+        - mountPath: /tmp
-          mountPath: /tmp
+          name: tmp-dir
       nodeSelector:
         kubernetes.io/os: linux
-        kubernetes.io/arch: "amd64"
+      priorityClassName: system-cluster-critical
+      serviceAccountName: metrics-server
+      volumes:
+      - emptyDir: {}
+        name: tmp-dir

files/metrics-server-Service.yaml

@@ -1,15 +1,15 @@
 apiVersion: v1
 kind: Service
 metadata:
+  labels:
+    k8s-app: metrics-server
   name: metrics-server
   namespace: kube-system
-  labels:
-    kubernetes.io/name: "Metrics-server"
-    kubernetes.io/cluster-service: "true"
 spec:
+  ports:
+  - name: https
+    port: 443
+    protocol: TCP
+    targetPort: https
   selector:
     k8s-app: metrics-server
-  ports:
-  - port: 443
-    protocol: TCP
-    targetPort: main-port

files/metrics-server-ServiceAccount.yaml

@@ -1,5 +1,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
+  labels:
+    k8s-app: metrics-server
   name: metrics-server
   namespace: kube-system

files/metrics-server-auth-reader-RoleBinding.yaml

@@ -1,6 +1,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
+  labels:
+    k8s-app: metrics-server
   name: metrics-server-auth-reader
   namespace: kube-system
 roleRef:

files/metrics-server:system:auth-delegator-ClusterRoleBinding.yaml

@@ -1,6 +1,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
+  labels:
+    k8s-app: metrics-server
   name: metrics-server:system:auth-delegator
 roleRef:
   apiGroup: rbac.authorization.k8s.io

files/system:aggregated-metrics-reader-ClusterRole.yaml

@@ -1,12 +1,19 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: system:aggregated-metrics-reader
   labels:
-    rbac.authorization.k8s.io/aggregate-to-view: "true"
+    k8s-app: metrics-server
-    rbac.authorization.k8s.io/aggregate-to-edit: "true"
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
+    rbac.authorization.k8s.io/aggregate-to-edit: "true"
+    rbac.authorization.k8s.io/aggregate-to-view: "true"
+  name: system:aggregated-metrics-reader
 rules:
-- apiGroups: ["metrics.k8s.io"]
+- apiGroups:
-  resources: ["pods", "nodes"]
+  - metrics.k8s.io
-  verbs: ["get", "list", "watch"]
+  resources:
+  - pods
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch

files/system:metrics-server-ClusterRole.yaml

@@ -1,6 +1,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  labels:
+    k8s-app: metrics-server
   name: system:metrics-server
 rules:
 - apiGroups:

files/system:metrics-server-ClusterRoleBinding.yaml

@@ -1,6 +1,8 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
+  labels:
+    k8s-app: metrics-server
   name: system:metrics-server
 roleRef:
   apiGroup: rbac.authorization.k8s.io

files/v1beta1.metrics.k8s.io-APIService.yaml

@@ -1,13 +1,15 @@
-apiVersion: apiregistration.k8s.io/v1beta1
+apiVersion: apiregistration.k8s.io/v1
 kind: APIService
 metadata:
+  labels:
+    k8s-app: metrics-server
   name: v1beta1.metrics.k8s.io
 spec:
+  group: metrics.k8s.io
+  groupPriorityMinimum: 100
+  insecureSkipTLSVerify: true
   service:
     name: metrics-server
     namespace: kube-system
-  group: metrics.k8s.io
   version: v1beta1
-  insecureSkipTLSVerify: true
-  groupPriorityMinimum: 100
   versionPriority: 100

vars/metrics_server_files_list.yml

@@ -1,11 +1,11 @@
 ---
 metrics_server_files:
-      - "system:aggregated-metrics-reader-ClusterRole.yaml"
-      - "metrics-server:system:auth-delegator-ClusterRoleBinding.yaml"
-      - "metrics-server-auth-reader-RoleBinding.yaml"
-      - "v1beta1.metrics.k8s.io-APIService.yaml"
       - "metrics-server-ServiceAccount.yaml"
-      - "metrics-server-Deployment.yaml"
+      - "system:aggregated-metrics-reader-ClusterRole.yaml"
-      - "metrics-server-Service.yaml"
       - "system:metrics-server-ClusterRole.yaml"
+      - "metrics-server-auth-reader-RoleBinding.yaml"
+      - "metrics-server:system:auth-delegator-ClusterRoleBinding.yaml"
       - "system:metrics-server-ClusterRoleBinding.yaml"
+      - "metrics-server-Service.yaml"
+      - "metrics-server-Deployment.yaml"
+      - "v1beta1.metrics.k8s.io-APIService.yaml"