diff --git a/scale.yml b/scale.yml index 05f9641d1..bcf6c69b0 100644 --- a/scale.yml +++ b/scale.yml @@ -38,3 +38,4 @@ - { role: kubernetes/node, tags: node } - { role: kubernetes/kubeadm, tags: kubeadm, when: "kubeadm_enabled" } - { role: network_plugin, tags: network } + environment: "{{proxy_env}}" diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml index 3044a629d..d279f5635 100644 --- a/upgrade-cluster.yml +++ b/upgrade-cluster.yml @@ -33,12 +33,14 @@ tags: rkt when: "'rkt' in [etcd_deployment_type, kubelet_deployment_type, vault_deployment_type]" - { role: download, tags: download, skip_downloads: false } + environment: "{{proxy_env}}" - hosts: etcd:k8s-cluster:vault any_errors_fatal: "{{ any_errors_fatal | default(true) }}" roles: - { role: kubespray-defaults, when: "cert_management == 'vault'" } - { role: vault, tags: vault, vault_bootstrap: true, when: "cert_management == 'vault'" } + environment: "{{proxy_env}}" - hosts: etcd any_errors_fatal: "{{ any_errors_fatal | default(true) }}" @@ -57,6 +59,7 @@ roles: - { role: kubespray-defaults, when: "cert_management == 'vault'"} - { role: vault, tags: vault, when: "cert_management == 'vault'"} + environment: "{{proxy_env}}" #Handle upgrades to master components first to maintain backwards compat. - hosts: kube-master @@ -71,6 +74,7 @@ - { role: kubernetes-apps/cluster_roles, tags: cluster-roles } - { role: network_plugin, tags: network } - { role: upgrade/post-upgrade, tags: post-upgrade } + environment: "{{proxy_env}}" #Finally handle worker upgrades, based on given batch size - hosts: kube-node:!kube-master @@ -84,6 +88,7 @@ - { role: upgrade/post-upgrade, tags: post-upgrade } - { role: kubernetes/kubeadm, tags: kubeadm, when: "kubeadm_enabled" } - { role: kubespray-defaults} + environment: "{{proxy_env}}" - hosts: kube-master[0] any_errors_fatal: true