summaryrefslogtreecommitdiffstats
path: root/kud/deployment_infra
diff options
context:
space:
mode:
authorTodd Malsbary <todd.malsbary@intel.com>2020-11-11 12:13:03 -0800
committerTodd Malsbary <todd.malsbary@intel.com>2021-10-12 10:57:04 -0700
commit988ebcf24c7d854a4053437b69cfb120acb8039c (patch)
tree6504bc0acaab449f44dc3d71a182984c2469b43b /kud/deployment_infra
parent5aa8c4de9fd620ef42ac5bf73b62f76d80e713a0 (diff)
Allow KuD installer to specify Kubespray 2.14.1 or 2.16.00.9.2
The default is 2.14.1 (the existing value). Setting KUBESPRAY_VERSION=2.16.0 in the installer environment uses the newer Kubespray version. The newer Kubespray version installs Kubernetes 1.20.7. Kubernetes 1.20.7 comes with following caveats: - The Virtlet addon is disabled; it does not work with 1.20.7. This requires removing the plugin_fw test as well. - Kubernetes 1.20.7 removed support for basic auth. Issue-ID: MULTICLOUD-1251 Signed-off-by: Todd Malsbary <todd.malsbary@intel.com> Change-Id: Ic8b9fb1f3effc31da58de5bb3768ed9e509d50de
Diffstat (limited to 'kud/deployment_infra')
-rw-r--r--kud/deployment_infra/galaxy-requirements.yml4
-rw-r--r--kud/deployment_infra/playbooks/kud-vars.yml3
2 files changed, 1 insertions, 6 deletions
diff --git a/kud/deployment_infra/galaxy-requirements.yml b/kud/deployment_infra/galaxy-requirements.yml
index 9747dc99..0dc5d896 100644
--- a/kud/deployment_infra/galaxy-requirements.yml
+++ b/kud/deployment_infra/galaxy-requirements.yml
@@ -7,9 +7,7 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-- src: andrewrothstein.go
- version: v2.1.15
- src: andrewrothstein.kubernetes-helm
- version: v1.3.16
+ version: v2.0.7
- src: geerlingguy.docker
version: 2.5.2
diff --git a/kud/deployment_infra/playbooks/kud-vars.yml b/kud/deployment_infra/playbooks/kud-vars.yml
index d627ab22..08f7e19b 100644
--- a/kud/deployment_infra/playbooks/kud-vars.yml
+++ b/kud/deployment_infra/playbooks/kud-vars.yml
@@ -53,9 +53,6 @@ cmk_pkgs: make,jq
cmk_untaint_required: true
go_version: '1.14.15'
-kubespray_version: 2.14.1
-# This matches the helm_version from kubespray defaults
-helm_client_version: 3.2.4
# kud playbooks not compatible with 2.8.0 - see MULTICLOUD-634
ansible_version: 2.9.7