diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2019-08-31 18:50:05 +0200 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2019-09-01 02:45:10 +0200 |
| commit | 5ed2d835de246e3cfb0878d78b382115ec8f0987 (patch) | |
| tree | f0c515ce1da4444eae0334cf73fcd99d8f9708d8 /xci/config | |
| parent | 0326442e753be727c2342b7caf9606393f84d744 (diff) | |
Refactor k8s scenario implementation
This change updates the scenario logic for basic k8s
scenarios that enables the use of various network plugins.
The change simply stops copying k8s-cluster.yml over but instead
operates on the existing/original k8s-cluster.yml and updates
kube_network_plugin in place.
This makes it easier to maintain the scenarios and more importantly
unblocks us from bumping kubespray and kubernetes versions.
Please note that opnfv-scenario-requirements.yml contains version and
the refspec of the corresponding change in releng-xci-scenarios repo
so this change must be verified properly and if it passes CI, it
needs to be amended, updating k8-calico-nofeature scenario's version
to master and submitted. And then the change in releng-xci-scenarios
can properly be verified.
https://gerrit.opnfv.org/gerrit/#/c/releng-xci-scenarios/+/68418/
installer-type:kubespray
deploy-scenario:k8-calico-nofeature
JIRA: XCI-20
Change-Id: I1f851d20f5f7bc256199303581b05659091fddf9
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
Diffstat (limited to 'xci/config')
| -rwxr-xr-x | xci/config/env-vars | 2 | ||||
| -rwxr-xr-x | xci/config/pinned-versions | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars index 2cb3e915..ee3b652b 100755 --- a/xci/config/env-vars +++ b/xci/config/env-vars @@ -8,7 +8,7 @@ export OPNFV_RELENG_GIT_URL=${OPNFV_RELENG_GIT_URL:-https://gerrit.opnfv.org/ger export OPENSTACK_BIFROST_GIT_URL=${OPENSTACK_BIFROST_GIT_URL:-https://git.openstack.org/openstack/bifrost} export OPENSTACK_OSA_GIT_URL=${OPENSTACK_OSA_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible} export OPENSTACK_OSA_OPENRC_GIT_URL=${OPENSTACK_OSA_OPENRC_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible-openstack_openrc} -export KUBESPRAY_GIT_URL=${KUBESPRAY_GIT_URL:-https://github.com/kubernetes-incubator/kubespray.git} +export KUBESPRAY_GIT_URL=${KUBESPRAY_GIT_URL:-https://github.com/kubernetes-sigs/kubespray.git} export OSH_GIT_URL=${OSH_GIT_URL:-https://github.com/openstack/openstack-helm.git} export OSH_INFRA_GIT_URL=${OSH_INFRA_GIT_URL:-https://github.com/openstack/openstack-helm-infra.git} export OPENSTACK_OSA_HAPROXY_GIT_URL=${OPENSTACK_OSA_HAPROXY_GIT_URL:-https://git.openstack.org/openstack/openstack-ansible-haproxy_server} diff --git a/xci/config/pinned-versions b/xci/config/pinned-versions index e40cf442..c5ed768a 100755 --- a/xci/config/pinned-versions +++ b/xci/config/pinned-versions @@ -50,3 +50,6 @@ export HAPROXY_VERSION=$(grep -E '.*name: haproxy_server' -A 3 \ | tail -n1 | sed -n 's/\(^.*: \)\([0-9a-z].*$\)/\2/p') # Kubespray release v2.7.0 dated 02.10.2018 export KUBESPRAY_VERSION=${KUBESPRAY_VERSION:-"v2.7.0"} +# Kubernetes version supported by the pinned kubespray version +# this is needed for pulling in kubectl +export KUBERNETES_VERSION=${KUBERNETES_VERSION:-"v1.11.3"} |