Commit 66125e7e authored by Дмитрий Сафронов's avatar Дмитрий Сафронов
Browse files

Merge branch 'trunk' into 'master' 

Trunk

See merge request infrastructure/system-configurations/kubernetes-platform-setup!9
parents 054f3c89 df35fb69

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ stages: 
.common: &common

  variables:

    GIT_DEPTH: 1

    GIT_SUBMODULE_STRATEGY: recursive

    ANSIBLE_FORCE_COLOR: "True"

  except:

    - /^master$/

setup.sh

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#git submodule update

#cd ..



apk add --no-cache build-base python3-dev libffi-dev libressl-dev

#apk add --no-cache build-base python3-dev libffi-dev libressl-dev



python3 -m venv --upgrade --system-site-packages .venv-kubespray

.venv-kubespray/bin/pip3 install --upgrade pip setuptools wheel