epostnikof/kubespray
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2025-12-14 13:54:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update nginx, minor weave and misc CI tools (vagrant/terraform) (#7215)

Browse Source
This commit is contained in:
Florian Ruynat
2021-01-26 17:22:34 +01:00
committed by GitHub
parent 774ec49396
commit 9007d6621a
9 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/lint.yml
View File

@@ -14,7 +14,7 @@ vagrant-validate:
stage: unit-tests
tags: [light]
variables:
VAGRANT_VERSION: 2.2.10
VAGRANT_VERSION: 2.2.14
script:
- ./tests/scripts/vagrant-validate.sh
except: ['triggers', 'master']

14
.gitlab-ci/terraform.yml
View File

@@ -56,21 +56,21 @@
tf-validate-openstack:
extends: .terraform_validate
variables:
TF_VERSION: 0.12.29
TF_VERSION: 0.12.30
PROVIDER: openstack
CLUSTER: $CI_COMMIT_REF_NAME
tf-validate-packet:
extends: .terraform_validate
variables:
TF_VERSION: 0.12.29
TF_VERSION: 0.12.30
PROVIDER: packet
CLUSTER: $CI_COMMIT_REF_NAME
tf-validate-aws:
extends: .terraform_validate
variables:
TF_VERSION: 0.12.29
TF_VERSION: 0.12.30
PROVIDER: aws
CLUSTER: $CI_COMMIT_REF_NAME
@@ -119,7 +119,7 @@ tf-0.14.x-validate-aws:
# tf-packet-ubuntu16-default:
# extends: .terraform_apply
# variables:
# TF_VERSION: 0.12.29
# TF_VERSION: 0.12.30
# PROVIDER: packet
# CLUSTER: $CI_COMMIT_REF_NAME
# TF_VAR_number_of_k8s_masters: "1"
@@ -133,7 +133,7 @@ tf-0.14.x-validate-aws:
# tf-packet-ubuntu18-default:
# extends: .terraform_apply
# variables:
# TF_VERSION: 0.12.29
# TF_VERSION: 0.12.30
# PROVIDER: packet
# CLUSTER: $CI_COMMIT_REF_NAME
# TF_VAR_number_of_k8s_masters: "1"
@@ -190,7 +190,7 @@ tf-elastx_ubuntu18-calico:
when: on_success
variables:
<<: *elastx_variables
TF_VERSION: 0.12.29
TF_VERSION: 0.12.30
PROVIDER: openstack
CLUSTER: $CI_COMMIT_REF_NAME
ANSIBLE_TIMEOUT: "60"
@@ -235,7 +235,7 @@ tf-ovh_ubuntu18-calico:
environment: ovh
variables:
<<: *ovh_variables
TF_VERSION: 0.12.29
TF_VERSION: 0.12.30
PROVIDER: openstack
CLUSTER: $CI_COMMIT_REF_NAME
ANSIBLE_TIMEOUT: "60"