From abec5106c032905661d31c58301a35e2fcbe259e Mon Sep 17 00:00:00 2001 From: Stoyan Rachev Date: Wed, 3 Nov 2021 19:16:14 +0200 Subject: [PATCH] Upgrade terraform to 0.13.7 --- build/alicloud/TF_VERSION | 2 +- build/alicloud/terraform-bundle.hcl | 12 ++++++-- build/all/TF_VERSION | 2 +- build/all/terraform-bundle.hcl | 38 +++++++++++++++++++------ build/aws/TF_VERSION | 2 +- build/aws/terraform-bundle.hcl | 12 ++++++-- build/azure/TF_VERSION | 2 +- build/azure/terraform-bundle.hcl | 12 ++++++-- build/equinixmetal/terraform-bundle.hcl | 2 +- build/gcp/TF_VERSION | 2 +- build/gcp/terraform-bundle.hcl | 16 ++++++++--- build/openstack/TF_VERSION | 2 +- build/openstack/terraform-bundle.hcl | 13 +++++++-- build/slim/TF_VERSION | 2 +- hack/get-version.sh | 2 +- 15 files changed, 87 insertions(+), 34 deletions(-) diff --git a/build/alicloud/TF_VERSION b/build/alicloud/TF_VERSION index f98d9c0d..5daaa7ba 100644 --- a/build/alicloud/TF_VERSION +++ b/build/alicloud/TF_VERSION @@ -1 +1 @@ -0.12.31 +0.13.7 diff --git a/build/alicloud/terraform-bundle.hcl b/build/alicloud/terraform-bundle.hcl index 14ba2e04..3ac05641 100644 --- a/build/alicloud/terraform-bundle.hcl +++ b/build/alicloud/terraform-bundle.hcl @@ -7,7 +7,13 @@ terraform { } providers { - alicloud = ["1.124.2"] - template = ["2.1.2"] - null = ["2.1.2"] + alicloud = { + versions = ["1.124.2"] + } + template = { + versions = ["2.1.2"] + } + null = { + versions = ["2.1.2"] + } } diff --git a/build/all/TF_VERSION b/build/all/TF_VERSION index f98d9c0d..5daaa7ba 100644 --- a/build/all/TF_VERSION +++ b/build/all/TF_VERSION @@ -1 +1 @@ -0.12.31 +0.13.7 diff --git a/build/all/terraform-bundle.hcl b/build/all/terraform-bundle.hcl index 3a9f55a0..f5ce4761 100644 --- a/build/all/terraform-bundle.hcl +++ b/build/all/terraform-bundle.hcl @@ -7,13 +7,33 @@ terraform { } providers { - aws = ["3.63.0"] - azurerm = ["2.68.0"] - google = ["3.62.0"] - google-beta = ["3.62.0"] - openstack = ["1.37.0"] - alicloud = ["1.124.2"] - packet = ["2.3.0"] - template = ["2.1.2"] - null = ["2.1.2"] + aws = { + versions = ["3.63.0"] + } + azurerm = { + versions = ["2.68.0"] + } + google = { + versions = ["3.62.0"] + } + google-beta = { + versions = ["3.62.0"] + } + openstack = { + versions = ["1.37.0"] + source = "terraform-provider-openstack/openstack" + } + alicloud = { + versions = ["1.124.2"] + } + metal = { + versions = ["3.1.0"] + source = "equinix/metal" + } + template = { + versions = ["2.1.2"] + } + null = { + versions = ["2.1.2"] + } } diff --git a/build/aws/TF_VERSION b/build/aws/TF_VERSION index f98d9c0d..5daaa7ba 100644 --- a/build/aws/TF_VERSION +++ b/build/aws/TF_VERSION @@ -1 +1 @@ -0.12.31 +0.13.7 diff --git a/build/aws/terraform-bundle.hcl b/build/aws/terraform-bundle.hcl index 279a3b60..d2ebb978 100644 --- a/build/aws/terraform-bundle.hcl +++ b/build/aws/terraform-bundle.hcl @@ -7,7 +7,13 @@ terraform { } providers { - aws = ["3.63.0"] - template = ["2.1.2"] - null = ["2.1.2"] + aws = { + versions = ["3.63.0"] + } + template = { + versions = ["2.1.2"] + } + null = { + versions = ["2.1.2"] + } } diff --git a/build/azure/TF_VERSION b/build/azure/TF_VERSION index f98d9c0d..5daaa7ba 100644 --- a/build/azure/TF_VERSION +++ b/build/azure/TF_VERSION @@ -1 +1 @@ -0.12.31 +0.13.7 diff --git a/build/azure/terraform-bundle.hcl b/build/azure/terraform-bundle.hcl index 8c8f45e8..cf7c281d 100644 --- a/build/azure/terraform-bundle.hcl +++ b/build/azure/terraform-bundle.hcl @@ -7,7 +7,13 @@ terraform { } providers { - azurerm = ["2.68.0"] - template = ["2.1.2"] - null = ["2.1.2"] + azurerm = { + versions = ["2.68.0"] + } + template = { + versions = ["2.1.2"] + } + null = { + versions = ["2.1.2"] + } } diff --git a/build/equinixmetal/terraform-bundle.hcl b/build/equinixmetal/terraform-bundle.hcl index fd0c036f..034194b9 100644 --- a/build/equinixmetal/terraform-bundle.hcl +++ b/build/equinixmetal/terraform-bundle.hcl @@ -7,7 +7,7 @@ terraform { } providers { - metal = { + metal = { versions = ["3.1.0"] source = "equinix/metal" } diff --git a/build/gcp/TF_VERSION b/build/gcp/TF_VERSION index f98d9c0d..5daaa7ba 100644 --- a/build/gcp/TF_VERSION +++ b/build/gcp/TF_VERSION @@ -1 +1 @@ -0.12.31 +0.13.7 diff --git a/build/gcp/terraform-bundle.hcl b/build/gcp/terraform-bundle.hcl index 92098681..6a5e914a 100644 --- a/build/gcp/terraform-bundle.hcl +++ b/build/gcp/terraform-bundle.hcl @@ -7,8 +7,16 @@ terraform { } providers { - google = ["3.62.0"] - google-beta = ["3.62.0"] - template = ["2.1.2"] - null = ["2.1.2"] + google = { + versions = ["3.62.0"] + } + google-beta = { + versions = ["3.62.0"] + } + template = { + versions = ["2.1.2"] + } + null = { + versions = ["2.1.2"] + } } diff --git a/build/openstack/TF_VERSION b/build/openstack/TF_VERSION index f98d9c0d..5daaa7ba 100644 --- a/build/openstack/TF_VERSION +++ b/build/openstack/TF_VERSION @@ -1 +1 @@ -0.12.31 +0.13.7 diff --git a/build/openstack/terraform-bundle.hcl b/build/openstack/terraform-bundle.hcl index f8c9ad59..a90f6cee 100644 --- a/build/openstack/terraform-bundle.hcl +++ b/build/openstack/terraform-bundle.hcl @@ -7,7 +7,14 @@ terraform { } providers { - openstack = ["1.37.0"] - template = ["2.1.2"] - null = ["2.1.2"] + openstack = { + versions = ["1.37.0"] + source = "terraform-provider-openstack/openstack" + } + template = { + versions = ["2.1.2"] + } + null = { + versions = ["2.1.2"] + } } diff --git a/build/slim/TF_VERSION b/build/slim/TF_VERSION index f98d9c0d..5daaa7ba 100644 --- a/build/slim/TF_VERSION +++ b/build/slim/TF_VERSION @@ -1 +1 @@ -0.12.31 +0.13.7 diff --git a/hack/get-version.sh b/hack/get-version.sh index f22ed3e6..78cf212d 100755 --- a/hack/get-version.sh +++ b/hack/get-version.sh @@ -32,7 +32,7 @@ fi # as a dirty work tree. # Additionally, it filters out changes to the `VERSION` file, as this is currently the only way to inject the # version-to-build in our pipelines (see https://github.com/gardener/cc-utils/issues/431). -TREE_STATE="$([ -z "$(git status --porcelain 2>/dev/null | grep -vf <(git ls-files --deleted --ignored --exclude-from=.dockerignore) -e 'VERSION')" ] && echo clean || echo dirty)" +TREE_STATE="$([ -z "$(git status --porcelain 2>/dev/null | grep -vf <(git ls-files -o --deleted --ignored --exclude-from=.dockerignore) -e 'VERSION')" ] && echo clean || echo dirty)" if [ "$TREE_STATE" = dirty ] ; then VERSION="$VERSION-dirty"