From 7c7837e089d4aeaf895c49ec6b7acfbd9226353d Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Fri, 13 Dec 2024 16:30:25 +0300 Subject: [PATCH 01/14] removed terraform version reqs; updated selectel and openstack providers --- versions.tf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/versions.tf b/versions.tf index 995d05d..b982741 100644 --- a/versions.tf +++ b/versions.tf @@ -2,13 +2,12 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = "5.1.1" + version = "6.0.1" } openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "3.0.0" } } backend "s3" {} - required_version = ">= 1.0.0, <= 1.6.2" } From ec00e06e4529a9c8126801878b0a2516353953d5 Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Fri, 13 Dec 2024 16:37:09 +0300 Subject: [PATCH 02/14] possible workaround with s3 endpoint --- .github/workflows/modules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml index 6481388..dd157ce 100644 --- a/.github/workflows/modules.yml +++ b/.github/workflows/modules.yml @@ -62,7 +62,7 @@ jobs: run: > terraform init -reconfigure -backend-config="bucket=github-terraform-state" - -backend-config="endpoint=s3.ru-1.storage.selcloud.ru" + -backend-config="endpoints={s3="s3.ru-1.storage.selcloud.ru"}" -backend-config="key=github-infra-examples.tfstate" -backend-config="region=ru-1" -backend-config="skip_region_validation=true" From e23e6509663dc3b0e5d49d5f208a9e5daf10296e Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Mon, 16 Dec 2024 12:15:30 +0300 Subject: [PATCH 03/14] added s3 endpoint configuration to versions.tf --- .github/workflows/modules.yml | 29 ++++++++++++++--------------- .github/workflows/opentofu.yml | 1 - .github/workflows/tf-pre-bsl.yml | 16 ---------------- versions.tf | 6 +++++- 4 files changed, 19 insertions(+), 33 deletions(-) diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml index dd157ce..3479126 100644 --- a/.github/workflows/modules.yml +++ b/.github/workflows/modules.yml @@ -62,7 +62,6 @@ jobs: run: > terraform init -reconfigure -backend-config="bucket=github-terraform-state" - -backend-config="endpoints={s3="s3.ru-1.storage.selcloud.ru"}" -backend-config="key=github-infra-examples.tfstate" -backend-config="region=ru-1" -backend-config="skip_region_validation=true" @@ -76,17 +75,17 @@ jobs: - name: Terraform destroy run: terraform destroy -auto-approve - - name: Telegram notify if job was failed - if: ${{ failure() }} - uses: appleboy/telegram-action@master - with: - to: ${{ secrets.TELEGRAM_TO }} - token: ${{ secrets.TELEGRAM_TOKEN }} - message: | - -= GITHUB public repository selectel/selectel-infra-examples =- - Terraform modules build pipeline was failed - 🚨 Critical - Не катится пайпа, необходимо принять меры, возможно внутренние пайпы с terraform так же не будут катиться. - - ⚡️Workflow: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} - 🔥 See changes: https://github.com/${{ github.repository }}/commit/${{ github.sha }} +# - name: Telegram notify if job was failed +# if: ${{ failure() }} +# uses: appleboy/telegram-action@master +# with: +# to: ${{ secrets.TELEGRAM_TO }} +# token: ${{ secrets.TELEGRAM_TOKEN }} +# message: | +# -= GITHUB public repository selectel/selectel-infra-examples =- +# Terraform modules build pipeline was failed +# 🚨 Critical +# Не катится пайпа, необходимо принять меры, возможно внутренние пайпы с terraform так же не будут катиться. +# +# ⚡️Workflow: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} +# 🔥 See changes: https://github.com/${{ github.repository }}/commit/${{ github.sha }} diff --git a/.github/workflows/opentofu.yml b/.github/workflows/opentofu.yml index e4fc645..41e3691 100644 --- a/.github/workflows/opentofu.yml +++ b/.github/workflows/opentofu.yml @@ -41,7 +41,6 @@ jobs: run: > tofu init -reconfigure -backend-config="bucket=github-terraform-state" - -backend-config="endpoint=s3.ru-1.storage.selcloud.ru" -backend-config="key=github-infra-examples.tfstate" -backend-config="region=ru-1" -backend-config="skip_region_validation=true" diff --git a/.github/workflows/tf-pre-bsl.yml b/.github/workflows/tf-pre-bsl.yml index b7b52b0..436c36c 100644 --- a/.github/workflows/tf-pre-bsl.yml +++ b/.github/workflows/tf-pre-bsl.yml @@ -62,7 +62,6 @@ jobs: run: > terraform init -reconfigure -backend-config="bucket=github-terraform-state" - -backend-config="endpoint=s3.ru-1.storage.selcloud.ru" -backend-config="key=github-infra-examples.tfstate" -backend-config="region=ru-1" -backend-config="skip_region_validation=true" @@ -75,18 +74,3 @@ jobs: - name: Terraform destroy run: terraform destroy -auto-approve - - - name: Telegram notify if job was failed - if: ${{ failure() }} - uses: appleboy/telegram-action@master - with: - to: ${{ secrets.TELEGRAM_TO }} - token: ${{ secrets.TELEGRAM_TOKEN }} - message: | - -= GITHUB public repository selectel/selectel-infra-examples =- - Terraform modules build pipeline was failed - 🚨 Critical - Не катится пайпа, необходимо принять меры, возможно внутренние пайпы с terraform так же не будут катиться. - - ⚡️Workflow: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} - 🔥 See changes: https://github.com/${{ github.repository }}/commit/${{ github.sha }} diff --git a/versions.tf b/versions.tf index b982741..acc314f 100644 --- a/versions.tf +++ b/versions.tf @@ -9,5 +9,9 @@ terraform { version = "3.0.0" } } - backend "s3" {} + backend "s3" { + endpoints = { + s3 = "s3.ru-1.storage.selcloud.ru" + } + } } From c444bf5a0cadb33eeac91171c974b52eaf5c7775 Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Mon, 16 Dec 2024 12:23:40 +0300 Subject: [PATCH 04/14] changed backend s3 params --- .github/workflows/modules.yml | 3 --- .github/workflows/opentofu.yml | 3 --- .github/workflows/tf-pre-bsl.yml | 3 --- versions.tf | 10 +++++++--- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml index 3479126..d537e4f 100644 --- a/.github/workflows/modules.yml +++ b/.github/workflows/modules.yml @@ -63,9 +63,6 @@ jobs: terraform init -reconfigure -backend-config="bucket=github-terraform-state" -backend-config="key=github-infra-examples.tfstate" - -backend-config="region=ru-1" - -backend-config="skip_region_validation=true" - -backend-config="skip_credentials_validation=true" -backend-config="access_key=${{ secrets.S3_ACCESS_KEY }}" -backend-config="secret_key=${{ secrets.S3_SECRET_KEY }}" diff --git a/.github/workflows/opentofu.yml b/.github/workflows/opentofu.yml index 41e3691..9d8b23e 100644 --- a/.github/workflows/opentofu.yml +++ b/.github/workflows/opentofu.yml @@ -42,9 +42,6 @@ jobs: tofu init -reconfigure -backend-config="bucket=github-terraform-state" -backend-config="key=github-infra-examples.tfstate" - -backend-config="region=ru-1" - -backend-config="skip_region_validation=true" - -backend-config="skip_credentials_validation=true" -backend-config="access_key=${{ secrets.S3_ACCESS_KEY }}" -backend-config="secret_key=${{ secrets.S3_SECRET_KEY }}" diff --git a/.github/workflows/tf-pre-bsl.yml b/.github/workflows/tf-pre-bsl.yml index 436c36c..35c91a3 100644 --- a/.github/workflows/tf-pre-bsl.yml +++ b/.github/workflows/tf-pre-bsl.yml @@ -63,9 +63,6 @@ jobs: terraform init -reconfigure -backend-config="bucket=github-terraform-state" -backend-config="key=github-infra-examples.tfstate" - -backend-config="region=ru-1" - -backend-config="skip_region_validation=true" - -backend-config="skip_credentials_validation=true" -backend-config="access_key=${{ secrets.S3_ACCESS_KEY }}" -backend-config="secret_key=${{ secrets.S3_SECRET_KEY }}" diff --git a/versions.tf b/versions.tf index acc314f..9e9bda5 100644 --- a/versions.tf +++ b/versions.tf @@ -10,8 +10,12 @@ terraform { } } backend "s3" { - endpoints = { - s3 = "s3.ru-1.storage.selcloud.ru" - } + endpoints = { s3 = "https://s3.ru-1.storage.selcloud.ru" } + region = "ru-1" + skip_region_validation = true + skip_credentials_validation = true + skip_requesting_account_id = true + skip_s3_checksum = true + skip_metadata_api_check = true } } From 59e3b5ad73641f12ca637cccfe0f4113a3b9b8af Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Mon, 16 Dec 2024 12:30:37 +0300 Subject: [PATCH 05/14] updated openstack provider version reqs --- modules/craas/versions.tf | 2 +- modules/flavor/versions.tf | 2 +- modules/floatingip/versions.tf | 2 +- modules/image_datasource/versions.tf | 2 +- modules/keypair/versions.tf | 2 +- modules/mks/k8s-cluster-standalone/versions.tf | 4 ++-- modules/mks/k8s-cluster/versions.tf | 2 +- modules/mks/k8s-nodegroup-gpu/versions.tf | 2 +- modules/mks/k8s-nodegroup/versions.tf | 2 +- modules/nat/versions.tf | 2 +- modules/network/versions.tf | 2 +- modules/os_project_with_user/versions.tf | 2 +- modules/s3/s3-bucket/versions.tf | 2 +- modules/s3/s3-credentials/versions.tf | 2 +- modules/sfs/versions.tf | 2 +- modules/vm/versions.tf | 4 ++-- modules/volume/versions.tf | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/modules/craas/versions.tf b/modules/craas/versions.tf index b77e5a3..3070da1 100644 --- a/modules/craas/versions.tf +++ b/modules/craas/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">=5.0.2" + version = ">= 5.0.2" } } } diff --git a/modules/flavor/versions.tf b/modules/flavor/versions.tf index 16977d6..6ba9a3e 100644 --- a/modules/flavor/versions.tf +++ b/modules/flavor/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "~> 3.0.0" } } } diff --git a/modules/floatingip/versions.tf b/modules/floatingip/versions.tf index 16977d6..6ba9a3e 100644 --- a/modules/floatingip/versions.tf +++ b/modules/floatingip/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "~> 3.0.0" } } } diff --git a/modules/image_datasource/versions.tf b/modules/image_datasource/versions.tf index 16977d6..6ba9a3e 100644 --- a/modules/image_datasource/versions.tf +++ b/modules/image_datasource/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "~> 3.0.0" } } } diff --git a/modules/keypair/versions.tf b/modules/keypair/versions.tf index 16977d6..6ba9a3e 100644 --- a/modules/keypair/versions.tf +++ b/modules/keypair/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "~> 3.0.0" } } } diff --git a/modules/mks/k8s-cluster-standalone/versions.tf b/modules/mks/k8s-cluster-standalone/versions.tf index 7833b9a..9d71bd7 100644 --- a/modules/mks/k8s-cluster-standalone/versions.tf +++ b/modules/mks/k8s-cluster-standalone/versions.tf @@ -2,11 +2,11 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">=5.0.2" + version = ">= 5.0.2" } openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "~> 3.0.0" } } } diff --git a/modules/mks/k8s-cluster/versions.tf b/modules/mks/k8s-cluster/versions.tf index b77e5a3..3070da1 100644 --- a/modules/mks/k8s-cluster/versions.tf +++ b/modules/mks/k8s-cluster/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">=5.0.2" + version = ">= 5.0.2" } } } diff --git a/modules/mks/k8s-nodegroup-gpu/versions.tf b/modules/mks/k8s-nodegroup-gpu/versions.tf index b77e5a3..3070da1 100644 --- a/modules/mks/k8s-nodegroup-gpu/versions.tf +++ b/modules/mks/k8s-nodegroup-gpu/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">=5.0.2" + version = ">= 5.0.2" } } } diff --git a/modules/mks/k8s-nodegroup/versions.tf b/modules/mks/k8s-nodegroup/versions.tf index b77e5a3..3070da1 100644 --- a/modules/mks/k8s-nodegroup/versions.tf +++ b/modules/mks/k8s-nodegroup/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">=5.0.2" + version = ">= 5.0.2" } } } diff --git a/modules/nat/versions.tf b/modules/nat/versions.tf index 16977d6..6ba9a3e 100644 --- a/modules/nat/versions.tf +++ b/modules/nat/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "~> 3.0.0" } } } diff --git a/modules/network/versions.tf b/modules/network/versions.tf index 16977d6..6ba9a3e 100644 --- a/modules/network/versions.tf +++ b/modules/network/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "~> 3.0.0" } } } diff --git a/modules/os_project_with_user/versions.tf b/modules/os_project_with_user/versions.tf index b264d11..a1b78ae 100644 --- a/modules/os_project_with_user/versions.tf +++ b/modules/os_project_with_user/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">=5.0.2" + version = ">= 5.0.2" } random = { source = "registry.terraform.io/hashicorp/random" diff --git a/modules/s3/s3-bucket/versions.tf b/modules/s3/s3-bucket/versions.tf index 59204ba..2672590 100644 --- a/modules/s3/s3-bucket/versions.tf +++ b/modules/s3/s3-bucket/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "~> 3.0.0" } http-full = { source = "registry.terraform.io/salrashid123/http-full" diff --git a/modules/s3/s3-credentials/versions.tf b/modules/s3/s3-credentials/versions.tf index b77e5a3..3070da1 100644 --- a/modules/s3/s3-credentials/versions.tf +++ b/modules/s3/s3-credentials/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">=5.0.2" + version = ">= 5.0.2" } } } diff --git a/modules/sfs/versions.tf b/modules/sfs/versions.tf index 16977d6..6ba9a3e 100644 --- a/modules/sfs/versions.tf +++ b/modules/sfs/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "~> 3.0.0" } } } diff --git a/modules/vm/versions.tf b/modules/vm/versions.tf index 7833b9a..9d71bd7 100644 --- a/modules/vm/versions.tf +++ b/modules/vm/versions.tf @@ -2,11 +2,11 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">=5.0.2" + version = ">= 5.0.2" } openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "~> 3.0.0" } } } diff --git a/modules/volume/versions.tf b/modules/volume/versions.tf index bc9bd4f..c27bfb3 100644 --- a/modules/volume/versions.tf +++ b/modules/volume/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" - version = "1.53.0" + version = "~> 3.0.0" } random = { source = "registry.terraform.io/hashicorp/random" From b9f6f118fd1bae40b35dee978cc86005e9776cc6 Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Mon, 16 Dec 2024 12:37:20 +0300 Subject: [PATCH 06/14] added necessary vars for the new version of the selectel provider --- providers.tf | 2 ++ vars.tf | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/providers.tf b/providers.tf index 3a08017..1acb966 100644 --- a/providers.tf +++ b/providers.tf @@ -2,6 +2,8 @@ provider "selectel" { domain_name = var.selectel_domain_name username = var.selectel_user_admin_user password = var.selectel_user_admin_password + auth_url = var.os_auth_url + auth_region = "ru-9" } provider "openstack" { diff --git a/vars.tf b/vars.tf index 64b6c2e..ce4cca5 100644 --- a/vars.tf +++ b/vars.tf @@ -22,7 +22,6 @@ variable "os_auth_url" { } # vm vars - variable "flavor_name" { type = string description = "Название флавора" From 5c73f8aa8936217a3dd8c4598ca733063d9e3ead Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Mon, 16 Dec 2024 12:40:55 +0300 Subject: [PATCH 07/14] added necessary var for the mks module --- modules/mks/k8s-nodegroup-gpu/main.tf | 3 +++ modules/mks/k8s-nodegroup/main.tf | 2 ++ 2 files changed, 5 insertions(+) diff --git a/modules/mks/k8s-nodegroup-gpu/main.tf b/modules/mks/k8s-nodegroup-gpu/main.tf index 0e1f979..d8db643 100644 --- a/modules/mks/k8s-nodegroup-gpu/main.tf +++ b/modules/mks/k8s-nodegroup-gpu/main.tf @@ -10,6 +10,9 @@ resource "selectel_mks_nodegroup_v1" "nodegroup_1" { volume_type = var.volume_type labels = var.labels flavor_id = var.flavor_id + + install_nvidia_device_plugin = true + dynamic "taints" { for_each = var.taints[*] content { diff --git a/modules/mks/k8s-nodegroup/main.tf b/modules/mks/k8s-nodegroup/main.tf index a5a2fe1..d46c3cf 100644 --- a/modules/mks/k8s-nodegroup/main.tf +++ b/modules/mks/k8s-nodegroup/main.tf @@ -10,6 +10,8 @@ resource "selectel_mks_nodegroup_v1" "nodegroup_1" { volume_type = var.volume_type labels = var.labels + install_nvidia_device_plugin = false + cpus = var.cpus != "" && var.flavor_id == "" ? var.cpus : null ram_mb = var.ram_mb != "" && var.flavor_id == "" ? var.ram_mb : null flavor_id = var.flavor_id != "" && var.ram_mb == "" && var.cpus == "" ? var.flavor_id : null From fe6e62179459d3d760ef2b8e50fefc559201bb1d Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Tue, 17 Dec 2024 14:11:07 +0300 Subject: [PATCH 08/14] removed pre-bsl terraform version due to compatibility issues; testing terraform setup using setup-terraform action --- .github/workflows/modules.yml | 46 ++++++++++---------- .github/workflows/tf-pre-bsl.yml | 73 -------------------------------- README.md | 1 - 3 files changed, 23 insertions(+), 97 deletions(-) delete mode 100644 .github/workflows/tf-pre-bsl.yml diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml index d537e4f..6d5c9dd 100644 --- a/.github/workflows/modules.yml +++ b/.github/workflows/modules.yml @@ -2,7 +2,7 @@ name: 'Modules Test Run - Terraform v1.10.2' on: schedule: - - cron: '0 8 * * 1' # run every Monday at 11:00 MSK + - cron: '0 8 * * 2' # run every Tuesday at 11:00 MSK workflow_dispatch: jobs: @@ -10,7 +10,7 @@ jobs: name: 'Modules Test Run - Terraform v1.10.2' runs-on: self-hosted env: - terraform_link: ${{ secrets.TERRAFORM_BINARY_LATEST }} + terraform_link: ${{ secrets.TERRAFORM_BINARY }} TF_VAR_selectel_domain_name: ${{ secrets.SELECTEL_ID }} TF_VAR_selectel_user_admin_user: ${{ secrets.SERVICE_USER }} TF_VAR_selectel_user_admin_password: ${{ secrets.SERVICE_PASSWORD }} @@ -27,13 +27,16 @@ jobs: node-version: 20 - name: Setup Terraform - shell: bash - run: | - curl -o terraform.zip $terraform_link - unzip terraform.zip - rm terraform.zip - chmod 755 terraform - mv terraform /usr/local/bin + uses: hashicorp/setup-terraform@v3 + +# - name: Setup Terraform +# shell: bash +# run: | +# curl -o terraform.zip $terraform_link +# unzip terraform.zip +# rm terraform.zip +# chmod 755 terraform +# mv terraform /usr/local/bin # - name: Run Checkov action # suppressed for now because it fails to copy a file inside a self-hosted runner # uses: bridgecrewio/checkov-action@v12 @@ -72,17 +75,14 @@ jobs: - name: Terraform destroy run: terraform destroy -auto-approve -# - name: Telegram notify if job was failed -# if: ${{ failure() }} -# uses: appleboy/telegram-action@master -# with: -# to: ${{ secrets.TELEGRAM_TO }} -# token: ${{ secrets.TELEGRAM_TOKEN }} -# message: | -# -= GITHUB public repository selectel/selectel-infra-examples =- -# Terraform modules build pipeline was failed -# 🚨 Critical -# Не катится пайпа, необходимо принять меры, возможно внутренние пайпы с terraform так же не будут катиться. -# -# ⚡️Workflow: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} -# 🔥 See changes: https://github.com/${{ github.repository }}/commit/${{ github.sha }} + - name: Telegram notify if job was failed + if: ${{ (failure()) && (github.ref == 'refs/heads/main') }} + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.TELEGRAM_TO }} + token: ${{ secrets.TELEGRAM_TOKEN }} + message: | + ⚙️ *GitHub repository selectel/selectel-infra-examples* + + 🔥 *Pipeline has failed* + ➡️ *Workflow:* https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} \ No newline at end of file diff --git a/.github/workflows/tf-pre-bsl.yml b/.github/workflows/tf-pre-bsl.yml deleted file mode 100644 index 35c91a3..0000000 --- a/.github/workflows/tf-pre-bsl.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: 'Modules Test Run - Terraform Pre-BSL' - -on: - schedule: - - cron: '0 8 * * 3' # run every Wednesday at 11:00 MSK - workflow_dispatch: - -jobs: - setup: - name: 'Modules Test Run - Terraform Pre-BSL' - runs-on: self-hosted - env: - terraform_link: ${{ secrets.TERRAFORM_BINARY_PREBSL }} - TF_VAR_selectel_domain_name: ${{ secrets.SELECTEL_ID }} - TF_VAR_selectel_user_admin_user: ${{ secrets.SERVICE_USER }} - TF_VAR_selectel_user_admin_password: ${{ secrets.SERVICE_PASSWORD }} - TF_VAR_flavor_name: ${{ secrets.FLAVOR_NAME }} - if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' }} - - steps: - - name: Checkout the repo - uses: actions/checkout@v4 - - - name: Setup NodeJS v20 - uses: actions/setup-node@v4 - with: - node-version: 20 - - - name: Setup Terraform - shell: bash - run: | - curl -o terraform.zip $terraform_link - unzip terraform.zip - rm terraform.zip - chmod 755 terraform - mv terraform /usr/local/bin - -# - name: Run Checkov action # suppressed for now because it fails to copy a file inside a self-hosted runner -# uses: bridgecrewio/checkov-action@v12 -# with: -# quiet: true -# directory: . -# output_format: cli -# framework: terraform,github_actions -# container_user: 1000 - - - name: Add .terraformrc - shell: bash - run: | - cat <<EOS >> $HOME/.terraformrc - provider_installation { - network_mirror { - url = "https://tf-proxy.selectel.ru/mirror/v1/" - } - } - EOS - - - name: Lint Terraform - run: terraform fmt -diff -check -recursive - - - name: Init Terraform - run: > - terraform init -reconfigure - -backend-config="bucket=github-terraform-state" - -backend-config="key=github-infra-examples.tfstate" - -backend-config="access_key=${{ secrets.S3_ACCESS_KEY }}" - -backend-config="secret_key=${{ secrets.S3_SECRET_KEY }}" - - - name: Terraform apply - run: terraform apply -auto-approve - - - name: Terraform destroy - run: terraform destroy -auto-approve diff --git a/README.md b/README.md index 4856bd9..42e75b2 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@ | Description | Pipeline Status | Version | |-------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------| | Terraform v1.10.2 | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml) | [![version](https://img.shields.io/badge/Terraform-1.10.2-green.svg)](https://github.com/hashicorp/terraform/releases/tag/v1.10.2) | -| Terraform Pre-BSL | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/tf-pre-bsl.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/tf-pre-bsl.yml) | [![version](https://img.shields.io/badge/Terraform-1.5.7-green.svg)](https://github.com/hashicorp/terraform/releases/tag/v1.5.7) | | OpenTofu Latest | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml) | [![version](https://img.shields.io/badge/OpenTofu-Latest-green.svg)](https://github.com/opentofu/opentofu/releases/latest) | - [Selectel Terraform Modules Example](#selectel-terraform-modules-example) From 5dd903103e48bae37b438efeb5b8be8195cb6c26 Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Wed, 18 Dec 2024 12:58:52 +0300 Subject: [PATCH 09/14] reverted automatic terraform setup; updated terraform-docs; added default flavor value; updated README.md --- .github/workflows/modules.yml | 19 ++++----- README.md | 43 +++++++------------- README_TF.md | 9 ++-- modules/craas/README.md | 4 +- modules/flavor/README.md | 4 +- modules/floatingip/README.md | 4 +- modules/image_datasource/README.md | 4 +- modules/keypair/README.md | 4 +- modules/mks/k8s-cluster-standalone/README.md | 6 +-- modules/mks/k8s-cluster/README.md | 4 +- modules/mks/k8s-nodegroup-gpu/README.md | 4 +- modules/mks/k8s-nodegroup/README.md | 4 +- modules/nat/README.md | 4 +- modules/network/README.md | 4 +- modules/os_project_with_user/README.md | 4 +- modules/s3/s3-bucket/README.md | 4 +- modules/s3/s3-credentials/README.md | 4 +- modules/sfs/README.md | 4 +- modules/vm/README.md | 6 +-- modules/volume/README.md | 4 +- vars.tf | 1 + 21 files changed, 63 insertions(+), 81 deletions(-) diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml index 6d5c9dd..9b281bd 100644 --- a/.github/workflows/modules.yml +++ b/.github/workflows/modules.yml @@ -27,16 +27,13 @@ jobs: node-version: 20 - name: Setup Terraform - uses: hashicorp/setup-terraform@v3 - -# - name: Setup Terraform -# shell: bash -# run: | -# curl -o terraform.zip $terraform_link -# unzip terraform.zip -# rm terraform.zip -# chmod 755 terraform -# mv terraform /usr/local/bin + shell: bash + run: | + curl -o terraform.zip $terraform_link + unzip terraform.zip + rm terraform.zip + chmod 755 terraform + mv terraform /usr/local/bin # - name: Run Checkov action # suppressed for now because it fails to copy a file inside a self-hosted runner # uses: bridgecrewio/checkov-action@v12 @@ -75,7 +72,7 @@ jobs: - name: Terraform destroy run: terraform destroy -auto-approve - - name: Telegram notify if job was failed + - name: Telegram notify if failed on main branch if: ${{ (failure()) && (github.ref == 'refs/heads/main') }} uses: appleboy/telegram-action@master with: diff --git a/README.md b/README.md index 42e75b2..adaccc7 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Selectel Terraform Modules Example -| Description | Pipeline Status | Version | -|-------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------| -| Terraform v1.10.2 | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml) | [![version](https://img.shields.io/badge/Terraform-1.10.2-green.svg)](https://github.com/hashicorp/terraform/releases/tag/v1.10.2) | -| OpenTofu Latest | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml) | [![version](https://img.shields.io/badge/OpenTofu-Latest-green.svg)](https://github.com/opentofu/opentofu/releases/latest) | +| | Pipeline Status | Version | +|-------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------| +| Terraform v1.10.2 | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml) | [![version](https://img.shields.io/badge/Terraform-1.10.2-green.svg)](https://github.com/hashicorp/terraform/releases/tag/v1.10.2) | +| OpenTofu | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml) | [![version](https://img.shields.io/badge/OpenTofu-Latest-green.svg)](https://github.com/opentofu/opentofu/releases/latest) | - [Selectel Terraform Modules Example](#selectel-terraform-modules-example) - [Использование](#использование) @@ -52,41 +52,26 @@ terraform { } ``` -<details> -<summary>Пример передачи `backend` для хранения стейта в S3 через CLI:</summary> - -```bash -terraform init \ - -backend-config="bucket=< имя бакета s3 >" \ - -backend-config="endpoint=s3.ru-1.storage.selcloud.ru" \ - -backend-config="key=< имя стейт-файла >.tfstate" \ - -backend-config="region=ru-1" \ - -backend-config="skip_region_validation=true" \ - -backend-config="skip_credentials_validation=true" \ - -backend-config="access_key=< S3_ACCESS_KEY >" \ - -backend-config="secret_key=< secrets.S3_SECRET_KEY >" -``` -</details> - -<details> -<summary>Через tf файл:</summary> +Пример передачи `backend` для хранения стейта в S3: ```terraform terraform { backend "s3" { - bucket = "< имя бакета s3 >" - endpoint = "s3.ru-1.storage.selcloud.ru" - key = "< имя стейт-файла >.tfstate" + bucket = "<название бакета s3>" + key = "<название стейт-файла>.tfstate" + access_key = "<access_key>" + secret_key = "<secret_key>" + endpoints = { s3 = "https://s3.ru-1.storage.selcloud.ru" } region = "ru-1" - access_key = "< S3_ACCESS_KEY >" - secret_key = "< secrets.S3_SECRET_KEY >" - + skip_region_validation = true skip_credentials_validation = true + skip_requesting_account_id = true + skip_s3_checksum = true + skip_metadata_api_check = true } } ``` -</details> ### 3. Init diff --git a/README_TF.md b/README_TF.md index d38ff64..3e7f113 100644 --- a/README_TF.md +++ b/README_TF.md @@ -3,16 +3,15 @@ | Name | Version | |------|---------| -| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0, <= 1.6.2 | -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | 5.1.1 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 3.0.0 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | 6.0.1 | ## Providers | Name | Version | |------|---------| -| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 1.53.0 | -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | 5.1.1 | +| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 3.0.0 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | 6.0.1 | ## Modules diff --git a/modules/craas/README.md b/modules/craas/README.md index 85dbb9d..1bca698 100644 --- a/modules/craas/README.md +++ b/modules/craas/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >=5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >=5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | ## Modules diff --git a/modules/flavor/README.md b/modules/flavor/README.md index 3a21831..78ef561 100644 --- a/modules/flavor/README.md +++ b/modules/flavor/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 1.53.0 | +| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | ## Modules diff --git a/modules/floatingip/README.md b/modules/floatingip/README.md index 4fde1ad..48c54b9 100644 --- a/modules/floatingip/README.md +++ b/modules/floatingip/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 1.53.0 | +| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | ## Modules diff --git a/modules/image_datasource/README.md b/modules/image_datasource/README.md index 4d59660..c5313d0 100644 --- a/modules/image_datasource/README.md +++ b/modules/image_datasource/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 1.53.0 | +| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | ## Modules diff --git a/modules/keypair/README.md b/modules/keypair/README.md index cda66c0..eaefccd 100644 --- a/modules/keypair/README.md +++ b/modules/keypair/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 1.53.0 | +| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | ## Modules diff --git a/modules/mks/k8s-cluster-standalone/README.md b/modules/mks/k8s-cluster-standalone/README.md index 4f8dc79..5b477a4 100644 --- a/modules/mks/k8s-cluster-standalone/README.md +++ b/modules/mks/k8s-cluster-standalone/README.md @@ -3,14 +3,14 @@ | Name | Version | |------|---------| -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >=5.0.2 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >=5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | ## Modules diff --git a/modules/mks/k8s-cluster/README.md b/modules/mks/k8s-cluster/README.md index 84076b9..f884bf9 100644 --- a/modules/mks/k8s-cluster/README.md +++ b/modules/mks/k8s-cluster/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >=5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >=5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | ## Modules diff --git a/modules/mks/k8s-nodegroup-gpu/README.md b/modules/mks/k8s-nodegroup-gpu/README.md index fc8c92c..ce6e5ac 100644 --- a/modules/mks/k8s-nodegroup-gpu/README.md +++ b/modules/mks/k8s-nodegroup-gpu/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >=5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >=5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | ## Modules diff --git a/modules/mks/k8s-nodegroup/README.md b/modules/mks/k8s-nodegroup/README.md index 49b7358..18e2e26 100644 --- a/modules/mks/k8s-nodegroup/README.md +++ b/modules/mks/k8s-nodegroup/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >=5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >=5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | ## Modules diff --git a/modules/nat/README.md b/modules/nat/README.md index c5490d0..28659ba 100644 --- a/modules/nat/README.md +++ b/modules/nat/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 1.53.0 | +| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | ## Modules diff --git a/modules/network/README.md b/modules/network/README.md index 1dc8d15..235a904 100644 --- a/modules/network/README.md +++ b/modules/network/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 1.53.0 | +| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | ## Modules diff --git a/modules/os_project_with_user/README.md b/modules/os_project_with_user/README.md index 17707d9..418cfaa 100644 --- a/modules/os_project_with_user/README.md +++ b/modules/os_project_with_user/README.md @@ -4,14 +4,14 @@ | Name | Version | |------|---------| | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.3.2 | -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >=5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | ## Providers | Name | Version | |------|---------| | <a name="provider_random"></a> [random](#provider\_random) | >= 3.3.2 | -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >=5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | ## Modules diff --git a/modules/s3/s3-bucket/README.md b/modules/s3/s3-bucket/README.md index 926667a..08ca135 100644 --- a/modules/s3/s3-bucket/README.md +++ b/modules/s3/s3-bucket/README.md @@ -4,14 +4,14 @@ | Name | Version | |------|---------| | <a name="requirement_http-full"></a> [http-full](#requirement\_http-full) | >= 1.3.1 | -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | | <a name="requirement_terracurl"></a> [terracurl](#requirement\_terracurl) | >= 1.0.1 | ## Providers | Name | Version | |------|---------| -| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 1.53.0 | +| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | | <a name="provider_terracurl"></a> [terracurl](#provider\_terracurl) | >= 1.0.1 | ## Modules diff --git a/modules/s3/s3-credentials/README.md b/modules/s3/s3-credentials/README.md index 1a9f2d0..76983a5 100644 --- a/modules/s3/s3-credentials/README.md +++ b/modules/s3/s3-credentials/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >=5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >=5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | ## Modules diff --git a/modules/sfs/README.md b/modules/sfs/README.md index 7df58a2..7621f33 100644 --- a/modules/sfs/README.md +++ b/modules/sfs/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 1.53.0 | +| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | ## Modules diff --git a/modules/vm/README.md b/modules/vm/README.md index 176be27..f133914 100644 --- a/modules/vm/README.md +++ b/modules/vm/README.md @@ -3,14 +3,14 @@ | Name | Version | |------|---------| -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >=5.0.2 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | ## Providers | Name | Version | |------|---------| -| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 1.53.0 | +| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | ## Modules diff --git a/modules/volume/README.md b/modules/volume/README.md index 08b8009..199da6d 100644 --- a/modules/volume/README.md +++ b/modules/volume/README.md @@ -3,14 +3,14 @@ | Name | Version | |------|---------| -| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | 1.53.0 | +| <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | | <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.3.2 | ## Providers | Name | Version | |------|---------| -| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | 1.53.0 | +| <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | | <a name="provider_random"></a> [random](#provider\_random) | >= 3.3.2 | ## Modules diff --git a/vars.tf b/vars.tf index ce4cca5..41ba3e0 100644 --- a/vars.tf +++ b/vars.tf @@ -24,5 +24,6 @@ variable "os_auth_url" { # vm vars variable "flavor_name" { type = string + default = "1013" description = "Название флавора" } \ No newline at end of file From abc64684b0eb7ba2534031e88d2b2bf69fa49f07 Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Wed, 18 Dec 2024 13:04:44 +0300 Subject: [PATCH 10/14] updated README.md --- README.md | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index adaccc7..b7418e5 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ | | Pipeline Status | Version | |-------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------| | Terraform v1.10.2 | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml) | [![version](https://img.shields.io/badge/Terraform-1.10.2-green.svg)](https://github.com/hashicorp/terraform/releases/tag/v1.10.2) | -| OpenTofu | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml) | [![version](https://img.shields.io/badge/OpenTofu-Latest-green.svg)](https://github.com/opentofu/opentofu/releases/latest) | +| OpenTofu Latest | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml) | [![version](https://img.shields.io/badge/OpenTofu-Latest-green.svg)](https://github.com/opentofu/opentofu/releases/latest) | - [Selectel Terraform Modules Example](#selectel-terraform-modules-example) - [Использование](#использование) @@ -14,7 +14,7 @@ - [Структура репозитория](#структура-репозитория) - [Modules](#modules) -В [данном репозитории](https://github.com/selectel/selectel-infra-examples) находятся примеры Terraform модулей, используемых для создания инфраструктуры в облаке Selectel. Также в репозитории еженедельно запускаются пайплайны с тестовым созданием ресурсов с помощью **Terraform** и **OpenTofu**. +В [данном репозитории](https://github.com/selectel/selectel-infra-examples) находятся примеры Terraform модулей, используемых для создания инфраструктуры в облаке Selectel. Также в репозитории еженедельно запускаются пайплайны с тестовым созданием ресурсов с помощью **Terraform** и **OpenTofu**. **P.S.** Если вы не нашли пример для создания определенного ресурса - можете оставить issue и мы примем во внимание необходимость его добавления. @@ -22,11 +22,9 @@ ## Использование -> Далее все команды terraform-cli могут быть заменены на tofu. Будут работать оба варианта. +> Все последующие команды terraform-cli могут быть заменены на opentofu. > -> Перед использованием **проверьте версию Terraform/OpenTofu**, данный репозиторий гарантирует запуск Terraform кода только на определенной версии Terraform/OpenTofu - [см. в шапке README](#selectel-terraform-modules-example). Версия Terraform 1.5.5 обусловлена переходом начиная с версии 1.6 на лицензию BSL. -> -> Также убедитесь, что в вашем env нет лишних переменных вида "OS_*", их наличие повлияет на провайдер Openstack. +> Убедитесь, что в вашем env нет лишних переменных вида "OS_*", их наличие повлияет на провайдер Openstack. ### 1. .terraformrc/.tofurc From dbb96d72e5cb6e08d59c23ad8a8134ce1e2548fd Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Wed, 18 Dec 2024 15:52:32 +0300 Subject: [PATCH 11/14] updated misc providers versions --- README_TF.md | 2 +- modules/craas/README.md | 4 ++-- modules/craas/versions.tf | 2 +- modules/mks/k8s-cluster-standalone/README.md | 4 ++-- modules/mks/k8s-cluster-standalone/versions.tf | 2 +- modules/mks/k8s-cluster/README.md | 4 ++-- modules/mks/k8s-cluster/versions.tf | 2 +- modules/mks/k8s-nodegroup-gpu/README.md | 4 ++-- modules/mks/k8s-nodegroup-gpu/versions.tf | 2 +- modules/mks/k8s-nodegroup/README.md | 4 ++-- modules/mks/k8s-nodegroup/versions.tf | 2 +- modules/os_project_with_user/README.md | 8 ++++---- modules/os_project_with_user/versions.tf | 4 ++-- modules/s3/s3-bucket/README.md | 6 +++--- modules/s3/s3-bucket/versions.tf | 4 ++-- modules/s3/s3-credentials/README.md | 4 ++-- modules/s3/s3-credentials/versions.tf | 2 +- modules/selectel-token/README.md | 4 ++-- modules/selectel-token/versions.tf | 2 +- modules/vm/README.md | 2 +- modules/vm/versions.tf | 2 +- modules/volume/README.md | 4 ++-- modules/volume/versions.tf | 2 +- 23 files changed, 38 insertions(+), 38 deletions(-) diff --git a/README_TF.md b/README_TF.md index 3e7f113..eae149b 100644 --- a/README_TF.md +++ b/README_TF.md @@ -37,7 +37,7 @@ | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| <a name="input_flavor_name"></a> [flavor\_name](#input\_flavor\_name) | Название флавора | `string` | n/a | yes | +| <a name="input_flavor_name"></a> [flavor\_name](#input\_flavor\_name) | Название флавора | `string` | `"1013"` | no | | <a name="input_os_auth_url"></a> [os\_auth\_url](#input\_os\_auth\_url) | URL до openstack api | `string` | `"https://cloud.api.selcloud.ru/identity/v3"` | no | | <a name="input_selectel_domain_name"></a> [selectel\_domain\_name](#input\_selectel\_domain\_name) | ID Selectel аккаунта | `string` | n/a | yes | | <a name="input_selectel_user_admin_password"></a> [selectel\_user\_admin\_password](#input\_selectel\_user\_admin\_password) | Пароль от сервисного пользователя | `string` | n/a | yes | diff --git a/modules/craas/README.md b/modules/craas/README.md index 1bca698..bc8e62b 100644 --- a/modules/craas/README.md +++ b/modules/craas/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | ~> 6.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | ~> 6.0.0 | ## Modules diff --git a/modules/craas/versions.tf b/modules/craas/versions.tf index 3070da1..89a72fb 100644 --- a/modules/craas/versions.tf +++ b/modules/craas/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">= 5.0.2" + version = "~> 6.0.0" } } } diff --git a/modules/mks/k8s-cluster-standalone/README.md b/modules/mks/k8s-cluster-standalone/README.md index 5b477a4..1e42401 100644 --- a/modules/mks/k8s-cluster-standalone/README.md +++ b/modules/mks/k8s-cluster-standalone/README.md @@ -4,13 +4,13 @@ | Name | Version | |------|---------| | <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | ~> 6.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | ~> 6.0.0 | ## Modules diff --git a/modules/mks/k8s-cluster-standalone/versions.tf b/modules/mks/k8s-cluster-standalone/versions.tf index 9d71bd7..62a4b99 100644 --- a/modules/mks/k8s-cluster-standalone/versions.tf +++ b/modules/mks/k8s-cluster-standalone/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">= 5.0.2" + version = "~> 6.0.0" } openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" diff --git a/modules/mks/k8s-cluster/README.md b/modules/mks/k8s-cluster/README.md index f884bf9..e23c6e3 100644 --- a/modules/mks/k8s-cluster/README.md +++ b/modules/mks/k8s-cluster/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | ~> 6.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | ~> 6.0.0 | ## Modules diff --git a/modules/mks/k8s-cluster/versions.tf b/modules/mks/k8s-cluster/versions.tf index 3070da1..89a72fb 100644 --- a/modules/mks/k8s-cluster/versions.tf +++ b/modules/mks/k8s-cluster/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">= 5.0.2" + version = "~> 6.0.0" } } } diff --git a/modules/mks/k8s-nodegroup-gpu/README.md b/modules/mks/k8s-nodegroup-gpu/README.md index ce6e5ac..fe67f66 100644 --- a/modules/mks/k8s-nodegroup-gpu/README.md +++ b/modules/mks/k8s-nodegroup-gpu/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | ~> 6.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | ~> 6.0.0 | ## Modules diff --git a/modules/mks/k8s-nodegroup-gpu/versions.tf b/modules/mks/k8s-nodegroup-gpu/versions.tf index 3070da1..89a72fb 100644 --- a/modules/mks/k8s-nodegroup-gpu/versions.tf +++ b/modules/mks/k8s-nodegroup-gpu/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">= 5.0.2" + version = "~> 6.0.0" } } } diff --git a/modules/mks/k8s-nodegroup/README.md b/modules/mks/k8s-nodegroup/README.md index 18e2e26..ed6d39e 100644 --- a/modules/mks/k8s-nodegroup/README.md +++ b/modules/mks/k8s-nodegroup/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | ~> 6.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | ~> 6.0.0 | ## Modules diff --git a/modules/mks/k8s-nodegroup/versions.tf b/modules/mks/k8s-nodegroup/versions.tf index 3070da1..89a72fb 100644 --- a/modules/mks/k8s-nodegroup/versions.tf +++ b/modules/mks/k8s-nodegroup/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">= 5.0.2" + version = "~> 6.0.0" } } } diff --git a/modules/os_project_with_user/README.md b/modules/os_project_with_user/README.md index 418cfaa..c964813 100644 --- a/modules/os_project_with_user/README.md +++ b/modules/os_project_with_user/README.md @@ -3,15 +3,15 @@ | Name | Version | |------|---------| -| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.3.2 | -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | +| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.6.0 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | ~> 6.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_random"></a> [random](#provider\_random) | >= 3.3.2 | -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | +| <a name="provider_random"></a> [random](#provider\_random) | ~> 3.6.0 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | ~> 6.0.0 | ## Modules diff --git a/modules/os_project_with_user/versions.tf b/modules/os_project_with_user/versions.tf index a1b78ae..bed29dc 100644 --- a/modules/os_project_with_user/versions.tf +++ b/modules/os_project_with_user/versions.tf @@ -2,11 +2,11 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">= 5.0.2" + version = "~> 6.0.0" } random = { source = "registry.terraform.io/hashicorp/random" - version = ">= 3.3.2" + version = "~> 3.6.0" } } } diff --git a/modules/s3/s3-bucket/README.md b/modules/s3/s3-bucket/README.md index 08ca135..9fad759 100644 --- a/modules/s3/s3-bucket/README.md +++ b/modules/s3/s3-bucket/README.md @@ -3,16 +3,16 @@ | Name | Version | |------|---------| -| <a name="requirement_http-full"></a> [http-full](#requirement\_http-full) | >= 1.3.1 | +| <a name="requirement_http-full"></a> [http-full](#requirement\_http-full) | ~> 1.3.0 | | <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | -| <a name="requirement_terracurl"></a> [terracurl](#requirement\_terracurl) | >= 1.0.1 | +| <a name="requirement_terracurl"></a> [terracurl](#requirement\_terracurl) | ~> 1.2.0 | ## Providers | Name | Version | |------|---------| | <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | -| <a name="provider_terracurl"></a> [terracurl](#provider\_terracurl) | >= 1.0.1 | +| <a name="provider_terracurl"></a> [terracurl](#provider\_terracurl) | ~> 1.2.0 | ## Modules diff --git a/modules/s3/s3-bucket/versions.tf b/modules/s3/s3-bucket/versions.tf index 2672590..d8c0c7b 100644 --- a/modules/s3/s3-bucket/versions.tf +++ b/modules/s3/s3-bucket/versions.tf @@ -6,11 +6,11 @@ terraform { } http-full = { source = "registry.terraform.io/salrashid123/http-full" - version = ">= 1.3.1" + version = "~> 1.3.0" } terracurl = { source = "registry.terraform.io/devops-rob/terracurl" - version = ">= 1.0.1" + version = "~> 1.2.0" } } } diff --git a/modules/s3/s3-credentials/README.md b/modules/s3/s3-credentials/README.md index 76983a5..f5e1040 100644 --- a/modules/s3/s3-credentials/README.md +++ b/modules/s3/s3-credentials/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | ~> 6.0.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | >= 5.0.2 | +| <a name="provider_selectel"></a> [selectel](#provider\_selectel) | ~> 6.0.0 | ## Modules diff --git a/modules/s3/s3-credentials/versions.tf b/modules/s3/s3-credentials/versions.tf index 3070da1..89a72fb 100644 --- a/modules/s3/s3-credentials/versions.tf +++ b/modules/s3/s3-credentials/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">= 5.0.2" + version = "~> 6.0.0" } } } diff --git a/modules/selectel-token/README.md b/modules/selectel-token/README.md index fb0d35c..0113ba9 100644 --- a/modules/selectel-token/README.md +++ b/modules/selectel-token/README.md @@ -3,13 +3,13 @@ | Name | Version | |------|---------| -| <a name="requirement_http-full"></a> [http-full](#requirement\_http-full) | >= 1.3.1 | +| <a name="requirement_http-full"></a> [http-full](#requirement\_http-full) | ~> 1.3.0 | ## Providers | Name | Version | |------|---------| -| <a name="provider_http-full"></a> [http-full](#provider\_http-full) | >= 1.3.1 | +| <a name="provider_http-full"></a> [http-full](#provider\_http-full) | ~> 1.3.0 | ## Modules diff --git a/modules/selectel-token/versions.tf b/modules/selectel-token/versions.tf index 584a78d..0b97dfe 100644 --- a/modules/selectel-token/versions.tf +++ b/modules/selectel-token/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { http-full = { source = "registry.terraform.io/salrashid123/http-full" - version = ">= 1.3.1" + version = "~> 1.3.0" } } } diff --git a/modules/vm/README.md b/modules/vm/README.md index f133914..98902c4 100644 --- a/modules/vm/README.md +++ b/modules/vm/README.md @@ -4,7 +4,7 @@ | Name | Version | |------|---------| | <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | -| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | >= 5.0.2 | +| <a name="requirement_selectel"></a> [selectel](#requirement\_selectel) | ~> 6.0.0 | ## Providers diff --git a/modules/vm/versions.tf b/modules/vm/versions.tf index 9d71bd7..62a4b99 100644 --- a/modules/vm/versions.tf +++ b/modules/vm/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { selectel = { source = "registry.terraform.io/selectel/selectel" - version = ">= 5.0.2" + version = "~> 6.0.0" } openstack = { source = "registry.terraform.io/terraform-provider-openstack/openstack" diff --git a/modules/volume/README.md b/modules/volume/README.md index 199da6d..a8753d3 100644 --- a/modules/volume/README.md +++ b/modules/volume/README.md @@ -4,14 +4,14 @@ | Name | Version | |------|---------| | <a name="requirement_openstack"></a> [openstack](#requirement\_openstack) | ~> 3.0.0 | -| <a name="requirement_random"></a> [random](#requirement\_random) | >= 3.3.2 | +| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.6.0 | ## Providers | Name | Version | |------|---------| | <a name="provider_openstack"></a> [openstack](#provider\_openstack) | ~> 3.0.0 | -| <a name="provider_random"></a> [random](#provider\_random) | >= 3.3.2 | +| <a name="provider_random"></a> [random](#provider\_random) | ~> 3.6.0 | ## Modules diff --git a/modules/volume/versions.tf b/modules/volume/versions.tf index c27bfb3..07f5b8f 100644 --- a/modules/volume/versions.tf +++ b/modules/volume/versions.tf @@ -6,7 +6,7 @@ terraform { } random = { source = "registry.terraform.io/hashicorp/random" - version = ">= 3.3.2" + version = "~> 3.6.0" } } } From c6fd550325316dd5b967424cf6df1d7ce57bbffe Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Wed, 18 Dec 2024 17:06:41 +0300 Subject: [PATCH 12/14] updated terraform binary to v1.10.3 --- .github/workflows/modules.yml | 4 ++-- README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml index 9b281bd..8367a85 100644 --- a/.github/workflows/modules.yml +++ b/.github/workflows/modules.yml @@ -1,4 +1,4 @@ -name: 'Modules Test Run - Terraform v1.10.2' +name: 'Modules Test Run - Terraform v1.10.3' on: schedule: @@ -7,7 +7,7 @@ on: jobs: setup: - name: 'Modules Test Run - Terraform v1.10.2' + name: 'Modules Test Run - Terraform v1.10.3' runs-on: self-hosted env: terraform_link: ${{ secrets.TERRAFORM_BINARY }} diff --git a/README.md b/README.md index b7418e5..d895064 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ | | Pipeline Status | Version | |-------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------| -| Terraform v1.10.2 | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml) | [![version](https://img.shields.io/badge/Terraform-1.10.2-green.svg)](https://github.com/hashicorp/terraform/releases/tag/v1.10.2) | +| Terraform v1.10.3 | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/modules.yml) | [![version](https://img.shields.io/badge/Terraform-1.10.3-green.svg)](https://github.com/hashicorp/terraform/releases/tag/v1.10.3) | | OpenTofu Latest | [![](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml/badge.svg)](https://github.com/selectel/selectel-infra-examples/actions/workflows/opentofu.yml) | [![version](https://img.shields.io/badge/OpenTofu-Latest-green.svg)](https://github.com/opentofu/opentofu/releases/latest) | - [Selectel Terraform Modules Example](#selectel-terraform-modules-example) From f7626cde19a52a08d7e6632d8c5dbd4fac2c1703 Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Wed, 18 Dec 2024 17:19:07 +0300 Subject: [PATCH 13/14] added debug cat B) --- .github/workflows/modules.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml index 8367a85..9615771 100644 --- a/.github/workflows/modules.yml +++ b/.github/workflows/modules.yml @@ -55,6 +55,10 @@ jobs: } EOS + - name: debug + shell: bash + run: cat $HOME/.terraformrc + - name: Lint Terraform run: terraform fmt -diff -check -recursive From c845da6ec681c9dbfaaee75216e05462efbbdf89 Mon Sep 17 00:00:00 2001 From: Alexey Orlov <orlov.aa@selectel.com> Date: Wed, 18 Dec 2024 17:39:09 +0300 Subject: [PATCH 14/14] removed debug cat :( --- .github/workflows/modules.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/modules.yml b/.github/workflows/modules.yml index 9615771..8367a85 100644 --- a/.github/workflows/modules.yml +++ b/.github/workflows/modules.yml @@ -55,10 +55,6 @@ jobs: } EOS - - name: debug - shell: bash - run: cat $HOME/.terraformrc - - name: Lint Terraform run: terraform fmt -diff -check -recursive