diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e08b887d90a55260fa8aa22713da57bd41e20dcf..a14f43a5ce4353b60bcbede4c3dd8e97fcd2ef25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ stages: - deploy-special variables: - KUBESPRAY_VERSION: v2.12.5 + KUBESPRAY_VERSION: v2.12.6 FAILFASTCI_NAMESPACE: 'kargo-ci' GITLAB_REPOSITORY: 'kargo-ci/kubernetes-sigs-kubespray' ANSIBLE_FORCE_COLOR: "true" diff --git a/Dockerfile b/Dockerfile index 81bc9debf4501343700045583d5a3dab5a0d479c..67ac6f81b25ac5d0396121af2c77e0ef468449bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +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/v1.14.4/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 diff --git a/test-infra/vagrant-docker/Dockerfile b/test-infra/vagrant-docker/Dockerfile index 1f7927c0a7bdaa22245eca8f3504387029576f9d..2f70f1c6249ac247bf510b969e41a00fc20630d6 100644 --- a/test-infra/vagrant-docker/Dockerfile +++ b/test-infra/vagrant-docker/Dockerfile @@ -1,6 +1,6 @@ # Docker image published at quay.io/kubespray/vagrant -ARG KUBESPRAY_VERSION=v2.12.5 +ARG KUBESPRAY_VERSION=v2.12.6 FROM quay.io/kubespray/kubespray:${KUBESPRAY_VERSION} ENV VAGRANT_VERSION=2.2.7