Merge pull request #130 from geerlingguy/128-hpa-revamp

Fixes #128: HPA revamp and fixes for metrics-server 0.3.1 and K8s 1.13

k8s-manifests/kube-system/metrics-server-deployment-arm.yaml → k8s-manifests/kube-system/metrics-server-deployment.yaml

@@ -1,6 +1,6 @@
-# Overridden version of deploy/1.8%2B/metrics-server-deployment.yaml for the
-# metrics-server project for ARM-based computers like the Raspberry Pi. The only
-# line changed is the container image.
+# Overridden version of deploy/1.8+/metrics-server-deployment.yaml from
+# kubernetes-incubator/metrics-server so we can control the container image and
+# command. See: https://github.com/geerlingguy/raspberry-pi-dramble/issues/128
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -26,10 +26,18 @@ spec:
         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
-        image: gcr.io/google_containers/metrics-server-arm:v0.2.1
+        image: {{ metrics_server_image }}
         imagePullPolicy: Always
+        volumeMounts:
+        - name: tmp-dir
+          mountPath: /tmp
         command:
         - /metrics-server
-        - --source=kubernetes.summary_api:''
+        - --kubelet-insecure-tls
+        - --kubelet-preferred-address-types=InternalIP

tasks/k8s-services.yml

@@ -31,14 +31,14 @@
   run_once: True
   delegate_to: "{{ groups.dramble[0] }}"
 
-- name: Overwrite metrics-server deployment manifest for ARM processor.
-  copy:
-    src: k8s-manifests/kube-system/metrics-server-deployment-arm.yaml
+- name: Overwrite metrics-server deployment manifest.
+  template:
+    src: k8s-manifests/kube-system/metrics-server-deployment.yaml
     dest: "~/metrics-server/deploy/1.8+/metrics-server-deployment.yaml"
-  when: deploy_target == 'pi'
   run_once: True
   delegate_to: "{{ groups.dramble[0] }}"
 
+# TODO: This task should do an *apply* if the deployment task above was changed.
 - name: Apply metrics-server services to the cluster.
   command: kubectl create -f ~/metrics-server/deploy/1.8+/
   when: metrics_server_download is changed

tasks/test-setup.yml

@@ -14,14 +14,13 @@
     drupal8_docker_image: geerlingguy/drupal:latest
     mysql_container_image: 'mysql:5.7'
     docker_registry_image: registry:2
-    default_http_backend_image: 'k8s.gcr.io/defaultbackend:1.0'
+    metrics_server_image: k8s.gcr.io/metrics-server-amd64:v0.3.1
   when: deploy_target != 'pi'
 
 - name: Override vars for single-node Docker environment.
   set_fact:
     kubernetes_kubelet_extra_args: '--fail-swap-on=false'
     kubernetes_allow_pods_on_master: True
-    mysql_node_affinity_hostname: kube1
   when: deploy_target == 'docker'
 
 - name: Copy kube-flannel-vagrant.yml file in place.

vars/main.yml

@@ -57,8 +57,9 @@ swap_file_path: /dev/mapper/packer--debian--9--amd64--vg-swap_1
 
 # See: https://github.com/docker-library/mysql/issues/318
 mysql_container_image: hypriot/rpi-mysql:5.5
-default_http_backend_image: gcr.io/google_containers/defaultbackend-arm:1.4
-mysql_node_affinity_hostname: kube5
+
+# Image to use for the metrics-server deployment.
+metrics_server_image: gcr.io/google_containers/metrics-server-arm:v0.3.1
 
 # NFS configuration.
 nfs_share_dir: /srv/nfs