Merge pull request #9147 from frobware/cluster-autoscaler-for-3.11

Updated openshift-cluster-autoscaler role and playbooks

playbooks/common/private/components.yml

@@ -66,3 +66,6 @@
 
 - import_playbook: ../../openshift-autoheal/private/config.yml
   when: openshift_autoheal_deploy | default(false) | bool
+
+- import_playbook: ../../openshift-cluster-autoscaler/private/config.yml
+  when: openshift_cluster_autoscaler_install | default(false) | bool

playbooks/openshift-cluster-autoscaler/config.yml

@@ -0,0 +1,9 @@
+---
+- import_playbook: ../init/main.yml
+  vars:
+    l_init_fact_hosts: "oo_masters_to_config"
+    l_openshift_version_set_hosts: "oo_masters_to_config:!oo_first_master"
+    l_sanity_check_hosts: "{{ groups['oo_masters_to_config'] }}"
+
+
+- import_playbook: private/config.yml

playbooks/openshift-cluster-autoscaler/private/config.yml

@@ -0,0 +1,31 @@
+---
+- name: Cluster Auto Scaler Install Checkpoint Start
+  hosts: all
+  gather_facts: false
+  tasks:
+  - name: Set Cluster Auto Scaler install 'In Progress'
+    run_once: true
+    set_stats:
+      data:
+        installer_phase_cluster_autoscaler:
+          title: "Cluster Auto Scaler Install"
+          playbook: "playbooks/openshift-cluster-autoscaler/config.yml"
+          status: "In Progress"
+          start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+
+- name: OpenShift Cluster Auto Scaler
+  hosts: oo_first_master
+  roles:
+  - role: openshift_cluster_autoscaler
+
+- name: Cluster Auto Scaler Install Checkpoint End
+  hosts: all
+  gather_facts: false
+  tasks:
+  - name: Set Cluster Auto Scaler install 'Complete'
+    run_once: true
+    set_stats:
+      data:
+        installer_phase_cluster_autoscaler:
+          status: "Complete"
+          end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"

playbooks/openshift-cluster-autoscaler/private/roles

@@ -0,0 +1 @@
+../../../roles

playbooks/openshift-master/private/additional_config.yml

@@ -28,6 +28,8 @@
     when: openshift_project_request_template_manage
   - role: openshift_examples
     when: openshift_install_examples | default(true) | bool
+  - role: openshift_cluster_autoscaler
+    when: openshift_cluster_autoscaler_deploy | default(false) | bool
   - role: openshift_hosted_templates
   - role: openshift_manageiq
     when: openshift_use_manageiq | default(true) | bool

roles/openshift_cluster_autoscaler/defaults/main.yml

@@ -1,25 +1,27 @@
 ---
 openshift_cluster_autoscaler_name: cluster-autoscaler
-openshift_cluster_autoscaler_version: 4
+openshift_cluster_autoscaler_loglevel: 4
 
 openshift_cluster_autoscaler_template_location: /tmp
 openshift_cluster_autoscaler_template_name: "{{ openshift_cluster_autoscaler_name }}"
 
 openshift_cluster_autoscaler_node_selector:
-  type: infra
+  node-role.kubernetes.io/infra: "true"
 
 openshift_cluster_autoscaler_state: present
-openshift_cluster_autoscaler_namespace: openshift-infra
+openshift_cluster_autoscaler_namespace: openshift-autoscaler
 openshift_cluster_autoscaler_delete_config: True
 openshift_cluster_autoscaler_skip_nodes_local_storage: False
 openshift_cluster_autoscaler_serviceaccount: cluster-autoscaler
 openshift_cluster_autoscaler_region: us-east-1
 
-openshift_cluster_autoscaler_image: docker.io/openshift/kubernetes-autoscaler:v0.6.1
+openshift_cluster_autoscaler_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'cluster-autoscaler') }}"
 
 openshift_cluster_autoscaler_cloud_provider: aws
 
 # AWS specific variables here
+openshift_cluster_autoscaler_aws_key: "{{ openshift_cloudprovider_aws_access_key | default('') }}"
+openshift_cluster_autoscaler_aws_secret_key: "{{ openshift_cloudprovider_aws_secret_key | default('') }}"
 openshift_cluster_autoscaler_aws_creds_name: aws-creds
 openshift_cluster_autoscaler_aws_secret_name: autoscaler-credentials
 openshift_cluster_autoscaler_aws_creds_path: "/var/run/secrets/{{ openshift_cluster_autoscaler_aws_creds_name }}/creds"

roles/openshift_cluster_autoscaler/files/clusterrole.yml

@@ -2,12 +2,11 @@
 apiVersion: v1
 kind: ClusterRole
 metadata:
-  name: system:cluster-autoscaler
+  name: cluster-autoscaler
 rules:
 - apiGroups:
   - ""
   resources:
-  - nodes
   - persistentvolumeclaims
   - persistentvolumes
   - pods
@@ -19,6 +18,28 @@ rules:
   - watch
   attributeRestrictions: null
 - apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - get
+  - list
+  - watch
+  - patch
+  - create
+  attributeRestrictions: null
+- apiGroups:
+  - ""
+  resources:
+  - nodes
+  verbs:
+  - get
+  - list
+  - watch
+  - patch
+  - update
+  attributeRestrictions: null
+- apiGroups:
   - extensions
   - apps
   resources:

roles/openshift_cluster_autoscaler/meta/main.yml

@@ -1,4 +1,5 @@
 ---
 dependencies:
-- lib_openshift
+- role: lib_openshift
+- role: openshift_facts
 - role: lib_utils

roles/openshift_cluster_autoscaler/tasks/aws.yml

@@ -1,4 +1,14 @@
 ---
+- name: Check that openshift_cluster_autoscaler_aws_key is set
+  fail:
+    msg: "openshift_cluster_autoscaler_aws_key is not set"
+  when: openshift_cluster_autoscaler_aws_key == ""
+
+- name: Check that openshift_cluster_autoscaler_aws_secret_key is set
+  fail:
+    msg: "openshift_cluster_autoscaler_aws_secret_key is not set"
+  when: openshift_cluster_autoscaler_aws_secret_key == ""
+
 - when: openshift_cluster_autoscaler_cloud_provider == 'aws'
   block:
   - name: laydown the aws-credentials

roles/openshift_cluster_autoscaler/tasks/main.yml

@@ -1,4 +1,10 @@
 ---
+- name: Set cluster autoscaler namespace
+  oc_project:
+    state: present
+    name: "{{ openshift_cluster_autoscaler_namespace }}"
+    node_selector: ""
+
 - name: create the cluster-autoscaler serviceaccount
   oc_serviceaccount:
     name: "{{ openshift_cluster_autoscaler_serviceaccount }}"
@@ -26,7 +32,7 @@
   with_items:
   - fname: clusterrole.yml
     type: clusterrole
-    name: "system:{{ openshift_cluster_autoscaler_name }}"
+    name: "{{ openshift_cluster_autoscaler_name }}"
   - fname: role.yml
     type: role
     name: "{{ openshift_cluster_autoscaler_name }}"
@@ -37,7 +43,7 @@
 - name: create the policies
   oc_adm_policy_user:
     state: "{{ openshift_cluster_autoscaler_state }}"
-    user: "system:serviceaccount:openshift-infra:{{ openshift_cluster_autoscaler_serviceaccount }}"
+    user: "system:serviceaccount:{{ openshift_cluster_autoscaler_namespace }}:{{ openshift_cluster_autoscaler_serviceaccount }}"
     namespace: "{{ openshift_cluster_autoscaler_namespace }}"
     resource_kind: "{{ item.name }}"
     resource_name: cluster-autoscaler

roles/openshift_cluster_autoscaler/templates/cluster-autoscaler.j2

@@ -1,5 +1,5 @@
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -20,8 +20,9 @@ spec:
     spec:
       containers:
       - args:
+        - /bin/cluster-autoscaler
         - --alsologtostderr
-        - --v={{ openshift_cluster_autoscaler_version }}
+        - --v={{ openshift_cluster_autoscaler_loglevel }}
         - --skip-nodes-with-local-storage={{ openshift_cluster_autoscaler_skip_nodes_local_storage }}
         - --leader-elect-resource-lock=configmaps
         - --namespace={{ openshift_cluster_autoscaler_namespace }}
@@ -32,6 +33,15 @@ spec:
 {% for group in openshift_cluster_autoscaler_node_groups %}
         - --nodes={{ group.min }}:{{ group.max }}:{{ group.name }}
 {% endfor %}
+{% if openshift_cluster_autoscaler_scale_down_delay_after_failure is defined %}
+        - --scale-down-delay-after-failure={{ openshift_cluster_autoscaler_scale_down_delay_after_failure }}
+{% endif %}
+{% if openshift_cluster_autoscaler_scale_down_unneeded_timeout is defined %}
+        - --scale-down-unneeded-time={{ openshift_cluster_autoscaler_scale_down_unneeded_timeout }}
+{% endif %}
+{% if openshift_cluster_autoscaler_scale_down_delay_after_add is defined %}
+        - --scale-down-delay-after-add={{ openshift_cluster_autoscaler_scale_down_delay_after_add }}
+{% endif %}
 {% if openshift_cluster_autoscaler_cloud_provider == 'aws' %}
         env: {{ openshift_cluster_autoscaler_aws_env_vars | union(openshift_cluster_autoscaler_env_vars) | to_json }}
 {% else %}