Add Kubernetes hashes 1.18.9/1.17.12 and set default (#6701 )

[2.13] add missing 'Set up proxy environment' tasks (#6591 )
* Add proxy_env calculation to reset.yml (#6558) * * add proxy_env definition to remove_node.yml resolving #6430 (#6431) Co-authored-by: Florian Ruynat <florian234@hotmail.com> Co-authored-by: nniehoff <github@nickniehoff.net>
2025-12-14 22:04:43 +03:00 · 2020-09-18 02:08:45 -07:00 · 2020-09-17 02:46:45 -07:00 · 2020-09-07 01:23:41 -07:00 · 2020-08-04 05:10:19 -07:00 · 2020-08-01 00:29:41 -07:00
674 changed files with 7905 additions and 39499 deletions
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -2,8 +2,15 @@
 parseable: true
 skip_list:
  # see https://docs.ansible.com/ansible-lint/rules/default_rules.html for a list of all default rules
-
-  # DO NOT add any other rules to this skip_list, instead use local `# noqa` with a comment explaining WHY it is necessary
+  # The following rules throw errors.
+  # These either still need to be corrected in the repository and the rules re-enabled or documented why they are skipped on purpose.
+  - '301'
+  - '302'
+  - '303'
+  - '305'
+  - '306'
+  - '404'
+  - '503'

  # These rules are intentionally skipped:
  #
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,15 +0,0 @@
-root = true
-
-[*.{yaml,yml,yml.j2,yaml.j2}]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-insert_final_newline = true
-charset = utf-8
-
-[{Dockerfile}]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-insert_final_newline = true
-charset = utf-8
--- a/.github/ISSUE_TEMPLATE/support.md
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -1,7 +1,7 @@
 ---
 name: Support Request
 about: Support request or question relating to Kubespray
-labels: kind/support
+labels: triage/support

 ---

--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 .vagrant
 *.retry
 **/vagrant_ansible_inventory
-*.iml
 temp
 .idea
 .tox
@@ -15,7 +14,6 @@ contrib/terraform/aws/credentials.tfvars
 **/*.sw[pon]
 *~
 vagrant/
-plugins/mitogen

 # Ansible inventory
 inventory/*
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,14 +8,13 @@ stages:
  - deploy-special

 variables:
-  KUBESPRAY_VERSION: v2.14.1
+  KUBESPRAY_VERSION: v2.12.9
  FAILFASTCI_NAMESPACE: 'kargo-ci'
  GITLAB_REPOSITORY: 'kargo-ci/kubernetes-sigs-kubespray'
  ANSIBLE_FORCE_COLOR: "true"
  MAGIC: "ci check this"
  TEST_ID: "$CI_PIPELINE_ID-$CI_BUILD_ID"
  CI_TEST_VARS: "./tests/files/${CI_JOB_NAME}.yml"
-  CI_TEST_REGISTRY_MIRROR: "./tests/common/_docker_hub_registry_mirror.yml"
  GS_ACCESS_KEY_ID: $GS_KEY
  GS_SECRET_ACCESS_KEY: $GS_SECRET
  CONTAINER_ENGINE: docker
@@ -43,7 +42,6 @@ before_script:
    - packet
  image: quay.io/kubespray/kubespray:$KUBESPRAY_VERSION
  artifacts:
-    when: always
    paths:
      - cluster-dump/

--- a/.gitlab-ci/lint.yml
+++ b/.gitlab-ci/lint.yml
@@ -14,7 +14,7 @@ vagrant-validate:
  stage: unit-tests
  tags: [light]
  variables:
-    VAGRANT_VERSION: 2.2.10
+    VAGRANT_VERSION: 2.2.4
  script:
    - ./tests/scripts/vagrant-validate.sh
  except: ['triggers', 'master']
@@ -64,9 +64,9 @@ markdownlint:
  tags: [light]
  image: node
  before_script:
-    - npm install -g markdownlint-cli@0.22.0
+    - npm install -g markdownlint-cli
  script:
-    - markdownlint $(find . -name '*.md' | grep -vF './.git') --ignore docs/_sidebar.md --ignore contrib/dind/README.md
+    - markdownlint README.md docs --ignore docs/_sidebar.md

 ci-matrix:
  stage: unit-tests
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -1,54 +1,43 @@
 ---
-.packet:
+.packet: &packet
  extends: .testcases
  variables:
-    CI_PLATFORM: packet
-    SSH_USER: kubespray
+    CI_PLATFORM: "packet"
+    SSH_USER: "kubespray"
  tags:
    - packet
-  except: [triggers]
-
-# CI template for PRs
-.packet_pr:
  only: [/^pr-.*$/]
-  extends: .packet
-
-# CI template for periodic CI jobs
-# Enabled when PERIODIC_CI_ENABLED var is set
-.packet_periodic:
-  only:
-    variables:
-      - $PERIODIC_CI_ENABLED
-  allow_failure: true
-  extends: .packet
+  except: ['triggers']

 packet_ubuntu18-calico-aio:
  stage: deploy-part1
-  extends: .packet_pr
+  extends: .packet
  when: on_success

 # Future AIO job
 packet_ubuntu20-calico-aio:
  stage: deploy-part1
-  extends: .packet_pr
-  when: on_success
+  extends: .packet
+  when: manual

 # ### PR JOBS PART2

 packet_centos7-flannel-containerd-addons-ha:
-  extends: .packet_pr
+  extends: .packet
  stage: deploy-part2
  when: on_success
  variables:
    MITOGEN_ENABLE: "true"

-packet_centos8-crio:
-  extends: .packet_pr
+packet_centos7-crio:
+  extends: .packet
  stage: deploy-part2
  when: on_success
+  variables:
+    MITOGEN_ENABLE: "true"

 packet_ubuntu18-crio:
-  extends: .packet_pr
+  extends: .packet
  stage: deploy-part2
  when: manual
  variables:
@@ -56,44 +45,34 @@ packet_ubuntu18-crio:

 packet_ubuntu16-canal-kubeadm-ha:
  stage: deploy-part2
-  extends: .packet_periodic
+  extends: .packet
  when: on_success

 packet_ubuntu16-canal-sep:
  stage: deploy-special
-  extends: .packet_pr
+  extends: .packet
  when: manual

 packet_ubuntu16-flannel-ha:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: manual

 packet_ubuntu16-kube-router-sep:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: manual

-packet_ubuntu16-kube-router-svc-proxy:
-  stage: deploy-part2
-  extends: .packet_pr
-  when: manual
-
-packet_debian10-cilium-svc-proxy:
-  stage: deploy-part2
-  extends: .packet_periodic
-  when: on_success
-
 packet_debian10-containerd:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: on_success
  variables:
    MITOGEN_ENABLE: "true"

 packet_centos7-calico-ha-once-localhost:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: on_success
  variables:
    # This will instruct Docker not to start over TLS.
@@ -103,123 +82,119 @@ packet_centos7-calico-ha-once-localhost:

 packet_centos8-kube-ovn:
  stage: deploy-part2
-  extends: .packet_periodic
+  extends: .packet
  when: on_success

 packet_centos8-calico:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: on_success

-packet_fedora32-weave:
+packet_fedora30-weave:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: on_success

 packet_opensuse-canal:
  stage: deploy-part2
-  extends: .packet_periodic
+  extends: .packet
  when: on_success

-packet_ubuntu18-ovn4nfv:
-  stage: deploy-part2
-  extends: .packet_periodic
-  when: on_success
+# Contiv does not work in k8s v1.16
+# packet_ubuntu16-contiv-sep:
+#   stage: deploy-part2
+#   extends: .packet
+#   when: on_success

 # ### MANUAL JOBS

 packet_ubuntu16-weave-sep:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: manual

 packet_ubuntu18-cilium-sep:
  stage: deploy-special
-  extends: .packet_pr
+  extends: .packet
  when: manual

 packet_ubuntu18-flannel-containerd-ha:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: manual

 packet_ubuntu18-flannel-containerd-ha-once:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: manual

 packet_debian9-macvlan:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: manual

 packet_centos7-calico-ha:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: manual

 packet_centos7-kube-router:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: manual

 packet_centos7-multus-calico:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: manual

 packet_oracle7-canal-ha:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: manual

-packet_fedora33-calico:
+packet_fedora31-flannel:
  stage: deploy-part2
-  extends: .packet_periodic
+  extends: .packet
  when: on_success
  variables:
    MITOGEN_ENABLE: "true"

 packet_amazon-linux-2-aio:
  stage: deploy-part2
-  extends: .packet_pr
+  extends: .packet
  when: manual

-packet_fedora32-kube-ovn-containerd:
-  stage: deploy-part2
-  extends: .packet_periodic
-  when: on_success
-
 # ### PR JOBS PART3
 # Long jobs (45min+)

 packet_centos7-weave-upgrade-ha:
  stage: deploy-part3
-  extends: .packet_periodic
-  when: on_success
+  extends: .packet
+  when: manual
  variables:
    UPGRADE_TEST: basic
    MITOGEN_ENABLE: "false"

 packet_debian9-calico-upgrade:
  stage: deploy-part3
-  extends: .packet_pr
-  when: on_success
+  extends: .packet
+  when: manual
  variables:
    UPGRADE_TEST: graceful
    MITOGEN_ENABLE: "false"

 packet_debian9-calico-upgrade-once:
  stage: deploy-part3
-  extends: .packet_periodic
-  when: on_success
+  extends: .packet
+  when: manual
  variables:
    UPGRADE_TEST: graceful
    MITOGEN_ENABLE: "false"

 packet_ubuntu18-calico-ha-recover:
  stage: deploy-part3
-  extends: .packet_periodic
+  extends: .packet
  when: on_success
  variables:
    RECOVER_CONTROL_PLANE_TEST: "true"
@@ -227,7 +202,7 @@ packet_ubuntu18-calico-ha-recover:

 packet_ubuntu18-calico-ha-recover-noquorum:
  stage: deploy-part3
-  extends: .packet_periodic
+  extends: .packet
  when: on_success
  variables:
    RECOVER_CONTROL_PLANE_TEST: "true"
--- a/.gitlab-ci/shellcheck.yml
+++ b/.gitlab-ci/shellcheck.yml
@@ -4,7 +4,7 @@ shellcheck:
  stage: unit-tests
  tags: [light]
  variables:
-    SHELLCHECK_VERSION: v0.7.1
+    SHELLCHECK_VERSION: v0.6.0
  before_script:
    - ./tests/scripts/rebase.sh
    - curl --silent --location "https://github.com/koalaman/shellcheck/releases/download/"${SHELLCHECK_VERSION}"/shellcheck-"${SHELLCHECK_VERSION}".linux.x86_64.tar.xz" | tar -xJv
@@ -12,5 +12,5 @@ shellcheck:
    - shellcheck --version
  script:
    # Run shellcheck for all *.sh except contrib/
-    - find . -name '*.sh' -not -path './contrib/*' -not -path './.git/*' | xargs shellcheck --severity error
+    - find . -name '*.sh' -not -path './contrib/*' | xargs shellcheck --severity error
  except: ['triggers', 'master']
--- a/.gitlab-ci/terraform.yml
+++ b/.gitlab-ci/terraform.yml
@@ -18,9 +18,6 @@
    - echo "$PACKET_PRIVATE_KEY" | base64 -d > ~/.ssh/id_rsa
    - chmod 400 ~/.ssh/id_rsa
    - echo "$PACKET_PUBLIC_KEY" | base64 -d > ~/.ssh/id_rsa.pub
-    - mkdir -p group_vars
-    # Random subnet to avoid routing conflicts
-    - export TF_VAR_subnet_cidr="10.$(( $RANDOM % 256 )).$(( $RANDOM % 256 )).0/24"

 .terraform_validate:
  extends: .terraform_install
@@ -38,7 +35,6 @@
  when: manual
  only: [/^pr-.*$/]
  artifacts:
-    when: always
    paths:
      - cluster-dump/
  variables:
@@ -56,70 +52,28 @@
 tf-validate-openstack:
  extends: .terraform_validate
  variables:
-    TF_VERSION: 0.12.29
+    TF_VERSION: 0.12.24
    PROVIDER: openstack
    CLUSTER: $CI_COMMIT_REF_NAME

 tf-validate-packet:
  extends: .terraform_validate
  variables:
-    TF_VERSION: 0.12.29
+    TF_VERSION: 0.12.24
    PROVIDER: packet
    CLUSTER: $CI_COMMIT_REF_NAME

 tf-validate-aws:
  extends: .terraform_validate
  variables:
-    TF_VERSION: 0.12.29
-    PROVIDER: aws
-    CLUSTER: $CI_COMMIT_REF_NAME
-
-tf-0.13.x-validate-openstack:
-  extends: .terraform_validate
-  variables:
-    TF_VERSION: 0.13.5
-    PROVIDER: openstack
-    CLUSTER: $CI_COMMIT_REF_NAME
-
-tf-0.13.x-validate-packet:
-  extends: .terraform_validate
-  variables:
-    TF_VERSION: 0.13.5
-    PROVIDER: packet
-    CLUSTER: $CI_COMMIT_REF_NAME
-
-tf-0.13.x-validate-aws:
-  extends: .terraform_validate
-  variables:
-    TF_VERSION: 0.13.5
-    PROVIDER: aws
-    CLUSTER: $CI_COMMIT_REF_NAME
-
-tf-0.14.x-validate-openstack:
-  extends: .terraform_validate
-  variables:
-    TF_VERSION: 0.14.3
-    PROVIDER: openstack
-    CLUSTER: $CI_COMMIT_REF_NAME
-
-tf-0.14.x-validate-packet:
-  extends: .terraform_validate
-  variables:
-    TF_VERSION: 0.14.3
-    PROVIDER: packet
-    CLUSTER: $CI_COMMIT_REF_NAME
-
-tf-0.14.x-validate-aws:
-  extends: .terraform_validate
-  variables:
-    TF_VERSION: 0.14.3
+    TF_VERSION: 0.12.24
    PROVIDER: aws
    CLUSTER: $CI_COMMIT_REF_NAME

 # tf-packet-ubuntu16-default:
 #   extends: .terraform_apply
 #   variables:
-#     TF_VERSION: 0.12.29
+#     TF_VERSION: 0.12.24
 #     PROVIDER: packet
 #     CLUSTER: $CI_COMMIT_REF_NAME
 #     TF_VAR_number_of_k8s_masters: "1"
@@ -133,7 +87,7 @@ tf-0.14.x-validate-aws:
 # tf-packet-ubuntu18-default:
 #   extends: .terraform_apply
 #   variables:
-#     TF_VERSION: 0.12.29
+#     TF_VERSION: 0.12.24
 #     PROVIDER: packet
 #     CLUSTER: $CI_COMMIT_REF_NAME
 #     TF_VAR_number_of_k8s_masters: "1"
@@ -144,116 +98,80 @@ tf-0.14.x-validate-aws:
 #     TF_VAR_public_key_path: ""
 #     TF_VAR_operating_system: ubuntu_18_04

-.ovh_variables: &ovh_variables
-  OS_AUTH_URL: https://auth.cloud.ovh.net/v3
-  OS_PROJECT_ID: 8d3cd5d737d74227ace462dee0b903fe
-  OS_PROJECT_NAME: "9361447987648822"
-  OS_USER_DOMAIN_NAME: Default
-  OS_PROJECT_DOMAIN_ID: default
-  OS_USERNAME: 8XuhBMfkKVrk
-  OS_REGION_NAME: UK1
-  OS_INTERFACE: public
-  OS_IDENTITY_API_VERSION: "3"
+# .ovh_variables: &ovh_variables
+#   OS_AUTH_URL: https://auth.cloud.ovh.net/v3
+#   OS_PROJECT_ID: 8d3cd5d737d74227ace462dee0b903fe
+#   OS_PROJECT_NAME: "9361447987648822"
+#   OS_USER_DOMAIN_NAME: Default
+#   OS_PROJECT_DOMAIN_ID: default
+#   OS_USERNAME: 8XuhBMfkKVrk
+#   OS_REGION_NAME: UK1
+#   OS_INTERFACE: public
+#   OS_IDENTITY_API_VERSION: "3"

-# Elastx is generously donating resources for Kubespray on Openstack CI
-# Contacts: @gix @bl0m1
-.elastx_variables: &elastx_variables
-  OS_AUTH_URL: https://ops.elastx.cloud:5000
-  OS_PROJECT_ID: 564c6b461c6b44b1bb19cdb9c2d928e4
-  OS_PROJECT_NAME: kubespray_ci
-  OS_USER_DOMAIN_NAME: Default
-  OS_PROJECT_DOMAIN_ID: default
-  OS_USERNAME: kubespray@root314.com
-  OS_REGION_NAME: se-sto
-  OS_INTERFACE: public
-  OS_IDENTITY_API_VERSION: "3"
-  TF_VAR_router_id: "ab95917c-41fb-4881-b507-3a6dfe9403df"
-  # Since ELASTX is in Stockholm, Mitogen helps with latency
-  MITOGEN_ENABLE: "false"
-  # Mitogen doesn't support interpreter discovery yet
-  ANSIBLE_PYTHON_INTERPRETER: "/usr/bin/python3"
+# tf-ovh_cleanup:
+#   stage: unit-tests
+#   tags: [light]
+#   image: python
+#   variables:
+#     <<: *ovh_variables
+#   before_script:
+#     - pip install -r scripts/openstack-cleanup/requirements.txt
+#   script:
+#     - ./scripts/openstack-cleanup/main.py

-tf-elastx_cleanup:
-  stage: unit-tests
-  tags: [light]
-  image: python
-  variables:
-    <<: *elastx_variables
-  before_script:
-    - pip install -r scripts/openstack-cleanup/requirements.txt
-  script:
-    - ./scripts/openstack-cleanup/main.py
+# tf-ovh_ubuntu18-calico:
+#   extends: .terraform_apply
+#   when: on_success
+#   variables:
+#     <<: *ovh_variables
+#     TF_VERSION: 0.12.24
+#     PROVIDER: openstack
+#     CLUSTER: $CI_COMMIT_REF_NAME
+#     ANSIBLE_TIMEOUT: "60"
+#     SSH_USER: ubuntu
+#     TF_VAR_number_of_k8s_masters: "0"
+#     TF_VAR_number_of_k8s_masters_no_floating_ip: "1"
+#     TF_VAR_number_of_k8s_masters_no_floating_ip_no_etcd: "0"
+#     TF_VAR_number_of_etcd: "0"
+#     TF_VAR_number_of_k8s_nodes: "0"
+#     TF_VAR_number_of_k8s_nodes_no_floating_ip: "1"
+#     TF_VAR_number_of_gfs_nodes_no_floating_ip: "0"
+#     TF_VAR_number_of_bastions: "0"
+#     TF_VAR_number_of_k8s_masters_no_etcd: "0"
+#     TF_VAR_use_neutron: "0"
+#     TF_VAR_floatingip_pool: "Ext-Net"
+#     TF_VAR_external_net: "6011fbc9-4cbf-46a4-8452-6890a340b60b"
+#     TF_VAR_network_name: "Ext-Net"
+#     TF_VAR_flavor_k8s_master: "defa64c3-bd46-43b4-858a-d93bbae0a229"    # s1-8
+#     TF_VAR_flavor_k8s_node: "defa64c3-bd46-43b4-858a-d93bbae0a229"      # s1-8
+#     TF_VAR_image: "Ubuntu 18.04"
+#     TF_VAR_k8s_allowed_remote_ips: '["0.0.0.0/0"]'

-tf-elastx_ubuntu18-calico:
-  extends: .terraform_apply
-  stage: deploy-part3
-  when: on_success
-  variables:
-    <<: *elastx_variables
-    TF_VERSION: 0.12.29
-    PROVIDER: openstack
-    CLUSTER: $CI_COMMIT_REF_NAME
-    ANSIBLE_TIMEOUT: "60"
-    SSH_USER: ubuntu
-    TF_VAR_number_of_k8s_masters: "1"
-    TF_VAR_number_of_k8s_masters_no_floating_ip: "0"
-    TF_VAR_number_of_k8s_masters_no_floating_ip_no_etcd: "0"
-    TF_VAR_number_of_etcd: "0"
-    TF_VAR_number_of_k8s_nodes: "1"
-    TF_VAR_number_of_k8s_nodes_no_floating_ip: "0"
-    TF_VAR_number_of_gfs_nodes_no_floating_ip: "0"
-    TF_VAR_number_of_bastions: "0"
-    TF_VAR_number_of_k8s_masters_no_etcd: "0"
-    TF_VAR_floatingip_pool: "elx-public1"
-    TF_VAR_dns_nameservers: '["1.1.1.1", "8.8.8.8", "8.8.4.4"]'
-    TF_VAR_use_access_ip: "0"
-    TF_VAR_external_net: "600b8501-78cb-4155-9c9f-23dfcba88828"
-    TF_VAR_network_name: "ci-$CI_JOB_ID"
-    TF_VAR_az_list: '["sto1"]'
-    TF_VAR_az_list_node: '["sto1"]'
-    TF_VAR_flavor_k8s_master: 3f73fc93-ec61-4808-88df-2580d94c1a9b    # v1-standard-2
-    TF_VAR_flavor_k8s_node: 3f73fc93-ec61-4808-88df-2580d94c1a9b      # v1-standard-2
-    TF_VAR_image: ubuntu-18.04-server-latest
-    TF_VAR_k8s_allowed_remote_ips: '["0.0.0.0/0"]'
-
-
-tf-ovh_cleanup:
-  stage: unit-tests
-  tags: [light]
-  image: python
-  environment: ovh
-  variables:
-    <<: *ovh_variables
-  before_script:
-    - pip install -r scripts/openstack-cleanup/requirements.txt
-  script:
-    - ./scripts/openstack-cleanup/main.py
-
-tf-ovh_ubuntu18-calico:
-  extends: .terraform_apply
-  when: on_success
-  environment: ovh
-  variables:
-    <<: *ovh_variables
-    TF_VERSION: 0.12.29
-    PROVIDER: openstack
-    CLUSTER: $CI_COMMIT_REF_NAME
-    ANSIBLE_TIMEOUT: "60"
-    SSH_USER: ubuntu
-    TF_VAR_number_of_k8s_masters: "0"
-    TF_VAR_number_of_k8s_masters_no_floating_ip: "1"
-    TF_VAR_number_of_k8s_masters_no_floating_ip_no_etcd: "0"
-    TF_VAR_number_of_etcd: "0"
-    TF_VAR_number_of_k8s_nodes: "0"
-    TF_VAR_number_of_k8s_nodes_no_floating_ip: "1"
-    TF_VAR_number_of_gfs_nodes_no_floating_ip: "0"
-    TF_VAR_number_of_bastions: "0"
-    TF_VAR_number_of_k8s_masters_no_etcd: "0"
-    TF_VAR_use_neutron: "0"
-    TF_VAR_floatingip_pool: "Ext-Net"
-    TF_VAR_external_net: "6011fbc9-4cbf-46a4-8452-6890a340b60b"
-    TF_VAR_network_name: "Ext-Net"
-    TF_VAR_flavor_k8s_master: "defa64c3-bd46-43b4-858a-d93bbae0a229"    # s1-8
-    TF_VAR_flavor_k8s_node: "defa64c3-bd46-43b4-858a-d93bbae0a229"      # s1-8
-    TF_VAR_image: "Ubuntu 18.04"
-    TF_VAR_k8s_allowed_remote_ips: '["0.0.0.0/0"]'
+# tf-ovh_coreos-calico:
+#   extends: .terraform_apply
+#   when: on_success
+#   variables:
+#     <<: *ovh_variables
+#     TF_VERSION: 0.12.24
+#     PROVIDER: openstack
+#     CLUSTER: $CI_COMMIT_REF_NAME
+#     ANSIBLE_TIMEOUT: "60"
+#     SSH_USER: core
+#     TF_VAR_number_of_k8s_masters: "0"
+#     TF_VAR_number_of_k8s_masters_no_floating_ip: "1"
+#     TF_VAR_number_of_k8s_masters_no_floating_ip_no_etcd: "0"
+#     TF_VAR_number_of_etcd: "0"
+#     TF_VAR_number_of_k8s_nodes: "0"
+#     TF_VAR_number_of_k8s_nodes_no_floating_ip: "1"
+#     TF_VAR_number_of_gfs_nodes_no_floating_ip: "0"
+#     TF_VAR_number_of_bastions: "0"
+#     TF_VAR_number_of_k8s_masters_no_etcd: "0"
+#     TF_VAR_use_neutron: "0"
+#     TF_VAR_floatingip_pool: "Ext-Net"
+#     TF_VAR_external_net: "6011fbc9-4cbf-46a4-8452-6890a340b60b"
+#     TF_VAR_network_name: "Ext-Net"
+#     TF_VAR_flavor_k8s_master: "4d4fd037-9493-4f2b-9afe-b542b5248eac"    # b2-7
+#     TF_VAR_flavor_k8s_node: "4d4fd037-9493-4f2b-9afe-b542b5248eac"      # b2-7
+#     TF_VAR_image: "CoreOS Stable"
+#     TF_VAR_k8s_allowed_remote_ips: '["0.0.0.0/0"]'
--- a/.gitlab-ci/vagrant.yml
+++ b/.gitlab-ci/vagrant.yml
@@ -20,7 +20,7 @@ molecule_tests:
  extends: .testcases
  variables:
    CI_PLATFORM: "vagrant"
-    SSH_USER: "vagrant"
+    SSH_USER: "kubespray"
    VAGRANT_DEFAULT_PROVIDER: "libvirt"
    KUBESPRAY_VAGRANT_CONFIG: tests/files/${CI_JOB_NAME}.rb
  tags: [c3.small.x86]
@@ -34,9 +34,9 @@ molecule_tests:
    - python -m pip install -r tests/requirements.txt
    - ./tests/scripts/vagrant_clean.sh
  script:
-    - ./tests/scripts/testcases_run.sh
+    - vagrant up
  after_script:
-    - chronic ./tests/scripts/testcases_cleanup.sh
+    - vagrant destroy --force

 vagrant_ubuntu18-flannel:
  stage: deploy-part2
@@ -47,8 +47,3 @@ vagrant_ubuntu18-weave-medium:
  stage: deploy-part2
  extends: .vagrant
  when: manual
-
-vagrant_ubuntu20-flannel:
-  stage: deploy-part2
-  extends: .vagrant
-  when: on_success
--- a/.yamllint
+++ b/.yamllint
@@ -1,9 +1,6 @@
 ---
 extends: default

-ignore: |
-  .git/
-
 rules:
  braces:
    min-spaces-inside: 0
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,7 +10,7 @@ To install development dependencies you can use `pip install -r tests/requiremen

 #### Linting

-Kubespray uses `yamllint` and `ansible-lint`. To run them locally use `yamllint .` and `ansible-lint`
+Kubespray uses `yamllint` and `ansible-lint`. To run them locally use `yamllint .` and `./tests/scripts/ansible-lint.sh`

 #### Molecule

--- a/8
+++ b/8
@@ -1,7 +1,4 @@
-# Use imutable image tags rather than mutable tags (like ubuntu:18.04)
-FROM ubuntu:bionic-20200807
-
-ENV KUBE_VERSION=v1.19.9
+FROM ubuntu:18.04

 RUN mkdir /kubespray
 WORKDIR /kubespray
@@ -17,8 +14,7 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
     && apt update -y && apt-get install docker-ce -y
 COPY . .
 RUN /usr/bin/python3 -m pip install pip -U && /usr/bin/python3 -m pip install -r tests/requirements.txt && python3 -m pip install -r requirements.txt && update-alternatives --install /usr/bin/python python /usr/bin/python3 1
-
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$KUBE_VERSION/bin/linux/amd64/kubectl \
+RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.5/bin/linux/amd64/kubectl \
    && chmod a+x kubectl && cp kubectl /usr/local/bin/kubectl

 # Some tools like yamllint need this
--- a/2
+++ b/2
@@ -4,5 +4,3 @@ approvers:
  - kubespray-approvers
 reviewers:
  - kubespray-reviewers
-emeritus_approvers:
-  - kubespray-emeritus_approvers
--- a/13
+++ b/13
@@ -1,18 +1,19 @@
 aliases:
  kubespray-approvers:
+    - ant31
    - mattymo
+    - atoms
    - chadswen
    - mirwan
    - miouge1
+    - riverzhang
+    - verwilst
    - woopstar
    - luckysb
-    - floryut
  kubespray-reviewers:
+    - jjungnickel
+    - archifleks
    - holmsten
    - bozzo
+    - floryut
    - eppo
-    - oomichi
-  kubespray-emeritus_approvers:
-    - riverzhang
-    - atoms
-    - ant31
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 If you have questions, check the documentation at [kubespray.io](https://kubespray.io) and join us on the [kubernetes slack](https://kubernetes.slack.com), channel **\#kubespray**.
 You can get your invite [here](http://slack.k8s.io/)

- Can be deployed on **[AWS](docs/aws.md), GCE, [Azure](docs/azure.md), [OpenStack](docs/openstack.md), [vSphere](docs/vsphere.md), [Packet](docs/packet.md) (bare metal), Oracle Cloud Infrastructure (Experimental), or Baremetal**
+- Can be deployed on **AWS, GCE, Azure, OpenStack, vSphere, Packet (bare metal), Oracle Cloud Infrastructure (Experimental), or Baremetal**
 - **Highly available** cluster
 - **Composable** (Choice of the network plugin for instance)
 - Supports most popular **Linux distributions**
@@ -75,7 +75,6 @@ vagrant up
 - [Requirements](#requirements)
 - [Kubespray vs ...](docs/comparisons.md)
 - [Getting started](docs/getting-started.md)
- [Setting up your first cluster](docs/setting-up-your-first-cluster.md)
 - [Ansible inventory and tags](docs/ansible.md)
 - [Integration with existing ansible repo](docs/integration.md)
 - [Deployment data variables](docs/vars.md)
@@ -83,7 +82,7 @@ vagrant up
 - [HA mode](docs/ha-mode.md)
 - [Network plugins](#network-plugins)
 - [Vagrant install](docs/vagrant.md)
- [Flatcar Container Linux bootstrap](docs/flatcar.md)
+- [CoreOS bootstrap](docs/coreos.md)
 - [Fedora CoreOS bootstrap](docs/fcos.md)
 - [Debian Jessie setup](docs/debian.md)
 - [openSUSE setup](docs/opensuse.md)
@@ -97,57 +96,55 @@ vagrant up
 - [Large deployments](docs/large-deployments.md)
 - [Adding/replacing a node](docs/nodes.md)
 - [Upgrades basics](docs/upgrades.md)
- [Air-Gap installation](docs/offline-environment.md)
 - [Roadmap](docs/roadmap.md)

 ## Supported Linux Distributions

- **Flatcar Container Linux by Kinvolk**
+- **Container Linux by CoreOS**
 - **Debian** Buster, Jessie, Stretch, Wheezy
- **Ubuntu** 16.04, 18.04, 20.04
- **CentOS/RHEL** 7, 8 (experimental: see [centos 8 notes](docs/centos8.md))
- **Fedora** 32, 33
+- **Ubuntu** 16.04, 18.04
+- **CentOS/RHEL** 7, 8 (experimental: see [centos 8 notes](docs/centos8.md)
+- **Fedora** 30, 31
 - **Fedora CoreOS** (experimental: see [fcos Note](docs/fcos.md))
- **openSUSE** Leap 15.x/Tumbleweed
- **Oracle Linux** 7, 8 (experimental: [centos 8 notes](docs/centos8.md) apply)
+- **openSUSE** Leap 42.3/Tumbleweed
+- **Oracle Linux** 7

 Note: Upstart/SysV init based OS types are not supported.

 ## Supported Components

 - Core
-  - [kubernetes](https://github.com/kubernetes/kubernetes) v1.19.9
-  - [etcd](https://github.com/coreos/etcd) v3.4.13
-  - [docker](https://www.docker.com/) v19.03 (see note)
-  - [containerd](https://containerd.io/) v1.3.9
-  - [cri-o](http://cri-o.io/) v1.19 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
+  - [kubernetes](https://github.com/kubernetes/kubernetes) v1.17.12
+  - [etcd](https://github.com/coreos/etcd) v3.3.12
+  - [docker](https://www.docker.com/) v18.06 (see note)
+  - [containerd](https://containerd.io/) v1.2.13
+  - [cri-o](http://cri-o.io/) v1.17 (experimental: see [CRI-O Note](docs/cri-o.md). Only on fedora, ubuntu and centos based OS)
 - Network Plugin
-  - [cni-plugins](https://github.com/containernetworking/plugins) v0.9.0
-  - [calico](https://github.com/projectcalico/calico) v3.16.9
+  - [cni-plugins](https://github.com/containernetworking/plugins) v0.8.6
+  - [calico](https://github.com/projectcalico/calico) v3.13.2
  - [canal](https://github.com/projectcalico/canal) (given calico/flannel versions)
-  - [cilium](https://github.com/cilium/cilium) v1.8.8
-  - [flanneld](https://github.com/coreos/flannel) v0.13.0
-  - [kube-ovn](https://github.com/alauda/kube-ovn) v1.6.1
-  - [kube-router](https://github.com/cloudnativelabs/kube-router) v1.1.1
-  - [multus](https://github.com/intel/multus-cni) v3.7.0
-  - [ovn4nfv](https://github.com/opnfv/ovn4nfv-k8s-plugin) v1.1.0
-  - [weave](https://github.com/weaveworks/weave) v2.7.0
+  - [cilium](https://github.com/cilium/cilium) v1.7.2
+  - [contiv](https://github.com/contiv/install) v1.2.1
+  - [flanneld](https://github.com/coreos/flannel) v0.12.0
+  - [kube-router](https://github.com/cloudnativelabs/kube-router) v0.4.0
+  - [multus](https://github.com/intel/multus-cni) v3.4.1
+  - [weave](https://github.com/weaveworks/weave) v2.6.2
 - Application
-  - [ambassador](https://github.com/datawire/ambassador): v1.5
  - [cephfs-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.0-k8s1.11
  - [rbd-provisioner](https://github.com/kubernetes-incubator/external-storage) v2.1.1-k8s1.11
-  - [cert-manager](https://github.com/jetstack/cert-manager) v0.16.1
-  - [coredns](https://github.com/coredns/coredns) v1.7.0
-  - [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.41.2
+  - [cert-manager](https://github.com/jetstack/cert-manager) v0.11.1
+  - [coredns](https://github.com/coredns/coredns) v1.6.5
+  - [ingress-nginx](https://github.com/kubernetes/ingress-nginx) v0.30.0

-Note: The list of available docker version is 18.09, 19.03 and 20.10. The recommended docker version is 19.03. The kubelet might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. yum versionlock plugin or apt pin).
+Note: The list of validated [docker versions](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.16.md) was updated to 1.13.1, 17.03, 17.06, 17.09, 18.06, 18.09. kubeadm now properly recognizes Docker 18.09.0 and newer, but still treats 18.06 as the default supported version. The kubelet might break on docker's non-standard version numbering (it no longer uses semantic versioning). To ensure auto-updates don't break your cluster look into e.g. yum versionlock plugin or apt pin).

 ## Requirements

- **Minimum required version of Kubernetes is v1.18**
- **Ansible v2.9.x, Jinja 2.11+ and python-netaddr is installed on the machine that will run Ansible commands, Ansible 2.10.x is not supported for now**
- The target servers must have **access to the Internet** in order to pull docker images. Otherwise, additional configuration is required (See [Offline Environment](docs/offline-environment.md))
+- **Minimum required version of Kubernetes is v1.15**
+- **Ansible v2.9+, Jinja 2.11+ and python-netaddr is installed on the machine that will run Ansible commands**
+- The target servers must have **access to the Internet** in order to pull docker images. Otherwise, additional configuration is required (See [Offline Environment](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/downloads.md#offline-environment))
 - The target servers are configured to allow **IPv4 forwarding**.
+- **Your ssh key must be copied** to all the servers part of your inventory.
 - The **firewalls are not managed**, you'll need to implement your own rules the way you used to.
    in order to avoid any issue during deployment you should disable your firewall.
 - If kubespray is ran from non-root user account, correct privilege escalation method
@@ -177,7 +174,8 @@ You can choose between 10 network plugins. (default: `calico`, except Vagrant us

 - [cilium](http://docs.cilium.io/en/latest/): layer 3/4 networking (as well as layer 7 to protect and secure application protocols), supports dynamic insertion of BPF bytecode into the Linux kernel to implement security services, networking and visibility logic.

- [ovn4nfv](docs/ovn4nfv.md): [ovn4nfv-k8s-plugins](https://github.com/opnfv/ovn4nfv-k8s-plugin) is the network controller, OVS agent and CNI server to offer basic SFC and OVN overlay networking.
+- [contiv](docs/contiv.md): supports vlan, vxlan, bgp and Cisco SDN networking. This plugin is able to
+    apply firewall policies, segregate containers in multiple network and bridging pods onto physical networks.

 - [weave](docs/weave.md): Weave is a lightweight container overlay network that doesn't require an external K/V database cluster.
    (Please refer to `weave` [troubleshooting documentation](https://www.weave.works/docs/net/latest/troubleshooting/)).
@@ -197,12 +195,6 @@ The choice is defined with the variable `kube_network_plugin`. There is also an
 option to leverage built-in cloud provider networking instead.
 See also [Network checker](docs/netcheck.md).

-## Ingress Plugins
-
- [ambassador](docs/ambassador.md): the Ambassador Ingress Controller and API gateway.
-
- [nginx](https://kubernetes.github.io/ingress-nginx): the NGINX Ingress Controller.
-
 ## Community docs and resources

 - [kubernetes.io/docs/setup/production-environment/tools/kubespray/](https://kubernetes.io/docs/setup/production-environment/tools/kubespray/)
@@ -217,8 +209,7 @@ See also [Network checker](docs/netcheck.md).

 ## CI Tests

-[![Build graphs](https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/badges/master/pipeline.svg)](https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/pipelines)
-
-CI/end-to-end tests sponsored by: [CNCF](https://cncf.io), [Packet](https://www.packet.com/), [OVHcloud](https://www.ovhcloud.com/), [ELASTX](https://elastx.se/).
+[![Build graphs](https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/badges/master/build.svg)](https://gitlab.com/kargo-ci/kubernetes-sigs-kubespray/pipelines)

+CI/end-to-end tests sponsored by Google (GCE)
 See the [test matrix](docs/test_cases.md) for details.
--- a/45
+++ b/45
@@ -9,31 +9,32 @@ Vagrant.require_version ">= 2.0.0"

 CONFIG = File.join(File.dirname(__FILE__), ENV['KUBESPRAY_VAGRANT_CONFIG'] || 'vagrant/config.rb')

+COREOS_URL_TEMPLATE = "https://storage.googleapis.com/%s.release.core-os.net/amd64-usr/current/coreos_production_vagrant.json"
 FLATCAR_URL_TEMPLATE = "https://%s.release.flatcar-linux.net/amd64-usr/current/flatcar_production_vagrant.json"

 # Uniq disk UUID for libvirt
 DISK_UUID = Time.now.utc.to_i

 SUPPORTED_OS = {
+  "coreos-stable"       => {box: "coreos-stable",              user: "core", box_url: COREOS_URL_TEMPLATE % ["stable"]},
+  "coreos-alpha"        => {box: "coreos-alpha",               user: "core", box_url: COREOS_URL_TEMPLATE % ["alpha"]},
+  "coreos-beta"         => {box: "coreos-beta",                user: "core", box_url: COREOS_URL_TEMPLATE % ["beta"]},
  "flatcar-stable"      => {box: "flatcar-stable",             user: "core", box_url: FLATCAR_URL_TEMPLATE % ["stable"]},
  "flatcar-beta"        => {box: "flatcar-beta",               user: "core", box_url: FLATCAR_URL_TEMPLATE % ["beta"]},
  "flatcar-alpha"       => {box: "flatcar-alpha",              user: "core", box_url: FLATCAR_URL_TEMPLATE % ["alpha"]},
  "flatcar-edge"        => {box: "flatcar-edge",               user: "core", box_url: FLATCAR_URL_TEMPLATE % ["edge"]},
  "ubuntu1604"          => {box: "generic/ubuntu1604",         user: "vagrant"},
  "ubuntu1804"          => {box: "generic/ubuntu1804",         user: "vagrant"},
-  "ubuntu2004"          => {box: "generic/ubuntu2004",         user: "vagrant"},
+  "ubuntu2004"          => {box: "geerlingguy/ubuntu2004",     user: "vagrant"},
  "centos"              => {box: "centos/7",                   user: "vagrant"},
  "centos-bento"        => {box: "bento/centos-7.6",           user: "vagrant"},
  "centos8"             => {box: "centos/8",                   user: "vagrant"},
  "centos8-bento"       => {box: "bento/centos-8",             user: "vagrant"},
-  "fedora32"            => {box: "fedora/32-cloud-base",       user: "vagrant"},
-  "fedora33"            => {box: "fedora/33-cloud-base",       user: "vagrant"},
-  "opensuse"            => {box: "bento/opensuse-leap-15.2",   user: "vagrant"},
+  "fedora30"            => {box: "fedora/30-cloud-base",       user: "vagrant"},
+  "fedora31"            => {box: "fedora/31-cloud-base",       user: "vagrant"},
+  "opensuse"            => {box: "bento/opensuse-leap-15.1",   user: "vagrant"},
  "opensuse-tumbleweed" => {box: "opensuse/Tumbleweed.x86_64", user: "vagrant"},
  "oraclelinux"         => {box: "generic/oracle7",            user: "vagrant"},
-  "oraclelinux8"        => {box: "generic/oracle8",            user: "vagrant"},
-  "rhel7"               => {box: "generic/rhel7",              user: "vagrant"},
-  "rhel8"               => {box: "generic/rhel8",              user: "vagrant"},
 }

 if File.exist?(CONFIG)
@@ -45,7 +46,7 @@ $num_instances ||= 3
 $instance_name_prefix ||= "k8s"
 $vm_gui ||= false
 $vm_memory ||= 2048
-$vm_cpus ||= 2
+$vm_cpus ||= 1
 $shared_folders ||= {}
 $forwarded_ports ||= {}
 $subnet ||= "172.18.8"
@@ -53,8 +54,6 @@ $os ||= "ubuntu1804"
 $network_plugin ||= "flannel"
 # Setting multi_networking to true will install Multus: https://github.com/intel/multus-cni
 $multi_networking ||= false
-$download_run_once ||= "True"
-$download_force_cache ||= "True"
 # The first three nodes are etcd servers
 $etcd_instances ||= $num_instances
 # The first two nodes are kube masters
@@ -69,9 +68,8 @@ $override_disk_size ||= false
 $disk_size ||= "20GB"
 $local_path_provisioner_enabled ||= false
 $local_path_provisioner_claim_root ||= "/opt/local-path-provisioner/"
-$libvirt_nested ||= false

-$playbook ||= "cluster.yml"
+$playbook = "cluster.yml"

 host_vars = {}

@@ -144,12 +142,9 @@ Vagrant.configure("2") do |config|
        vb.gui = $vm_gui
        vb.linked_clone = true
        vb.customize ["modifyvm", :id, "--vram", "8"] # ubuntu defaults to 256 MB which is a waste of precious RAM
-        vb.customize ["modifyvm", :id, "--audio", "none"]
      end

      node.vm.provider :libvirt do |lv|
-        lv.nested = $libvirt_nested
-        lv.cpu_mode = "host-model"
        lv.memory = $vm_memory
        lv.cpus = $vm_cpus
        lv.default_prefix = 'kubespray'
@@ -179,19 +174,10 @@ Vagrant.configure("2") do |config|
        node.vm.network "forwarded_port", guest: guest, host: host, auto_correct: true
      end

-      if ["rhel7","rhel8"].include? $os
-        # Vagrant synced_folder rsync options cannot be used for RHEL boxes as Rsync package cannot
-        # be installed until the host is registered with a valid Red Hat support subscription
-        node.vm.synced_folder ".", "/vagrant", disabled: false
-        $shared_folders.each do |src, dst|
-          node.vm.synced_folder src, dst
-        end
-      else
      node.vm.synced_folder ".", "/vagrant", disabled: false, type: "rsync", rsync__args: ['--verbose', '--archive', '--delete', '-z'] , rsync__exclude: ['.git','venv']
      $shared_folders.each do |src, dst|
        node.vm.synced_folder src, dst, type: "rsync", rsync__args: ['--verbose', '--archive', '--delete', '-z']
      end
-      end

      ip = "#{$subnet}.#{i+100}"
      node.vm.network :private_network, ip: ip
@@ -199,24 +185,19 @@ Vagrant.configure("2") do |config|
      # Disable swap for each vm
      node.vm.provision "shell", inline: "swapoff -a"

-      # Disable firewalld on oraclelinux/redhat vms
-      if ["oraclelinux","oraclelinux8","rhel7","rhel8"].include? $os
-        node.vm.provision "shell", inline: "systemctl stop firewalld; systemctl disable firewalld"
-      end
-
      host_vars[vm_name] = {
        "ip": ip,
        "flannel_interface": "eth1",
        "kube_network_plugin": $network_plugin,
        "kube_network_plugin_multus": $multi_networking,
-        "download_run_once": $download_run_once,
+        "download_run_once": "True",
        "download_localhost": "False",
        "download_cache_dir": ENV['HOME'] + "/kubespray_cache",
        # Make kubespray cache even when download_run_once is false
-        "download_force_cache": $download_force_cache,
+        "download_force_cache": "True",
        # Keeping the cache on the nodes can improve provisioning speed while debugging kubespray
        "download_keep_remote_cache": "False",
-        "docker_rpm_keepcache": "1",
+        "docker_keepcache": "1",
        # These two settings will put kubectl and admin.config in $inventory/artifacts
        "kubeconfig_localhost": "True",
        "kubectl_localhost": "True",
--- a/ansible_version.yml
+++ b/ansible_version.yml
@@ -3,15 +3,13 @@
  gather_facts: false
  become: no
  vars:
-    minimal_ansible_version: 2.9.0
-    maximal_ansible_version: 2.10.0
+    minimal_ansible_version: 2.8.0
    ansible_connection: local
  tasks:
-    - name: "Check {{ minimal_ansible_version }} <= Ansible version < {{ maximal_ansible_version }}"
+    - name: "Check ansible version >={{ minimal_ansible_version }}"
      assert:
-        msg: "Ansible must be between {{ minimal_ansible_version }} and {{ maximal_ansible_version }}"
+        msg: "Ansible must be {{ minimal_ansible_version }} or higher"
        that:
          - ansible_version.string is version(minimal_ansible_version, ">=")
-          - ansible_version.string is version(maximal_ansible_version, "<")
      tags:
        - check
--- a/cluster.yml
+++ b/cluster.yml
@@ -2,9 +2,22 @@
 - name: Check ansible version
  import_playbook: ansible_version.yml

+- hosts: all
+  gather_facts: false
+  tasks:
+    - name: "Set up proxy environment"
+      set_fact:
+        proxy_env:
+          http_proxy: "{{ http_proxy | default ('') }}"
+          HTTP_PROXY: "{{ http_proxy | default ('') }}"
+          https_proxy: "{{ https_proxy | default ('') }}"
+          HTTPS_PROXY: "{{ https_proxy | default ('') }}"
+          no_proxy: "{{ no_proxy | default ('') }}"
+          NO_PROXY: "{{ no_proxy | default ('') }}"
+      no_log: true
+
 - hosts: bastion[0]
  gather_facts: False
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - { role: bastion-ssh-config, tags: ["localhost", "bastion"] }
@@ -13,29 +26,26 @@
  strategy: linear
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
  gather_facts: false
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - { role: bootstrap-os, tags: bootstrap-os}

 - name: Gather facts
-  tags: always
  import_playbook: facts.yml

 - hosts: k8s-cluster:etcd
  gather_facts: False
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - { role: kubernetes/preinstall, tags: preinstall }
    - { role: "container-engine", tags: "container-engine", when: deploy_container_engine|default(true) }
    - { role: download, tags: download, when: "not skip_downloads" }
+  environment: "{{ proxy_env }}"

 - hosts: etcd
  gather_facts: False
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - role: etcd
@@ -48,7 +58,6 @@
 - hosts: k8s-cluster
  gather_facts: False
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - role: etcd
@@ -61,15 +70,14 @@
 - hosts: k8s-cluster
  gather_facts: False
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - { role: kubernetes/node, tags: node }
+  environment: "{{ proxy_env }}"

 - hosts: kube-master
  gather_facts: False
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - { role: kubernetes/master, tags: master }
@@ -79,7 +87,6 @@
 - hosts: k8s-cluster
  gather_facts: False
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - { role: kubernetes/kubeadm, tags: kubeadm}
@@ -89,7 +96,6 @@
 - hosts: calico-rr
  gather_facts: False
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - { role: network_plugin/calico/rr, tags: ['network', 'calico_rr'] }
@@ -97,15 +103,14 @@
 - hosts: kube-master[0]
  gather_facts: False
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
+    - { role: kubernetes-apps/rotate_tokens, tags: rotate_tokens, when: "secret_changed|default(false)" }
    - { role: win_nodes/kubernetes_patch, tags: ["master", "win_nodes"] }

 - hosts: kube-master
  gather_facts: False
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - { role: kubernetes-apps/external_cloud_controller, tags: external-cloud-controller }
@@ -117,15 +122,14 @@
 - hosts: kube-master
  gather_facts: False
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - { role: kubernetes-apps, tags: apps }
+  environment: "{{ proxy_env }}"

 - hosts: k8s-cluster
  gather_facts: False
  any_errors_fatal: "{{ any_errors_fatal | default(true) }}"
-  environment: "{{ proxy_disable_env }}"
  roles:
    - { role: kubespray-defaults }
    - { role: kubernetes/preinstall, when: "dns_mode != 'none' and resolvconf_mode == 'host_resolvconf'", tags: resolvconf, dns_late: true }
--- a/contrib/aws_inventory/requirements.txt
+++ b/contrib/aws_inventory/requirements.txt
@@ -1 +0,0 @@
-boto3  # Apache-2.0
--- a/contrib/azurerm/README.md
+++ b/contrib/azurerm/README.md
@@ -31,7 +31,7 @@ also removes all public IPs from all other VMs.
 To generate and apply the templates, call:

 ```shell
-./apply-rg.sh <resource_group_name>
+$ ./apply-rg.sh <resource_group_name>
 ```

 If you change something in the configuration (e.g. number of nodes) later, you can call this again and Azure will
@@ -42,23 +42,24 @@ take care about creating/modifying whatever is needed.
 If you need to delete all resources from a resource group, simply call:

 ```shell
-./clear-rg.sh <resource_group_name>
+$ ./clear-rg.sh <resource_group_name>
 ```

 **WARNING** this really deletes everything from your resource group, including everything that was later created by you!

+
 ## Generating an inventory for kubespray

 After you have applied the templates, you can generate an inventory with this call:

 ```shell
-./generate-inventory.sh <resource_group_name>
+$ ./generate-inventory.sh <resource_group_name>
 ```

 It will create the file ./inventory which can then be used with kubespray, e.g.:

 ```shell
-cd kubespray-root-dir
-sudo pip3 install -r requirements.txt
-ansible-playbook -i contrib/azurerm/inventory -u devops --become -e "@inventory/sample/group_vars/all/all.yml" cluster.yml
+$ cd kubespray-root-dir
+$ ansible-playbook -i contrib/azurerm/inventory -u devops --become -e "@inventory/sample/group_vars/all/all.yml" cluster.yml
 ```
+
--- a/contrib/azurerm/apply-rg.sh
+++ b/contrib/azurerm/apply-rg.sh
@@ -9,11 +9,18 @@ if [ "$AZURE_RESOURCE_GROUP" == "" ]; then
    exit 1
 fi

+if az &>/dev/null; then
+    echo "azure cli 2.0 found, using it instead of 1.0"
+    ./apply-rg_2.sh "$AZURE_RESOURCE_GROUP"
+elif azure &>/dev/null; then 
    ansible-playbook generate-templates.yml
    
-az deployment group create --template-file ./.generated/network.json -g $AZURE_RESOURCE_GROUP
-az deployment group create --template-file ./.generated/storage.json -g $AZURE_RESOURCE_GROUP
-az deployment group create --template-file ./.generated/availability-sets.json -g $AZURE_RESOURCE_GROUP
-az deployment group create --template-file ./.generated/bastion.json -g $AZURE_RESOURCE_GROUP
-az deployment group create --template-file ./.generated/masters.json -g $AZURE_RESOURCE_GROUP
-az deployment group create --template-file ./.generated/minions.json -g $AZURE_RESOURCE_GROUP
+    azure group deployment create -f ./.generated/network.json -g $AZURE_RESOURCE_GROUP
+    azure group deployment create -f ./.generated/storage.json -g $AZURE_RESOURCE_GROUP
+    azure group deployment create -f ./.generated/availability-sets.json -g $AZURE_RESOURCE_GROUP
+    azure group deployment create -f ./.generated/bastion.json -g $AZURE_RESOURCE_GROUP
+    azure group deployment create -f ./.generated/masters.json -g $AZURE_RESOURCE_GROUP
+    azure group deployment create -f ./.generated/minions.json -g $AZURE_RESOURCE_GROUP
+else 
+    echo "Azure cli not found"
+fi
--- a/contrib/azurerm/apply-rg_2.sh
+++ b/contrib/azurerm/apply-rg_2.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -e
+
+AZURE_RESOURCE_GROUP="$1"
+
+if [ "$AZURE_RESOURCE_GROUP" == "" ]; then
+    echo "AZURE_RESOURCE_GROUP is missing"
+    exit 1
+fi
+
+ansible-playbook generate-templates.yml
+
+az deployment group create --template-file ./.generated/network.json -g $AZURE_RESOURCE_GROUP
+az deployment group create --template-file ./.generated/storage.json -g $AZURE_RESOURCE_GROUP
+az deployment group create --template-file ./.generated/availability-sets.json -g $AZURE_RESOURCE_GROUP
+az deployment group create --template-file ./.generated/bastion.json -g $AZURE_RESOURCE_GROUP
+az deployment group create --template-file ./.generated/masters.json -g $AZURE_RESOURCE_GROUP
+az deployment group create --template-file ./.generated/minions.json -g $AZURE_RESOURCE_GROUP
--- a/contrib/azurerm/clear-rg.sh
+++ b/contrib/azurerm/clear-rg.sh
@@ -9,6 +9,10 @@ if [ "$AZURE_RESOURCE_GROUP" == "" ]; then
    exit 1
 fi

+if az &>/dev/null; then
+    echo "azure cli 2.0 found, using it instead of 1.0"
+    ./clear-rg_2.sh "$AZURE_RESOURCE_GROUP"
+else
    ansible-playbook generate-templates.yml
-
-az group deployment create -g "$AZURE_RESOURCE_GROUP" --template-file ./.generated/clear-rg.json --mode Complete
+    azure group deployment create -g "$AZURE_RESOURCE_GROUP" -f ./.generated/clear-rg.json -m Complete
+fi
--- a/contrib/azurerm/clear-rg_2.sh
+++ b/contrib/azurerm/clear-rg_2.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -e
+
+AZURE_RESOURCE_GROUP="$1"
+
+if [ "$AZURE_RESOURCE_GROUP" == "" ]; then
+    echo "AZURE_RESOURCE_GROUP is missing"
+    exit 1
+fi
+
+ansible-playbook generate-templates.yml
+
+az group deployment create -g "$AZURE_RESOURCE_GROUP" --template-file ./.generated/clear-rg.json --mode Complete
--- a/contrib/azurerm/roles/generate-inventory/tasks/main.yml
+++ b/contrib/azurerm/roles/generate-inventory/tasks/main.yml
@@ -1,6 +1,6 @@
 ---

- name: Query Azure VMs  # noqa 301
+- name: Query Azure VMs
  command: azure vm list-ip-address --json {{ azure_resource_group }}
  register: vm_list_cmd

--- a/contrib/azurerm/roles/generate-inventory_2/tasks/main.yml
+++ b/contrib/azurerm/roles/generate-inventory_2/tasks/main.yml
@@ -1,14 +1,14 @@
 ---

- name: Query Azure VMs IPs  # noqa 301
+- name: Query Azure VMs IPs
  command: az vm list-ip-addresses -o json --resource-group {{ azure_resource_group }}
  register: vm_ip_list_cmd

- name: Query Azure VMs Roles  # noqa 301
+- name: Query Azure VMs Roles
  command: az vm list -o json --resource-group {{ azure_resource_group }}
  register: vm_list_cmd

- name: Query Azure Load Balancer Public IP  # noqa 301
+- name: Query Azure Load Balancer Public IP
  command: az network public-ip show -o json -g {{ azure_resource_group }} -n kubernetes-api-pubip
  register: lb_pubip_cmd

--- a/contrib/dind/README.md
+++ b/contrib/dind/README.md
@@ -6,7 +6,6 @@ to serve as Kubernetes "nodes", which in turn will run
 called DIND (Docker-IN-Docker).

 The playbook has two roles:
-
 - dind-host: creates the "nodes" as containers in localhost, with
  appropriate settings for DIND (privileged, volume mapping for dind
  storage, etc).
@@ -28,7 +27,7 @@ See below for a complete successful run:

 1. Create the node containers

-```shell
+~~~~
 # From the kubespray root dir
 cd contrib/dind
 pip install -r requirements.txt
@@ -37,15 +36,15 @@ ansible-playbook -i hosts dind-cluster.yaml

 # Back to kubespray root
 cd ../..
-```
+~~~~

 NOTE: if the playbook run fails with something like below error
 message, you may need to specifically set `ansible_python_interpreter`,
 see `./hosts` file for an example expanded localhost entry.

-```shell
+~~~
 failed: [localhost] (item=kube-node1) => {"changed": false, "item": "kube-node1", "msg": "Failed to import docker or docker-py - No module named requests.exceptions. Try `pip install docker` or `pip install docker-py` (Python 2.6)"}
-```
+~~~

 2. Customize kubespray-dind.yaml

@@ -53,33 +52,33 @@ Note that there's coupling between above created node containers
 and `kubespray-dind.yaml` settings, in particular regarding selected `node_distro`
 (as set in `group_vars/all/all.yaml`), and docker settings.

-```shell
+~~~
 $EDITOR contrib/dind/kubespray-dind.yaml
-```
+~~~

 3. Prepare the inventory and run the playbook

-```shell
+~~~
 INVENTORY_DIR=inventory/local-dind
 mkdir -p ${INVENTORY_DIR}
 rm -f ${INVENTORY_DIR}/hosts.ini
 CONFIG_FILE=${INVENTORY_DIR}/hosts.ini /tmp/kubespray.dind.inventory_builder.sh

 ansible-playbook --become -e ansible_ssh_user=debian -i ${INVENTORY_DIR}/hosts.ini cluster.yml --extra-vars @contrib/dind/kubespray-dind.yaml
-```
+~~~

 NOTE: You could also test other distros without editing files by
 passing `--extra-vars` as per below commandline,
 replacing `DISTRO` by either `debian`, `ubuntu`, `centos`, `fedora`:

-```shell
+~~~
 cd contrib/dind
 ansible-playbook -i hosts dind-cluster.yaml --extra-vars node_distro=DISTRO

 cd ../..
 CONFIG_FILE=inventory/local-dind/hosts.ini /tmp/kubespray.dind.inventory_builder.sh
 ansible-playbook --become -e ansible_ssh_user=DISTRO -i inventory/local-dind/hosts.ini cluster.yml --extra-vars @contrib/dind/kubespray-dind.yaml --extra-vars bootstrap_os=DISTRO
-```
+~~~

 ## Resulting deployment

@@ -90,7 +89,7 @@ from the host where you ran kubespray playbooks.

 Running from an Ubuntu Xenial host:

-```shell
+~~~
 $ uname -a
 Linux ip-xx-xx-xx-xx 4.4.0-1069-aws #79-Ubuntu SMP Mon Sep 24
 15:01:41 UTC 2018 x86_64 x86_64 x86_64 GNU/Linux
@@ -150,14 +149,14 @@ kube-system   weave-net-xr46t                         2/2     Running   0

 $ docker exec kube-node1 curl -s http://localhost:31081/api/v1/connectivity_check
 {"Message":"All 10 pods successfully reported back to the server","Absent":null,"Outdated":null}
-```
+~~~

 ## Using ./run-test-distros.sh

 You can use `./run-test-distros.sh` to run a set of tests via DIND,
 and excerpt from this script, to get an idea:

-```shell
+~~~
 # The SPEC file(s) must have two arrays as e.g.
 # DISTROS=(debian centos)
 # EXTRAS=(
@@ -170,7 +169,7 @@ and excerpt from this script, to get an idea:
 #
 # Each $EXTRAS element will be whitespace split, and passed as --extra-vars
 # to main kubespray ansible-playbook run.
-```
+~~~

 See e.g. `test-some_distros-most_CNIs.env` and
 `test-some_distros-kube_router_combo.env` in particular for a richer
--- a/contrib/dind/roles/dind-host/tasks/main.yaml
+++ b/contrib/dind/roles/dind-host/tasks/main.yaml
@@ -69,7 +69,7 @@

 # Running systemd-machine-id-setup doesn't create a unique id for each node container on Debian,
 # handle manually
- name: Re-create unique machine-id (as we may just get what comes in the docker image), needed by some CNIs for mac address seeding (notably weave)  # noqa 301
+- name: Re-create unique machine-id (as we may just get what comes in the docker image), needed by some CNIs for mac address seeding (notably weave)
  raw: |
    echo {{ item | hash('sha1') }} > /etc/machine-id.new
    mv -b /etc/machine-id.new /etc/machine-id
--- a/contrib/inventory_builder/inventory.py
+++ b/contrib/inventory_builder/inventory.py
@@ -41,7 +41,6 @@ from ruamel.yaml import YAML

 import os
 import re
-import subprocess
 import sys

 ROLES = ['all', 'kube-master', 'kube-node', 'etcd', 'k8s-cluster',
@@ -63,14 +62,13 @@ def get_var_as_bool(name, default):


 CONFIG_FILE = os.environ.get("CONFIG_FILE", "./inventory/sample/hosts.yaml")
-KUBE_MASTERS = int(os.environ.get("KUBE_MASTERS", 2))
+KUBE_MASTERS = int(os.environ.get("KUBE_MASTERS_MASTERS", 2))
 # Reconfigures cluster distribution at scale
 SCALE_THRESHOLD = int(os.environ.get("SCALE_THRESHOLD", 50))
-MASSIVE_SCALE_THRESHOLD = int(os.environ.get("MASSIVE_SCALE_THRESHOLD", 200))
+MASSIVE_SCALE_THRESHOLD = int(os.environ.get("SCALE_THRESHOLD", 200))

 DEBUG = get_var_as_bool("DEBUG", True)
 HOST_PREFIX = os.environ.get("HOST_PREFIX", "node")
-USE_REAL_HOSTNAME = get_var_as_bool("USE_REAL_HOSTNAME", False)

 # Configurable as shell vars end

@@ -169,7 +167,6 @@ class KubesprayInventory(object):

        # FIXME(mattymo): Fix condition where delete then add reuses highest id
        next_host_id = highest_host_id + 1
-        next_host = ""

        all_hosts = existing_hosts.copy()
        for host in changed_hosts:
@@ -194,12 +191,6 @@ class KubesprayInventory(object):
                    self.debug("Skipping existing host {0}.".format(ip))
                    continue

-                if USE_REAL_HOSTNAME:
-                    cmd = ("ssh -oStrictHostKeyChecking=no "
-                           + access_ip + " 'hostname -s'")
-                    next_host = subprocess.check_output(cmd, shell=True)
-                    next_host = next_host.strip().decode('ascii')
-                else:
                next_host = "{0}{1}".format(HOST_PREFIX, next_host_id)
                next_host_id += 1
                all_hosts[next_host] = {'ansible_host': access_ip,
@@ -238,7 +229,7 @@ class KubesprayInventory(object):
            return [ip_address(ip).exploded for ip in range(start, end + 1)]

        for host in hosts:
-            if '-' in host and not (host.startswith('-') or host[0].isalpha()):
+            if '-' in host and not host.startswith('-'):
                start, end = host.strip().split('-')
                try:
                    reworked_hosts.extend(ips(start, end))
@@ -402,7 +393,6 @@ Configurable env vars:
 DEBUG                   Enable debug printing. Default: True
 CONFIG_FILE             File to write config to Default: ./inventory/sample/hosts.yaml
 HOST_PREFIX             Host prefix for generated hosts. Default: node
-KUBE_MASTERS            Set the number of kube-masters. Default: 2
 SCALE_THRESHOLD         Separate ETCD role if # of nodes >= 50
 MASSIVE_SCALE_THRESHOLD Separate K8s master and ETCD if # of nodes >= 200
 '''  # noqa
--- a/contrib/inventory_builder/tests/test_inventory.py
+++ b/contrib/inventory_builder/tests/test_inventory.py
@@ -51,7 +51,7 @@ class TestInventory(unittest.TestCase):
        groups = ['group1', 'group2']
        self.inv.ensure_required_groups(groups)
        for group in groups:
-            self.assertIn(group, self.inv.yaml_config['all']['children'])
+            self.assertTrue(group in self.inv.yaml_config['all']['children'])

    def test_get_host_id(self):
        hostnames = ['node99', 'no99de01', '01node01', 'node1.domain',
@@ -209,8 +209,8 @@ class TestInventory(unittest.TestCase):
            ('doesnotbelong2', {'whateveropts=ilike'})])
        self.inv.yaml_config['all']['hosts'] = existing_hosts
        self.inv.purge_invalid_hosts(proper_hostnames)
-        self.assertNotIn(
-            bad_host, self.inv.yaml_config['all']['hosts'].keys())
+        self.assertTrue(
+            bad_host not in self.inv.yaml_config['all']['hosts'].keys())

    def test_add_host_to_group(self):
        group = 'etcd'
@@ -227,8 +227,8 @@ class TestInventory(unittest.TestCase):
        host = 'node1'

        self.inv.set_kube_master([host])
-        self.assertIn(
-            host, self.inv.yaml_config['all']['children'][group]['hosts'])
+        self.assertTrue(
+            host in self.inv.yaml_config['all']['children'][group]['hosts'])

    def test_set_all(self):
        hosts = OrderedDict([
@@ -246,8 +246,8 @@ class TestInventory(unittest.TestCase):

        self.inv.set_k8s_cluster()
        for host in expected_hosts:
-            self.assertIn(
-                host,
+            self.assertTrue(
+                host in
                self.inv.yaml_config['all']['children'][group]['children'])

    def test_set_kube_node(self):
@@ -255,16 +255,16 @@ class TestInventory(unittest.TestCase):
        host = 'node1'

        self.inv.set_kube_node([host])
-        self.assertIn(
-            host, self.inv.yaml_config['all']['children'][group]['hosts'])
+        self.assertTrue(
+            host in self.inv.yaml_config['all']['children'][group]['hosts'])

    def test_set_etcd(self):
        group = 'etcd'
        host = 'node1'

        self.inv.set_etcd([host])
-        self.assertIn(
-            host, self.inv.yaml_config['all']['children'][group]['hosts'])
+        self.assertTrue(
+            host in self.inv.yaml_config['all']['children'][group]['hosts'])

    def test_scale_scenario_one(self):
        num_nodes = 50
--- a/contrib/kvm-setup/README.md
+++ b/contrib/kvm-setup/README.md
@@ -5,7 +5,7 @@ deployment on VMs.

 This playbook does not create Virtual Machines, nor does it run Kubespray itself.

-## User creation
+### User creation

 If you want to create a user for running Kubespray deployment, you should specify
 both `k8s_deployment_user` and `k8s_deployment_user_pkey_path`.
--- a/contrib/metallb/README.md
+++ b/contrib/metallb/README.md
@@ -0,0 +1,12 @@
+# Deploy MetalLB into Kubespray/Kubernetes
+```
+MetalLB hooks into your Kubernetes cluster, and provides a network load-balancer implementation. In short, it allows you to create Kubernetes services of type “LoadBalancer” in clusters that don’t run on a cloud provider, and thus cannot simply hook into paid products to provide load-balancers.
+```
+This playbook aims to automate [this](https://metallb.universe.tf/concepts/layer2/). It deploys MetalLB into kubernetes and sets up a layer 2 loadbalancer.
+
+## Install
+```
+Defaults can be found in contrib/metallb/roles/provision/defaults/main.yml. You can override the defaults by copying the contents of this file to somewhere in inventory/mycluster/group_vars such as inventory/mycluster/groups_vars/k8s-cluster/addons.yml and making any adjustments as required.
+
+ansible-playbook --ask-become -i inventory/sample/hosts.ini contrib/metallb/metallb.yml
+```
--- a/contrib/metallb/library
+++ b/contrib/metallb/library
@@ -0,0 +1 @@
+../../library
--- a/contrib/metallb/metallb.yml
+++ b/contrib/metallb/metallb.yml
@@ -0,0 +1,12 @@
+---
+- hosts: bastion[0]
+  gather_facts: False
+  roles:
+    - { role: kubespray-defaults}
+    - { role: bastion-ssh-config, tags: ["localhost", "bastion"]}
+- hosts: kube-master[0]
+  tags:
+    - "provision"
+  roles:
+    - { role: kubespray-defaults}
+    - { role: provision }
--- a/contrib/metallb/roles/provision/defaults/main.yml
+++ b/contrib/metallb/roles/provision/defaults/main.yml
@@ -0,0 +1,16 @@
+---
+metallb:
+  ip_range:
+    - "10.5.0.50-10.5.0.99"
+  protocol: "layer2"
+  # additional_address_pools:
+  #   kube_service_pool:
+  #     ip_range:
+  #       - 10.5.1.50-10.5.1.99"
+  #     protocol: "layer2"
+  #     auto_assign: false
+  limits:
+    cpu: "100m"
+    memory: "100Mi"
+  port: "7472"
+  version: v0.7.3
--- a/contrib/metallb/roles/provision/tasks/main.yml
+++ b/contrib/metallb/roles/provision/tasks/main.yml
@@ -5,18 +5,6 @@
  when:
    - "kube_proxy_mode == 'ipvs' and not kube_proxy_strict_arp"

- name: Kubernetes Apps | Check cluster settings for MetalLB
-  fail:
-    msg: "metallb_ip_range is mandatory to be specified for MetalLB"
-  when:
-    - metallb_ip_range is not defined or not metallb_ip_range
-
- name: Kubernetes Apps | Check BGP peers for MetalLB
-  fail:
-    msg: "metallb_peers is mandatory when metallb_protocol is bgp"
-  when:
-    - metallb_protocol == 'bgp' and metallb_peers is not defined
-
 - name: Kubernetes Apps | Check AppArmor status
  command: which apparmor_parser
  register: apparmor_status
@@ -50,25 +38,3 @@
  with_items: "{{ rendering.results }}"
  when:
    - "inventory_hostname == groups['kube-master'][0]"
-
- name: Kubernetes Apps | Check existing secret of MetalLB
-  command: "{{ bin_dir }}/kubectl --kubeconfig /etc/kubernetes/admin.conf -n metallb-system get secret memberlist"
-  register: metallb_secret
-  become: true
-  ignore_errors: yes
-  when:
-    - inventory_hostname == groups['kube-master'][0]
-
- name: Kubernetes Apps | Create random bytes for MetalLB
-  command: "openssl rand -base64 32"
-  register: metallb_rand
-  when:
-    - inventory_hostname == groups['kube-master'][0]
-    - metallb_secret.rc != 0
-
- name: Kubernetes Apps | Install secret of MetalLB if not existing
-  command: "{{ bin_dir }}/kubectl --kubeconfig /etc/kubernetes/admin.conf -n metallb-system create secret generic memberlist --from-literal=secretkey={{ metallb_rand.stdout }}"
-  become: true
-  when:
-    - inventory_hostname == groups['kube-master'][0]
-    - metallb_secret.rc != 0
--- a/contrib/metallb/roles/provision/templates/metallb-config.yml.j2
+++ b/contrib/metallb/roles/provision/templates/metallb-config.yml.j2
@@ -0,0 +1,25 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: metallb-system
+  name: config
+data:
+  config: |
+    address-pools:
+    - name: loadbalanced
+      protocol: {{ metallb.protocol }}
+      addresses:
+{% for ip_range in metallb.ip_range %}
+      - {{ ip_range }}
+{% endfor %}
+{% if metallb.additional_address_pools is defined %}{% for pool in metallb.additional_address_pools %}
+    - name: {{ pool }}
+      protocol: {{ metallb.additional_address_pools[pool].protocol }}
+      addresses:
+{% for ip_range in metallb.additional_address_pools[pool].ip_range %}
+      - {{ ip_range }}
+{% endfor %}
+      auto-assign: {{ metallb.additional_address_pools[pool].auto_assign }}
+{% endfor %}
+{% endif %}
--- a/contrib/metallb/roles/provision/templates/metallb.yml.j2
+++ b/contrib/metallb/roles/provision/templates/metallb.yml.j2
@@ -0,0 +1,263 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: metallb-system
+  labels:
+    app: metallb
+---
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  namespace: metallb-system
+  name: controller
+  labels:
+    app: metallb
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  namespace: metallb-system
+  name: speaker
+  labels:
+    app: metallb
+
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: metallb-system:controller
+  labels:
+    app: metallb
+rules:
+- apiGroups: [""]
+  resources: ["services"]
+  verbs: ["get", "list", "watch", "update"]
+- apiGroups: [""]
+  resources: ["services/status"]
+  verbs: ["update"]
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create", "patch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: metallb-system:speaker
+  labels:
+    app: metallb
+rules:
+- apiGroups: [""]
+  resources: ["services", "endpoints", "nodes"]
+  verbs: ["get", "list", "watch"]
+{% if podsecuritypolicy_enabled %}
+- apiGroups: ["policy"]
+  resourceNames: ["metallb"]
+  resources: ["podsecuritypolicies"]
+  verbs: ["use"]
+---
+apiVersion: policy/v1beta1
+kind: PodSecurityPolicy
+metadata:
+  name: metallb
+  annotations:
+    seccomp.security.alpha.kubernetes.io/defaultProfileName:  'docker/default'
+    seccomp.security.alpha.kubernetes.io/allowedProfileNames: 'docker/default'
+{% if apparmor_enabled %}
+    apparmor.security.beta.kubernetes.io/defaultProfileName:  'runtime/default'
+    apparmor.security.beta.kubernetes.io/allowedProfileNames: 'runtime/default'
+{% endif %}
+  labels:
+    app: metallb
+spec:
+  privileged: true
+  allowPrivilegeEscalation: false
+  allowedCapabilities:
+  - net_raw
+  volumes:
+  - secret
+  hostNetwork: true
+  hostPorts:
+  - min: {{ metallb.port }}
+    max: {{ metallb.port }}
+  hostIPC: false
+  hostPID: false
+  runAsUser:
+    rule: 'RunAsAny'
+  seLinux:
+    rule: 'RunAsAny'
+  supplementalGroups:
+    rule: 'RunAsAny'
+  fsGroup:
+    rule: 'RunAsAny'
+  readOnlyRootFilesystem: true
+{% endif %}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  namespace: metallb-system
+  name: config-watcher
+  labels:
+    app: metallb
+rules:
+- apiGroups: [""]
+  resources: ["configmaps"]
+  verbs: ["get", "list", "watch"]
+- apiGroups: [""]
+  resources: ["events"]
+  verbs: ["create"]
+---
+
+## Role bindings
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: metallb-system:controller
+  labels:
+    app: metallb
+subjects:
+- kind: ServiceAccount
+  name: controller
+  namespace: metallb-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: metallb-system:controller
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: metallb-system:speaker
+  labels:
+    app: metallb
+subjects:
+- kind: ServiceAccount
+  name: speaker
+  namespace: metallb-system
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: metallb-system:speaker
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  namespace: metallb-system
+  name: config-watcher
+  labels:
+    app: metallb
+subjects:
+- kind: ServiceAccount
+  name: controller
+- kind: ServiceAccount
+  name: speaker
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: config-watcher
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  namespace: metallb-system
+  name: speaker
+  labels:
+    app: metallb
+    component: speaker
+spec:
+  selector:
+    matchLabels:
+      app: metallb
+      component: speaker
+  template:
+    metadata:
+      labels:
+        app: metallb
+        component: speaker
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "{{ metallb.port }}"
+    spec:
+      serviceAccountName: speaker
+      terminationGracePeriodSeconds: 0
+      hostNetwork: true
+      containers:
+      - name: speaker
+        image: metallb/speaker:{{ metallb.version }}
+        imagePullPolicy: IfNotPresent
+        args:
+        - --port={{ metallb.port }}
+        - --config=config
+        env:
+        - name: METALLB_NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
+        ports:
+        - name: monitoring
+          containerPort: {{ metallb.port }}
+        resources:
+          limits:
+            cpu: {{ metallb.limits.cpu }}
+            memory: {{ metallb.limits.memory }}
+        securityContext:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
+          capabilities:
+            drop:
+            - all
+            add:
+            - net_raw
+
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  namespace: metallb-system
+  name: controller
+  labels:
+    app: metallb
+    component: controller
+spec:
+  revisionHistoryLimit: 3
+  selector:
+    matchLabels:
+      app: metallb
+      component: controller
+  template:
+    metadata:
+      labels:
+        app: metallb
+        component: controller
+      annotations:
+        prometheus.io/scrape: "true"
+        prometheus.io/port: "{{ metallb.port }}"
+    spec:
+      serviceAccountName: controller
+      terminationGracePeriodSeconds: 0
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534 # nobody
+      containers:
+      - name: controller
+        image: metallb/controller:{{ metallb.version }}
+        imagePullPolicy: IfNotPresent
+        args:
+        - --port={{ metallb.port }}
+        - --config=config
+        ports:
+        - name: monitoring
+          containerPort: {{ metallb.port }}
+        resources:
+          limits:
+            cpu: {{ metallb.limits.cpu }}
+            memory: {{ metallb.limits.memory }}
+        securityContext:
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+            - all
+          readOnlyRootFilesystem: true
+
+---
--- a/contrib/network-storage/glusterfs/README.md
+++ b/contrib/network-storage/glusterfs/README.md
@@ -8,19 +8,19 @@ In the same directory of this ReadMe file you should find a file named `inventor

 Change that file to reflect your local setup (adding more machines or removing them and setting the adequate ip numbers), and save it to `inventory/sample/k8s_gfs_inventory`. Make sure that the settings on `inventory/sample/group_vars/all.yml` make sense with your deployment. Then execute change to the kubespray root folder, and execute (supposing that the machines are all using ubuntu):

-```shell
+```
 ansible-playbook -b --become-user=root -i inventory/sample/k8s_gfs_inventory --user=ubuntu ./cluster.yml
 ```

 This will provision your Kubernetes cluster. Then, to provision and configure the GlusterFS cluster, from the same directory execute:

-```shell
+```
 ansible-playbook -b --become-user=root -i inventory/sample/k8s_gfs_inventory --user=ubuntu ./contrib/network-storage/glusterfs/glusterfs.yml
 ```

 If your machines are not using Ubuntu, you need to change the `--user=ubuntu` to the correct user. Alternatively, if your Kubernetes machines are using one OS and your GlusterFS a different one, you can instead specify the `ansible_ssh_user=<correct-user>` variable in the inventory file that you just created, for each machine/VM:

-```shell
+```
 k8s-master-1 ansible_ssh_host=192.168.0.147 ip=192.168.0.147 ansible_ssh_user=core
 k8s-master-node-1 ansible_ssh_host=192.168.0.148 ip=192.168.0.148 ansible_ssh_user=core
 k8s-master-node-2 ansible_ssh_host=192.168.0.146 ip=192.168.0.146 ansible_ssh_user=core
@@ -30,7 +30,7 @@ k8s-master-node-2 ansible_ssh_host=192.168.0.146 ip=192.168.0.146 ansible_ssh_us

 First step is to fill in a `my-kubespray-gluster-cluster.tfvars` file with the specification desired for your cluster. An example with all required variables would look like:

-```ini
+```
 cluster_name = "cluster1"
 number_of_k8s_masters = "1"
 number_of_k8s_masters_no_floating_ip = "2"
@@ -54,7 +54,7 @@ ssh_user_gfs = "ubuntu"

 As explained in the general terraform/openstack guide, you need to source your OpenStack credentials file, add your ssh-key to the ssh-agent and setup environment variables for terraform:

-```shell
+```
 $ source ~/.stackrc
 $ eval $(ssh-agent -s)
 $ ssh-add ~/.ssh/my-desired-key
@@ -67,7 +67,7 @@ $ echo Setting up Terraform creds && \

 Then, standing on the kubespray directory (root base of the Git checkout), issue the following terraform command to create the VMs for the cluster:

-```shell
+```
 terraform apply -state=contrib/terraform/openstack/terraform.tfstate -var-file=my-kubespray-gluster-cluster.tfvars contrib/terraform/openstack
 ```

@@ -75,18 +75,18 @@ This will create both your Kubernetes and Gluster VMs. Make sure that the ansibl

 Then, provision your Kubernetes (kubespray) cluster with the following ansible call:

-```shell
+```
 ansible-playbook -b --become-user=root -i contrib/terraform/openstack/hosts ./cluster.yml
 ```

 Finally, provision the glusterfs nodes and add the Persistent Volume setup for GlusterFS in Kubernetes through the following ansible call:

-```shell
+```
 ansible-playbook -b --become-user=root -i contrib/terraform/openstack/hosts ./contrib/network-storage/glusterfs/glusterfs.yml
 ```

 If you need to destroy the cluster, you can run:

-```shell
+```
 terraform destroy -state=contrib/terraform/openstack/terraform.tfstate -var-file=my-kubespray-gluster-cluster.tfvars contrib/terraform/openstack
 ```
--- a/contrib/network-storage/glusterfs/roles/glusterfs/client/tasks/setup-Debian.yml
+++ b/contrib/network-storage/glusterfs/roles/glusterfs/client/tasks/setup-Debian.yml
@@ -7,7 +7,7 @@
  register: glusterfs_ppa_added
  when: glusterfs_ppa_use

- name: Ensure GlusterFS client will reinstall if the PPA was just added.  # noqa 503
+- name: Ensure GlusterFS client will reinstall if the PPA was just added.
  apt:
    name: "{{ item }}"
    state: absent
@@ -18,7 +18,7 @@
 - name: Ensure GlusterFS client is installed.
  apt:
    name: "{{ item }}"
-    state: present
+    state: installed
    default_release: "{{ glusterfs_default_release }}"
  with_items:
    - glusterfs-client
--- a/contrib/network-storage/glusterfs/roles/glusterfs/server/tasks/setup-Debian.yml
+++ b/contrib/network-storage/glusterfs/roles/glusterfs/server/tasks/setup-Debian.yml
@@ -7,7 +7,7 @@
  register: glusterfs_ppa_added
  when: glusterfs_ppa_use

- name: Ensure GlusterFS will reinstall if the PPA was just added.  # noqa 503
+- name: Ensure GlusterFS will reinstall if the PPA was just added.
  apt:
    name: "{{ item }}"
    state: absent
@@ -19,7 +19,7 @@
 - name: Ensure GlusterFS is installed.
  apt:
    name: "{{ item }}"
-    state: present
+    state: installed
    default_release: "{{ glusterfs_default_release }}"
  with_items:
    - glusterfs-server
--- a/contrib/network-storage/heketi/README.md
+++ b/contrib/network-storage/heketi/README.md
@@ -1,26 +1,17 @@
 # Deploy Heketi/Glusterfs into Kubespray/Kubernetes
-
 This playbook aims to automate [this](https://github.com/heketi/heketi/blob/master/docs/admin/install-kubernetes.md) tutorial. It deploys heketi/glusterfs into kubernetes and sets up a storageclass.

-## Important notice
-
-> Due to resource limits on the current project maintainers and general lack of contributions we are considering placing Heketi into a [near-maintenance mode](https://github.com/heketi/heketi#important-notice)
-
 ## Client Setup
-
 Heketi provides a CLI that provides users with a means to administer the deployment and configuration of GlusterFS in Kubernetes. [Download and install the heketi-cli](https://github.com/heketi/heketi/releases) on your client machine.

 ## Install
-
 Copy the inventory.yml.sample over to inventory/sample/k8s_heketi_inventory.yml and change it according to your setup.
-
-```shell
+```
 ansible-playbook --ask-become -i inventory/sample/k8s_heketi_inventory.yml contrib/network-storage/heketi/heketi.yml
 ```

 ## Tear down
-
-```shell
+```
 ansible-playbook --ask-become -i inventory/sample/k8s_heketi_inventory.yml contrib/network-storage/heketi/heketi-tear-down.yml
 ```

--- a/contrib/network-storage/heketi/roles/provision/tasks/bootstrap/tear-down.yml
+++ b/contrib/network-storage/heketi/roles/provision/tasks/bootstrap/tear-down.yml
@@ -6,7 +6,7 @@
 - name: "Delete bootstrap Heketi."
  command: "{{ bin_dir }}/kubectl delete all,service,jobs,deployment,secret --selector=\"deploy-heketi\""
  when: "heketi_resources.stdout|from_json|json_query('items[*]')|length > 0"
- name: "Ensure there is nothing left over."  # noqa 301
+- name: "Ensure there is nothing left over."
  command: "{{ bin_dir }}/kubectl get all,service,jobs,deployment,secret --selector=\"deploy-heketi\" -o=json"
  register: "heketi_result"
  until: "heketi_result.stdout|from_json|json_query('items[*]')|length == 0"
--- a/contrib/network-storage/heketi/roles/provision/tasks/bootstrap/topology.yml
+++ b/contrib/network-storage/heketi/roles/provision/tasks/bootstrap/topology.yml
@@ -13,7 +13,7 @@
 - name: "Copy topology configuration into container."
  changed_when: false
  command: "{{ bin_dir }}/kubectl cp {{ kube_config_dir }}/topology.json {{ initial_heketi_pod_name }}:/tmp/topology.json"
- name: "Load heketi topology."  # noqa 503
+- name: "Load heketi topology."
  when: "render.changed"
  command: "{{ bin_dir }}/kubectl exec {{ initial_heketi_pod_name }} -- heketi-cli --user admin --secret {{ heketi_admin_key }} topology load --json=/tmp/topology.json"
  register: "load_heketi"
--- a/contrib/network-storage/heketi/roles/provision/tasks/bootstrap/volumes.yml
+++ b/contrib/network-storage/heketi/roles/provision/tasks/bootstrap/volumes.yml
@@ -18,7 +18,7 @@
 - name: "Provision database volume."
  command: "{{ bin_dir }}/kubectl exec {{ initial_heketi_pod_name }} -- heketi-cli --user admin --secret {{ heketi_admin_key }} setup-openshift-heketi-storage"
  when: "heketi_database_volume_exists is undefined"
- name: "Copy configuration from pod."  # noqa 301
+- name: "Copy configuration from pod."
  become: true
  command: "{{ bin_dir }}/kubectl cp {{ initial_heketi_pod_name }}:/heketi-storage.json {{ kube_config_dir }}/heketi-storage-bootstrap.json"
 - name: "Get heketi volume ids."
--- a/contrib/network-storage/heketi/roles/provision/tasks/topology.yml
+++ b/contrib/network-storage/heketi/roles/provision/tasks/topology.yml
@@ -10,10 +10,10 @@
  template:
    src: "topology.json.j2"
    dest: "{{ kube_config_dir }}/topology.json"
- name: "Copy topology configuration into container."  # noqa 503
+- name: "Copy topology configuration into container."
  when: "rendering.changed"
  command: "{{ bin_dir }}/kubectl cp {{ kube_config_dir }}/topology.json {{ heketi_pod_name }}:/tmp/topology.json"
- name: "Load heketi topology."  # noqa 503
+- name: "Load heketi topology."
  when: "rendering.changed"
  command: "{{ bin_dir }}/kubectl exec {{ heketi_pod_name }} -- heketi-cli --user admin --secret {{ heketi_admin_key }} topology load --json=/tmp/topology.json"
 - name: "Get heketi topology."
--- a/contrib/network-storage/heketi/roles/tear-down-disks/tasks/main.yml
+++ b/contrib/network-storage/heketi/roles/tear-down-disks/tasks/main.yml
@@ -22,7 +22,7 @@
  ignore_errors: true
  changed_when: false

- name: "Remove volume groups."  # noqa 301
+- name: "Remove volume groups."
  environment:
    PATH: "{{ ansible_env.PATH }}:/sbin"  # Make sure we can workaround RH / CentOS conservative path management
  become: true
@@ -30,7 +30,7 @@
  with_items: "{{ volume_groups.stdout_lines }}"
  loop_control: { loop_var: "volume_group" }

- name: "Remove physical volume from cluster disks."  # noqa 301
+- name: "Remove physical volume from cluster disks."
  environment:
    PATH: "{{ ansible_env.PATH }}:/sbin"  # Make sure we can workaround RH / CentOS conservative path management
  become: true
--- a/contrib/network-storage/heketi/roles/tear-down/tasks/main.yml
+++ b/contrib/network-storage/heketi/roles/tear-down/tasks/main.yml
@@ -1,43 +1,43 @@
 ---
- name: "Remove storage class."  # noqa 301
+- name: "Remove storage class."
  command: "{{ bin_dir }}/kubectl delete storageclass gluster"
  ignore_errors: true
- name: "Tear down heketi."  # noqa 301
+- name: "Tear down heketi."
  command: "{{ bin_dir }}/kubectl delete all,service,jobs,deployment,secret --selector=\"glusterfs=heketi-pod\""
  ignore_errors: true
- name: "Tear down heketi."  # noqa 301
+- name: "Tear down heketi."
  command: "{{ bin_dir }}/kubectl delete all,service,jobs,deployment,secret --selector=\"glusterfs=heketi-deployment\""
  ignore_errors: true
 - name: "Tear down bootstrap."
-  include_tasks: "../../provision/tasks/bootstrap/tear-down.yml"
- name: "Ensure there is nothing left over."  # noqa 301
+  include_tasks: "../provision/tasks/bootstrap/tear-down.yml"
+- name: "Ensure there is nothing left over."
  command: "{{ bin_dir }}/kubectl get all,service,jobs,deployment,secret --selector=\"glusterfs=heketi-pod\" -o=json"
  register: "heketi_result"
  until: "heketi_result.stdout|from_json|json_query('items[*]')|length == 0"
  retries: 60
  delay: 5
- name: "Ensure there is nothing left over."  # noqa 301
+- name: "Ensure there is nothing left over."
  command: "{{ bin_dir }}/kubectl get all,service,jobs,deployment,secret --selector=\"glusterfs=heketi-deployment\" -o=json"
  register: "heketi_result"
  until: "heketi_result.stdout|from_json|json_query('items[*]')|length == 0"
  retries: 60
  delay: 5
- name: "Tear down glusterfs."  # noqa 301
+- name: "Tear down glusterfs."
  command: "{{ bin_dir }}/kubectl delete daemonset.extensions/glusterfs"
  ignore_errors: true
- name: "Remove heketi storage service."  # noqa 301
+- name: "Remove heketi storage service."
  command: "{{ bin_dir }}/kubectl delete service heketi-storage-endpoints"
  ignore_errors: true
- name: "Remove heketi gluster role binding"  # noqa 301
+- name: "Remove heketi gluster role binding"
  command: "{{ bin_dir }}/kubectl delete clusterrolebinding heketi-gluster-admin"
  ignore_errors: true
- name: "Remove heketi config secret"  # noqa 301
+- name: "Remove heketi config secret"
  command: "{{ bin_dir }}/kubectl delete secret heketi-config-secret"
  ignore_errors: true
- name: "Remove heketi db backup"  # noqa 301
+- name: "Remove heketi db backup"
  command: "{{ bin_dir }}/kubectl delete secret heketi-db-backup"
  ignore_errors: true
- name: "Remove heketi service account"  # noqa 301
+- name: "Remove heketi service account"
  command: "{{ bin_dir }}/kubectl delete serviceaccount heketi-service-account"
  ignore_errors: true
 - name: "Get secrets"
--- a/contrib/offline/README.md
+++ b/contrib/offline/README.md
@@ -1,21 +0,0 @@
-# Container image collecting script for offline deployment
-
-This script has two features:
-(1) Get container images from an environment which is deployed online.
-(2) Deploy local container registry and register the container images to the registry.
-
-Step(1) should be done online site as a preparation, then we bring the gotten images
-to the target offline environment.
-Then we will run step(2) for registering the images to local registry.
-
-Step(1) can be operated with:
-
-```shell
-manage-offline-container-images.sh   create
-```
-
-Step(2) can be operated with:
-
-```shell
-manage-offline-container-images.sh   register
-```
--- a/contrib/offline/docker-daemon.json
+++ b/contrib/offline/docker-daemon.json
@@ -1 +0,0 @@
-{ "insecure-registries":["HOSTNAME:5000"] }
--- a/contrib/offline/manage-offline-container-images.sh
+++ b/contrib/offline/manage-offline-container-images.sh
@@ -1,150 +0,0 @@
-#!/bin/bash
-
-OPTION=$1
-CURRENT_DIR=$(cd $(dirname $0); pwd)
-TEMP_DIR="${CURRENT_DIR}/temp"
-
-IMAGE_TAR_FILE="${CURRENT_DIR}/container-images.tar.gz"
-IMAGE_DIR="${CURRENT_DIR}/container-images"
-IMAGE_LIST="${IMAGE_DIR}/container-images.txt"
-RETRY_COUNT=5
-
-function create_container_image_tar() {
-	set -e
-
-	IMAGES=$(kubectl describe pods --all-namespaces | grep " Image:" | awk '{print $2}' | sort | uniq)
-	# NOTE: etcd and pause cannot be seen as pods.
-	# The pause image is used for --pod-infra-container-image option of kubelet.
-	EXT_IMAGES=$(kubectl cluster-info dump | egrep "quay.io/coreos/etcd:|k8s.gcr.io/pause:" | sed s@\"@@g)
-	IMAGES="${IMAGES} ${EXT_IMAGES}"
-
-	rm -f  ${IMAGE_TAR_FILE}
-	rm -rf ${IMAGE_DIR}
-	mkdir  ${IMAGE_DIR}
-	cd     ${IMAGE_DIR}
-
-	sudo docker pull registry:latest
-	sudo docker save -o registry-latest.tar registry:latest
-
-	for image in ${IMAGES}
-	do
-		FILE_NAME="$(echo ${image} | sed s@"/"@"-"@g | sed s/":"/"-"/g)".tar
-		set +e
-		for step in $(seq 1 ${RETRY_COUNT})
-		do
-			sudo docker pull ${image}
-			if [ $? -eq 0 ]; then
-				break
-			fi
-			echo "Failed to pull ${image} at step ${step}"
-			if [ ${step} -eq ${RETRY_COUNT} ]; then
-				exit 1
-			fi
-		done
-		set -e
-		sudo docker save -o ${FILE_NAME}  ${image}
-
-		# NOTE: Here removes the following repo parts from each image
-		# so that these parts will be replaced with Kubespray.
-		# - kube_image_repo: "k8s.gcr.io"
-		# - gcr_image_repo: "gcr.io"
-		# - docker_image_repo: "docker.io"
-		# - quay_image_repo: "quay.io"
-		FIRST_PART=$(echo ${image} | awk -F"/" '{print $1}')
-		if [ "${FIRST_PART}" = "k8s.gcr.io" ] ||
-		   [ "${FIRST_PART}" = "gcr.io" ] ||
-		   [ "${FIRST_PART}" = "docker.io" ] ||
-		   [ "${FIRST_PART}" = "quay.io" ]; then
-			image=$(echo ${image} | sed s@"${FIRST_PART}/"@@)
-		fi
-		echo "${FILE_NAME}  ${image}" >> ${IMAGE_LIST}
-	done
-
-	cd ..
-	sudo chown ${USER} ${IMAGE_DIR}/*
-	tar -zcvf ${IMAGE_TAR_FILE}  ./container-images
-	rm -rf ${IMAGE_DIR}
-
-	echo ""
-	echo "${IMAGE_TAR_FILE} is created to contain your container images."
-	echo "Please keep this file and bring it to your offline environment."
-}
-
-function register_container_images() {
-	if [ ! -f ${IMAGE_TAR_FILE} ]; then
-		echo "${IMAGE_TAR_FILE} should exist."
-		exit 1
-	fi
-	if [ ! -d ${TEMP_DIR} ]; then
-		mkdir ${TEMP_DIR}
-	fi
-
-	# To avoid "http: server gave http response to https client" error.
-	LOCALHOST_NAME=$(hostname)
-	if [ -d /etc/docker/ ]; then
-		set -e
-		# Ubuntu18.04, RHEL7/CentOS7
-		cp ${CURRENT_DIR}/docker-daemon.json      ${TEMP_DIR}/docker-daemon.json
-		sed -i s@"HOSTNAME"@"${LOCALHOST_NAME}"@  ${TEMP_DIR}/docker-daemon.json
-		sudo cp ${TEMP_DIR}/docker-daemon.json           /etc/docker/daemon.json
-	elif [ -d /etc/containers/ ]; then
-		set -e
-		# RHEL8/CentOS8
-		cp ${CURRENT_DIR}/registries.conf         ${TEMP_DIR}/registries.conf
-		sed -i s@"HOSTNAME"@"${LOCALHOST_NAME}"@  ${TEMP_DIR}/registries.conf
-		sudo cp ${TEMP_DIR}/registries.conf   /etc/containers/registries.conf
-	else
-		echo "docker package(docker-ce, etc.) should be installed"
-		exit 1
-	fi
-
-	tar -zxvf ${IMAGE_TAR_FILE}
-	sudo docker load -i ${IMAGE_DIR}/registry-latest.tar
-	sudo docker run --restart=always -d -p 5000:5000 --name registry registry:latest
-	set +e
-
-	set -e
-	while read -r line; do
-		file_name=$(echo ${line} | awk '{print $1}')
-		org_image=$(echo ${line} | awk '{print $2}')
-		new_image="${LOCALHOST_NAME}:5000/${org_image}"
-		image_id=$(tar -tf ${IMAGE_DIR}/${file_name} | grep "\.json" | grep -v manifest.json | sed s/"\.json"//)
-		sudo docker load -i ${IMAGE_DIR}/${file_name}
-		sudo docker tag  ${image_id} ${new_image}
-		sudo docker push ${new_image}
-	done <<< "$(cat ${IMAGE_LIST})"
-
-	echo "Succeeded to register container images to local registry."
-	echo "Please specify ${LOCALHOST_NAME}:5000 for the following options in your inventry:"
-	echo "- kube_image_repo"
-	echo "- gcr_image_repo"
-	echo "- docker_image_repo"
-	echo "- quay_image_repo"
-}
-
-if [ "${OPTION}" == "create" ]; then
-	create_container_image_tar
-elif [ "${OPTION}" == "register" ]; then
-	register_container_images
-else
-	echo "This script has two features:"
-	echo "(1) Get container images from an environment which is deployed online."
-	echo "(2) Deploy local container registry and register the container images to the registry."
-	echo ""
-	echo "Step(1) should be done online site as a preparation, then we bring"
-	echo "the gotten images to the target offline environment."
-	echo "Then we will run step(2) for registering the images to local registry."
-	echo ""
-	echo "${IMAGE_TAR_FILE} is created to contain your container images."
-	echo "Please keep this file and bring it to your offline environment."
-	echo ""
-	echo "Step(1) can be operated with:"
-	echo " $ ./manage-offline-container-images.sh   create"
-	echo ""
-	echo "Step(2) can be operated with:"
-	echo " $ ./manage-offline-container-images.sh   register"
-	echo ""
-	echo "Please specify 'create' or 'register'."
-	echo ""
-	exit 1
-fi
--- a/contrib/offline/registries.conf
+++ b/contrib/offline/registries.conf
@@ -1,8 +0,0 @@
-[registries.search]
-registries = ['registry.access.redhat.com', 'registry.redhat.io', 'docker.io']
-
-[registries.insecure]
-registries = ['HOSTNAME:5000']
-
-[registries.block]
-registries = []
--- a/contrib/terraform/aws/README.md
+++ b/contrib/terraform/aws/README.md
@@ -1,64 +1,55 @@
-# Kubernetes on AWS with Terraform
+## Kubernetes on AWS with Terraform

-## Overview
+**Overview:**

 This project will create:
+* VPC with Public and Private Subnets in # Availability Zones
+* Bastion Hosts and NAT Gateways in the Public Subnet
+* A dynamic number of masters, etcd, and worker nodes in the Private Subnet
+ * even distributed over the # of Availability Zones
+* AWS ELB in the Public Subnet for accessing the Kubernetes API from the internet

- VPC with Public and Private Subnets in # Availability Zones
- Bastion Hosts and NAT Gateways in the Public Subnet
- A dynamic number of masters, etcd, and worker nodes in the Private Subnet
-  - even distributed over the # of Availability Zones
- AWS ELB in the Public Subnet for accessing the Kubernetes API from the internet
-
-## Requirements
-
+**Requirements**
 - Terraform 0.12.0 or newer

-## How to Use
+**How to Use:**

 - Export the variables for your AWS credentials or edit `credentials.tfvars`:

-```commandline
+```
 export TF_VAR_AWS_ACCESS_KEY_ID="www"
 export TF_VAR_AWS_SECRET_ACCESS_KEY ="xxx"
 export TF_VAR_AWS_SSH_KEY_NAME="yyy"
 export TF_VAR_AWS_DEFAULT_REGION="zzz"
 ```
-
- Update `contrib/terraform/aws/terraform.tfvars` with your data. By default, the Terraform scripts use Ubuntu 18.04 LTS (Bionic) as base image. If you want to change this behaviour, see note "Using other distrib than Ubuntu" below.
+- Update `contrib/terraform/aws/terraform.tfvars` with your data. By default, the Terraform scripts use CoreOS as base image. If you want to change this behaviour, see note "Using other distrib than CoreOs" below.
 - Create an AWS EC2 SSH Key
 - Run with `terraform apply --var-file="credentials.tfvars"` or `terraform apply` depending if you exported your AWS credentials

 Example:
-
 ```commandline
 terraform apply -var-file=credentials.tfvars
 ```

 - Terraform automatically creates an Ansible Inventory file called `hosts` with the created infrastructure in the directory `inventory`
+
 - Ansible will automatically generate an ssh config file for your bastion hosts. To connect to hosts with ssh using bastion host use generated ssh-bastion.conf.
  Ansible automatically detects bastion and changes ssh_args  
-
 ```commandline
 ssh -F ./ssh-bastion.conf user@$ip
 ```

 - Once the infrastructure is created, you can run the kubespray playbooks and supply inventory/hosts with the `-i` flag.

-Example (this one assumes you are using Ubuntu)
-
+Example (this one assumes you are using CoreOS)
 ```commandline
-ansible-playbook -i ./inventory/hosts ./cluster.yml -e ansible_user=ubuntu -b --become-user=root --flush-cache
+ansible-playbook -i ./inventory/hosts ./cluster.yml -e ansible_user=core -b --become-user=root --flush-cache
 ```
-
-***Using other distrib than Ubuntu***
-If you want to use another distribution than Ubuntu 18.04 (Bionic) LTS, you can modify the search filters of the 'data "aws_ami" "distro"' in variables.tf.
+***Using other distrib than CoreOs***
+If you want to use another distribution than CoreOS, you can modify the search filters of the 'data "aws_ami" "distro"' in variables.tf.

 For example, to use:
-
 - Debian Jessie, replace 'data "aws_ami" "distro"' in variables.tf with
-
-```ini
 data "aws_ami" "distro" {
  most_recent = true

@@ -74,11 +65,8 @@ data "aws_ami" "distro" {

  owners = ["379101102735"]
 }
-```

 - Ubuntu 16.04, replace 'data "aws_ami" "distro"' in variables.tf with
-
-```ini
 data "aws_ami" "distro" {
  most_recent = true

@@ -94,11 +82,8 @@ data "aws_ami" "distro" {

  owners = ["099720109477"]
 }
-```

 - Centos 7, replace 'data "aws_ami" "distro"' in variables.tf with
-
-```ini
 data "aws_ami" "distro" {
  most_recent = true

@@ -114,49 +99,23 @@ data "aws_ami" "distro" {

  owners = ["688023202711"]
 }
-```

-## Connecting to Kubernetes
+**Troubleshooting**

-You can use the following set of commands to get the kubeconfig file from your newly created cluster. Before running the commands, make sure you are in the project's root folder.
-
-```commandline
-# Get the controller's IP address.
-CONTROLLER_HOST_NAME=$(cat ./inventory/hosts | grep "\[kube-master\]" -A 1 | tail -n 1)
-CONTROLLER_IP=$(cat ./inventory/hosts | grep $CONTROLLER_HOST_NAME | grep ansible_host | cut -d'=' -f2)
-
-# Get the hostname of the load balancer.
-LB_HOST=$(cat inventory/hosts | grep apiserver_loadbalancer_domain_name | cut -d'"' -f2)
-
-# Get the controller's SSH fingerprint.
-ssh-keygen -R $CONTROLLER_IP > /dev/null 2>&1
-ssh-keyscan -H $CONTROLLER_IP >> ~/.ssh/known_hosts 2>/dev/null
-
-# Get the kubeconfig from the controller.
-mkdir -p ~/.kube
-ssh -F ssh-bastion.conf centos@$CONTROLLER_IP "sudo chmod 644 /etc/kubernetes/admin.conf"
-scp -F ssh-bastion.conf centos@$CONTROLLER_IP:/etc/kubernetes/admin.conf ~/.kube/config
-sed -i "s^server:.*^server: https://$LB_HOST:6443^" ~/.kube/config
-kubectl get nodes
-```
-
-## Troubleshooting
-
-### Remaining AWS IAM Instance Profile
+***Remaining AWS IAM Instance Profile***:

 If the cluster was destroyed without using Terraform it is possible that
 the AWS IAM Instance Profiles still remain. To delete them you can use
 the `AWS CLI` with the following command:
-
-```commandline
+```
 aws iam delete-instance-profile --region <region_name> --instance-profile-name <profile_name>
 ```

-### Ansible Inventory doesn't get created
+***Ansible Inventory doesn't get created:***

 It could happen that Terraform doesn't create an Ansible Inventory file automatically. If this is the case copy the output after `inventory=` and create a file named `hosts`in the directory `inventory` and paste the inventory into the file.

-## Architecture
+**Architecture**

 Pictured is an AWS Infrastructure created with this Terraform project distributed over two Availability Zones.

--- a/contrib/terraform/aws/create-infrastructure.tf
+++ b/contrib/terraform/aws/create-infrastructure.tf
@@ -3,9 +3,9 @@ terraform {
 }

 provider "aws" {
-  access_key = var.AWS_ACCESS_KEY_ID
-  secret_key = var.AWS_SECRET_ACCESS_KEY
-  region     = var.AWS_DEFAULT_REGION
+  access_key = "${var.AWS_ACCESS_KEY_ID}"
+  secret_key = "${var.AWS_SECRET_ACCESS_KEY}"
+  region     = "${var.AWS_DEFAULT_REGION}"
 }

 data "aws_availability_zones" "available" {}
@@ -18,30 +18,30 @@ data "aws_availability_zones" "available" {}
 module "aws-vpc" {
  source = "./modules/vpc"

-  aws_cluster_name         = var.aws_cluster_name
-  aws_vpc_cidr_block       = var.aws_vpc_cidr_block
-  aws_avail_zones          = slice(data.aws_availability_zones.available.names, 0, 2)
-  aws_cidr_subnets_private = var.aws_cidr_subnets_private
-  aws_cidr_subnets_public  = var.aws_cidr_subnets_public
-  default_tags             = var.default_tags
+  aws_cluster_name         = "${var.aws_cluster_name}"
+  aws_vpc_cidr_block       = "${var.aws_vpc_cidr_block}"
+  aws_avail_zones          = "${slice(data.aws_availability_zones.available.names, 0, 2)}"
+  aws_cidr_subnets_private = "${var.aws_cidr_subnets_private}"
+  aws_cidr_subnets_public  = "${var.aws_cidr_subnets_public}"
+  default_tags             = "${var.default_tags}"
 }

 module "aws-elb" {
  source = "./modules/elb"

-  aws_cluster_name      = var.aws_cluster_name
-  aws_vpc_id            = module.aws-vpc.aws_vpc_id
-  aws_avail_zones       = slice(data.aws_availability_zones.available.names, 0, 2)
-  aws_subnet_ids_public = module.aws-vpc.aws_subnet_ids_public
-  aws_elb_api_port      = var.aws_elb_api_port
-  k8s_secure_api_port   = var.k8s_secure_api_port
-  default_tags          = var.default_tags
+  aws_cluster_name      = "${var.aws_cluster_name}"
+  aws_vpc_id            = "${module.aws-vpc.aws_vpc_id}"
+  aws_avail_zones       = "${slice(data.aws_availability_zones.available.names, 0, 2)}"
+  aws_subnet_ids_public = "${module.aws-vpc.aws_subnet_ids_public}"
+  aws_elb_api_port      = "${var.aws_elb_api_port}"
+  k8s_secure_api_port   = "${var.k8s_secure_api_port}"
+  default_tags          = "${var.default_tags}"
 }

 module "aws-iam" {
  source = "./modules/iam"

-  aws_cluster_name = var.aws_cluster_name
+  aws_cluster_name = "${var.aws_cluster_name}"
 }

 /*
@@ -50,22 +50,22 @@ module "aws-iam" {
 */

 resource "aws_instance" "bastion-server" {
-  ami                         = data.aws_ami.distro.id
-  instance_type               = var.aws_bastion_size
-  count                       = length(var.aws_cidr_subnets_public)
+  ami                         = "${data.aws_ami.distro.id}"
+  instance_type               = "${var.aws_bastion_size}"
+  count                       = "${length(var.aws_cidr_subnets_public)}"
  associate_public_ip_address = true
-  availability_zone           = element(slice(data.aws_availability_zones.available.names, 0, 2), count.index)
-  subnet_id                   = element(module.aws-vpc.aws_subnet_ids_public, count.index)
+  availability_zone           = "${element(slice(data.aws_availability_zones.available.names, 0, 2), count.index)}"
+  subnet_id                   = "${element(module.aws-vpc.aws_subnet_ids_public, count.index)}"

-  vpc_security_group_ids = module.aws-vpc.aws_security_group
+  vpc_security_group_ids = "${module.aws-vpc.aws_security_group}"

-  key_name = var.AWS_SSH_KEY_NAME
+  key_name = "${var.AWS_SSH_KEY_NAME}"

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-bastion-${count.index}",
-    "Cluster", var.aws_cluster_name,
+    "Cluster", "${var.aws_cluster_name}",
    "Role", "bastion-${var.aws_cluster_name}-${count.index}"
-  ))
+  ))}"
 }

 /*
@@ -74,71 +74,71 @@ resource "aws_instance" "bastion-server" {
 */

 resource "aws_instance" "k8s-master" {
-  ami           = data.aws_ami.distro.id
-  instance_type = var.aws_kube_master_size
+  ami           = "${data.aws_ami.distro.id}"
+  instance_type = "${var.aws_kube_master_size}"

-  count = var.aws_kube_master_num
+  count = "${var.aws_kube_master_num}"

-  availability_zone = element(slice(data.aws_availability_zones.available.names, 0, 2), count.index)
-  subnet_id         = element(module.aws-vpc.aws_subnet_ids_private, count.index)
+  availability_zone = "${element(slice(data.aws_availability_zones.available.names, 0, 2), count.index)}"
+  subnet_id         = "${element(module.aws-vpc.aws_subnet_ids_private, count.index)}"

-  vpc_security_group_ids = module.aws-vpc.aws_security_group
+  vpc_security_group_ids = "${module.aws-vpc.aws_security_group}"

-  iam_instance_profile = module.aws-iam.kube-master-profile
-  key_name             = var.AWS_SSH_KEY_NAME
+  iam_instance_profile = "${module.aws-iam.kube-master-profile}"
+  key_name             = "${var.AWS_SSH_KEY_NAME}"

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-master${count.index}",
    "kubernetes.io/cluster/${var.aws_cluster_name}", "member",
    "Role", "master"
-  ))
+  ))}"
 }

 resource "aws_elb_attachment" "attach_master_nodes" {
-  count    = var.aws_kube_master_num
-  elb      = module.aws-elb.aws_elb_api_id
-  instance = element(aws_instance.k8s-master.*.id, count.index)
+  count    = "${var.aws_kube_master_num}"
+  elb      = "${module.aws-elb.aws_elb_api_id}"
+  instance = "${element(aws_instance.k8s-master.*.id, count.index)}"
 }

 resource "aws_instance" "k8s-etcd" {
-  ami           = data.aws_ami.distro.id
-  instance_type = var.aws_etcd_size
+  ami           = "${data.aws_ami.distro.id}"
+  instance_type = "${var.aws_etcd_size}"

-  count = var.aws_etcd_num
+  count = "${var.aws_etcd_num}"

-  availability_zone = element(slice(data.aws_availability_zones.available.names, 0, 2), count.index)
-  subnet_id         = element(module.aws-vpc.aws_subnet_ids_private, count.index)
+  availability_zone = "${element(slice(data.aws_availability_zones.available.names, 0, 2), count.index)}"
+  subnet_id         = "${element(module.aws-vpc.aws_subnet_ids_private, count.index)}"

-  vpc_security_group_ids = module.aws-vpc.aws_security_group
+  vpc_security_group_ids = "${module.aws-vpc.aws_security_group}"

-  key_name = var.AWS_SSH_KEY_NAME
+  key_name = "${var.AWS_SSH_KEY_NAME}"

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-etcd${count.index}",
    "kubernetes.io/cluster/${var.aws_cluster_name}", "member",
    "Role", "etcd"
-  ))
+  ))}"
 }

 resource "aws_instance" "k8s-worker" {
-  ami           = data.aws_ami.distro.id
-  instance_type = var.aws_kube_worker_size
+  ami           = "${data.aws_ami.distro.id}"
+  instance_type = "${var.aws_kube_worker_size}"

-  count = var.aws_kube_worker_num
+  count = "${var.aws_kube_worker_num}"

-  availability_zone = element(slice(data.aws_availability_zones.available.names, 0, 2), count.index)
-  subnet_id         = element(module.aws-vpc.aws_subnet_ids_private, count.index)
+  availability_zone = "${element(slice(data.aws_availability_zones.available.names, 0, 2), count.index)}"
+  subnet_id         = "${element(module.aws-vpc.aws_subnet_ids_private, count.index)}"

-  vpc_security_group_ids = module.aws-vpc.aws_security_group
+  vpc_security_group_ids = "${module.aws-vpc.aws_security_group}"

-  iam_instance_profile = module.aws-iam.kube-worker-profile
-  key_name             = var.AWS_SSH_KEY_NAME
+  iam_instance_profile = "${module.aws-iam.kube-worker-profile}"
+  key_name             = "${var.AWS_SSH_KEY_NAME}"

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-worker${count.index}",
    "kubernetes.io/cluster/${var.aws_cluster_name}", "member",
    "Role", "worker"
-  ))
+  ))}"
 }

 /*
@@ -146,16 +146,16 @@ resource "aws_instance" "k8s-worker" {
 *
 */
 data "template_file" "inventory" {
-  template = file("${path.module}/templates/inventory.tpl")
+  template = "${file("${path.module}/templates/inventory.tpl")}"

  vars = {
-    public_ip_address_bastion = join("\n", formatlist("bastion ansible_host=%s", aws_instance.bastion-server.*.public_ip))
-    connection_strings_master = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-master.*.private_dns, aws_instance.k8s-master.*.private_ip))
-    connection_strings_node   = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-worker.*.private_dns, aws_instance.k8s-worker.*.private_ip))
-    connection_strings_etcd   = join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-etcd.*.private_dns, aws_instance.k8s-etcd.*.private_ip))
-    list_master               = join("\n", aws_instance.k8s-master.*.private_dns)
-    list_node                 = join("\n", aws_instance.k8s-worker.*.private_dns)
-    list_etcd                 = join("\n", aws_instance.k8s-etcd.*.private_dns)
+    public_ip_address_bastion = "${join("\n", formatlist("bastion ansible_host=%s", aws_instance.bastion-server.*.public_ip))}"
+    connection_strings_master = "${join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-master.*.private_dns, aws_instance.k8s-master.*.private_ip))}"
+    connection_strings_node   = "${join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-worker.*.private_dns, aws_instance.k8s-worker.*.private_ip))}"
+    connection_strings_etcd   = "${join("\n", formatlist("%s ansible_host=%s", aws_instance.k8s-etcd.*.private_dns, aws_instance.k8s-etcd.*.private_ip))}"
+    list_master               = "${join("\n", aws_instance.k8s-master.*.private_dns)}"
+    list_node                 = "${join("\n", aws_instance.k8s-worker.*.private_dns)}"
+    list_etcd                 = "${join("\n", aws_instance.k8s-etcd.*.private_dns)}"
    elb_api_fqdn              = "apiserver_loadbalancer_domain_name=\"${module.aws-elb.aws_elb_api_fqdn}\""
  }
 }
@@ -166,6 +166,6 @@ resource "null_resource" "inventories" {
  }

  triggers = {
-    template = data.template_file.inventory.rendered
+    template = "${data.template_file.inventory.rendered}"
  }
 }
--- a/contrib/terraform/aws/modules/elb/main.tf
+++ b/contrib/terraform/aws/modules/elb/main.tf
@@ -1,19 +1,19 @@
 resource "aws_security_group" "aws-elb" {
  name   = "kubernetes-${var.aws_cluster_name}-securitygroup-elb"
-  vpc_id = var.aws_vpc_id
+  vpc_id = "${var.aws_vpc_id}"

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-securitygroup-elb"
-  ))
+  ))}"
 }

 resource "aws_security_group_rule" "aws-allow-api-access" {
  type              = "ingress"
-  from_port         = var.aws_elb_api_port
-  to_port           = var.k8s_secure_api_port
+  from_port         = "${var.aws_elb_api_port}"
+  to_port           = "${var.k8s_secure_api_port}"
  protocol          = "TCP"
  cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = aws_security_group.aws-elb.id
+  security_group_id = "${aws_security_group.aws-elb.id}"
 }

 resource "aws_security_group_rule" "aws-allow-api-egress" {
@@ -22,19 +22,19 @@ resource "aws_security_group_rule" "aws-allow-api-egress" {
  to_port           = 65535
  protocol          = "TCP"
  cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = aws_security_group.aws-elb.id
+  security_group_id = "${aws_security_group.aws-elb.id}"
 }

 # Create a new AWS ELB for K8S API
 resource "aws_elb" "aws-elb-api" {
  name            = "kubernetes-elb-${var.aws_cluster_name}"
  subnets         = var.aws_subnet_ids_public
-  security_groups = [aws_security_group.aws-elb.id]
+  security_groups = ["${aws_security_group.aws-elb.id}"]

  listener {
-    instance_port     = var.k8s_secure_api_port
+    instance_port     = "${var.k8s_secure_api_port}"
    instance_protocol = "tcp"
-    lb_port           = var.aws_elb_api_port
+    lb_port           = "${var.aws_elb_api_port}"
    lb_protocol       = "tcp"
  }

@@ -42,7 +42,7 @@ resource "aws_elb" "aws-elb-api" {
    healthy_threshold   = 2
    unhealthy_threshold = 2
    timeout             = 3
-    target              = "HTTPS:${var.k8s_secure_api_port}/healthz"
+    target              = "TCP:${var.k8s_secure_api_port}"
    interval            = 30
  }

@@ -51,7 +51,7 @@ resource "aws_elb" "aws-elb-api" {
  connection_draining         = true
  connection_draining_timeout = 400

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-elb-api"
-  ))
+  ))}"
 }
--- a/contrib/terraform/aws/modules/elb/outputs.tf
+++ b/contrib/terraform/aws/modules/elb/outputs.tf
@@ -1,7 +1,7 @@
 output "aws_elb_api_id" {
-  value = aws_elb.aws-elb-api.id
+  value = "${aws_elb.aws-elb-api.id}"
 }

 output "aws_elb_api_fqdn" {
-  value = aws_elb.aws-elb-api.dns_name
+  value = "${aws_elb.aws-elb-api.dns_name}"
 }
--- a/contrib/terraform/aws/modules/elb/variables.tf
+++ b/contrib/terraform/aws/modules/elb/variables.tf
@@ -16,15 +16,15 @@ variable "k8s_secure_api_port" {

 variable "aws_avail_zones" {
  description = "Availability Zones Used"
-  type        = list(string)
+  type        = "list"
 }

 variable "aws_subnet_ids_public" {
  description = "IDs of Public Subnets"
-  type        = list(string)
+  type        = "list"
 }

 variable "default_tags" {
  description = "Tags for all resources"
-  type        = map(string)
+  type        = "map"
 }
--- a/contrib/terraform/aws/modules/iam/main.tf
+++ b/contrib/terraform/aws/modules/iam/main.tf
@@ -42,7 +42,7 @@ EOF

 resource "aws_iam_role_policy" "kube-master" {
  name = "kubernetes-${var.aws_cluster_name}-master"
-  role = aws_iam_role.kube-master.id
+  role = "${aws_iam_role.kube-master.id}"

  policy = <<EOF
 {
@@ -77,7 +77,7 @@ EOF

 resource "aws_iam_role_policy" "kube-worker" {
  name = "kubernetes-${var.aws_cluster_name}-node"
-  role = aws_iam_role.kube-worker.id
+  role = "${aws_iam_role.kube-worker.id}"

  policy = <<EOF
 {
@@ -132,10 +132,10 @@ EOF

 resource "aws_iam_instance_profile" "kube-master" {
  name = "kube_${var.aws_cluster_name}_master_profile"
-  role = aws_iam_role.kube-master.name
+  role = "${aws_iam_role.kube-master.name}"
 }

 resource "aws_iam_instance_profile" "kube-worker" {
  name = "kube_${var.aws_cluster_name}_node_profile"
-  role = aws_iam_role.kube-worker.name
+  role = "${aws_iam_role.kube-worker.name}"
 }
--- a/contrib/terraform/aws/modules/iam/outputs.tf
+++ b/contrib/terraform/aws/modules/iam/outputs.tf
@@ -1,7 +1,7 @@
 output "kube-master-profile" {
-  value = aws_iam_instance_profile.kube-master.name
+  value = "${aws_iam_instance_profile.kube-master.name}"
 }

 output "kube-worker-profile" {
-  value = aws_iam_instance_profile.kube-worker.name
+  value = "${aws_iam_instance_profile.kube-worker.name}"
 }
--- a/contrib/terraform/aws/modules/vpc/main.tf
+++ b/contrib/terraform/aws/modules/vpc/main.tf
@@ -1,55 +1,55 @@
 resource "aws_vpc" "cluster-vpc" {
-  cidr_block = var.aws_vpc_cidr_block
+  cidr_block = "${var.aws_vpc_cidr_block}"

  #DNS Related Entries
  enable_dns_support   = true
  enable_dns_hostnames = true

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-vpc"
-  ))
+  ))}"
 }

 resource "aws_eip" "cluster-nat-eip" {
-  count = length(var.aws_cidr_subnets_public)
+  count = "${length(var.aws_cidr_subnets_public)}"
  vpc   = true
 }

 resource "aws_internet_gateway" "cluster-vpc-internetgw" {
-  vpc_id = aws_vpc.cluster-vpc.id
+  vpc_id = "${aws_vpc.cluster-vpc.id}"

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-internetgw"
-  ))
+  ))}"
 }

 resource "aws_subnet" "cluster-vpc-subnets-public" {
-  vpc_id            = aws_vpc.cluster-vpc.id
-  count             = length(var.aws_avail_zones)
-  availability_zone = element(var.aws_avail_zones, count.index)
-  cidr_block        = element(var.aws_cidr_subnets_public, count.index)
+  vpc_id            = "${aws_vpc.cluster-vpc.id}"
+  count             = "${length(var.aws_avail_zones)}"
+  availability_zone = "${element(var.aws_avail_zones, count.index)}"
+  cidr_block        = "${element(var.aws_cidr_subnets_public, count.index)}"

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-${element(var.aws_avail_zones, count.index)}-public",
    "kubernetes.io/cluster/${var.aws_cluster_name}", "member"
-  ))
+  ))}"
 }

 resource "aws_nat_gateway" "cluster-nat-gateway" {
-  count         = length(var.aws_cidr_subnets_public)
-  allocation_id = element(aws_eip.cluster-nat-eip.*.id, count.index)
-  subnet_id     = element(aws_subnet.cluster-vpc-subnets-public.*.id, count.index)
+  count         = "${length(var.aws_cidr_subnets_public)}"
+  allocation_id = "${element(aws_eip.cluster-nat-eip.*.id, count.index)}"
+  subnet_id     = "${element(aws_subnet.cluster-vpc-subnets-public.*.id, count.index)}"
 }

 resource "aws_subnet" "cluster-vpc-subnets-private" {
-  vpc_id            = aws_vpc.cluster-vpc.id
-  count             = length(var.aws_avail_zones)
-  availability_zone = element(var.aws_avail_zones, count.index)
-  cidr_block        = element(var.aws_cidr_subnets_private, count.index)
+  vpc_id            = "${aws_vpc.cluster-vpc.id}"
+  count             = "${length(var.aws_avail_zones)}"
+  availability_zone = "${element(var.aws_avail_zones, count.index)}"
+  cidr_block        = "${element(var.aws_cidr_subnets_private, count.index)}"

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-${element(var.aws_avail_zones, count.index)}-private"
-  ))
+  ))}"
 }

 #Routing in VPC
@@ -57,53 +57,53 @@ resource "aws_subnet" "cluster-vpc-subnets-private" {
 #TODO: Do we need two routing tables for each subnet for redundancy or is one enough?

 resource "aws_route_table" "kubernetes-public" {
-  vpc_id = aws_vpc.cluster-vpc.id
+  vpc_id = "${aws_vpc.cluster-vpc.id}"

  route {
    cidr_block = "0.0.0.0/0"
-    gateway_id = aws_internet_gateway.cluster-vpc-internetgw.id
+    gateway_id = "${aws_internet_gateway.cluster-vpc-internetgw.id}"
  }

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-routetable-public"
-  ))
+  ))}"
 }

 resource "aws_route_table" "kubernetes-private" {
-  count  = length(var.aws_cidr_subnets_private)
-  vpc_id = aws_vpc.cluster-vpc.id
+  count  = "${length(var.aws_cidr_subnets_private)}"
+  vpc_id = "${aws_vpc.cluster-vpc.id}"

  route {
    cidr_block     = "0.0.0.0/0"
-    nat_gateway_id = element(aws_nat_gateway.cluster-nat-gateway.*.id, count.index)
+    nat_gateway_id = "${element(aws_nat_gateway.cluster-nat-gateway.*.id, count.index)}"
  }

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-routetable-private-${count.index}"
-  ))
+  ))}"
 }

 resource "aws_route_table_association" "kubernetes-public" {
-  count          = length(var.aws_cidr_subnets_public)
-  subnet_id      = element(aws_subnet.cluster-vpc-subnets-public.*.id, count.index)
-  route_table_id = aws_route_table.kubernetes-public.id
+  count          = "${length(var.aws_cidr_subnets_public)}"
+  subnet_id      = "${element(aws_subnet.cluster-vpc-subnets-public.*.id, count.index)}"
+  route_table_id = "${aws_route_table.kubernetes-public.id}"
 }

 resource "aws_route_table_association" "kubernetes-private" {
-  count          = length(var.aws_cidr_subnets_private)
-  subnet_id      = element(aws_subnet.cluster-vpc-subnets-private.*.id, count.index)
-  route_table_id = element(aws_route_table.kubernetes-private.*.id, count.index)
+  count          = "${length(var.aws_cidr_subnets_private)}"
+  subnet_id      = "${element(aws_subnet.cluster-vpc-subnets-private.*.id, count.index)}"
+  route_table_id = "${element(aws_route_table.kubernetes-private.*.id, count.index)}"
 }

 #Kubernetes Security Groups

 resource "aws_security_group" "kubernetes" {
  name   = "kubernetes-${var.aws_cluster_name}-securitygroup"
-  vpc_id = aws_vpc.cluster-vpc.id
+  vpc_id = "${aws_vpc.cluster-vpc.id}"

-  tags = merge(var.default_tags, map(
+  tags = "${merge(var.default_tags, map(
    "Name", "kubernetes-${var.aws_cluster_name}-securitygroup"
-  ))
+  ))}"
 }

 resource "aws_security_group_rule" "allow-all-ingress" {
@@ -111,8 +111,8 @@ resource "aws_security_group_rule" "allow-all-ingress" {
  from_port         = 0
  to_port           = 65535
  protocol          = "-1"
-  cidr_blocks       = [var.aws_vpc_cidr_block]
-  security_group_id = aws_security_group.kubernetes.id
+  cidr_blocks       = ["${var.aws_vpc_cidr_block}"]
+  security_group_id = "${aws_security_group.kubernetes.id}"
 }

 resource "aws_security_group_rule" "allow-all-egress" {
@@ -121,7 +121,7 @@ resource "aws_security_group_rule" "allow-all-egress" {
  to_port           = 65535
  protocol          = "-1"
  cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = aws_security_group.kubernetes.id
+  security_group_id = "${aws_security_group.kubernetes.id}"
 }

 resource "aws_security_group_rule" "allow-ssh-connections" {
@@ -130,5 +130,5 @@ resource "aws_security_group_rule" "allow-ssh-connections" {
  to_port           = 22
  protocol          = "TCP"
  cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = aws_security_group.kubernetes.id
+  security_group_id = "${aws_security_group.kubernetes.id}"
 }
--- a/contrib/terraform/aws/modules/vpc/outputs.tf
+++ b/contrib/terraform/aws/modules/vpc/outputs.tf
@@ -1,5 +1,5 @@
 output "aws_vpc_id" {
-  value = aws_vpc.cluster-vpc.id
+  value = "${aws_vpc.cluster-vpc.id}"
 }

 output "aws_subnet_ids_private" {
@@ -15,5 +15,5 @@ output "aws_security_group" {
 }

 output "default_tags" {
-  value = var.default_tags
+  value = "${var.default_tags}"
 }
--- a/contrib/terraform/aws/modules/vpc/variables.tf
+++ b/contrib/terraform/aws/modules/vpc/variables.tf
@@ -8,20 +8,20 @@ variable "aws_cluster_name" {

 variable "aws_avail_zones" {
  description = "AWS Availability Zones Used"
-  type        = list(string)
+  type        = "list"
 }

 variable "aws_cidr_subnets_private" {
  description = "CIDR Blocks for private subnets in Availability zones"
-  type        = list(string)
+  type        = "list"
 }

 variable "aws_cidr_subnets_public" {
  description = "CIDR Blocks for public subnets in Availability zones"
-  type        = list(string)
+  type        = "list"
 }

 variable "default_tags" {
  description = "Default tags for all resources"
-  type        = map(string)
+  type        = "map"
 }
--- a/contrib/terraform/aws/output.tf
+++ b/contrib/terraform/aws/output.tf
@@ -1,17 +1,17 @@
 output "bastion_ip" {
-  value = join("\n", aws_instance.bastion-server.*.public_ip)
+  value = "${join("\n", aws_instance.bastion-server.*.public_ip)}"
 }

 output "masters" {
-  value = join("\n", aws_instance.k8s-master.*.private_ip)
+  value = "${join("\n", aws_instance.k8s-master.*.private_ip)}"
 }

 output "workers" {
-  value = join("\n", aws_instance.k8s-worker.*.private_ip)
+  value = "${join("\n", aws_instance.k8s-worker.*.private_ip)}"
 }

 output "etcd" {
-  value = join("\n", aws_instance.k8s-etcd.*.private_ip)
+  value = "${join("\n", aws_instance.k8s-etcd.*.private_ip)}"
 }

 output "aws_elb_api_fqdn" {
@@ -19,9 +19,9 @@ output "aws_elb_api_fqdn" {
 }

 output "inventory" {
-  value = data.template_file.inventory.rendered
+  value = "${data.template_file.inventory.rendered}"
 }

 output "default_tags" {
-  value = var.default_tags
+  value = "${var.default_tags}"
 }
--- a/contrib/terraform/aws/variables.tf
+++ b/contrib/terraform/aws/variables.tf
@@ -25,7 +25,7 @@ data "aws_ami" "distro" {

  filter {
    name   = "name"
-    values = ["ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*"]
+    values = ["CoreOS-stable-*"]
  }

  filter {
@@ -33,7 +33,7 @@ data "aws_ami" "distro" {
    values = ["hvm"]
  }

-  owners = ["099720109477"] # Canonical
+  owners = ["595879546273"] #CoreOS
 }

 //AWS VPC Variables
@@ -44,12 +44,12 @@ variable "aws_vpc_cidr_block" {

 variable "aws_cidr_subnets_private" {
  description = "CIDR Blocks for private subnets in Availability Zones"
-  type        = list(string)
+  type        = "list"
 }

 variable "aws_cidr_subnets_public" {
  description = "CIDR Blocks for public subnets in Availability Zones"
-  type        = list(string)
+  type        = "list"
 }

 //AWS EC2 Settings
@@ -101,7 +101,7 @@ variable "k8s_secure_api_port" {

 variable "default_tags" {
  description = "Default tags for all resources"
-  type        = map(string)
+  type        = "map"
 }

 variable "inventory_file" {
--- a/contrib/terraform/gcp/README.md
+++ b/contrib/terraform/gcp/README.md
@@ -1,90 +0,0 @@
-# Kubernetes on GCP with Terraform
-
-Provision a Kubernetes cluster on GCP using Terraform and Kubespray
-
-## Overview
-
-The setup looks like following
-
-```text
-                           Kubernetes cluster
-                        +-----------------------+
-+---------------+       |   +--------------+    |
-|               |       |   | +--------------+  |
-| API server LB +---------> | |              |  |
-|               |       |   | | Master/etcd  |  |
-+---------------+       |   | | node(s)      |  |
-                        |   +-+              |  |
-                        |     +--------------+  |
-                        |           ^           |
-                        |           |           |
-                        |           v           |
-+---------------+       |   +--------------+    |
-|               |       |   | +--------------+  |
-|  Ingress LB   +---------> | |              |  |
-|               |       |   | |    Worker    |  |
-+---------------+       |   | |    node(s)   |  |
-                        |   +-+              |  |
-                        |     +--------------+  |
-                        +-----------------------+
-```
-
-## Requirements
-
-* Terraform 0.12.0 or newer
-
-## Quickstart
-
-To get a cluster up and running you'll need a JSON keyfile.
-Set the path to the file in the `tfvars.json` file and run the following:
-
-```bash
-terraform apply -var-file tfvars.json -state dev-cluster.tfstate -var gcp_project_id=<ID of your GCP project> -var keyfile_location=<location of the json keyfile>
-```
-
-To generate kubespray inventory based on the terraform state file you can run the following:
-
-```bash
-./generate-inventory.sh dev-cluster.tfstate > inventory.ini
-```
-
-You should now have a inventory file named `inventory.ini` that you can use with kubespray, e.g.
-
-```bash
-ansible-playbook -i contrib/terraform/gcs/inventory.ini cluster.yml -b -v
-```
-
-## Variables
-
-### Required
-
-* `keyfile_location`: Location to the keyfile to use as credentials for the google terraform provider
-* `gcp_project_id`: ID of the GCP project to deploy the cluster in
-* `ssh_pub_key`: Path to public ssh key to use for all machines
-* `region`: The region where to run the cluster
-* `machines`: Machines to provision. Key of this object will be used as the name of the machine
-  * `node_type`: The role of this node *(master|worker)*
-  * `size`: The size to use
-  * `zone`: The zone the machine should run in
-  * `additional_disks`: Extra disks to add to the machine. Key of this object will be used as the disk name
-    * `size`: Size of the disk (in GB)
-  * `boot_disk`: The boot disk to use
-    * `image_name`: Name of the image
-    * `size`: Size of the boot disk (in GB)
-* `ssh_whitelist`: List of IP ranges (CIDR) that will be allowed to ssh to the nodes
-* `api_server_whitelist`: List of IP ranges (CIDR) that will be allowed to connect to the API server
-* `nodeport_whitelist`: List of IP ranges (CIDR) that will be allowed to connect to the kubernetes nodes on port 30000-32767 (kubernetes nodeports)
-
-### Optional
-
-* `prefix`: Prefix to use for all resources, required to be unique for all clusters in the same project *(Defaults to `default`)*
-* `master_sa_email`: Service account email to use for the master nodes *(Defaults to `""`, auto generate one)*
-* `master_sa_scopes`: Service account email to use for the master nodes *(Defaults to `["https://www.googleapis.com/auth/cloud-platform"]`)*
-* `worker_sa_email`: Service account email to use for the worker nodes *(Defaults to `""`, auto generate one)*
-* `worker_sa_scopes`: Service account email to use for the worker nodes *(Defaults to `["https://www.googleapis.com/auth/cloud-platform"]`)*
-
-An example variables file can be found `tfvars.json`
-
-## Known limitations
-
-This solution does not provide a solution to use a bastion host. Thus all the nodes must expose a public IP for kubespray to work.
--- a/contrib/terraform/gcp/generate-inventory.sh
+++ b/contrib/terraform/gcp/generate-inventory.sh
@@ -1,76 +0,0 @@
-#!/bin/bash
-
-#
-# Generates a inventory file based on the terraform output.
-# After provisioning a cluster, simply run this command and supply the terraform state file
-# Default state file is terraform.tfstate
-#
-
-set -e
-
-usage () {
-  echo "Usage: $0 <state file>" >&2
-  exit 1
-}
-
-if [[ $# -ne 1 ]]; then
-  usage
-fi
-
-TF_STATE_FILE=${1}
-
-if [[ ! -f "${TF_STATE_FILE}" ]]; then
-  echo "ERROR: state file ${TF_STATE_FILE} doesn't exist" >&2
-  usage
-fi
-
-TF_OUT=$(terraform output -state "${TF_STATE_FILE}" -json)
-
-MASTERS=$(jq -r '.master_ips.value | to_entries[]'  <(echo "${TF_OUT}"))
-WORKERS=$(jq -r '.worker_ips.value | to_entries[]'  <(echo "${TF_OUT}"))
-mapfile -t MASTER_NAMES < <(jq -r '.key'  <(echo "${MASTERS}"))
-mapfile -t WORKER_NAMES < <(jq -r '.key'  <(echo "${WORKERS}"))
-
-API_LB=$(jq -r '.control_plane_lb_ip_address.value' <(echo "${TF_OUT}"))
-
-# Generate master hosts
-i=1
-for name in "${MASTER_NAMES[@]}"; do
-  private_ip=$(jq -r '. | select( .key=='"\"${name}\""' ) | .value.private_ip'  <(echo "${MASTERS}"))
-  public_ip=$(jq -r '. | select( .key=='"\"${name}\""' ) | .value.public_ip'  <(echo "${MASTERS}"))
-  echo "${name} ansible_user=ubuntu ansible_host=${public_ip} ip=${private_ip} etcd_member_name=etcd${i}"
-  i=$(( i + 1 ))
-done
-
-# Generate worker hosts
-for name in "${WORKER_NAMES[@]}"; do
-  private_ip=$(jq -r '. | select( .key=='"\"${name}\""' ) | .value.private_ip'  <(echo "${WORKERS}"))
-  public_ip=$(jq -r '. | select( .key=='"\"${name}\""' ) | .value.public_ip'  <(echo "${WORKERS}"))
-  echo "${name} ansible_user=ubuntu ansible_host=${public_ip} ip=${private_ip}"
-done
-
-echo ""
-echo "[kube-master]"
-for name in "${MASTER_NAMES[@]}"; do
-  echo "${name}"
-done
-
-echo ""
-echo "[kube-master:vars]"
-echo "supplementary_addresses_in_ssl_keys = [ '${API_LB}' ]" # Add LB address to API server certificate
-echo ""
-echo "[etcd]"
-for name in "${MASTER_NAMES[@]}"; do
-  echo "${name}"
-done
-
-echo ""
-echo "[kube-node]"
-for name in "${WORKER_NAMES[@]}"; do
-  echo "${name}"
-done
-
-echo ""
-echo "[k8s-cluster:children]"
-echo "kube-master"
-echo "kube-node"
--- a/contrib/terraform/gcp/main.tf
+++ b/contrib/terraform/gcp/main.tf
@@ -1,24 +0,0 @@
-provider "google" {
-  credentials = file(var.keyfile_location)
-  region      = var.region
-  project     = var.gcp_project_id
-  version     = "~> 3.48"
-}
-
-module "kubernetes" {
-  source = "./modules/kubernetes-cluster"
-  region = var.region
-  prefix = var.prefix
-
-  machines    = var.machines
-  ssh_pub_key = var.ssh_pub_key
-
-  master_sa_email  = var.master_sa_email
-  master_sa_scopes = var.master_sa_scopes
-  worker_sa_email  = var.worker_sa_email
-  worker_sa_scopes = var.worker_sa_scopes
-
-  ssh_whitelist        = var.ssh_whitelist
-  api_server_whitelist = var.api_server_whitelist
-  nodeport_whitelist   = var.nodeport_whitelist
-}
--- a/contrib/terraform/gcp/modules/kubernetes-cluster/main.tf
+++ b/contrib/terraform/gcp/modules/kubernetes-cluster/main.tf
@@ -1,360 +0,0 @@
-#################################################
-##
-## General
-##
-
-resource "google_compute_network" "main" {
-  name = "${var.prefix}-network"
-}
-
-resource "google_compute_subnetwork" "main" {
-  name          = "${var.prefix}-subnet"
-  network       = google_compute_network.main.name
-  ip_cidr_range = var.private_network_cidr
-  region        = var.region
-}
-
-resource "google_compute_firewall" "deny_all" {
-  name    = "${var.prefix}-default-firewall"
-  network = google_compute_network.main.name
-
-  priority = 1000
-
-  deny {
-    protocol = "all"
-  }
-}
-
-resource "google_compute_firewall" "allow_internal" {
-  name    = "${var.prefix}-internal-firewall"
-  network = google_compute_network.main.name
-
-  priority = 500
-
-  source_ranges = [var.private_network_cidr]
-
-  allow {
-    protocol = "all"
-  }
-}
-
-resource "google_compute_firewall" "ssh" {
-  name    = "${var.prefix}-ssh-firewall"
-  network = google_compute_network.main.name
-
-  priority = 100
-
-  source_ranges = var.ssh_whitelist
-
-  allow {
-    protocol = "tcp"
-    ports    = ["22"]
-  }
-}
-
-resource "google_compute_firewall" "api_server" {
-  name    = "${var.prefix}-api-server-firewall"
-  network = google_compute_network.main.name
-
-  priority = 100
-
-  source_ranges = var.api_server_whitelist
-
-  allow {
-    protocol = "tcp"
-    ports    = ["6443"]
-  }
-}
-
-resource "google_compute_firewall" "nodeport" {
-  name    = "${var.prefix}-nodeport-firewall"
-  network = google_compute_network.main.name
-
-  priority = 100
-
-  source_ranges = var.nodeport_whitelist
-
-  allow {
-    protocol = "tcp"
-    ports    = ["30000-32767"]
-  }
-}
-
-resource "google_compute_firewall" "ingress_http" {
-  name    = "${var.prefix}-http-ingress-firewall"
-  network = google_compute_network.main.name
-
-  priority = 100
-
-  allow {
-    protocol = "tcp"
-    ports    = ["80"]
-  }
-}
-
-resource "google_compute_firewall" "ingress_https" {
-  name    = "${var.prefix}-https-ingress-firewall"
-  network = google_compute_network.main.name
-
-  priority = 100
-
-  allow {
-    protocol = "tcp"
-    ports    = ["443"]
-  }
-}
-
-#################################################
-##
-## Local variables
-##
-
-locals {
-  master_target_list = [
-    for name, machine in google_compute_instance.master :
-    "${machine.zone}/${machine.name}"
-  ]
-
-  worker_target_list = [
-    for name, machine in google_compute_instance.worker :
-    "${machine.zone}/${machine.name}"
-  ]
-
-  master_disks = flatten([
-    for machine_name, machine in var.machines : [
-      for disk_name, disk in machine.additional_disks : {
-        "${machine_name}-${disk_name}" = {
-          "machine_name": machine_name,
-          "machine": machine,
-          "disk_size": disk.size,
-          "disk_name": disk_name
-        }
-      }
-    ]
-    if machine.node_type == "master"
-  ])
-
-  worker_disks = flatten([
-    for machine_name, machine in var.machines : [
-      for disk_name, disk in machine.additional_disks : {
-        "${machine_name}-${disk_name}" = {
-          "machine_name": machine_name,
-          "machine": machine,
-          "disk_size": disk.size,
-          "disk_name": disk_name
-        }
-      }
-    ]
-    if machine.node_type == "worker"
-  ])
-}
-
-#################################################
-##
-## Master
-##
-
-resource "google_compute_address" "master" {
-  for_each = {
-    for name, machine in var.machines :
-    name => machine
-    if machine.node_type == "master"
-  }
-
-  name         = "${var.prefix}-${each.key}-pip"
-  address_type = "EXTERNAL"
-  region       = var.region
-}
-
-resource "google_compute_disk" "master" {
-  for_each = {
-    for item in local.master_disks :
-     keys(item)[0] => values(item)[0]
-   }
-
-  name = "${var.prefix}-${each.key}"
-  type = "pd-ssd"
-  zone = each.value.machine.zone
-  size = each.value.disk_size
-
-  physical_block_size_bytes = 4096
-}
-
-resource "google_compute_attached_disk" "master" {
-  for_each = {
-    for item in local.master_disks :
-     keys(item)[0] => values(item)[0]
-   }
-
-  disk     = google_compute_disk.master[each.key].id
-  instance = google_compute_instance.master[each.value.machine_name].id
-}
-
-resource "google_compute_instance" "master" {
-  for_each = {
-    for name, machine in var.machines :
-    name => machine
-    if machine.node_type == "master"
-  }
-
-  name         = "${var.prefix}-${each.key}"
-  machine_type = each.value.size
-  zone         = each.value.zone
-
-  tags = ["master"]
-
-  boot_disk {
-    initialize_params {
-      image = each.value.boot_disk.image_name
-      size = each.value.boot_disk.size
-    }
-  }
-
-  network_interface {
-    subnetwork = google_compute_subnetwork.main.name
-
-    access_config {
-      nat_ip = google_compute_address.master[each.key].address
-    }
-  }
-
-  metadata = {
-    ssh-keys = "ubuntu:${trimspace(file(pathexpand(var.ssh_pub_key)))}"
-  }
-
-  service_account {
-    email  = var.master_sa_email
-    scopes = var.master_sa_scopes
-  }
-
-  # Since we use google_compute_attached_disk we need to ignore this
-  lifecycle {
-    ignore_changes = ["attached_disk"]
-  }
-}
-
-resource "google_compute_forwarding_rule" "master_lb" {
-  name = "${var.prefix}-master-lb-forward-rule"
-
-  port_range = "6443"
-
-  target = google_compute_target_pool.master_lb.id
-}
-
-resource "google_compute_target_pool" "master_lb" {
-  name      = "${var.prefix}-master-lb-pool"
-  instances = local.master_target_list
-}
-
-#################################################
-##
-## Worker
-##
-
-resource "google_compute_disk" "worker" {
-  for_each = {
-    for item in local.worker_disks :
-     keys(item)[0] => values(item)[0]
-   }
-
-  name = "${var.prefix}-${each.key}"
-  type = "pd-ssd"
-  zone = each.value.machine.zone
-  size = each.value.disk_size
-
-  physical_block_size_bytes = 4096
-}
-
-resource "google_compute_attached_disk" "worker" {
-  for_each = {
-    for item in local.worker_disks :
-     keys(item)[0] => values(item)[0]
-   }
-
-  disk     = google_compute_disk.worker[each.key].id
-  instance = google_compute_instance.worker[each.value.machine_name].id
-}
-
-resource "google_compute_address" "worker" {
-  for_each = {
-    for name, machine in var.machines :
-    name => machine
-    if machine.node_type == "worker"
-  }
-
-  name         = "${var.prefix}-${each.key}-pip"
-  address_type = "EXTERNAL"
-  region       = var.region
-}
-
-resource "google_compute_instance" "worker" {
-  for_each = {
-    for name, machine in var.machines :
-    name => machine
-    if machine.node_type == "worker"
-  }
-
-  name         = "${var.prefix}-${each.key}"
-  machine_type = each.value.size
-  zone         = each.value.zone
-
-  tags = ["worker"]
-
-  boot_disk {
-    initialize_params {
-      image = each.value.boot_disk.image_name
-      size = each.value.boot_disk.size
-    }
-  }
-
-  network_interface {
-    subnetwork = google_compute_subnetwork.main.name
-
-    access_config {
-      nat_ip = google_compute_address.worker[each.key].address
-    }
-  }
-
-  metadata = {
-    ssh-keys = "ubuntu:${trimspace(file(pathexpand(var.ssh_pub_key)))}"
-  }
-
-  service_account {
-    email  = var.worker_sa_email
-    scopes = var.worker_sa_scopes
-  }
-
-  # Since we use google_compute_attached_disk we need to ignore this
-  lifecycle {
-    ignore_changes = ["attached_disk"]
-  }
-}
-
-resource "google_compute_address" "worker_lb" {
-  name         = "${var.prefix}-worker-lb-address"
-  address_type = "EXTERNAL"
-  region       = var.region
-}
-
-resource "google_compute_forwarding_rule" "worker_http_lb" {
-  name = "${var.prefix}-worker-http-lb-forward-rule"
-
-  ip_address = google_compute_address.worker_lb.address
-  port_range = "80"
-
-  target = google_compute_target_pool.worker_lb.id
-}
-
-resource "google_compute_forwarding_rule" "worker_https_lb" {
-  name = "${var.prefix}-worker-https-lb-forward-rule"
-
-  ip_address = google_compute_address.worker_lb.address
-  port_range = "443"
-
-  target = google_compute_target_pool.worker_lb.id
-}
-
-resource "google_compute_target_pool" "worker_lb" {
-  name      = "${var.prefix}-worker-lb-pool"
-  instances = local.worker_target_list
-}
--- a/contrib/terraform/gcp/modules/kubernetes-cluster/output.tf
+++ b/contrib/terraform/gcp/modules/kubernetes-cluster/output.tf
@@ -1,27 +0,0 @@
-output "master_ip_addresses" {
-  value = {
-    for key, instance in google_compute_instance.master :
-    instance.name => {
-      "private_ip" = instance.network_interface.0.network_ip
-      "public_ip"  = instance.network_interface.0.access_config.0.nat_ip
-    }
-  }
-}
-
-output "worker_ip_addresses" {
-  value = {
-    for key, instance in google_compute_instance.worker :
-    instance.name => {
-      "private_ip" = instance.network_interface.0.network_ip
-      "public_ip"  = instance.network_interface.0.access_config.0.nat_ip
-    }
-  }
-}
-
-output "ingress_controller_lb_ip_address" {
-  value = google_compute_address.worker_lb.address
-}
-
-output "control_plane_lb_ip_address" {
-  value = google_compute_forwarding_rule.master_lb.ip_address
-}
--- a/contrib/terraform/gcp/modules/kubernetes-cluster/variables.tf
+++ b/contrib/terraform/gcp/modules/kubernetes-cluster/variables.tf
@@ -1,54 +0,0 @@
-variable "region" {
-  type = string
-}
-
-variable "prefix" {}
-
-variable "machines" {
-  type = map(object({
-    node_type = string
-    size      = string
-    zone      = string
-    additional_disks = map(object({
-      size = number
-    }))
-    boot_disk = object({
-      image_name = string
-      size = number
-    })
-  }))
-}
-
-variable "master_sa_email" {
-  type = string
-}
-
-variable "master_sa_scopes" {
-  type = list(string)
-}
-
-variable "worker_sa_email" {
-  type = string
-}
-
-variable "worker_sa_scopes" {
-  type = list(string)
-}
-
-variable "ssh_pub_key" {}
-
-variable "ssh_whitelist" {
-  type = list(string)
-}
-
-variable "api_server_whitelist" {
-  type = list(string)
-}
-
-variable "nodeport_whitelist" {
-  type = list(string)
-}
-
-variable "private_network_cidr" {
-  default = "10.0.10.0/24"
-}
--- a/contrib/terraform/gcp/output.tf
+++ b/contrib/terraform/gcp/output.tf
@@ -1,15 +0,0 @@
-output "master_ips" {
-  value = module.kubernetes.master_ip_addresses
-}
-
-output "worker_ips" {
-  value = module.kubernetes.worker_ip_addresses
-}
-
-output "ingress_controller_lb_ip_address" {
-  value = module.kubernetes.ingress_controller_lb_ip_address
-}
-
-output "control_plane_lb_ip_address" {
-  value = module.kubernetes.control_plane_lb_ip_address
-}
--- a/contrib/terraform/gcp/tfvars.json
+++ b/contrib/terraform/gcp/tfvars.json
@@ -1,60 +0,0 @@
-{
-  "gcp_project_id": "GCP_PROJECT_ID",
-  "region": "us-central1",
-  "ssh_pub_key": "~/.ssh/id_rsa.pub",
-
-  "keyfile_location": "service-account.json",
-
-  "prefix": "development",
-
-  "ssh_whitelist": [
-    "1.2.3.4/32"
-  ],
-  "api_server_whitelist": [
-    "1.2.3.4/32"
-  ],
-  "nodeport_whitelist": [
-    "1.2.3.4/32"
-  ],
-
-  "machines": {
-    "master-0": {
-      "node_type": "master",
-      "size": "n1-standard-2",
-      "zone": "us-central1-a",
-      "additional_disks": {},
-      "boot_disk": {
-        "image_name": "ubuntu-os-cloud/ubuntu-1804-bionic-v20201116",
-        "size": 50
-      }
-    },
-    "worker-0": {
-      "node_type": "worker",
-      "size": "n1-standard-8",
-      "zone": "us-central1-a",
-      "additional_disks": {
-        "extra-disk-1": {
-          "size": 100
-        }
-      },
-      "boot_disk": {
-        "image_name": "ubuntu-os-cloud/ubuntu-1804-bionic-v20201116",
-        "size": 50
-      }
-    },
-    "worker-1": {
-      "node_type": "worker",
-      "size": "n1-standard-8",
-      "zone": "us-central1-a",
-      "additional_disks": {
-        "extra-disk-1": {
-          "size": 100
-        }
-      },
-      "boot_disk": {
-        "image_name": "ubuntu-os-cloud/ubuntu-1804-bionic-v20201116",
-        "size": 50
-      }
-    }
-  }
-}
--- a/contrib/terraform/gcp/variables.tf
+++ b/contrib/terraform/gcp/variables.tf
@@ -1,72 +0,0 @@
-variable keyfile_location {
-  description = "Location of the json keyfile to use with the google provider"
-  type        = string
-}
-
-variable region {
-  description = "Region of all resources"
-  type        = string
-}
-
-variable gcp_project_id {
-  description = "ID of the project"
-  type        = string
-}
-
-variable prefix {
-  description = "Prefix for resource names"
-  default     = "default"
-}
-
-variable machines {
-  description = "Cluster machines"
-  type = map(object({
-    node_type = string
-    size      = string
-    zone      = string
-    additional_disks = map(object({
-      size = number
-    }))
-    boot_disk = object({
-      image_name = string
-      size       = number
-    })
-  }))
-}
-
-variable "master_sa_email" {
-  type    = string
-  default = ""
-}
-
-variable "master_sa_scopes" {
-  type    = list(string)
-  default = ["https://www.googleapis.com/auth/cloud-platform"]
-}
-
-variable "worker_sa_email" {
-  type    = string
-  default = ""
-}
-
-variable "worker_sa_scopes" {
-  type    = list(string)
-  default = ["https://www.googleapis.com/auth/cloud-platform"]
-}
-
-variable ssh_pub_key {
-  description = "Path to public SSH key file which is injected into the VMs."
-  type        = string
-}
-
-variable ssh_whitelist {
-  type = list(string)
-}
-
-variable api_server_whitelist {
-  type = list(string)
-}
-
-variable nodeport_whitelist {
-  type = list(string)
-}
--- a/contrib/terraform/openstack/README.md
+++ b/contrib/terraform/openstack/README.md
@@ -1,15 +1,14 @@
-# Kubernetes on OpenStack with Terraform
+# Kubernetes on Openstack with Terraform

 Provision a Kubernetes cluster with [Terraform](https://www.terraform.io) on
-OpenStack.
+Openstack.

 ## Status

-This will install a Kubernetes cluster on an OpenStack Cloud. It should work on
+This will install a Kubernetes cluster on an Openstack Cloud. It should work on
 most modern installs of OpenStack that support the basic services.

 ### Known compatible public clouds
-
 - [Auro](https://auro.io/)
 - [Betacloud](https://www.betacloud.io/)
 - [CityCloud](https://www.citycloud.com/)
@@ -24,8 +23,8 @@ most modern installs of OpenStack that support the basic services.
 - [VexxHost](https://vexxhost.com/)
 - [Zetta](https://www.zetta.io/)

-## Approach

+## Approach
 The terraform configuration inspects variables found in
 [variables.tf](variables.tf) to create resources in your OpenStack cluster.
 There is a [python script](../terraform.py) that reads the generated`.tfstate`
@@ -33,7 +32,6 @@ file to generate a dynamic inventory that is consumed by the main ansible script
 to actually install kubernetes and stand up the cluster.

 ### Networking
-
 The configuration includes creating a private subnet with a router to the
 external net. It will allocate floating IPs from a pool and assign them to the
 hosts where that makes sense. You have the option of creating bastion hosts
@@ -41,23 +39,19 @@ inside the private subnet to access the nodes there.  Alternatively, a node with
 a floating IP can be used as a jump host to nodes without.

 #### Using an existing router
-
 It is possible to use an existing router instead of creating one. To use an
 existing router set the router\_id variable to the uuid of the router you wish
 to use.

 For example:
-
-```ShellSession
+```
 router_id = "00c542e7-6f46-4535-ae95-984c7f0391a3"
 ```

 ### Kubernetes Nodes
-
 You can create many different kubernetes topologies by setting the number of
 different classes of hosts. For each class there are options for allocating
 floating IP addresses or not.
-
 - Master nodes with etcd
 - Master nodes without etcd
 - Standalone etcd hosts
@@ -70,19 +64,17 @@ master nodes with etcd replicas. As an example, if you have three master nodes w
 etcd replicas and three standalone etcd nodes, the script will fail since there are
 now six total etcd replicas.

-### GlusterFS shared file system
-
+### GlusterFS
 The Terraform configuration supports provisioning of an optional GlusterFS
 shared file system based on a separate set of VMs. To enable this, you need to
 specify:
-
 - the number of Gluster hosts (minimum 2)
 - Size of the non-ephemeral volumes to be attached to store the GlusterFS bricks
 - Other properties related to provisioning the hosts

-Even if you are using Flatcar Container Linux by Kinvolk for your cluster, you will still
+Even if you are using Container Linux by CoreOS for your cluster, you will still
 need the GlusterFS VMs to be based on either Debian or RedHat based images.
-Flatcar Container Linux by Kinvolk cannot serve GlusterFS, but can connect to it through
+Container Linux by CoreOS cannot serve GlusterFS, but can connect to it through
 binaries available on hyperkube v1.4.3_coreos.0 or higher.

 ## Requirements
@@ -95,9 +87,7 @@ binaries available on hyperkube v1.4.3_coreos.0 or higher.
 - you have a pair of keys generated that can be used to secure the new hosts

 ## Module Architecture
-
 The configuration is divided into three modules:
-
 - Network
 - IPs
 - Compute
@@ -110,13 +100,12 @@ to be updated.
 You can force your existing IPs by modifying the compute variables in
 `kubespray.tf` as follows:

-```ini
+```
 k8s_master_fips = ["151.101.129.67"]
 k8s_node_fips = ["151.101.129.68"]
 ```

 ## Terraform
-
 Terraform will be used to provision all of the OpenStack resources with base software as appropriate.

 ### Configuration
@@ -126,10 +115,10 @@ Terraform will be used to provision all of the OpenStack resources with base sof
 Create an inventory directory for your cluster by copying the existing sample and linking the `hosts` script (used to build the inventory based on Terraform state):

 ```ShellSession
-cp -LRp contrib/terraform/openstack/sample-inventory inventory/$CLUSTER
-cd inventory/$CLUSTER
-ln -s ../../contrib/terraform/openstack/hosts
-ln -s ../../contrib
+$ cp -LRp contrib/terraform/openstack/sample-inventory inventory/$CLUSTER
+$ cd inventory/$CLUSTER
+$ ln -s ../../contrib/terraform/openstack/hosts
+$ ln -s ../../contrib
 ```

 This will be the base for subsequent Terraform commands.
@@ -149,13 +138,13 @@ please read the [OpenStack provider documentation](https://www.terraform.io/docs

 The recommended authentication method is to describe credentials in a YAML file `clouds.yaml` that can be stored in:

- the current directory
- `~/.config/openstack`
- `/etc/openstack`
+* the current directory
+* `~/.config/openstack`
+* `/etc/openstack`

 `clouds.yaml`:

-```yaml
+```
 clouds:
  mycloud:
    auth:
@@ -173,7 +162,7 @@ clouds:
 If you have multiple clouds defined in your `clouds.yaml` file you can choose
 the one you want to use with the environment variable `OS_CLOUD`:

-```ShellSession
+```
 export OS_CLOUD=mycloud
 ```

@@ -185,7 +174,7 @@ from Horizon under *Project* -> *Compute* -> *Access & Security* -> *API Access*

 With identity v2:

-```ShellSession
+```
 source openrc

 env | grep OS
@@ -202,7 +191,7 @@ OS_IDENTITY_API_VERSION=2

 With identity v3:

-```ShellSession
+```
 source openrc

 env | grep OS
@@ -219,24 +208,24 @@ OS_IDENTITY_API_VERSION=3
 OS_USER_DOMAIN_NAME=Default
 ```

-Terraform does not support a mix of DomainName and DomainID, choose one or the other:
+Terraform does not support a mix of DomainName and DomainID, choose one or the
+other:

- provider.openstack: You must provide exactly one of DomainID or DomainName to authenticate by Username
+```
+* provider.openstack: You must provide exactly one of DomainID or DomainName to authenticate by Username
+```

-```ShellSession
+```
 unset OS_USER_DOMAIN_NAME
 export OS_USER_DOMAIN_ID=default
-```

 or

-```ShellSession
 unset OS_PROJECT_DOMAIN_ID
 set OS_PROJECT_DOMAIN_NAME=Default
 ```

 #### Cluster variables
-
 The construction of the cluster is driven by values found in
 [variables.tf](variables.tf).

@@ -250,7 +239,6 @@ For your cluster, edit `inventory/$CLUSTER/cluster.tfvars`.
 |`network_dns_domain` | (Optional) The dns_domain for the internal network that will be generated |
 |`dns_nameservers`| An array of DNS name server names to be used by hosts in the internal subnet. |
 |`floatingip_pool` | Name of the pool from which floating IPs will be allocated |
-|`k8s_master_fips` | A list of floating IPs that you have already pre-allocated; they will be attached to master nodes instead of creating new random floating IPs. |
 |`external_net` | UUID of the external network that will be routed to |
 |`flavor_k8s_master`,`flavor_k8s_node`,`flavor_etcd`, `flavor_bastion`,`flavor_gfs_node` | Flavor depends on your openstack installation, you can get available flavor IDs through `openstack flavor list` |
 |`image`,`image_gfs` | Name of the image to use in provisioning the compute resources. Should already be loaded into glance. |
@@ -276,19 +264,16 @@ For your cluster, edit `inventory/$CLUSTER/cluster.tfvars`.
 |`etcd_root_volume_size_in_gb` | Size of the root volume for etcd nodes, 0 to use ephemeral storage |
 |`bastion_root_volume_size_in_gb` | Size of the root volume for bastions, 0 to use ephemeral storage |
 |`use_server_group` | Create and use openstack nova servergroups, default: false |
-|`use_access_ip` | If 1, nodes with floating IPs will transmit internal cluster traffic via floating IPs; if 0 private IPs will be used instead. Default value is 1. |
 |`k8s_nodes` | Map containing worker node definition, see explanation below |

 ##### k8s_nodes
-
 Allows a custom defintion of worker nodes giving the operator full control over individual node flavor and
 availability zone placement. To enable the use of this mode set the `number_of_k8s_nodes` and
 `number_of_k8s_nodes_no_floating_ip` variables to 0. Then define your desired worker node configuration
 using the `k8s_nodes` variable.

 For example:
-
-```ini
+```
 k8s_nodes = {
  "1" = {
    "az" = "sto1"
@@ -309,16 +294,14 @@ k8s_nodes = {
 ```

 Would result in the same configuration as:
-
-```ini
+```
 number_of_k8s_nodes = 3
 flavor_k8s_node = "83d8b44a-26a0-4f02-a981-079446926445"
 az_list = ["sto1", "sto2", "sto3"]
 ```

 And:
-
-```ini
+```
 k8s_nodes = {
  "ing-1" = {
    "az" = "sto1"
@@ -372,8 +355,7 @@ Would result in three nodes in each availability zone each with their own separa
 flavor and floating ip configuration.

 The "schema":
-
-```ini
+```
 k8s_nodes = {
  "key | node name suffix, must be unique" = {
    "az" = string
@@ -382,7 +364,6 @@ k8s_nodes = {
  },
 }
 ```
-
 All values are required.

 #### Terraform state files
@@ -391,10 +372,10 @@ In the cluster's inventory folder, the following files might be created (either
 or manually), to prevent you from pushing them accidentally they are in a
 `.gitignore` file in the `terraform/openstack` directory :

- `.terraform`
- `.tfvars`
- `.tfstate`
- `.tfstate.backup`
+* `.terraform`
+* `.tfvars`
+* `.tfstate`
+* `.tfstate.backup`

 You can still add them manually if you want to.

@@ -404,19 +385,17 @@ Before Terraform can operate on your cluster you need to install the required
 plugins. This is accomplished as follows:

 ```ShellSession
-cd inventory/$CLUSTER
-terraform init ../../contrib/terraform/openstack
+$ cd inventory/$CLUSTER
+$ terraform init ../../contrib/terraform/openstack
 ```

 This should finish fairly quickly telling you Terraform has successfully initialized and loaded necessary modules.

 ### Provisioning cluster
-
 You can apply the Terraform configuration to your cluster with the following command
 issued from your cluster's inventory directory (`inventory/$CLUSTER`):
-
 ```ShellSession
-terraform apply -var-file=cluster.tfvars ../../contrib/terraform/openstack
+$ terraform apply -var-file=cluster.tfvars ../../contrib/terraform/openstack
 ```

 if you chose to create a bastion host, this script will create
@@ -427,20 +406,18 @@ or move that file. If you want to use this, just leave it there, as ansible will
 pick it up automatically.

 ### Destroying cluster
-
 You can destroy your new cluster with the following command issued from the cluster's inventory directory:

 ```ShellSession
-terraform destroy -var-file=cluster.tfvars ../../contrib/terraform/openstack
+$ terraform destroy -var-file=cluster.tfvars ../../contrib/terraform/openstack
 ```

 If you've started the Ansible run, it may also be a good idea to do some manual cleanup:

- remove SSH keys from the destroyed cluster from your `~/.ssh/known_hosts` file
- clean up any temporary cache files: `rm /tmp/$CLUSTER-*`
+* remove SSH keys from the destroyed cluster from your `~/.ssh/known_hosts` file
+* clean up any temporary cache files: `rm /tmp/$CLUSTER-*`

 ### Debugging
-
 You can enable debugging output from Terraform by setting
 `OS_DEBUG` to 1 and`TF_LOG` to`DEBUG` before running the Terraform command.

@@ -460,9 +437,9 @@ Terraform can output values that are useful for configure Neutron/Octavia LBaaS
 Ensure your local ssh-agent is running and your ssh key has been added. This
 step is required by the terraform provisioner:

-```ShellSession
-eval $(ssh-agent -s)
-ssh-add ~/.ssh/id_rsa
+```
+$ eval $(ssh-agent -s)
+$ ssh-add ~/.ssh/id_rsa
 ```

 If you have deployed and destroyed a previous iteration of your cluster, you will need to clear out any stale keys from your SSH "known hosts" file ( `~/.ssh/known_hosts`).
@@ -474,7 +451,7 @@ generated`.tfstate` file to generate a dynamic inventory recognizes
 some variables within a "metadata" block, defined in a "resource"
 block (example):

-```ini
+```
 resource "openstack_compute_instance_v2" "example" {
    ...
    metadata {
@@ -505,9 +482,9 @@ So, either a bastion host, or at least master/node with a floating IP are requir

 #### Test access

-Make sure you can connect to the hosts.  Note that Flatcar Container Linux by Kinvolk will have a state `FAILED` due to Python not being present.  This is okay, because Python will be installed during bootstrapping, so long as the hosts are not `UNREACHABLE`.
+Make sure you can connect to the hosts.  Note that Container Linux by CoreOS will have a state `FAILED` due to Python not being present.  This is okay, because Python will be installed during bootstrapping, so long as the hosts are not `UNREACHABLE`.

-```ShellSession
+```
 $ ansible -i inventory/$CLUSTER/hosts -m ping all
 example-k8s_node-1 | SUCCESS => {
    "changed": false,
@@ -528,55 +505,48 @@ If it fails try to connect manually via SSH.  It could be something as simple as
 ### Configure cluster variables

 Edit `inventory/$CLUSTER/group_vars/all/all.yml`:
-
 - **bin_dir**:
-
-```yml
+```
 # Directory where the binaries will be installed
 # Default:
 # bin_dir: /usr/local/bin
-# For Flatcar Container Linux by Kinvolk:
+# For Container Linux by CoreOS:
 bin_dir: /opt/bin
 ```
-
 - and **cloud_provider**:
-
-```yml
+```
 cloud_provider: openstack
 ```
-
 Edit `inventory/$CLUSTER/group_vars/k8s-cluster/k8s-cluster.yml`:
-
 - Set variable **kube_network_plugin** to your desired networking plugin.
  - **flannel** works out-of-the-box
  - **calico** requires [configuring OpenStack Neutron ports](/docs/openstack.md) to allow service and pod subnets
-
-```yml
+```
 # Choose network plugin (calico, weave or flannel)
 # Can also be set to 'cloud', which lets the cloud provider setup appropriate routing
 kube_network_plugin: flannel
 ```
-
 - Set variable **resolvconf_mode**
-
-```yml
+```
 # Can be docker_dns, host_resolvconf or none
 # Default:
 # resolvconf_mode: docker_dns
-# For Flatcar Container Linux by Kinvolk:
+# For Container Linux by CoreOS:
 resolvconf_mode: host_resolvconf
 ```
-
 - Set max amount of attached cinder volume per host (default 256)
-
-```yml
+```
 node_volume_attach_limit: 26
 ```
+- Disable access_ip, this will make all innternal cluster traffic to be sent over local network when a floating IP is attached (default this value is set to 1)
+```
+use_access_ip: 0
+```

 ### Deploy Kubernetes

-```ShellSession
-ansible-playbook --become -i inventory/$CLUSTER/hosts cluster.yml
+```
+$ ansible-playbook --become -i inventory/$CLUSTER/hosts cluster.yml
 ```

 This will take some time as there are many tasks to run.
@@ -584,36 +554,26 @@ This will take some time as there are many tasks to run.
 ## Kubernetes

 ### Set up kubectl
-
 1. [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on your workstation
 2. Add a route to the internal IP of a master node (if needed):
-
-```ShellSession
+```
 sudo route add [master-internal-ip] gw [router-ip]
 ```
-
 or
-
-```ShellSession
+```
 sudo route add -net [internal-subnet]/24 gw [router-ip]
 ```
-
-1. List Kubernetes certificates & keys:
-
-```ShellSession
+3. List Kubernetes certificates & keys:
+```
 ssh [os-user]@[master-ip] sudo ls /etc/kubernetes/ssl/
 ```
-
-1. Get `admin`'s certificates and keys:
-
-```ShellSession
+4. Get `admin`'s certificates and keys:
+```
 ssh [os-user]@[master-ip] sudo cat /etc/kubernetes/ssl/admin-kube-master-1-key.pem > admin-key.pem
 ssh [os-user]@[master-ip] sudo cat /etc/kubernetes/ssl/admin-kube-master-1.pem > admin.pem
 ssh [os-user]@[master-ip] sudo cat /etc/kubernetes/ssl/ca.pem > ca.pem
 ```
-
-1. Configure kubectl:
-
+5. Configure kubectl:
 ```ShellSession
 $ kubectl config set-cluster default-cluster --server=https://[master-internal-ip]:6443 \
    --certificate-authority=ca.pem
@@ -626,25 +586,22 @@ $ kubectl config set-credentials default-admin \
 $ kubectl config set-context default-system --cluster=default-cluster --user=default-admin
 $ kubectl config use-context default-system
 ```
-
-1. Check it:
-
-```ShellSession
+7. Check it:
+```
 kubectl version
 ```

 ## GlusterFS
-
 GlusterFS is not deployed by the standard`cluster.yml` playbook, see the
 [GlusterFS playbook documentation](../../network-storage/glusterfs/README.md)
 for instructions.

 Basically you will install Gluster as
-
 ```ShellSession
-ansible-playbook --become -i inventory/$CLUSTER/hosts ./contrib/network-storage/glusterfs/glusterfs.yml
+$ ansible-playbook --become -i inventory/$CLUSTER/hosts ./contrib/network-storage/glusterfs/glusterfs.yml
 ```

+
 ## What's next

 Try out your new Kubernetes cluster with the [Hello Kubernetes service](https://kubernetes.io/docs/tasks/access-application-cluster/service-access-application-cluster/).
@@ -652,7 +609,6 @@ Try out your new Kubernetes cluster with the [Hello Kubernetes service](https://
 ## Appendix

 ### Migration from `number_of_k8s_nodes*` to `k8s_nodes`
-
 If you currently have a cluster defined using the `number_of_k8s_nodes*` variables and wish
 to migrate to the `k8s_nodes` style you can do it like so:

--- a/contrib/terraform/openstack/kubespray.tf
+++ b/contrib/terraform/openstack/kubespray.tf
@@ -1,108 +1,106 @@
+provider "openstack" {
+  version = "~> 1.17"
+}
+
 module "network" {
  source = "./modules/network"

-  external_net       = var.external_net
-  network_name       = var.network_name
-  subnet_cidr        = var.subnet_cidr
-  cluster_name       = var.cluster_name
-  dns_nameservers    = var.dns_nameservers
-  network_dns_domain = var.network_dns_domain
-  use_neutron        = var.use_neutron
-  router_id          = var.router_id
+  external_net       = "${var.external_net}"
+  network_name       = "${var.network_name}"
+  subnet_cidr        = "${var.subnet_cidr}"
+  cluster_name       = "${var.cluster_name}"
+  dns_nameservers    = "${var.dns_nameservers}"
+  network_dns_domain = "${var.network_dns_domain}"
+  use_neutron        = "${var.use_neutron}"
+  router_id          = "${var.router_id}"
 }

 module "ips" {
  source = "./modules/ips"

-  number_of_k8s_masters         = var.number_of_k8s_masters
-  number_of_k8s_masters_no_etcd = var.number_of_k8s_masters_no_etcd
-  number_of_k8s_nodes           = var.number_of_k8s_nodes
-  floatingip_pool               = var.floatingip_pool
-  number_of_bastions            = var.number_of_bastions
-  external_net                  = var.external_net
-  network_name                  = var.network_name
-  router_id                     = module.network.router_id
-  k8s_nodes                     = var.k8s_nodes
-  k8s_master_fips               = var.k8s_master_fips
-  router_internal_port_id       = module.network.router_internal_port_id
+  number_of_k8s_masters         = "${var.number_of_k8s_masters}"
+  number_of_k8s_masters_no_etcd = "${var.number_of_k8s_masters_no_etcd}"
+  number_of_k8s_nodes           = "${var.number_of_k8s_nodes}"
+  floatingip_pool               = "${var.floatingip_pool}"
+  number_of_bastions            = "${var.number_of_bastions}"
+  external_net                  = "${var.external_net}"
+  network_name                  = "${var.network_name}"
+  router_id                     = "${module.network.router_id}"
+  k8s_nodes                     = "${var.k8s_nodes}"
 }

 module "compute" {
  source = "./modules/compute"

-  cluster_name                                 = var.cluster_name
-  az_list                                      = var.az_list
-  az_list_node                                 = var.az_list_node
-  number_of_k8s_masters                        = var.number_of_k8s_masters
-  number_of_k8s_masters_no_etcd                = var.number_of_k8s_masters_no_etcd
-  number_of_etcd                               = var.number_of_etcd
-  number_of_k8s_masters_no_floating_ip         = var.number_of_k8s_masters_no_floating_ip
-  number_of_k8s_masters_no_floating_ip_no_etcd = var.number_of_k8s_masters_no_floating_ip_no_etcd
-  number_of_k8s_nodes                          = var.number_of_k8s_nodes
-  number_of_bastions                           = var.number_of_bastions
-  number_of_k8s_nodes_no_floating_ip           = var.number_of_k8s_nodes_no_floating_ip
-  number_of_gfs_nodes_no_floating_ip           = var.number_of_gfs_nodes_no_floating_ip
-  k8s_nodes                                    = var.k8s_nodes
-  bastion_root_volume_size_in_gb               = var.bastion_root_volume_size_in_gb
-  etcd_root_volume_size_in_gb                  = var.etcd_root_volume_size_in_gb
-  master_root_volume_size_in_gb                = var.master_root_volume_size_in_gb
-  node_root_volume_size_in_gb                  = var.node_root_volume_size_in_gb
-  gfs_root_volume_size_in_gb                   = var.gfs_root_volume_size_in_gb
-  gfs_volume_size_in_gb                        = var.gfs_volume_size_in_gb
-  master_volume_type                           = var.master_volume_type
-  public_key_path                              = var.public_key_path
-  image                                        = var.image
-  image_gfs                                    = var.image_gfs
-  ssh_user                                     = var.ssh_user
-  ssh_user_gfs                                 = var.ssh_user_gfs
-  flavor_k8s_master                            = var.flavor_k8s_master
-  flavor_k8s_node                              = var.flavor_k8s_node
-  flavor_etcd                                  = var.flavor_etcd
-  flavor_gfs_node                              = var.flavor_gfs_node
-  network_name                                 = var.network_name
-  flavor_bastion                               = var.flavor_bastion
-  k8s_master_fips                              = module.ips.k8s_master_fips
-  k8s_master_no_etcd_fips                      = module.ips.k8s_master_no_etcd_fips
-  k8s_node_fips                                = module.ips.k8s_node_fips
-  k8s_nodes_fips                               = module.ips.k8s_nodes_fips
-  bastion_fips                                 = module.ips.bastion_fips
-  bastion_allowed_remote_ips                   = var.bastion_allowed_remote_ips
-  master_allowed_remote_ips                    = var.master_allowed_remote_ips
-  k8s_allowed_remote_ips                       = var.k8s_allowed_remote_ips
-  k8s_allowed_egress_ips                       = var.k8s_allowed_egress_ips
-  supplementary_master_groups                  = var.supplementary_master_groups
-  supplementary_node_groups                    = var.supplementary_node_groups
-  master_allowed_ports                         = var.master_allowed_ports
-  worker_allowed_ports                         = var.worker_allowed_ports
-  wait_for_floatingip                          = var.wait_for_floatingip
-  use_access_ip                                = var.use_access_ip
-  use_server_groups                            = var.use_server_groups
-  extra_sec_groups                             = var.extra_sec_groups
-  extra_sec_groups_name                        = var.extra_sec_groups_name
+  cluster_name                                 = "${var.cluster_name}"
+  az_list                                      = "${var.az_list}"
+  az_list_node                                 = "${var.az_list_node}"
+  number_of_k8s_masters                        = "${var.number_of_k8s_masters}"
+  number_of_k8s_masters_no_etcd                = "${var.number_of_k8s_masters_no_etcd}"
+  number_of_etcd                               = "${var.number_of_etcd}"
+  number_of_k8s_masters_no_floating_ip         = "${var.number_of_k8s_masters_no_floating_ip}"
+  number_of_k8s_masters_no_floating_ip_no_etcd = "${var.number_of_k8s_masters_no_floating_ip_no_etcd}"
+  number_of_k8s_nodes                          = "${var.number_of_k8s_nodes}"
+  number_of_bastions                           = "${var.number_of_bastions}"
+  number_of_k8s_nodes_no_floating_ip           = "${var.number_of_k8s_nodes_no_floating_ip}"
+  number_of_gfs_nodes_no_floating_ip           = "${var.number_of_gfs_nodes_no_floating_ip}"
+  k8s_nodes                                    = "${var.k8s_nodes}"
+  bastion_root_volume_size_in_gb               = "${var.bastion_root_volume_size_in_gb}"
+  etcd_root_volume_size_in_gb                  = "${var.etcd_root_volume_size_in_gb}"
+  master_root_volume_size_in_gb                = "${var.master_root_volume_size_in_gb}"
+  node_root_volume_size_in_gb                  = "${var.node_root_volume_size_in_gb}"
+  gfs_root_volume_size_in_gb                   = "${var.gfs_root_volume_size_in_gb}"
+  gfs_volume_size_in_gb                        = "${var.gfs_volume_size_in_gb}"
+  public_key_path                              = "${var.public_key_path}"
+  image                                        = "${var.image}"
+  image_gfs                                    = "${var.image_gfs}"
+  ssh_user                                     = "${var.ssh_user}"
+  ssh_user_gfs                                 = "${var.ssh_user_gfs}"
+  flavor_k8s_master                            = "${var.flavor_k8s_master}"
+  flavor_k8s_node                              = "${var.flavor_k8s_node}"
+  flavor_etcd                                  = "${var.flavor_etcd}"
+  flavor_gfs_node                              = "${var.flavor_gfs_node}"
+  network_name                                 = "${var.network_name}"
+  flavor_bastion                               = "${var.flavor_bastion}"
+  k8s_master_fips                              = "${module.ips.k8s_master_fips}"
+  k8s_master_no_etcd_fips                      = "${module.ips.k8s_master_no_etcd_fips}"
+  k8s_node_fips                                = "${module.ips.k8s_node_fips}"
+  k8s_nodes_fips                               = "${module.ips.k8s_nodes_fips}"
+  bastion_fips                                 = "${module.ips.bastion_fips}"
+  bastion_allowed_remote_ips                   = "${var.bastion_allowed_remote_ips}"
+  master_allowed_remote_ips                    = "${var.master_allowed_remote_ips}"
+  k8s_allowed_remote_ips                       = "${var.k8s_allowed_remote_ips}"
+  k8s_allowed_egress_ips                       = "${var.k8s_allowed_egress_ips}"
+  supplementary_master_groups                  = "${var.supplementary_master_groups}"
+  supplementary_node_groups                    = "${var.supplementary_node_groups}"
+  worker_allowed_ports                         = "${var.worker_allowed_ports}"
+  wait_for_floatingip                          = "${var.wait_for_floatingip}"
+  use_access_ip                                = "${var.use_access_ip}"
+  use_server_groups                            = "${var.use_server_groups}"

-  network_id = module.network.router_id
+  network_id = "${module.network.router_id}"
 }

 output "private_subnet_id" {
-  value = module.network.subnet_id
+  value = "${module.network.subnet_id}"
 }

 output "floating_network_id" {
-  value = var.external_net
+  value = "${var.external_net}"
 }

 output "router_id" {
-  value = module.network.router_id
+  value = "${module.network.router_id}"
 }

 output "k8s_master_fips" {
-  value = concat(module.ips.k8s_master_fips, module.ips.k8s_master_no_etcd_fips)
+  value = "${concat(module.ips.k8s_master_fips, module.ips.k8s_master_no_etcd_fips)}"
 }

 output "k8s_node_fips" {
-  value = var.number_of_k8s_nodes > 0 ? module.ips.k8s_node_fips : [for key, value in module.ips.k8s_nodes_fips : value.address]
+  value = "${var.number_of_k8s_nodes > 0 ? module.ips.k8s_node_fips : [for key, value in module.ips.k8s_nodes_fips : value.address]}"
 }

 output "bastion_fips" {
-  value = module.ips.bastion_fips
+  value = "${module.ips.bastion_fips}"
 }
--- a/contrib/terraform/openstack/modules/compute/main.tf
+++ b/contrib/terraform/openstack/modules/compute/main.tf
@@ -1,14 +1,14 @@
 data "openstack_images_image_v2" "vm_image" {
-  name = var.image
+  name = "${var.image}"
 }

 data "openstack_images_image_v2" "gfs_image" {
-  name = var.image_gfs == "" ? var.image : var.image_gfs
+  name = "${var.image_gfs == "" ? var.image : var.image_gfs}"
 }

 resource "openstack_compute_keypair_v2" "k8s" {
  name       = "kubernetes-${var.cluster_name}"
-  public_key = chomp(file(var.public_key_path))
+  public_key = "${chomp(file(var.public_key_path))}"
 }

 resource "openstack_networking_secgroup_v2" "k8s_master" {
@@ -17,51 +17,33 @@ resource "openstack_networking_secgroup_v2" "k8s_master" {
  delete_default_rules = true
 }

-resource "openstack_networking_secgroup_v2" "k8s_master_extra" {
-  count                = "%{if var.extra_sec_groups}1%{else}0%{endif}"
-  name                 = "${var.cluster_name}-k8s-master-${var.extra_sec_groups_name}"
-  description          = "${var.cluster_name} - Kubernetes Master nodes - rules not managed by terraform"
-  delete_default_rules = true
-}
-
 resource "openstack_networking_secgroup_rule_v2" "k8s_master" {
-  count             = length(var.master_allowed_remote_ips)
+  count             = "${length(var.master_allowed_remote_ips)}"
  direction         = "ingress"
  ethertype         = "IPv4"
  protocol          = "tcp"
  port_range_min    = "6443"
  port_range_max    = "6443"
-  remote_ip_prefix  = var.master_allowed_remote_ips[count.index]
-  security_group_id = openstack_networking_secgroup_v2.k8s_master.id
-}
-
-resource "openstack_networking_secgroup_rule_v2" "k8s_master_ports" {
-  count             = length(var.master_allowed_ports)
-  direction         = "ingress"
-  ethertype         = "IPv4"
-  protocol          = lookup(var.master_allowed_ports[count.index], "protocol", "tcp")
-  port_range_min    = lookup(var.master_allowed_ports[count.index], "port_range_min")
-  port_range_max    = lookup(var.master_allowed_ports[count.index], "port_range_max")
-  remote_ip_prefix  = lookup(var.master_allowed_ports[count.index], "remote_ip_prefix", "0.0.0.0/0")
-  security_group_id = openstack_networking_secgroup_v2.k8s_master.id
+  remote_ip_prefix  = "${var.master_allowed_remote_ips[count.index]}"
+  security_group_id = "${openstack_networking_secgroup_v2.k8s_master.id}"
 }

 resource "openstack_networking_secgroup_v2" "bastion" {
  name                 = "${var.cluster_name}-bastion"
-  count                = var.number_of_bastions != "" ? 1 : 0
+  count                = "${var.number_of_bastions != "" ? 1 : 0}"
  description          = "${var.cluster_name} - Bastion Server"
  delete_default_rules = true
 }

 resource "openstack_networking_secgroup_rule_v2" "bastion" {
-  count             = var.number_of_bastions != "" ? length(var.bastion_allowed_remote_ips) : 0
+  count             = "${var.number_of_bastions != "" ? length(var.bastion_allowed_remote_ips) : 0}"
  direction         = "ingress"
  ethertype         = "IPv4"
  protocol          = "tcp"
  port_range_min    = "22"
  port_range_max    = "22"
-  remote_ip_prefix  = var.bastion_allowed_remote_ips[count.index]
-  security_group_id = openstack_networking_secgroup_v2.bastion[0].id
+  remote_ip_prefix  = "${var.bastion_allowed_remote_ips[count.index]}"
+  security_group_id = "${openstack_networking_secgroup_v2.bastion[0].id}"
 }

 resource "openstack_networking_secgroup_v2" "k8s" {
@@ -73,27 +55,27 @@ resource "openstack_networking_secgroup_v2" "k8s" {
 resource "openstack_networking_secgroup_rule_v2" "k8s" {
  direction         = "ingress"
  ethertype         = "IPv4"
-  remote_group_id   = openstack_networking_secgroup_v2.k8s.id
-  security_group_id = openstack_networking_secgroup_v2.k8s.id
+  remote_group_id   = "${openstack_networking_secgroup_v2.k8s.id}"
+  security_group_id = "${openstack_networking_secgroup_v2.k8s.id}"
 }

 resource "openstack_networking_secgroup_rule_v2" "k8s_allowed_remote_ips" {
-  count             = length(var.k8s_allowed_remote_ips)
+  count             = "${length(var.k8s_allowed_remote_ips)}"
  direction         = "ingress"
  ethertype         = "IPv4"
  protocol          = "tcp"
  port_range_min    = "22"
  port_range_max    = "22"
-  remote_ip_prefix  = var.k8s_allowed_remote_ips[count.index]
-  security_group_id = openstack_networking_secgroup_v2.k8s.id
+  remote_ip_prefix  = "${var.k8s_allowed_remote_ips[count.index]}"
+  security_group_id = "${openstack_networking_secgroup_v2.k8s.id}"
 }

 resource "openstack_networking_secgroup_rule_v2" "egress" {
-  count             = length(var.k8s_allowed_egress_ips)
+  count             = "${length(var.k8s_allowed_egress_ips)}"
  direction         = "egress"
  ethertype         = "IPv4"
-  remote_ip_prefix  = var.k8s_allowed_egress_ips[count.index]
-  security_group_id = openstack_networking_secgroup_v2.k8s.id
+  remote_ip_prefix  = "${var.k8s_allowed_egress_ips[count.index]}"
+  security_group_id = "${openstack_networking_secgroup_v2.k8s.id}"
 }

 resource "openstack_networking_secgroup_v2" "worker" {
@@ -102,22 +84,15 @@ resource "openstack_networking_secgroup_v2" "worker" {
  delete_default_rules = true
 }

-resource "openstack_networking_secgroup_v2" "worker_extra" {
-  count                = "%{if var.extra_sec_groups}1%{else}0%{endif}"
-  name                 = "${var.cluster_name}-k8s-worker-${var.extra_sec_groups_name}"
-  description          = "${var.cluster_name} - Kubernetes worker nodes - rules not managed by terraform"
-  delete_default_rules = true
-}
-
 resource "openstack_networking_secgroup_rule_v2" "worker" {
-  count             = length(var.worker_allowed_ports)
+  count             = "${length(var.worker_allowed_ports)}"
  direction         = "ingress"
  ethertype         = "IPv4"
-  protocol          = lookup(var.worker_allowed_ports[count.index], "protocol", "tcp")
-  port_range_min    = lookup(var.worker_allowed_ports[count.index], "port_range_min")
-  port_range_max    = lookup(var.worker_allowed_ports[count.index], "port_range_max")
-  remote_ip_prefix  = lookup(var.worker_allowed_ports[count.index], "remote_ip_prefix", "0.0.0.0/0")
-  security_group_id = openstack_networking_secgroup_v2.worker.id
+  protocol          = "${lookup(var.worker_allowed_ports[count.index], "protocol", "tcp")}"
+  port_range_min    = "${lookup(var.worker_allowed_ports[count.index], "port_range_min")}"
+  port_range_max    = "${lookup(var.worker_allowed_ports[count.index], "port_range_max")}"
+  remote_ip_prefix  = "${lookup(var.worker_allowed_ports[count.index], "remote_ip_prefix", "0.0.0.0/0")}"
+  security_group_id = "${openstack_networking_secgroup_v2.worker.id}"
 }

 resource "openstack_compute_servergroup_v2" "k8s_master" {
@@ -138,34 +113,19 @@ resource "openstack_compute_servergroup_v2" "k8s_etcd" {
  policies = ["anti-affinity"]
 }

-locals {
-# master groups
-  master_sec_groups = compact([
-    openstack_networking_secgroup_v2.k8s_master.name,
-    openstack_networking_secgroup_v2.k8s.name,
-    var.extra_sec_groups ?openstack_networking_secgroup_v2.k8s_master_extra[0].name : "",
-  ])
-# worker groups
-  worker_sec_groups = compact([
-    openstack_networking_secgroup_v2.k8s.name,
-    openstack_networking_secgroup_v2.worker.name,
-    var.extra_sec_groups ? openstack_networking_secgroup_v2.k8s_master_extra[0].name : "",
-  ])
-}
-
 resource "openstack_compute_instance_v2" "bastion" {
  name       = "${var.cluster_name}-bastion-${count.index + 1}"
-  count      = var.number_of_bastions
-  image_name = var.image
-  flavor_id  = var.flavor_bastion
-  key_pair   = openstack_compute_keypair_v2.k8s.name
+  count      = "${var.number_of_bastions}"
+  image_name = "${var.image}"
+  flavor_id  = "${var.flavor_bastion}"
+  key_pair   = "${openstack_compute_keypair_v2.k8s.name}"

  dynamic "block_device" {
    for_each = var.bastion_root_volume_size_in_gb > 0 ? [var.image] : []
    content {
-      uuid                  = data.openstack_images_image_v2.vm_image.id
+      uuid                  = "${data.openstack_images_image_v2.vm_image.id}"
      source_type           = "image"
-      volume_size           = var.bastion_root_volume_size_in_gb
+      volume_size           = "${var.bastion_root_volume_size_in_gb}"
      boot_index            = 0
      destination_type      = "volume"
      delete_on_termination = true
@@ -173,18 +133,18 @@ resource "openstack_compute_instance_v2" "bastion" {
  }

  network {
-    name = var.network_name
+    name = "${var.network_name}"
  }

-  security_groups = [openstack_networking_secgroup_v2.k8s.name,
-    element(openstack_networking_secgroup_v2.bastion.*.name, count.index),
+  security_groups = ["${openstack_networking_secgroup_v2.k8s.name}",
+    "${element(openstack_networking_secgroup_v2.bastion.*.name, count.index)}",
  ]

  metadata = {
-    ssh_user         = var.ssh_user
+    ssh_user         = "${var.ssh_user}"
    kubespray_groups = "bastion"
-    depends_on       = var.network_id
-    use_access_ip    = var.use_access_ip
+    depends_on       = "${var.network_id}"
+    use_access_ip    = "${var.use_access_ip}"
  }

  provisioner "local-exec" {
@@ -194,20 +154,19 @@ resource "openstack_compute_instance_v2" "bastion" {

 resource "openstack_compute_instance_v2" "k8s_master" {
  name              = "${var.cluster_name}-k8s-master-${count.index + 1}"
-  count             = var.number_of_k8s_masters
-  availability_zone = element(var.az_list, count.index)
-  image_name        = var.image
-  flavor_id         = var.flavor_k8s_master
-  key_pair          = openstack_compute_keypair_v2.k8s.name
+  count             = "${var.number_of_k8s_masters}"
+  availability_zone = "${element(var.az_list, count.index)}"
+  image_name        = "${var.image}"
+  flavor_id         = "${var.flavor_k8s_master}"
+  key_pair          = "${openstack_compute_keypair_v2.k8s.name}"


  dynamic "block_device" {
    for_each = var.master_root_volume_size_in_gb > 0 ? [var.image] : []
    content {
-      uuid                  = data.openstack_images_image_v2.vm_image.id
+      uuid                  = "${data.openstack_images_image_v2.vm_image.id}"
      source_type           = "image"
-      volume_size           = var.master_root_volume_size_in_gb
-      volume_type           = var.master_volume_type
+      volume_size           = "${var.master_root_volume_size_in_gb}"
      boot_index            = 0
      destination_type      = "volume"
      delete_on_termination = true
@@ -215,23 +174,25 @@ resource "openstack_compute_instance_v2" "k8s_master" {
  }

  network {
-    name = var.network_name
+    name = "${var.network_name}"
  }

-  security_groups = local.master_sec_groups
+  security_groups = ["${openstack_networking_secgroup_v2.k8s_master.name}",
+    "${openstack_networking_secgroup_v2.k8s.name}",
+  ]

  dynamic "scheduler_hints" {
    for_each = var.use_server_groups ? [openstack_compute_servergroup_v2.k8s_master[0]] : []
    content {
-      group = openstack_compute_servergroup_v2.k8s_master[0].id
+      group = "${openstack_compute_servergroup_v2.k8s_master[0].id}"
    }
  }

  metadata = {
-    ssh_user         = var.ssh_user
+    ssh_user         = "${var.ssh_user}"
    kubespray_groups = "etcd,kube-master,${var.supplementary_master_groups},k8s-cluster,vault"
-    depends_on       = var.network_id
-    use_access_ip    = var.use_access_ip
+    depends_on       = "${var.network_id}"
+    use_access_ip    = "${var.use_access_ip}"
  }

  provisioner "local-exec" {
@@ -241,20 +202,19 @@ resource "openstack_compute_instance_v2" "k8s_master" {

 resource "openstack_compute_instance_v2" "k8s_master_no_etcd" {
  name              = "${var.cluster_name}-k8s-master-ne-${count.index + 1}"
-  count             = var.number_of_k8s_masters_no_etcd
-  availability_zone = element(var.az_list, count.index)
-  image_name        = var.image
-  flavor_id         = var.flavor_k8s_master
-  key_pair          = openstack_compute_keypair_v2.k8s.name
+  count             = "${var.number_of_k8s_masters_no_etcd}"
+  availability_zone = "${element(var.az_list, count.index)}"
+  image_name        = "${var.image}"
+  flavor_id         = "${var.flavor_k8s_master}"
+  key_pair          = "${openstack_compute_keypair_v2.k8s.name}"


  dynamic "block_device" {
    for_each = var.master_root_volume_size_in_gb > 0 ? [var.image] : []
    content {
-      uuid                  = data.openstack_images_image_v2.vm_image.id
+      uuid                  = "${data.openstack_images_image_v2.vm_image.id}"
      source_type           = "image"
-      volume_size           = var.master_root_volume_size_in_gb
-      volume_type           = var.master_volume_type
+      volume_size           = "${var.master_root_volume_size_in_gb}"
      boot_index            = 0
      destination_type      = "volume"
      delete_on_termination = true
@@ -262,23 +222,25 @@ resource "openstack_compute_instance_v2" "k8s_master_no_etcd" {
  }

  network {
-    name = var.network_name
+    name = "${var.network_name}"
  }

-  security_groups = local.master_sec_groups
+  security_groups = ["${openstack_networking_secgroup_v2.k8s_master.name}",
+    "${openstack_networking_secgroup_v2.k8s.name}",
+  ]

  dynamic "scheduler_hints" {
    for_each = var.use_server_groups ? [openstack_compute_servergroup_v2.k8s_master[0]] : []
    content {
-      group = openstack_compute_servergroup_v2.k8s_master[0].id
+      group = "${openstack_compute_servergroup_v2.k8s_master[0].id}"
    }
  }

  metadata = {
-    ssh_user         = var.ssh_user
+    ssh_user         = "${var.ssh_user}"
    kubespray_groups = "kube-master,${var.supplementary_master_groups},k8s-cluster,vault"
-    depends_on       = var.network_id
-    use_access_ip    = var.use_access_ip
+    depends_on       = "${var.network_id}"
+    use_access_ip    = "${var.use_access_ip}"
  }

  provisioner "local-exec" {
@@ -288,18 +250,18 @@ resource "openstack_compute_instance_v2" "k8s_master_no_etcd" {

 resource "openstack_compute_instance_v2" "etcd" {
  name              = "${var.cluster_name}-etcd-${count.index + 1}"
-  count             = var.number_of_etcd
-  availability_zone = element(var.az_list, count.index)
-  image_name        = var.image
-  flavor_id         = var.flavor_etcd
-  key_pair          = openstack_compute_keypair_v2.k8s.name
+  count             = "${var.number_of_etcd}"
+  availability_zone = "${element(var.az_list, count.index)}"
+  image_name        = "${var.image}"
+  flavor_id         = "${var.flavor_etcd}"
+  key_pair          = "${openstack_compute_keypair_v2.k8s.name}"

  dynamic "block_device" {
    for_each = var.etcd_root_volume_size_in_gb > 0 ? [var.image] : []
    content {
-      uuid                  = data.openstack_images_image_v2.vm_image.id
+      uuid                  = "${data.openstack_images_image_v2.vm_image.id}"
      source_type           = "image"
-      volume_size           = var.etcd_root_volume_size_in_gb
+      volume_size           = "${var.etcd_root_volume_size_in_gb}"
      boot_index            = 0
      destination_type      = "volume"
      delete_on_termination = true
@@ -307,41 +269,40 @@ resource "openstack_compute_instance_v2" "etcd" {
  }

  network {
-    name = var.network_name
+    name = "${var.network_name}"
  }

-  security_groups = [openstack_networking_secgroup_v2.k8s.name]
+  security_groups = ["${openstack_networking_secgroup_v2.k8s.name}"]

  dynamic "scheduler_hints" {
    for_each = var.use_server_groups ? [openstack_compute_servergroup_v2.k8s_etcd[0]] : []
    content {
-      group = openstack_compute_servergroup_v2.k8s_etcd[0].id
+      group = "${openstack_compute_servergroup_v2.k8s_etcd[0].id}"
    }
  }

  metadata = {
-    ssh_user         = var.ssh_user
+    ssh_user         = "${var.ssh_user}"
    kubespray_groups = "etcd,vault,no-floating"
-    depends_on       = var.network_id
-    use_access_ip    = var.use_access_ip
+    depends_on       = "${var.network_id}"
+    use_access_ip    = "${var.use_access_ip}"
  }
 }

 resource "openstack_compute_instance_v2" "k8s_master_no_floating_ip" {
  name              = "${var.cluster_name}-k8s-master-nf-${count.index + 1}"
-  count             = var.number_of_k8s_masters_no_floating_ip
-  availability_zone = element(var.az_list, count.index)
-  image_name        = var.image
-  flavor_id         = var.flavor_k8s_master
-  key_pair          = openstack_compute_keypair_v2.k8s.name
+  count             = "${var.number_of_k8s_masters_no_floating_ip}"
+  availability_zone = "${element(var.az_list, count.index)}"
+  image_name        = "${var.image}"
+  flavor_id         = "${var.flavor_k8s_master}"
+  key_pair          = "${openstack_compute_keypair_v2.k8s.name}"

  dynamic "block_device" {
    for_each = var.master_root_volume_size_in_gb > 0 ? [var.image] : []
    content {
-      uuid                  = data.openstack_images_image_v2.vm_image.id
+      uuid                  = "${data.openstack_images_image_v2.vm_image.id}"
      source_type           = "image"
-      volume_size           = var.master_root_volume_size_in_gb
-      volume_type           = var.master_volume_type
+      volume_size           = "${var.master_root_volume_size_in_gb}"
      boot_index            = 0
      destination_type      = "volume"
      delete_on_termination = true
@@ -349,41 +310,42 @@ resource "openstack_compute_instance_v2" "k8s_master_no_floating_ip" {
  }

  network {
-    name = var.network_name
+    name = "${var.network_name}"
  }

-  security_groups = local.master_sec_groups
+  security_groups = ["${openstack_networking_secgroup_v2.k8s_master.name}",
+    "${openstack_networking_secgroup_v2.k8s.name}",
+  ]

  dynamic "scheduler_hints" {
    for_each = var.use_server_groups ? [openstack_compute_servergroup_v2.k8s_master[0]] : []
    content {
-      group = openstack_compute_servergroup_v2.k8s_master[0].id
+      group = "${openstack_compute_servergroup_v2.k8s_master[0].id}"
    }
  }

  metadata = {
-    ssh_user         = var.ssh_user
+    ssh_user         = "${var.ssh_user}"
    kubespray_groups = "etcd,kube-master,${var.supplementary_master_groups},k8s-cluster,vault,no-floating"
-    depends_on       = var.network_id
-    use_access_ip    = var.use_access_ip
+    depends_on       = "${var.network_id}"
+    use_access_ip    = "${var.use_access_ip}"
  }
 }

 resource "openstack_compute_instance_v2" "k8s_master_no_floating_ip_no_etcd" {
  name              = "${var.cluster_name}-k8s-master-ne-nf-${count.index + 1}"
-  count             = var.number_of_k8s_masters_no_floating_ip_no_etcd
-  availability_zone = element(var.az_list, count.index)
-  image_name        = var.image
-  flavor_id         = var.flavor_k8s_master
-  key_pair          = openstack_compute_keypair_v2.k8s.name
+  count             = "${var.number_of_k8s_masters_no_floating_ip_no_etcd}"
+  availability_zone = "${element(var.az_list, count.index)}"
+  image_name        = "${var.image}"
+  flavor_id         = "${var.flavor_k8s_master}"
+  key_pair          = "${openstack_compute_keypair_v2.k8s.name}"

  dynamic "block_device" {
    for_each = var.master_root_volume_size_in_gb > 0 ? [var.image] : []
    content {
-      uuid                  = data.openstack_images_image_v2.vm_image.id
+      uuid                  = "${data.openstack_images_image_v2.vm_image.id}"
      source_type           = "image"
-      volume_size           = var.master_root_volume_size_in_gb
-      volume_type           = var.master_volume_type
+      volume_size           = "${var.master_root_volume_size_in_gb}"
      boot_index            = 0
      destination_type      = "volume"
      delete_on_termination = true
@@ -391,40 +353,42 @@ resource "openstack_compute_instance_v2" "k8s_master_no_floating_ip_no_etcd" {
  }

  network {
-    name = var.network_name
+    name = "${var.network_name}"
  }

-  security_groups = local.master_sec_groups
+  security_groups = ["${openstack_networking_secgroup_v2.k8s_master.name}",
+    "${openstack_networking_secgroup_v2.k8s.name}",
+  ]

  dynamic "scheduler_hints" {
    for_each = var.use_server_groups ? [openstack_compute_servergroup_v2.k8s_master[0]] : []
    content {
-      group = openstack_compute_servergroup_v2.k8s_master[0].id
+      group = "${openstack_compute_servergroup_v2.k8s_master[0].id}"
    }
  }

  metadata = {
-    ssh_user         = var.ssh_user
+    ssh_user         = "${var.ssh_user}"
    kubespray_groups = "kube-master,${var.supplementary_master_groups},k8s-cluster,vault,no-floating"
-    depends_on       = var.network_id
-    use_access_ip    = var.use_access_ip
+    depends_on       = "${var.network_id}"
+    use_access_ip    = "${var.use_access_ip}"
  }
 }

 resource "openstack_compute_instance_v2" "k8s_node" {
  name              = "${var.cluster_name}-k8s-node-${count.index + 1}"
-  count             = var.number_of_k8s_nodes
-  availability_zone = element(var.az_list_node, count.index)
-  image_name        = var.image
-  flavor_id         = var.flavor_k8s_node
-  key_pair          = openstack_compute_keypair_v2.k8s.name
+  count             = "${var.number_of_k8s_nodes}"
+  availability_zone = "${element(var.az_list_node, count.index)}"
+  image_name        = "${var.image}"
+  flavor_id         = "${var.flavor_k8s_node}"
+  key_pair          = "${openstack_compute_keypair_v2.k8s.name}"

  dynamic "block_device" {
    for_each = var.node_root_volume_size_in_gb > 0 ? [var.image] : []
    content {
-      uuid                  = data.openstack_images_image_v2.vm_image.id
+      uuid                  = "${data.openstack_images_image_v2.vm_image.id}"
      source_type           = "image"
-      volume_size           = var.node_root_volume_size_in_gb
+      volume_size           = "${var.node_root_volume_size_in_gb}"
      boot_index            = 0
      destination_type      = "volume"
      delete_on_termination = true
@@ -432,23 +396,25 @@ resource "openstack_compute_instance_v2" "k8s_node" {
  }

  network {
-    name = var.network_name
+    name = "${var.network_name}"
  }

-  security_groups = local.worker_sec_groups
+  security_groups = ["${openstack_networking_secgroup_v2.k8s.name}",
+    "${openstack_networking_secgroup_v2.worker.name}",
+  ]

  dynamic "scheduler_hints" {
    for_each = var.use_server_groups ? [openstack_compute_servergroup_v2.k8s_node[0]] : []
    content {
-      group = openstack_compute_servergroup_v2.k8s_node[0].id
+      group = "${openstack_compute_servergroup_v2.k8s_node[0].id}"
    }
  }

  metadata = {
-    ssh_user         = var.ssh_user
+    ssh_user         = "${var.ssh_user}"
    kubespray_groups = "kube-node,k8s-cluster,${var.supplementary_node_groups}"
-    depends_on       = var.network_id
-    use_access_ip    = var.use_access_ip
+    depends_on       = "${var.network_id}"
+    use_access_ip    = "${var.use_access_ip}"
  }

  provisioner "local-exec" {
@@ -458,18 +424,18 @@ resource "openstack_compute_instance_v2" "k8s_node" {

 resource "openstack_compute_instance_v2" "k8s_node_no_floating_ip" {
  name              = "${var.cluster_name}-k8s-node-nf-${count.index + 1}"
-  count             = var.number_of_k8s_nodes_no_floating_ip
-  availability_zone = element(var.az_list_node, count.index)
-  image_name        = var.image
-  flavor_id         = var.flavor_k8s_node
-  key_pair          = openstack_compute_keypair_v2.k8s.name
+  count             = "${var.number_of_k8s_nodes_no_floating_ip}"
+  availability_zone = "${element(var.az_list_node, count.index)}"
+  image_name        = "${var.image}"
+  flavor_id         = "${var.flavor_k8s_node}"
+  key_pair          = "${openstack_compute_keypair_v2.k8s.name}"

  dynamic "block_device" {
    for_each = var.node_root_volume_size_in_gb > 0 ? [var.image] : []
    content {
-      uuid                  = data.openstack_images_image_v2.vm_image.id
+      uuid                  = "${data.openstack_images_image_v2.vm_image.id}"
      source_type           = "image"
-      volume_size           = var.node_root_volume_size_in_gb
+      volume_size           = "${var.node_root_volume_size_in_gb}"
      boot_index            = 0
      destination_type      = "volume"
      delete_on_termination = true
@@ -477,40 +443,42 @@ resource "openstack_compute_instance_v2" "k8s_node_no_floating_ip" {
  }

  network {
-    name = var.network_name
+    name = "${var.network_name}"
  }

-  security_groups = local.worker_sec_groups
+  security_groups = ["${openstack_networking_secgroup_v2.k8s.name}",
+    "${openstack_networking_secgroup_v2.worker.name}",
+  ]

  dynamic "scheduler_hints" {
    for_each = var.use_server_groups ? [openstack_compute_servergroup_v2.k8s_node[0]] : []
    content {
-      group = openstack_compute_servergroup_v2.k8s_node[0].id
+      group = "${openstack_compute_servergroup_v2.k8s_node[0].id}"
    }
  }

  metadata = {
-    ssh_user         = var.ssh_user
+    ssh_user         = "${var.ssh_user}"
    kubespray_groups = "kube-node,k8s-cluster,no-floating,${var.supplementary_node_groups}"
-    depends_on       = var.network_id
-    use_access_ip    = var.use_access_ip
+    depends_on       = "${var.network_id}"
+    use_access_ip    = "${var.use_access_ip}"
  }
 }

 resource "openstack_compute_instance_v2" "k8s_nodes" {
  for_each          = var.number_of_k8s_nodes == 0 && var.number_of_k8s_nodes_no_floating_ip == 0 ? var.k8s_nodes : {}
  name              = "${var.cluster_name}-k8s-node-${each.key}"
-  availability_zone = each.value.az
-  image_name        = var.image
-  flavor_id         = each.value.flavor
-  key_pair          = openstack_compute_keypair_v2.k8s.name
+  availability_zone = "${each.value.az}"
+  image_name        = "${var.image}"
+  flavor_id         = "${each.value.flavor}"
+  key_pair          = "${openstack_compute_keypair_v2.k8s.name}"

  dynamic "block_device" {
    for_each = var.node_root_volume_size_in_gb > 0 ? [var.image] : []
    content {
-      uuid                  = data.openstack_images_image_v2.vm_image.id
+      uuid                  = "${data.openstack_images_image_v2.vm_image.id}"
      source_type           = "image"
-      volume_size           = var.node_root_volume_size_in_gb
+      volume_size           = "${var.node_root_volume_size_in_gb}"
      boot_index            = 0
      destination_type      = "volume"
      delete_on_termination = true
@@ -518,23 +486,25 @@ resource "openstack_compute_instance_v2" "k8s_nodes" {
  }

  network {
-    name = var.network_name
+    name = "${var.network_name}"
  }

-  security_groups = local.worker_sec_groups
+  security_groups = ["${openstack_networking_secgroup_v2.k8s.name}",
+    "${openstack_networking_secgroup_v2.worker.name}",
+  ]

  dynamic "scheduler_hints" {
    for_each = var.use_server_groups ? [openstack_compute_servergroup_v2.k8s_node[0]] : []
    content {
-      group = openstack_compute_servergroup_v2.k8s_node[0].id
+      group = "${openstack_compute_servergroup_v2.k8s_node[0].id}"
    }
  }

  metadata = {
-    ssh_user         = var.ssh_user
+    ssh_user         = "${var.ssh_user}"
    kubespray_groups = "kube-node,k8s-cluster,%{if each.value.floating_ip == false}no-floating,%{endif}${var.supplementary_node_groups}"
-    depends_on       = var.network_id
-    use_access_ip    = var.use_access_ip
+    depends_on       = "${var.network_id}"
+    use_access_ip    = "${var.use_access_ip}"
  }

  provisioner "local-exec" {
@@ -544,18 +514,18 @@ resource "openstack_compute_instance_v2" "k8s_nodes" {

 resource "openstack_compute_instance_v2" "glusterfs_node_no_floating_ip" {
  name              = "${var.cluster_name}-gfs-node-nf-${count.index + 1}"
-  count             = var.number_of_gfs_nodes_no_floating_ip
-  availability_zone = element(var.az_list, count.index)
-  image_name        = var.image_gfs
-  flavor_id         = var.flavor_gfs_node
-  key_pair          = openstack_compute_keypair_v2.k8s.name
+  count             = "${var.number_of_gfs_nodes_no_floating_ip}"
+  availability_zone = "${element(var.az_list, count.index)}"
+  image_name        = "${var.image_gfs}"
+  flavor_id         = "${var.flavor_gfs_node}"
+  key_pair          = "${openstack_compute_keypair_v2.k8s.name}"

  dynamic "block_device" {
    for_each = var.gfs_root_volume_size_in_gb > 0 ? [var.image] : []
    content {
-      uuid                  = data.openstack_images_image_v2.vm_image.id
+      uuid                  = "${data.openstack_images_image_v2.vm_image.id}"
      source_type           = "image"
-      volume_size           = var.gfs_root_volume_size_in_gb
+      volume_size           = "${var.gfs_root_volume_size_in_gb}"
      boot_index            = 0
      destination_type      = "volume"
      delete_on_termination = true
@@ -563,70 +533,70 @@ resource "openstack_compute_instance_v2" "glusterfs_node_no_floating_ip" {
  }

  network {
-    name = var.network_name
+    name = "${var.network_name}"
  }

-  security_groups = [openstack_networking_secgroup_v2.k8s.name]
+  security_groups = ["${openstack_networking_secgroup_v2.k8s.name}"]

  dynamic "scheduler_hints" {
    for_each = var.use_server_groups ? [openstack_compute_servergroup_v2.k8s_node[0]] : []
    content {
-      group = openstack_compute_servergroup_v2.k8s_node[0].id
+      group = "${openstack_compute_servergroup_v2.k8s_node[0].id}"
    }
  }

  metadata = {
-    ssh_user         = var.ssh_user_gfs
+    ssh_user         = "${var.ssh_user_gfs}"
    kubespray_groups = "gfs-cluster,network-storage,no-floating"
-    depends_on       = var.network_id
-    use_access_ip    = var.use_access_ip
+    depends_on       = "${var.network_id}"
+    use_access_ip    = "${var.use_access_ip}"
  }
 }

 resource "openstack_compute_floatingip_associate_v2" "bastion" {
-  count                 = var.number_of_bastions
-  floating_ip           = var.bastion_fips[count.index]
-  instance_id           = element(openstack_compute_instance_v2.bastion.*.id, count.index)
-  wait_until_associated = var.wait_for_floatingip
+  count                 = "${var.number_of_bastions}"
+  floating_ip           = "${var.bastion_fips[count.index]}"
+  instance_id           = "${element(openstack_compute_instance_v2.bastion.*.id, count.index)}"
+  wait_until_associated = "${var.wait_for_floatingip}"
 }


 resource "openstack_compute_floatingip_associate_v2" "k8s_master" {
-  count                 = var.number_of_k8s_masters
-  instance_id           = element(openstack_compute_instance_v2.k8s_master.*.id, count.index)
-  floating_ip           = var.k8s_master_fips[count.index]
-  wait_until_associated = var.wait_for_floatingip
+  count                 = "${var.number_of_k8s_masters}"
+  instance_id           = "${element(openstack_compute_instance_v2.k8s_master.*.id, count.index)}"
+  floating_ip           = "${var.k8s_master_fips[count.index]}"
+  wait_until_associated = "${var.wait_for_floatingip}"
 }

 resource "openstack_compute_floatingip_associate_v2" "k8s_master_no_etcd" {
-  count       = var.master_root_volume_size_in_gb == 0 ? var.number_of_k8s_masters_no_etcd : 0
-  instance_id = element(openstack_compute_instance_v2.k8s_master_no_etcd.*.id, count.index)
-  floating_ip = var.k8s_master_no_etcd_fips[count.index]
+  count       = "${var.master_root_volume_size_in_gb == 0 ? var.number_of_k8s_masters_no_etcd : 0}"
+  instance_id = "${element(openstack_compute_instance_v2.k8s_master_no_etcd.*.id, count.index)}"
+  floating_ip = "${var.k8s_master_no_etcd_fips[count.index]}"
 }

 resource "openstack_compute_floatingip_associate_v2" "k8s_node" {
-  count                 = var.node_root_volume_size_in_gb == 0 ? var.number_of_k8s_nodes : 0
-  floating_ip           = var.k8s_node_fips[count.index]
-  instance_id           = element(openstack_compute_instance_v2.k8s_node[*].id, count.index)
-  wait_until_associated = var.wait_for_floatingip
+  count                 = "${var.node_root_volume_size_in_gb == 0 ? var.number_of_k8s_nodes : 0}"
+  floating_ip           = "${var.k8s_node_fips[count.index]}"
+  instance_id           = "${element(openstack_compute_instance_v2.k8s_node[*].id, count.index)}"
+  wait_until_associated = "${var.wait_for_floatingip}"
 }

 resource "openstack_compute_floatingip_associate_v2" "k8s_nodes" {
  for_each              = var.number_of_k8s_nodes == 0 && var.number_of_k8s_nodes_no_floating_ip == 0 ? { for key, value in var.k8s_nodes : key => value if value.floating_ip } : {}
-  floating_ip           = var.k8s_nodes_fips[each.key].address
-  instance_id           = openstack_compute_instance_v2.k8s_nodes[each.key].id
-  wait_until_associated = var.wait_for_floatingip
+  floating_ip           = "${var.k8s_nodes_fips[each.key].address}"
+  instance_id           = "${openstack_compute_instance_v2.k8s_nodes[each.key].id}"
+  wait_until_associated = "${var.wait_for_floatingip}"
 }

 resource "openstack_blockstorage_volume_v2" "glusterfs_volume" {
  name        = "${var.cluster_name}-glusterfs_volume-${count.index + 1}"
-  count       = var.gfs_root_volume_size_in_gb == 0 ? var.number_of_gfs_nodes_no_floating_ip : 0
+  count       = "${var.gfs_root_volume_size_in_gb == 0 ? var.number_of_gfs_nodes_no_floating_ip : 0}"
  description = "Non-ephemeral volume for GlusterFS"
-  size        = var.gfs_volume_size_in_gb
+  size        = "${var.gfs_volume_size_in_gb}"
 }

 resource "openstack_compute_volume_attach_v2" "glusterfs_volume" {
-  count       = var.gfs_root_volume_size_in_gb == 0 ? var.number_of_gfs_nodes_no_floating_ip : 0
-  instance_id = element(openstack_compute_instance_v2.glusterfs_node_no_floating_ip.*.id, count.index)
-  volume_id   = element(openstack_blockstorage_volume_v2.glusterfs_volume.*.id, count.index)
+  count       = "${var.gfs_root_volume_size_in_gb == 0 ? var.number_of_gfs_nodes_no_floating_ip : 0}"
+  instance_id = "${element(openstack_compute_instance_v2.glusterfs_node_no_floating_ip.*.id, count.index)}"
+  volume_id   = "${element(openstack_blockstorage_volume_v2.glusterfs_volume.*.id, count.index)}"
 }
--- a/contrib/terraform/openstack/modules/compute/variables.tf
+++ b/contrib/terraform/openstack/modules/compute/variables.tf
@@ -38,8 +38,6 @@ variable "gfs_root_volume_size_in_gb" {}

 variable "gfs_volume_size_in_gb" {}

-variable "master_volume_type" {}
-
 variable "public_key_path" {}

 variable "image" {}
@@ -67,39 +65,39 @@ variable "network_id" {
 }

 variable "k8s_master_fips" {
-  type = list
+  type = "list"
 }

 variable "k8s_master_no_etcd_fips" {
-  type = list
+  type = "list"
 }

 variable "k8s_node_fips" {
-  type = list
+  type = "list"
 }

 variable "k8s_nodes_fips" {
-  type = map
+  type = "map"
 }

 variable "bastion_fips" {
-  type = list
+  type = "list"
 }

 variable "bastion_allowed_remote_ips" {
-  type = list
+  type = "list"
 }

 variable "master_allowed_remote_ips" {
-  type = list
+  type = "list"
 }

 variable "k8s_allowed_remote_ips" {
-  type = list
+  type = "list"
 }

 variable "k8s_allowed_egress_ips" {
-  type = list
+  type = "list"
 }

 variable "k8s_nodes" {}
@@ -114,12 +112,8 @@ variable "supplementary_node_groups" {
  default = ""
 }

-variable "master_allowed_ports" {
-  type = list
-}
-
 variable "worker_allowed_ports" {
-  type = list
+  type = "list"
 }

 variable "use_access_ip" {}
@@ -127,11 +121,3 @@ variable "use_access_ip" {}
 variable "use_server_groups" {
  type = bool
 }
-
-variable "extra_sec_groups" {
-  type = bool
-}
-
-variable "extra_sec_groups_name" {
-  type = string
-}
--- a/contrib/terraform/openstack/modules/compute/versions.tf
+++ b/contrib/terraform/openstack/modules/compute/versions.tf
@@ -1,8 +0,0 @@
-terraform {
-  required_providers {
-    openstack = {
-      source = "terraform-provider-openstack/openstack"
-    }
-  }
-  required_version = ">= 0.12.26"
-}
--- a/contrib/terraform/openstack/modules/ips/main.tf
+++ b/contrib/terraform/openstack/modules/ips/main.tf
@@ -1,41 +1,36 @@
 resource "null_resource" "dummy_dependency" {
  triggers = {
-    dependency_id = var.router_id
+    dependency_id = "${var.router_id}"
  }
-  depends_on = [
-    var.router_internal_port_id
-  ]
 }

-# If user specifies pre-existing IPs to use in k8s_master_fips, do not create new ones.
 resource "openstack_networking_floatingip_v2" "k8s_master" {
-  count      = length(var.k8s_master_fips) > 0 ? 0 : var.number_of_k8s_masters
-  pool       = var.floatingip_pool
-  depends_on = [null_resource.dummy_dependency]
+  count      = "${var.number_of_k8s_masters}"
+  pool       = "${var.floatingip_pool}"
+  depends_on = ["null_resource.dummy_dependency"]
 }

-# If user specifies pre-existing IPs to use in k8s_master_fips, do not create new ones.
 resource "openstack_networking_floatingip_v2" "k8s_master_no_etcd" {
-  count      = length(var.k8s_master_fips) > 0 ? 0 : var.number_of_k8s_masters_no_etcd
-  pool       = var.floatingip_pool
-  depends_on = [null_resource.dummy_dependency]
+  count      = "${var.number_of_k8s_masters_no_etcd}"
+  pool       = "${var.floatingip_pool}"
+  depends_on = ["null_resource.dummy_dependency"]
 }

 resource "openstack_networking_floatingip_v2" "k8s_node" {
-  count      = var.number_of_k8s_nodes
-  pool       = var.floatingip_pool
-  depends_on = [null_resource.dummy_dependency]
+  count      = "${var.number_of_k8s_nodes}"
+  pool       = "${var.floatingip_pool}"
+  depends_on = ["null_resource.dummy_dependency"]
 }

 resource "openstack_networking_floatingip_v2" "bastion" {
-  count      = var.number_of_bastions
-  pool       = var.floatingip_pool
-  depends_on = [null_resource.dummy_dependency]
+  count      = "${var.number_of_bastions}"
+  pool       = "${var.floatingip_pool}"
+  depends_on = ["null_resource.dummy_dependency"]
 }

 resource "openstack_networking_floatingip_v2" "k8s_nodes" {
  for_each   = var.number_of_k8s_nodes == 0 ? { for key, value in var.k8s_nodes : key => value if value.floating_ip } : {}
-  pool       = var.floatingip_pool
-  depends_on = [null_resource.dummy_dependency]
+  pool       = "${var.floatingip_pool}"
+  depends_on = ["null_resource.dummy_dependency"]
 }

--- a/contrib/terraform/openstack/modules/ips/outputs.tf
+++ b/contrib/terraform/openstack/modules/ips/outputs.tf
@@ -1,21 +1,19 @@
-# If k8s_master_fips is already defined as input, keep the same value since new FIPs have not been created.
 output "k8s_master_fips" {
-  value = length(var.k8s_master_fips) > 0 ? var.k8s_master_fips : openstack_networking_floatingip_v2.k8s_master[*].address
+  value = "${openstack_networking_floatingip_v2.k8s_master[*].address}"
 }

-# If k8s_master_fips is already defined as input, keep the same value since new FIPs have not been created.
 output "k8s_master_no_etcd_fips" {
-  value = length(var.k8s_master_fips) > 0 ? var.k8s_master_fips : openstack_networking_floatingip_v2.k8s_master_no_etcd[*].address
+  value = "${openstack_networking_floatingip_v2.k8s_master_no_etcd[*].address}"
 }

 output "k8s_node_fips" {
-  value = openstack_networking_floatingip_v2.k8s_node[*].address
+  value = "${openstack_networking_floatingip_v2.k8s_node[*].address}"
 }

 output "k8s_nodes_fips" {
-  value = openstack_networking_floatingip_v2.k8s_nodes
+  value = "${openstack_networking_floatingip_v2.k8s_nodes}"
 }

 output "bastion_fips" {
-  value = openstack_networking_floatingip_v2.bastion[*].address
+  value = "${openstack_networking_floatingip_v2.bastion[*].address}"
 }
--- a/contrib/terraform/openstack/modules/ips/variables.tf
+++ b/contrib/terraform/openstack/modules/ips/variables.tf
@@ -17,7 +17,3 @@ variable "router_id" {
 }

 variable "k8s_nodes" {}
-
-variable "k8s_master_fips" {}
-
-variable "router_internal_port_id" {}
--- a/contrib/terraform/openstack/modules/ips/versions.tf
+++ b/contrib/terraform/openstack/modules/ips/versions.tf
@@ -1,11 +0,0 @@
-terraform {
-  required_providers {
-    null = {
-      source = "hashicorp/null"
-    }
-    openstack = {
-      source = "terraform-provider-openstack/openstack"
-    }
-  }
-  required_version = ">= 0.12.26"
-}
--- a/contrib/terraform/openstack/modules/network/main.tf
+++ b/contrib/terraform/openstack/modules/network/main.tf
@@ -1,33 +1,33 @@
 resource "openstack_networking_router_v2" "k8s" {
  name                = "${var.cluster_name}-router"
-  count               = var.use_neutron == 1 && var.router_id == null ? 1 : 0
+  count               = "${var.use_neutron}" == 1 && "${var.router_id}" == null ? 1 : 0
  admin_state_up      = "true"
-  external_network_id = var.external_net
+  external_network_id = "${var.external_net}"
 }

 data "openstack_networking_router_v2" "k8s" {
-  router_id = var.router_id
-  count     = var.use_neutron == 1 && var.router_id != null ? 1 : 0
+  router_id = "${var.router_id}"
+  count     = "${var.use_neutron}" == 1 && "${var.router_id}" != null ? 1 : 0
 }

 resource "openstack_networking_network_v2" "k8s" {
-  name           = var.network_name
-  count          = var.use_neutron
-  dns_domain     = var.network_dns_domain != null ? var.network_dns_domain : null
+  name           = "${var.network_name}"
+  count          = "${var.use_neutron}"
+  dns_domain     = var.network_dns_domain != null ? "${var.network_dns_domain}" : null
  admin_state_up = "true"
 }

 resource "openstack_networking_subnet_v2" "k8s" {
  name            = "${var.cluster_name}-internal-network"
-  count           = var.use_neutron
-  network_id      = openstack_networking_network_v2.k8s[count.index].id
-  cidr            = var.subnet_cidr
+  count           = "${var.use_neutron}"
+  network_id      = "${openstack_networking_network_v2.k8s[count.index].id}"
+  cidr            = "${var.subnet_cidr}"
  ip_version      = 4
-  dns_nameservers = var.dns_nameservers
+  dns_nameservers = "${var.dns_nameservers}"
 }

 resource "openstack_networking_router_interface_v2" "k8s" {
-  count     = var.use_neutron
+  count     = "${var.use_neutron}"
  router_id = "%{if openstack_networking_router_v2.k8s != []}${openstack_networking_router_v2.k8s[count.index].id}%{else}${var.router_id}%{endif}"
-  subnet_id = openstack_networking_subnet_v2.k8s[count.index].id
+  subnet_id = "${openstack_networking_subnet_v2.k8s[count.index].id}"
 }
--- a/contrib/terraform/openstack/modules/network/outputs.tf
+++ b/contrib/terraform/openstack/modules/network/outputs.tf
@@ -3,9 +3,9 @@ output "router_id" {
 }

 output "router_internal_port_id" {
-  value = element(concat(openstack_networking_router_interface_v2.k8s.*.id, [""]), 0)
+  value = "${element(concat(openstack_networking_router_interface_v2.k8s.*.id, [""]), 0)}"
 }

 output "subnet_id" {
-  value = element(concat(openstack_networking_subnet_v2.k8s.*.id, [""]), 0)
+  value = "${element(concat(openstack_networking_subnet_v2.k8s.*.id, [""]), 0)}"
 }
--- a/contrib/terraform/openstack/modules/network/variables.tf
+++ b/contrib/terraform/openstack/modules/network/variables.tf
@@ -7,7 +7,7 @@ variable "network_dns_domain" {}
 variable "cluster_name" {}

 variable "dns_nameservers" {
-  type = list
+  type = "list"
 }

 variable "subnet_cidr" {}
--- a/contrib/terraform/openstack/modules/network/versions.tf
+++ b/contrib/terraform/openstack/modules/network/versions.tf
@@ -1,8 +0,0 @@
-terraform {
-  required_providers {
-    openstack = {
-      source = "terraform-provider-openstack/openstack"
-    }
-  }
-  required_version = ">= 0.12.26"
-}
--- a/contrib/terraform/openstack/variables.tf
+++ b/contrib/terraform/openstack/variables.tf
@@ -74,10 +74,6 @@ variable "gfs_volume_size_in_gb" {
  default = 75
 }

-variable "master_volume_type" {
-  default = "Default"
-}
-
 variable "public_key_path" {
  description = "The path of the ssh pub key"
  default     = "~/.ssh/id_rsa.pub"
@@ -135,7 +131,7 @@ variable "network_name" {

 variable "network_dns_domain" {
  description = "dns_domain for the internal network"
-  type        = string
+  type        = "string"
  default     = null
 }

@@ -146,19 +142,13 @@ variable "use_neutron" {

 variable "subnet_cidr" {
  description = "Subnet CIDR block."
-  type        = string
+  type        = "string"
  default     = "10.0.0.0/24"
 }

 variable "dns_nameservers" {
  description = "An array of DNS name server names used by hosts in this subnet."
-  type        = list(string)
-  default     = []
-}
-
-variable "k8s_master_fips" {
-  description = "specific pre-existing floating IPs to use for master nodes"
-  type        = list(string)
+  type        = "list"
  default     = []
 }

@@ -188,36 +178,30 @@ variable "supplementary_node_groups" {

 variable "bastion_allowed_remote_ips" {
  description = "An array of CIDRs allowed to SSH to hosts"
-  type        = list(string)
+  type        = "list"
  default     = ["0.0.0.0/0"]
 }

 variable "master_allowed_remote_ips" {
  description = "An array of CIDRs allowed to access API of masters"
-  type        = list(string)
+  type        = "list"
  default     = ["0.0.0.0/0"]
 }

 variable "k8s_allowed_remote_ips" {
  description = "An array of CIDRs allowed to SSH to hosts"
-  type        = list(string)
+  type        = "list"
  default     = []
 }

 variable "k8s_allowed_egress_ips" {
  description = "An array of CIDRs allowed for egress traffic"
-  type        = list(string)
+  type        = "list"
  default     = ["0.0.0.0/0"]
 }

-variable "master_allowed_ports" {
-  type = list(any)
-
-  default = []
-}
-
 variable "worker_allowed_ports" {
-  type = list(any)
+  type = "list"

  default = [
    {
@@ -242,19 +226,7 @@ variable "router_id" {
  default     = null
 }

-variable "router_internal_port_id" {
-  description = "uuid of the port connection our router to our network"
-  default     = null
-}
-
 variable "k8s_nodes" {
  default = {}
 }

-variable "extra_sec_groups" {
-  default = false
-}
-
-variable "extra_sec_groups_name" {
-  default = "custom"
-}
--- a/contrib/terraform/openstack/versions.tf
+++ b/contrib/terraform/openstack/versions.tf
@@ -1,9 +0,0 @@
-terraform {
-  required_providers {
-    openstack = {
-      source  = "terraform-provider-openstack/openstack"
-      version = "~> 1.17"
-    }
-  }
-  required_version = ">= 0.12.26"
-}
--- a/contrib/terraform/packet/README.md
+++ b/contrib/terraform/packet/README.md
@@ -8,7 +8,6 @@ Provision a Kubernetes cluster with [Terraform](https://www.terraform.io) on
 This will install a Kubernetes cluster on Packet bare metal. It should work in all locations and on most server types.

 ## Approach
-
 The terraform configuration inspects variables found in
 [variables.tf](variables.tf) to create resources in your Packet project.
 There is a [python script](../terraform.py) that reads the generated`.tfstate`
@@ -16,10 +15,8 @@ file to generate a dynamic inventory that is consumed by [cluster.yml](../../../
 to actually install Kubernetes with Kubespray.

 ### Kubernetes Nodes
-
 You can create many different kubernetes topologies by setting the number of
 different classes of hosts.
-
 - Master nodes with etcd: `number_of_k8s_masters` variable
 - Master nodes without etcd: `number_of_k8s_masters_no_etcd` variable
 - Standalone etcd hosts: `number_of_etcd` variable
@@ -50,7 +47,6 @@ ssh-keygen -f ~/.ssh/id_rsa
 ```

 ## Terraform
-
 Terraform will be used to provision all of the Packet resources with base software as appropriate.

 ### Configuration
@@ -60,9 +56,9 @@ Terraform will be used to provision all of the Packet resources with base softwa
 Create an inventory directory for your cluster by copying the existing sample and linking the `hosts` script (used to build the inventory based on Terraform state):

 ```ShellSession
-cp -LRp contrib/terraform/packet/sample-inventory inventory/$CLUSTER
-cd inventory/$CLUSTER
-ln -s ../../contrib/terraform/packet/hosts
+$ cp -LRp contrib/terraform/packet/sample-inventory inventory/$CLUSTER
+$ cd inventory/$CLUSTER
+$ ln -s ../../contrib/terraform/packet/hosts
 ```

 This will be the base for subsequent Terraform commands.
@@ -73,23 +69,22 @@ Your Packet API key must be available in the `PACKET_AUTH_TOKEN` environment var
 This key is typically stored outside of the code repo since it is considered secret.
 If someone gets this key, they can startup/shutdown hosts in your project!

-For more information on how to generate an API key or find your project ID, please see
-[API Integrations](https://support.packet.com/kb/articles/api-integrations)
+For more information on how to generate an API key or find your project ID, please see:
+https://support.packet.com/kb/articles/api-integrations

 The Packet Project ID associated with the key will be set later in cluster.tfvars.

-For more information about the API, please see [Packet API](https://www.packet.com/developers/api/)
+For more information about the API, please see:
+https://www.packet.com/developers/api/

 Example:
-
 ```ShellSession
-export PACKET_AUTH_TOKEN="Example-API-Token"
+$ export PACKET_AUTH_TOKEN="Example-API-Token"
 ```

 Note that to deploy several clusters within the same project you need to use [terraform workspace](https://www.terraform.io/docs/state/workspaces.html#using-workspaces).

 #### Cluster variables
-
 The construction of the cluster is driven by values found in
 [variables.tf](variables.tf).

@@ -100,11 +95,10 @@ This helps when identifying which hosts are associated with each cluster.

 While the defaults in variables.tf will successfully deploy a cluster, it is recommended to set the following values:

- cluster_name = the name of the inventory directory created above as $CLUSTER
- packet_project_id = the Packet Project ID associated with the Packet API token above
+* cluster_name = the name of the inventory directory created above as $CLUSTER
+* packet_project_id = the Packet Project ID associated with the Packet API token above

 #### Enable localhost access
-
 Kubespray will pull down a Kubernetes configuration file to access this cluster by enabling the 
 `kubeconfig_localhost: true` in the Kubespray configuration.

@@ -121,10 +115,10 @@ In the cluster's inventory folder, the following files might be created (either
 or manually), to prevent you from pushing them accidentally they are in a
 `.gitignore` file in the `terraform/packet` directory :

- `.terraform`
- `.tfvars`
- `.tfstate`
- `.tfstate.backup`
+* `.terraform`
+* `.tfvars`
+* `.tfstate`
+* `.tfstate.backup`

 You can still add them manually if you want to.

@@ -134,38 +128,34 @@ Before Terraform can operate on your cluster you need to install the required
 plugins. This is accomplished as follows:

 ```ShellSession
-cd inventory/$CLUSTER
-terraform init ../../contrib/terraform/packet
+$ cd inventory/$CLUSTER
+$ terraform init ../../contrib/terraform/packet
 ```

 This should finish fairly quickly telling you Terraform has successfully initialized and loaded necessary modules.

 ### Provisioning cluster
-
 You can apply the Terraform configuration to your cluster with the following command
 issued from your cluster's inventory directory (`inventory/$CLUSTER`):
-
 ```ShellSession
-terraform apply -var-file=cluster.tfvars ../../contrib/terraform/packet
-export ANSIBLE_HOST_KEY_CHECKING=False
-ansible-playbook -i hosts ../../cluster.yml
+$ terraform apply -var-file=cluster.tfvars ../../contrib/terraform/packet
+$ export ANSIBLE_HOST_KEY_CHECKING=False
+$ ansible-playbook -i hosts ../../cluster.yml
 ```

 ### Destroying cluster
-
 You can destroy your new cluster with the following command issued from the cluster's inventory directory:

 ```ShellSession
-terraform destroy -var-file=cluster.tfvars ../../contrib/terraform/packet
+$ terraform destroy -var-file=cluster.tfvars ../../contrib/terraform/packet
 ```

 If you've started the Ansible run, it may also be a good idea to do some manual cleanup:

- Remove SSH keys from the destroyed cluster from your `~/.ssh/known_hosts` file
- Clean up any temporary cache files: `rm /tmp/$CLUSTER-*`
+* remove SSH keys from the destroyed cluster from your `~/.ssh/known_hosts` file
+* clean up any temporary cache files: `rm /tmp/$CLUSTER-*`

 ### Debugging
-
 You can enable debugging output from Terraform by setting `TF_LOG` to `DEBUG` before running the Terraform command.

 ## Ansible
@@ -177,18 +167,18 @@ You can enable debugging output from Terraform by setting `TF_LOG` to `DEBUG` be
 Ensure your local ssh-agent is running and your ssh key has been added. This
 step is required by the terraform provisioner:

-```ShellSession
-eval $(ssh-agent -s)
-ssh-add ~/.ssh/id_rsa
+```
+$ eval $(ssh-agent -s)
+$ ssh-add ~/.ssh/id_rsa
 ```

 If you have deployed and destroyed a previous iteration of your cluster, you will need to clear out any stale keys from your SSH "known hosts" file ( `~/.ssh/known_hosts`).

 #### Test access

-Make sure you can connect to the hosts.  Note that Flatcar Container Linux by Kinvolk will have a state `FAILED` due to Python not being present.  This is okay, because Python will be installed during bootstrapping, so long as the hosts are not `UNREACHABLE`.
+Make sure you can connect to the hosts.  Note that Container Linux by CoreOS will have a state `FAILED` due to Python not being present.  This is okay, because Python will be installed during bootstrapping, so long as the hosts are not `UNREACHABLE`.

-```ShellSession
+```
 $ ansible -i inventory/$CLUSTER/hosts -m ping all
 example-k8s_node-1 | SUCCESS => {
    "changed": false,
@@ -208,8 +198,8 @@ If it fails try to connect manually via SSH.  It could be something as simple as

 ### Deploy Kubernetes

-```ShellSession
-ansible-playbook --become -i inventory/$CLUSTER/hosts cluster.yml
+```
+$ ansible-playbook --become -i inventory/$CLUSTER/hosts cluster.yml
 ```

 This will take some time as there are many tasks to run.
@@ -218,22 +208,20 @@ This will take some time as there are many tasks to run.

 ### Set up kubectl

- [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on the localhost.
- Verify that Kubectl runs correctly
+* [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) on the localhost.

-```ShellSession
+* Verify that Kubectl runs correctly
+```
 kubectl version
 ```

- Verify that the Kubernetes configuration file has been copied over
-
-```ShellSession
+* Verify that the Kubernetes configuration file has been copied over
+```
 cat inventory/alpha/$CLUSTER/admin.conf
 ```

- Verify that all the nodes are running correctly.
-
-```ShellSession
+* Verify that all the nodes are running correctly.
+```
 kubectl version
 kubectl --kubeconfig=inventory/$CLUSTER/artifacts/admin.conf  get nodes
 ```
--- a/contrib/terraform/packet/versions.tf
+++ b/contrib/terraform/packet/versions.tf
@@ -1,9 +1,4 @@

 terraform {
  required_version = ">= 0.12"
-  required_providers {
-    packet = {
-      source = "terraform-providers/packet"
-    }
-  }
 }
--- a/contrib/terraform/terraform.py
+++ b/contrib/terraform/terraform.py
@@ -223,8 +223,8 @@ def packet_device(resource, tfvars=None):
        'provider': 'packet',
    }

-    if raw_attrs['operating_system'] == 'flatcar_stable':
-        # For Flatcar set the ssh_user to core
+    if raw_attrs['operating_system'] == 'coreos_stable':
+        # For CoreOS set the ssh_user to core
        attrs.update({'ansible_ssh_user': 'core'})

    # add groups based on attrs
@@ -319,7 +319,9 @@ def openstack_host(resource, module_name):

    # attrs specific to Mantl
    attrs.update({
-        'role': attrs['metadata'].get('role', 'none')
+        'consul_dc': _clean_dc(attrs['metadata'].get('dc', module_name)),
+        'role': attrs['metadata'].get('role', 'none'),
+        'ansible_python_interpreter': attrs['metadata'].get('python_bin','python')
    })

    # add groups based on attrs
@@ -329,6 +331,10 @@ def openstack_host(resource, module_name):
                  for item in list(attrs['metadata'].items()))
    groups.append('os_region=' + attrs['region'])

+    # groups specific to Mantl
+    groups.append('role=' + attrs['metadata'].get('role', 'none'))
+    groups.append('dc=' + attrs['consul_dc'])
+
    # groups specific to kubespray
    for group in attrs['metadata'].get('kubespray_groups', "").split(","):
        groups.append(group)
--- a/contrib/vault/roles/vault/tasks/bootstrap/ca_trust.yml
+++ b/contrib/vault/roles/vault/tasks/bootstrap/ca_trust.yml
@@ -13,7 +13,7 @@
      /usr/local/share/ca-certificates/vault-ca.crt
      {%- elif ansible_os_family == "RedHat" -%}
      /etc/pki/ca-trust/source/anchors/vault-ca.crt
-      {%- elif ansible_os_family in ["Flatcar Container Linux by Kinvolk"] -%}
+      {%- elif ansible_os_family in ["Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"] -%}
      /etc/ssl/certs/vault-ca.pem
      {%- endif %}

@@ -23,9 +23,9 @@
    dest: "{{ ca_cert_path }}"
  register: vault_ca_cert

- name: bootstrap/ca_trust | update ca-certificates (Debian/Ubuntu/Flatcar)
+- name: bootstrap/ca_trust | update ca-certificates (Debian/Ubuntu/CoreOS)
  command: update-ca-certificates
-  when: vault_ca_cert.changed and ansible_os_family in ["Debian", "Flatcar Container Linux by Kinvolk"]
+  when: vault_ca_cert.changed and ansible_os_family in ["Debian", "CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk"]

 - name: bootstrap/ca_trust | update ca-certificates (RedHat)
  command: update-ca-trust extract
--- a/contrib/vault/vault.md
+++ b/contrib/vault/vault.md
@@ -1,9 +1,9 @@
+# /!\ The vault role have been retired from the main playbook.
+# This role probably requires a LOT of changes in order to work again
+
 Hashicorp Vault Role
 ====================

-The vault role have been retired from the main playbook.
-This role probably requires a LOT of changes in order to work again
-
 Overview
 --------

@@ -22,7 +22,7 @@ role can generate certs for itself as well. Eventually, this may be improved
 to allow alternate backends (such as Consul), but currently the tasks are
 hardcoded to only create a Vault role for Etcd.

-1. Cluster
+2. Cluster

 This step is where the long-term Vault cluster is started and configured. Its
 first task, is to stop any temporary instances of Vault, to free the port for
@@ -81,18 +81,18 @@ generated elsewhere, you'll need to copy the certificate and key to the hosts in

 Additional Notes:

-* ``groups.vault|first`` is considered the source of truth for Vault variables
-* ``vault_leader_url`` is used as pointer for the current running Vault
-* Each service should have its own role and credentials. Currently those
+- ``groups.vault|first`` is considered the source of truth for Vault variables
+- ``vault_leader_url`` is used as pointer for the current running Vault
+- Each service should have its own role and credentials. Currently those
  credentials are saved to ``/etc/vault/roles/<role>/``. The service will
  need to read in those credentials, if they want to interact with Vault.

 Potential Work
 --------------

-* Change the Vault role to not run certain tasks when ``root_token`` and
+- Change the Vault role to not run certain tasks when ``root_token`` and
  ``unseal_keys`` are not present. Alternatively, allow user input for these
  values when missing.
-* Add the ability to start temp Vault with Host or Docker
-* Add a dynamic way to change out the backend role creation during Bootstrap,
+- Add the ability to start temp Vault with Host or Docker
+- Add a dynamic way to change out the backend role creation during Bootstrap,
  so other services can be used (such as Consul)
--- a/docs/_sidebar.md
+++ b/docs/_sidebar.md
@@ -9,15 +9,13 @@
  * [HA Mode](docs/ha-mode.md)
  * [Adding/replacing a node](docs/nodes.md)
  * [Large deployments](docs/large-deployments.md)
-  * [Air-Gap Installation](docs/offline-environment.md)
 * CNI
  * [Calico](docs/calico.md)
+  * [Contiv](docs/contiv.md)
  * [Flannel](docs/flannel.md)
  * [Kube Router](docs/kube-router.md)
  * [Weave](docs/weave.md)
  * [Multus](docs/multus.md)
-* Ingress
-  * [Ambassador](docs/ambassador.md)
 * [Cloud providers](docs/cloud.md)
  * [AWS](docs/aws.md)
  * [Azure](docs/azure.md)
@@ -26,15 +24,13 @@
  * [vSphere](/docs/vsphere.md)
 * Operating Systems
  * [Debian](docs/debian.md)
-  * [Flatcar Container Linux](docs/flatcar.md)
+  * [Coreos](docs/coreos.md)
  * [Fedora CoreOS](docs/fcos.md)  
  * [OpenSUSE](docs/opensuse.md)
-* CRI
-  * [Containerd](docs/containerd.md)
-  * [CRI-O](docs/cri-o.md)
 * Advanced
  * [Proxy](/docs/proxy.md)
  * [Downloads](docs/downloads.md)
+  * [CRI-O](docs/cri-o.md)
  * [Netcheck](docs/netcheck.md)
  * [DNS Stack](docs/dns-stack.md)
  * [Kubernetes reliability](docs/kubernetes-reliability.md)
@@ -42,5 +38,4 @@
  * [Test cases](docs/test_cases.md)
  * [Vagrant](docs/vagrant.md)
  * [CI Matrix](docs/ci.md)
-  * [CI Setup](docs/ci-setup.md)
 * [Roadmap](docs/roadmap.md)
--- a/docs/ambassador.md
+++ b/docs/ambassador.md
@@ -1,87 +0,0 @@
-
-# Ambassador
-
-The [Ambassador API Gateway](https://github.com/datawire/ambassador) provides all the functionality of a traditional ingress controller
-(e.g., path-based routing) while exposing many additional capabilities such as authentication,
-URL rewriting, CORS, rate limiting, and automatic metrics collection.
-
-## Installation
-
-### Configuration
-
-* `ingress_ambassador_namespace` (default `ambassador`): namespace for installing Ambassador.
-* `ingress_ambassador_update_window` (default `0 0 * * SUN`): _crontab_-like expression
-  for specifying when the Operator should try to update the Ambassador API Gateway.
-* `ingress_ambassador_version` (default: `*`): SemVer rule for versions allowed for
-  installation/updates.
-* `ingress_ambassador_secure_port` (default: 443): HTTPS port to listen at.
-* `ingress_ambassador_insecure_port` (default: 80): HTTP port to listen at.
-
-### Ambassador Operator
-
-This Ambassador addon deploys the Ambassador Operator, which in turn will install
-the [Ambassador API Gateway](https://github.com/datawire/ambassador) in
-a Kubernetes cluster.
-
-The Ambassador Operator is a Kubernetes Operator that controls Ambassador's complete lifecycle
-in your cluster, automating many of the repeatable tasks you would otherwise have to perform
-yourself.  Once installed, the Operator will complete installations and seamlessly upgrade to new
-versions of Ambassador as they become available.
-
-## Usage
-
-The following example creates simple http-echo services and an `Ingress` object
-to route to these services.
-
-Note well that the [Ambassador API Gateway](https://github.com/datawire/ambassador) will automatically load balance `Ingress` resources
-that include the annotation `kubernetes.io/ingress.class=ambassador`. All the other
-resources will be just ignored.
-
-```yaml
-kind: Pod
-apiVersion: v1
-metadata:
-  name: foo-app
-  labels:
-    app: foo
-spec:
-  containers:
-  - name: foo-app
-    image: hashicorp/http-echo
-    args:
-    - "-text=foo"
---
-kind: Service
-apiVersion: v1
-metadata:
-  name: foo-service
-spec:
-  selector:
-    app: foo
-  ports:
-  # Default port used by the image
-  - port: 5678
---
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: example-ingress
-  annotations:
-    kubernetes.io/ingress.class: ambassador
-spec:
-  rules:
-  - http:
-      paths:
-      - path: /foo
-        backend:
-          serviceName: foo-service
-          servicePort: 5678
-```
-
-Now you can test that the ingress is working with curl:
-
-```console
-$ export AMB_IP=$(kubectl get service ambassador -n ambassador -o 'go-template={{range .status.loadBalancer.ingress}}{{print .ip "\n"}}{{end}}')
-$ curl $AMB_IP/foo
-foo
-```
--- a/docs/ansible.md
+++ b/docs/ansible.md
@@ -116,6 +116,7 @@ The following tags are defined in playbooks:
 |                    facts | Gathering facts and misc check results
 |                  flannel | Network plugin flannel
 |                      gce | Cloud-provider GCP
+|                hyperkube | Manipulations with K8s hyperkube image
 |          k8s-pre-upgrade | Upgrading K8s cluster
 |              k8s-secrets | Configuring K8s certs/keys
 |           kube-apiserver | Configuring static pod kube-apiserver
@@ -137,7 +138,6 @@ The following tags are defined in playbooks:
 |                   upload | Distributing images/binaries across hosts
 |                    weave | Network plugin Weave
 |              ingress_alb | AWS ALB Ingress Controller
-|              ambassador  | Ambassador Ingress Controller

 Note: Use the ``bash scripts/gen_tags.sh`` command to generate a list of all
 tags found in the codebase. New tags will be listed with the empty "Used for"
--- a/docs/azure-csi.md
+++ b/docs/azure-csi.md
@@ -1,6 +1,6 @@
 # Azure Disk CSI Driver

-The Azure Disk CSI driver allows you to provision volumes for pods with a Kubernetes deployment over Azure Cloud. The CSI driver replaces to volume provisioning done by the in-tree azure cloud provider which is deprecated.
+The Azure Disk CSI driver allows you to provision volumes for pods with a Kubernetes deployment over Azure Cloud. The CSI driver replaces to volume provioning done by the in-tree azure cloud provider which is deprecated.

 This documentation is an updated version of the in-tree Azure cloud provider documentation (azure.md).

--- a/docs/azure.md
+++ b/docs/azure.md
@@ -13,13 +13,6 @@ Before creating the instances you must first set the `azure_` variables in the `
 All of the values can be retrieved using the azure cli tool which can be downloaded here: <https://docs.microsoft.com/en-gb/azure/xplat-cli-install>
 After installation you have to run `az login` to get access to your account.

-### azure_cloud
-
-Azure Stack has different API endpoints, depending on the Azure Stack deployment. These need to be provided to the Azure SDK.
-Possible values are: `AzureChinaCloud`, `AzureGermanCloud`, `AzurePublicCloud` and `AzureUSGovernmentCloud`.
-The full list of existing settings for the AzureChinaCloud, AzureGermanCloud, AzurePublicCloud and AzureUSGovernmentCloud
-is available in the source code [here](https://github.com/kubernetes-sigs/cloud-provider-azure/blob/master/docs/cloud-provider-config.md)
-
 ### azure\_tenant\_id + azure\_subscription\_id

 run `az account show` to retrieve your subscription id and tenant id:
@@ -36,16 +29,12 @@ The name of the resource group your instances are in, can be retrieved via `az g

 ### azure\_vmtype

-The type of the vm. Supported values are `standard` or `vmss`. If vm is type of `Virtual Machines` then value is `standard`. If vm is part of `Virtual Machine Scale Sets` then value is `vmss`
+The type of the vm. Supported values are `standard` or `vmss`. If vm is type of `Virtal Machines` then value is `standard`. If vm is part of `Virtaul Machine Scale Sets` then value is `vmss`

 ### azure\_vnet\_name

 The name of the virtual network your instances are in, can be retrieved via `az network vnet list`

-### azure\_vnet\_resource\_group
-
-The name of the resource group that contains the vnet.
-
 ### azure\_subnet\_name

 The name of the subnet your instances are in, can be retrieved via `az network vnet subnet list --resource-group RESOURCE_GROUP --vnet-name VNET_NAME`
@@ -54,18 +43,6 @@ The name of the subnet your instances are in, can be retrieved via `az network v

 The name of the network security group your instances are in, can be retrieved via `az network nsg list`

-### azure\_security\_group\_resource\_group
-
-The name of the resource group that contains the network security group.  Defaults to `azure_vnet_resource_group`
-
-### azure\_route\_table\_name
-
-The name of the route table used with your instances.
-
-### azure\_route\_table\_resource\_group
-
-The name of the resource group that contains the route table.  Defaults to `azure_vnet_resource_group`
-
 ### azure\_aad\_client\_id + azure\_aad\_client\_secret

 These will have to be generated first:
--- a/docs/calico.md
+++ b/docs/calico.md
@@ -1,12 +1,18 @@
 # Calico

+N.B. **Version 2.6.5 upgrade to 3.1.1 is upgrading etcd store to etcdv3**
+
+If you create automated backups of etcdv2 please switch for creating etcdv3 backups, as kubernetes and calico now uses etcdv3
+ After migration you can check `/tmp/calico_upgrade/` directory for converted items to etcdv3.
+ **PLEASE TEST upgrade before upgrading production cluster.**
+
 Check if the calico-node container is running

 ```ShellSession
 docker ps | grep calico
 ```

-The **calicoctl.sh** is wrap script with configured access credentials for command calicoctl allows to check the status of the network workloads.
+The **calicoctl.sh** is wrap script with configured acces credentials for command calicoctl allows to check the status of the network workloads.

 * Check the status of Calico nodes

@@ -14,13 +20,25 @@ The **calicoctl.sh** is wrap script with configured access credentials for comma
 calicoctl.sh node status
 ```

+or for versions prior to *v1.0.0*:
+
+```ShellSession
+calicoctl.sh status
+```
+
 * Show the configured network subnet for containers

 ```ShellSession
 calicoctl.sh get ippool -o wide
 ```

-* Show the workloads (ip addresses of containers and their location)
+or for versions prior to *v1.0.0*:
+
+```ShellSession
+calicoctl.sh pool show
+```
+
+* Show the workloads (ip addresses of containers and their located)

 ```ShellSession
 calicoctl.sh get workloadEndpoint -o wide
@@ -32,22 +50,14 @@ and
 calicoctl.sh get hostEndpoint -o wide
 ```

-## Configuration
+or for versions prior *v1.0.0*:

-### Optional : Define datastore type
-
-The default datastore, Kubernetes API datastore is recommended for on-premises deployments, and supports only Kubernetes workloads; etcd is the best datastore for hybrid deployments.
-
-Allowed values are `kdd` (default) and `etcd`.
-
-Note: using kdd and more than 50 nodes, consider using the `typha` daemon to provide scaling.
-
-To re-define you need to edit the inventory and add a group variable `calico_datastore`
-
-```yml
-calico_datastore: kdd
+```ShellSession
+calicoctl.sh endpoint show --detail
 ```

+## Configuration
+
 ### Optional : Define network backend

 In some cases you may want to define Calico network backend. Allowed values are `bird`, `vxlan` or `none`. Bird is a default value.
@@ -93,15 +103,6 @@ This can be enabled by setting the following variable as follow in group_vars (k
 calico_advertise_cluster_ips: true
 ```

-Since calico 3.10, Calico supports advertising Kubernetes service ExternalIPs over BGP in addition to cluster IPs advertising.
-This can be enabled by setting the following variable in group_vars (k8s-cluster/k8s-net-calico.yml)
-
-```yml
-calico_advertise_service_external_ips:
- x.x.x.x/24
- y.y.y.y/32
-```
-
 ### Optional : Define global AS number

 Optional parameter `global_as_num` defines Calico global AS number (`/calico/bgp/v1/global/as_num` etcd key).
@@ -234,28 +235,7 @@ Note that in OpenStack you must allow `ipip` traffic in your security groups,
 otherwise you will experience timeouts.
 To do this you must add a rule which allows it, for example:

-### Optional : Felix configuration via extraenvs of calico node
-
-Possible environment variable parameters for [configuring Felix](https://docs.projectcalico.org/reference/felix/configuration)
-
-```yml
-calico_node_extra_envs:
-    FELIX_DEVICEROUTESOURCEADDRESS: 172.17.0.1
-```
-
 ```ShellSession
 neutron  security-group-rule-create  --protocol 4  --direction egress  k8s-a0tp4t
 neutron  security-group-rule-create  --protocol 4  --direction igress  k8s-a0tp4t
 ```
-
-### Optional : Use Calico CNI host-local IPAM plugin
-
-Calico currently supports two types of CNI IPAM plugins, `host-local` and `calico-ipam` (default).
-
-To allow Calico to determine the subnet to use from the Kubernetes API based on the `Node.podCIDR` field, enable the following setting.
-
-```yml
-calico_ipam_host_local: true
-```
-
-Refer to Project Calico section [Using host-local IPAM](https://docs.projectcalico.org/reference/cni-plugin/configuration#using-host-local-ipam) for further information.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Florian Ruynat	d28a6d68f9	Add Kubernetes hashes 1.18.9/1.17.12 and set default (#6701 )	2020-09-18 02:08:45 -07:00
ahmadali shafiee	f4b6bce69f	[2.13] add missing 'Set up proxy environment' tasks (#6591 ) * Add proxy_env calculation to reset.yml (#6558) * * add proxy_env definition to remove_node.yml resolving #6430 (#6431) Co-authored-by: Florian Ruynat <florian234@hotmail.com> Co-authored-by: nniehoff <github@nickniehoff.net>	2020-09-17 02:46:45 -07:00
Florian Ruynat	8e53d81146	Add Kubernetes 1.16.15 hashes (#6626 )	2020-09-07 01:23:41 -07:00
Maxime Guyot	28ee071bd6	Update base image to v2.12.9 (#6492 )	2020-08-04 05:10:19 -07:00
Florian Ruynat	0ba1c8ff0a	Fix test if openstack_cacert is a base64 string (#6421 ) (#6475 )	2020-08-01 00:29:41 -07:00
Florian Ruynat	d6f859619c	Update hashes and set default version to 1.17.9 (#6435 )	2020-07-30 00:50:31 -07:00
Florian Ruynat	8a3bd6ba72	Move healthz check to secure ports (#6446 ) (#6457 )	2020-07-29 05:11:47 -07:00
Lovro Seder	d3fca7d47a	Fix shellcheck url (#6463 )	2020-07-28 06:03:07 -07:00
LucasBoisserie	587f7b33a7	Modify the populate no_proxy task to use a combine rather than relying on the hash_behaviour setting to be set to merge rather than replace (#6112 ) (#6346 ) Co-authored-by: Cody Seavey <seavey.cody@gmail.com>	2020-07-07 08:05:59 -07:00
Florian Ruynat	d3e8fd808e	Update hashes and set default version to 1.17.8 (#6336 )	2020-06-30 01:58:07 -07:00
Maxime Guyot	6bfc133d6c	[2.13] Update base image to v2.12.7 (#6295 ) * Use v2.12.7 base image for CI * Use 19.03.9 in localhost CI (#6201)	2020-06-22 04:32:39 -07:00
Florian Ruynat	3d6b9d6c15	Update hashes and set default to 1.17.7 (#6286 )	2020-06-18 23:43:58 -07:00
Etienne Champetier	39fa9503d9	[2.13] Bump CNI plugins to 0.8.6 (#6228 ) https://github.com/containernetworking/plugins/releases/tag/v0.8.6 https://github.com/kubernetes/kubernetes/issues/91507 Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com> (cherry picked from commit `41b44739b1`)	2020-06-09 05:23:18 -07:00
spaced	051e08e31c	[2.13] Backport CRI-O bugfixes (#6230 ) * Enable crio 1.18 (#6197) * fix CRI-O repos for centos distributions (#6224) * fix CRI-O repos for centos distributions * fix CRI-O repos for centos distributions - revert workarounds * fix CRI-O repos for centos distributions - use https for centos repos * avoid 302 redirects for centos repos * Use OS packaging default value for apparmor_profile in crio.conf (#6125) Co-authored-by: jeanfabrice <github@bobo-rousselin.com>	2020-06-04 07:09:15 -07:00
bozzo	dd539cf360	Fix resolv.conf configuration for Fedora CoreOS. (#6155 )	2020-05-28 08:02:02 -07:00
Florian Ruynat	31094b1768	Add new Kubernetes version hashes and set default to 1.17.6 (#6183 ) * Add new Kubernetes version hashes and set default to 1.17.6 * Do not rebase against master when commiting a release branch	2020-05-25 02:43:11 -07:00
Florian Ruynat	1f4ef0e86e	[2.13] Backport recent bugfixes and mainly docker-cli issue (#6179 ) * Reorder tests in packet file (#6067) * Skip molecule tests for Ubuntu 18.04 (#6077) * Fix kubernetes-dashboard template identation (#6066) The `98e7a07fba` commit udpates the dashboard version to 2.0.0 but it enable skip login flag wasn't updated. This change updates its identation to avoid issues when dashboard_skip_login is enabled. * Disable OVH CI (#6114) * Create namespace when dashboard deployment uses customized namespace. (#6107) * Create namespace when dashboard deployment uses customized namespace. * Fix syntax. * Fix apiserver port when upgrading (#6136) * Fix docker fedora packages (#6097) * Match docker-cli version with docker-engine version (when available) * Disable upgrade jobs to allow release 2.13.1 (docker-cli bug) Co-authored-by: Maxime Guyot <Miouge1@users.noreply.github.com> Co-authored-by: Victor Morales <electrocucaracha@gmail.com> Co-authored-by: petruha <5363545+p37ruh4@users.noreply.github.com> Co-authored-by: Mateus Caruccio <mateus.caruccio@getupcloud.com>	2020-05-22 07:30:37 -07:00
				`@@ -1 +0,0 @@`
				`{ "insecure-registries":["HOSTNAME:5000"] }`