Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
9ffe5940
Unverified
Commit
9ffe5940
authored
3 years ago
by
Florian Ruynat
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove TF 0.14/0.15 support - Add TF 1.x support only (#8062)
parent
c8d9afce
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-2
1 addition, 2 deletions
.gitlab-ci.yml
.gitlab-ci/terraform.yml
+16
-57
16 additions, 57 deletions
.gitlab-ci/terraform.yml
with
17 additions
and
59 deletions
.gitlab-ci.yml
+
1
−
2
View file @
9ffe5940
...
...
@@ -31,8 +31,7 @@ variables:
ANSIBLE_LOG_LEVEL
:
"
-vv"
RECOVER_CONTROL_PLANE_TEST
:
"
false"
RECOVER_CONTROL_PLANE_TEST_GROUPS
:
"
etcd[2:],kube_control_plane[1:]"
TERRAFORM_14_VERSION
:
0.14.11
TERRAFORM_15_VERSION
:
0.15.5
TERRAFORM_VERSION
:
1.0.8
before_script
:
-
./tests/scripts/rebase.sh
...
...
This diff is collapsed.
Click to expand it.
.gitlab-ci/terraform.yml
+
16
−
57
View file @
9ffe5940
...
...
@@ -53,92 +53,51 @@
# Cleanup regardless of exit code
-
chronic ./tests/scripts/testcases_cleanup.sh
tf-
0.15.x-
validate-openstack
:
tf-validate-openstack
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_
15_
VERSION
TF_VERSION
:
$TERRAFORM_VERSION
PROVIDER
:
openstack
CLUSTER
:
$CI_COMMIT_REF_NAME
tf-
0.15.x-
validate-packet
:
tf-validate-packet
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_
15_
VERSION
TF_VERSION
:
$TERRAFORM_VERSION
PROVIDER
:
packet
CLUSTER
:
$CI_COMMIT_REF_NAME
tf-
0.15.x-
validate-aws
:
tf-validate-aws
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_
15_
VERSION
TF_VERSION
:
$TERRAFORM_VERSION
PROVIDER
:
aws
CLUSTER
:
$CI_COMMIT_REF_NAME
tf-
0.15.x-
validate-exoscale
:
tf-validate-exoscale
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_
15_
VERSION
TF_VERSION
:
$TERRAFORM_VERSION
PROVIDER
:
exoscale
tf-
0.15.x-
validate-vsphere
:
tf-validate-vsphere
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_
15_
VERSION
TF_VERSION
:
$TERRAFORM_VERSION
PROVIDER
:
vsphere
CLUSTER
:
$CI_COMMIT_REF_NAME
tf-
0.15.x-
validate-upcloud
:
tf-validate-upcloud
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_15_VERSION
PROVIDER
:
upcloud
CLUSTER
:
$CI_COMMIT_REF_NAME
tf-0.14.x-validate-openstack
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_14_VERSION
PROVIDER
:
openstack
CLUSTER
:
$CI_COMMIT_REF_NAME
tf-0.14.x-validate-packet
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_14_VERSION
PROVIDER
:
packet
CLUSTER
:
$CI_COMMIT_REF_NAME
tf-0.14.x-validate-aws
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_14_VERSION
PROVIDER
:
aws
CLUSTER
:
$CI_COMMIT_REF_NAME
tf-0.14.x-validate-exoscale
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_14_VERSION
PROVIDER
:
exoscale
tf-0.14.x-validate-vsphere
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_14_VERSION
PROVIDER
:
vsphere
CLUSTER
:
$CI_COMMIT_REF_NAME
tf-0.14.x-validate-upcloud
:
extends
:
.terraform_validate
variables
:
TF_VERSION
:
$TERRAFORM_14_VERSION
TF_VERSION
:
$TERRAFORM_VERSION
PROVIDER
:
upcloud
CLUSTER
:
$CI_COMMIT_REF_NAME
# tf-packet-ubuntu16-default:
# extends: .terraform_apply
# variables:
# TF_VERSION: $TERRAFORM_
14_
VERSION
# TF_VERSION: $TERRAFORM_VERSION
# PROVIDER: packet
# CLUSTER: $CI_COMMIT_REF_NAME
# TF_VAR_number_of_k8s_masters: "1"
...
...
@@ -152,7 +111,7 @@ tf-0.14.x-validate-upcloud:
# tf-packet-ubuntu18-default:
# extends: .terraform_apply
# variables:
# TF_VERSION: $TERRAFORM_
14_
VERSION
# TF_VERSION: $TERRAFORM_VERSION
# PROVIDER: packet
# CLUSTER: $CI_COMMIT_REF_NAME
# TF_VAR_number_of_k8s_masters: "1"
...
...
@@ -210,7 +169,7 @@ tf-elastx_ubuntu18-calico:
allow_failure
:
true
variables
:
<<
:
*elastx_variables
TF_VERSION
:
$TERRAFORM_
15_
VERSION
TF_VERSION
:
$TERRAFORM_VERSION
PROVIDER
:
openstack
CLUSTER
:
$CI_COMMIT_REF_NAME
ANSIBLE_TIMEOUT
:
"
60"
...
...
@@ -256,7 +215,7 @@ tf-elastx_ubuntu18-calico:
# environment: ovh
# variables:
# <<: *ovh_variables
# TF_VERSION: $TERRAFORM_
14_
VERSION
# TF_VERSION: $TERRAFORM_VERSION
# PROVIDER: openstack
# CLUSTER: $CI_COMMIT_REF_NAME
# ANSIBLE_TIMEOUT: "60"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment