Wolfgang Kulhanek
2020-03-16 99fb030c4b735e2df2b4804db38954a4aa2f002b
Add remove default machineset param (#1343)

* Add support to scale the base machinesets to zero when deploying new machinesets

* Add workaround for DNS DaemonSet as well (now necessary)

* Remove double call

* Remove (non working) DNS workaround

* Fix (non-working) DNS workaround
2 files modified
15 ■■■■ changed files
ansible/roles/ocp4-workload-machinesets/defaults/main.yml 14 ●●●● patch | view | raw | blame | history
ansible/roles/ocp4-workload-machinesets/tasks/workload.yml 1 ●●●● patch | view | raw | blame | history
ansible/roles/ocp4-workload-machinesets/defaults/main.yml
@@ -8,6 +8,13 @@
# e.g. if you need more worker nodes use worker1, worker2, ... or
#      more descriptive names.
ocp4_workload_machinesets_defaults:
  # Scale the default machineset(s) to zero replicas
  # When this is true there has be one machineset group defined with
  # no taints. Use a role other than "worker" to ensure the check for
  # node availability waits for the right nodes to be available.
  disable_default_machinesets: false
  # The Machineset groups to set up
  machineset_groups:
  # Infranodes: Must be named "infra"
  - name: infra
@@ -23,7 +30,7 @@
    - key: infra
      value: reserved
      effect: NoExecute
    instance_type: "m5.2xlarge"
    instance_type: "m5a.2xlarge"
# root_volume_size is only available for AWS it is ignored for OpenStack
#   root_volume_size: "150" 
# instance_type for OpenStack
@@ -47,7 +54,7 @@
#     value: reserved
#     effect: NoExecute
#   instance_type: "4c16g30d"
#   instance_type: "m5.4xlarge"
#   instance_type: "m5a.4xlarge"
# To add another group of worker nodes - with autoscaling enabled add
# the following:
@@ -80,5 +87,6 @@
#   node_labels:
#     node-role.kubernetes.io/ocs: ""
#     cluster.ocs.openshift.io/openshift-storage: ""
#   instance_type: "m5.4xlarge"
#   instance_type: "m5a.4xlarge"
#   instance_type: "12c32g30d"
#   root_volume_size: "2000"
ansible/roles/ocp4-workload-machinesets/tasks/workload.yml
@@ -16,6 +16,7 @@
    name: ocp4_machineset_config
  vars:
    ocp4_machineset_config_groups: "{{ ocp4_workload_machinesets.machineset_groups }}"
    ocp4_machineset_config_disable_base_worker_machinesets: "{{ ocp4_workload_machinesets.disable_default_machinesets }}"
- name: Wait for Nodes to be available
  k8s_facts: