From 377a14f5f0391d7feaeb3f89a3455d7175daca0e Mon Sep 17 00:00:00 2001 From: Khalezin Dmitrii Date: Mon, 3 May 2021 16:36:21 +0300 Subject: [PATCH 1/4] #49 updated terraform version to 15.1, updated providers version --- terraform/layer1-aws/.terraform-version | 2 +- terraform/layer1-aws/.terraform.lock.hcl | 58 ++++++++-------- terraform/layer1-aws/main.tf | 6 +- terraform/layer2-k8s/.terraform-version | 2 +- terraform/layer2-k8s/.terraform.lock.hcl | 84 +++++++++++++----------- terraform/layer2-k8s/main.tf | 8 +-- 6 files changed, 86 insertions(+), 74 deletions(-) diff --git a/terraform/layer1-aws/.terraform-version b/terraform/layer1-aws/.terraform-version index 226468ee..e815b861 100644 --- a/terraform/layer1-aws/.terraform-version +++ b/terraform/layer1-aws/.terraform-version @@ -1 +1 @@ -0.14.6 +0.15.1 diff --git a/terraform/layer1-aws/.terraform.lock.hcl b/terraform/layer1-aws/.terraform.lock.hcl index 3ed6d564..2c58d4ce 100644 --- a/terraform/layer1-aws/.terraform.lock.hcl +++ b/terraform/layer1-aws/.terraform.lock.hcl @@ -2,38 +2,40 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "3.26.0" - constraints = ">= 2.49.0, >= 2.53.0, >= 3.10.0, >= 3.22.0, 3.26.0" + version = "3.38.0" + constraints = ">= 2.49.0, >= 2.53.0, >= 3.10.0, >= 3.22.0, 3.38.0" hashes = [ - "h1:b1qNzEzDHZpnHSOW4fRo1PFC0U2Ft25PKKs9NSDGe3U=", - "zh:26043eed36d070ca032cf04bc980c654a25821a8abc0c85e1e570e3935bbfcbb", - "zh:2fe68f3f78d23830a04d7fac3eda550eef1f627dfc130486f70a65dc5c254300", - "zh:3d66484c608c64678e639db25d63872783ce60363a1246e30317f21c9c23b84b", - "zh:46ffd755cfd4cf94fe66342797b5afdcef010a24e126c67fee141b357d393535", - "zh:5e96f24357e945c9067cf5e032ad1d003609629c956c2f9f642fefe714e74587", - "zh:60c27aca36bb63bf3e865c2193be80ca83b376581d00f9c220af4b013e163c4d", - "zh:896f0f22d19d41e71b22f9240b261714c3915b165ddefeb771e7734d69dc47ea", - "zh:90de9966cb2fd3e2f326df291595e55d2dd2d90e7d6dd085c2c8691dce82bdb4", - "zh:ad05a91a88ceb1d6de5a568f7cc0b0e5bc0a79f3da70bc28c1e7f3750e362d58", - "zh:e8c63f59c6465329e1f3357498face3dd7ef10a033df3c366a33aa9e94b46c01", + "h1:ARuS11ThIcUfmAQKWNXGPLOa1GheaIwkeCnMh9Mjvao=", + "zh:20476d4c1b0c0efc55226bcbd85fbd948638fd9860a0edcdb7875cbb2b449e46", + "zh:7102622e6549cc3fc46b9ad68cbf4c50b162ce1013d4da817d05d1edf1f12fae", + "zh:74ff7f1610065e14c043cd9d74b3d5e0de4474f09a1a81e0b126b920b5cf6a27", + "zh:800e1b168149d507d23845f7a8b7e598c7dc16d2ee0f47848cf85d3e7458884f", + "zh:81ac3c68d6230b77740ca367e0c05a32ebb9be0fe5478c836573218a84eb3e46", + "zh:86536598796ba65539816f08351ac0ab32988ab84fa8f100049579996fafc800", + "zh:b9985c64f0f0b5bafb7067a60381fd807f7c3dd952c5d9f531385e464867bdd5", + "zh:c19c692896469724c6320fa7d87532ec3935e14e0e0fa0a8a0f1cf28ae7a0b0a", + "zh:cb8b14f246953a275ada562f5275a0d1a4938b7d20597e62fabe264012410f53", + "zh:cdbfa0ad87ff4d7451cfb89e53692a651d4c9cadece6845e60d986fd454b52b3", + "zh:ed5c4c8ae5adda37942bb15ef058c0811a95cb4c87259ae822627756dcb90efc", ] } provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.0.2" - constraints = ">= 1.11.1, 2.0.2" + version = "2.1.0" + constraints = ">= 1.11.1, 2.1.0" hashes = [ - "h1:vNrgTrqsLcL2Uw8kr89ZIq2NF858MZ15sLtNfd55hVA=", - "zh:4e66d509c828b0a2e599a567ad470bf85ebada62788aead87a8fb621301dec55", - "zh:55ca6466a82f60d2c9798d171edafacc9ea4991aa7aa32ed5d82d6831cf44542", - "zh:65741e6910c8b1322d9aef5dda4d98d1e6409aebc5514b518f46019cd06e1b47", - "zh:79456ca037c19983977285703f19f4b04f7eadcf8eb6af21f5ea615026271578", - "zh:7c39ced4dc44181296721715005e390021770077012c206ab4c209fb704b34d0", - "zh:86856c82a6444c19b3e3005e91408ac68eb010c9218c4c4119fc59300b107026", - "zh:999865090c72fa9b85c45e76b20839da51714ae429d1ab14b7d8ce66c2655abf", - "zh:a3ea0ae37c61b4bfe81f7a395fb7b5ba61564e7d716d7a191372c3c983271d13", - "zh:d9061861822933ebb2765fa691aeed2930ee495bfb6f72a5bdd88f43ccd9e038", - "zh:e04adbe0d5597d1fdd4f418be19c9df171f1d709009f63b8ce1239b71b4fa45a", + "h1:8RC6upWV190+kE3+rYI4HuSouBUOfOXwV5GvIEXW4nk=", + "zh:22e2bcef08fb7f97ed503a27e3725d9d14fdd09fe3aa144fae8a7f78ed27856a", + "zh:2380cc2a91239b80ea380af8a7fcdcc7396f5213a71a251a5505c962ac6cb9c2", + "zh:496ea2818d5480590ada763672be051f4e76dc12c6a61fde2faa0c909e174eb7", + "zh:4e5b6c230d9a8da8a0f12e5db198f158f2c26432ad8e1c6ac22770ce7ec39118", + "zh:55ad614beffda4cdc918ad87dca09bb7b961f12183c0923230301f73e23e9665", + "zh:6849c52899091fa2f6714d8e5180a4affffc4b2ad03dc2250043d4b32049e16e", + "zh:7a6f0d9da5172b3770af98d59263e142313a8b2c4048271893c6003493ad1c89", + "zh:7c97fb24e60c41fa16f6305620d18ae51545c329f46f92988493a4c51a4e43e5", + "zh:a08111c4898544c40c62437cc28798d1f4d7298f61ddaf3f48dddec042d3519f", + "zh:be7493bff6b9f95fe203c295bfc5933111e7c8a5f3bd9e9ae143a0d699d516f8", + "zh:e4c94adc65b5ad5551893f58c19e1c766f212f16220087ca3e940a89449ac285", ] } @@ -41,6 +43,7 @@ provider "registry.terraform.io/hashicorp/local" { version = "2.1.0" constraints = ">= 1.4.0" hashes = [ + "h1:EYZdckuGU3n6APs97nS2LxZm3dDtGqyM4qaIvsmac8o=", "h1:KfieWtVyGWwplSoLIB5usKAUnrIkDQBkWaR5TI+4WYg=", "zh:0f1ec65101fa35050978d483d6e8916664b7556800348456ff3d09454ac1eae2", "zh:36e42ac19f5d68467aacf07e6adcf83c7486f2e5b5f4339e9671f68525fc87ab", @@ -60,6 +63,7 @@ provider "registry.terraform.io/hashicorp/null" { version = "3.1.0" constraints = ">= 2.1.0" hashes = [ + "h1:vpC6bgUQoJ0znqIKVFevOdq+YQw42bRq0u+H3nto8nA=", "h1:xhbHC6in3nQryvTQBWKxebi3inG5OCgHgc4fRxL0ymc=", "zh:02a1675fd8de126a00460942aaae242e65ca3380b5bb192e8773ef3da9073fd2", "zh:53e30545ff8926a8e30ad30648991ca8b93b6fa496272cd23b26763c8ee84515", @@ -79,6 +83,7 @@ provider "registry.terraform.io/hashicorp/random" { version = "3.1.0" constraints = ">= 2.1.0" hashes = [ + "h1:BZMEPucF+pbu9gsPk0G0BHx7YP04+tKdq2MrRDF1EDM=", "h1:rKYu5ZUbXwrLG1w81k7H3nce/Ys6yAxXhWcbtk36HjY=", "zh:2bbb3339f0643b5daa07480ef4397bd23a79963cc364cdfbb4e86354cb7725bc", "zh:3cd456047805bf639fbf2c761b1848880ea703a054f76db51852008b11008626", @@ -99,6 +104,7 @@ provider "registry.terraform.io/hashicorp/template" { constraints = ">= 2.1.0" hashes = [ "h1:0wlehNaxBX7GJQnPfQwTNvvAf38Jm0Nv7ssKGMaG6Og=", + "h1:94qn780bi1qjrbC3uQtjJh3Wkfwd5+tTtJHOb7KTg9w=", "zh:01702196f0a0492ec07917db7aaa595843d8f171dc195f4c988d2ffca2a06386", "zh:09aae3da826ba3d7df69efeb25d146a1de0d03e951d35019a0f80e4f58c89b53", "zh:09ba83c0625b6fe0a954da6fbd0c355ac0b7f07f86c91a2a97849140fea49603", diff --git a/terraform/layer1-aws/main.tf b/terraform/layer1-aws/main.tf index 016b46bf..eef56791 100644 --- a/terraform/layer1-aws/main.tf +++ b/terraform/layer1-aws/main.tf @@ -1,14 +1,14 @@ terraform { - required_version = "~> 0.14.6" + required_version = "~> 0.15.1" required_providers { aws = { source = "aws" - version = "3.26.0" + version = "3.38.0" } kubernetes = { source = "kubernetes" - version = "2.0.2" + version = "2.1.0" } } } diff --git a/terraform/layer2-k8s/.terraform-version b/terraform/layer2-k8s/.terraform-version index 226468ee..e815b861 100644 --- a/terraform/layer2-k8s/.terraform-version +++ b/terraform/layer2-k8s/.terraform-version @@ -1 +1 @@ -0.14.6 +0.15.1 diff --git a/terraform/layer2-k8s/.terraform.lock.hcl b/terraform/layer2-k8s/.terraform.lock.hcl index ad9feccd..6a3a2abb 100644 --- a/terraform/layer2-k8s/.terraform.lock.hcl +++ b/terraform/layer2-k8s/.terraform.lock.hcl @@ -2,20 +2,21 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "3.26.0" - constraints = "3.26.0" + version = "3.38.0" + constraints = "3.38.0" hashes = [ - "h1:b1qNzEzDHZpnHSOW4fRo1PFC0U2Ft25PKKs9NSDGe3U=", - "zh:26043eed36d070ca032cf04bc980c654a25821a8abc0c85e1e570e3935bbfcbb", - "zh:2fe68f3f78d23830a04d7fac3eda550eef1f627dfc130486f70a65dc5c254300", - "zh:3d66484c608c64678e639db25d63872783ce60363a1246e30317f21c9c23b84b", - "zh:46ffd755cfd4cf94fe66342797b5afdcef010a24e126c67fee141b357d393535", - "zh:5e96f24357e945c9067cf5e032ad1d003609629c956c2f9f642fefe714e74587", - "zh:60c27aca36bb63bf3e865c2193be80ca83b376581d00f9c220af4b013e163c4d", - "zh:896f0f22d19d41e71b22f9240b261714c3915b165ddefeb771e7734d69dc47ea", - "zh:90de9966cb2fd3e2f326df291595e55d2dd2d90e7d6dd085c2c8691dce82bdb4", - "zh:ad05a91a88ceb1d6de5a568f7cc0b0e5bc0a79f3da70bc28c1e7f3750e362d58", - "zh:e8c63f59c6465329e1f3357498face3dd7ef10a033df3c366a33aa9e94b46c01", + "h1:ARuS11ThIcUfmAQKWNXGPLOa1GheaIwkeCnMh9Mjvao=", + "zh:20476d4c1b0c0efc55226bcbd85fbd948638fd9860a0edcdb7875cbb2b449e46", + "zh:7102622e6549cc3fc46b9ad68cbf4c50b162ce1013d4da817d05d1edf1f12fae", + "zh:74ff7f1610065e14c043cd9d74b3d5e0de4474f09a1a81e0b126b920b5cf6a27", + "zh:800e1b168149d507d23845f7a8b7e598c7dc16d2ee0f47848cf85d3e7458884f", + "zh:81ac3c68d6230b77740ca367e0c05a32ebb9be0fe5478c836573218a84eb3e46", + "zh:86536598796ba65539816f08351ac0ab32988ab84fa8f100049579996fafc800", + "zh:b9985c64f0f0b5bafb7067a60381fd807f7c3dd952c5d9f531385e464867bdd5", + "zh:c19c692896469724c6320fa7d87532ec3935e14e0e0fa0a8a0f1cf28ae7a0b0a", + "zh:cb8b14f246953a275ada562f5275a0d1a4938b7d20597e62fabe264012410f53", + "zh:cdbfa0ad87ff4d7451cfb89e53692a651d4c9cadece6845e60d986fd454b52b3", + "zh:ed5c4c8ae5adda37942bb15ef058c0811a95cb4c87259ae822627756dcb90efc", ] } @@ -38,44 +39,47 @@ provider "registry.terraform.io/hashicorp/external" { } provider "registry.terraform.io/hashicorp/helm" { - version = "2.0.2" - constraints = "2.0.2" + version = "2.1.2" + constraints = "2.1.2" hashes = [ - "h1:GJjzJSGrKLlrAX1hJf/FdrP7kYkkEBqtuFjcaKMX/rw=", - "zh:09f7b2389f0e41f51c933d014fe3a89aa53c12801ab45c082d3626689961d5a6", - "zh:0af792512adf59648b7cb7f0f194151ac926ae6805ffdb2baf61512b55933e17", - "zh:0e29837d65bf4dbe3b9766221a1a4448b2c9df7f4d3049a0b6812055e299c063", - "zh:25a0c4d1cba9a22f4d12f6465f191db6e2ec675cbc2c7751bf128bcae23848a8", - "zh:6d92f9ffd43a45f0f0da4c59cbb1790b163235882532a88344a53b8526808979", - "zh:7c98a0e05f106d4bbfc0c81f7d8b41bc8e867a99b30ccd472367d0414e778c30", - "zh:8de8232eedfa4ade990faea4ed3706f0846eb1d66fb82aa22718c7a9aeda92b1", - "zh:baff5ff10c9573104d25eece9f79477112ed6882c0ea9280ecbfa944d117838d", - "zh:d151fac8be471922cbe137f5a263f4854cdcfbf3fb8af7db83c709d64956934b", - "zh:e4d238facc27fc91d26aef79b7f398a6b9f3a1fe078c8d3f0cd4df47ec5aaacd", + "h1:axFN2JRP+iDo8EAhCfnA3fRUCB5S5x4zCKkivWLNN+Y=", + "zh:09bd2b6f33a040c3fd59d82c9768b886b8c82163e31ec92dc1b747229d0548df", + "zh:09f209fa57ad5d01f04c458f1719b42958ca5e0fc2eca63d9ec29f92c77a29f8", + "zh:0bfc627539500ffb2a41a2f8a5ea7f6fb1d76367b11bbf9489b483b9e8dfff8f", + "zh:0c0fef5587a5e927d15f9f4cc13cd0620b138238f9a422490fe9ea2bf086b61a", + "zh:187f99648fad2b84d49cdd372f8f6cedbf06e13411b3f1ff66708f66852d7855", + "zh:3d9ae08f8a99b19e80bd27708aecf592c28c92da66fd60189dfd7dce4d7da93c", + "zh:60b767109362c616b2e6386bfb08581b03bc3e528920444e52b16743f5a180d6", + "zh:729db42ed49d91c9b51eb602b9253e6ed6b3ab613c42deefc14996c9a8ee8ae4", + "zh:8401f3bf6d69ce43eb14911823c7e5cbb273cf564508043cd04fb064c30a3e1a", + "zh:91139b492ce1f41847017349ea49f9441b7cf70762c8d1c32a6a909e25ed10c1", + "zh:98fca606a539510edc94dcad8069a321e6a42df90e483f58df03b305726d9220", ] } provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.0.2" - constraints = "2.0.2" + version = "2.1.0" + constraints = "2.1.0" hashes = [ - "h1:vNrgTrqsLcL2Uw8kr89ZIq2NF858MZ15sLtNfd55hVA=", - "zh:4e66d509c828b0a2e599a567ad470bf85ebada62788aead87a8fb621301dec55", - "zh:55ca6466a82f60d2c9798d171edafacc9ea4991aa7aa32ed5d82d6831cf44542", - "zh:65741e6910c8b1322d9aef5dda4d98d1e6409aebc5514b518f46019cd06e1b47", - "zh:79456ca037c19983977285703f19f4b04f7eadcf8eb6af21f5ea615026271578", - "zh:7c39ced4dc44181296721715005e390021770077012c206ab4c209fb704b34d0", - "zh:86856c82a6444c19b3e3005e91408ac68eb010c9218c4c4119fc59300b107026", - "zh:999865090c72fa9b85c45e76b20839da51714ae429d1ab14b7d8ce66c2655abf", - "zh:a3ea0ae37c61b4bfe81f7a395fb7b5ba61564e7d716d7a191372c3c983271d13", - "zh:d9061861822933ebb2765fa691aeed2930ee495bfb6f72a5bdd88f43ccd9e038", - "zh:e04adbe0d5597d1fdd4f418be19c9df171f1d709009f63b8ce1239b71b4fa45a", + "h1:8RC6upWV190+kE3+rYI4HuSouBUOfOXwV5GvIEXW4nk=", + "zh:22e2bcef08fb7f97ed503a27e3725d9d14fdd09fe3aa144fae8a7f78ed27856a", + "zh:2380cc2a91239b80ea380af8a7fcdcc7396f5213a71a251a5505c962ac6cb9c2", + "zh:496ea2818d5480590ada763672be051f4e76dc12c6a61fde2faa0c909e174eb7", + "zh:4e5b6c230d9a8da8a0f12e5db198f158f2c26432ad8e1c6ac22770ce7ec39118", + "zh:55ad614beffda4cdc918ad87dca09bb7b961f12183c0923230301f73e23e9665", + "zh:6849c52899091fa2f6714d8e5180a4affffc4b2ad03dc2250043d4b32049e16e", + "zh:7a6f0d9da5172b3770af98d59263e142313a8b2c4048271893c6003493ad1c89", + "zh:7c97fb24e60c41fa16f6305620d18ae51545c329f46f92988493a4c51a4e43e5", + "zh:a08111c4898544c40c62437cc28798d1f4d7298f61ddaf3f48dddec042d3519f", + "zh:be7493bff6b9f95fe203c295bfc5933111e7c8a5f3bd9e9ae143a0d699d516f8", + "zh:e4c94adc65b5ad5551893f58c19e1c766f212f16220087ca3e940a89449ac285", ] } provider "registry.terraform.io/hashicorp/null" { version = "3.1.0" hashes = [ + "h1:vpC6bgUQoJ0znqIKVFevOdq+YQw42bRq0u+H3nto8nA=", "h1:xhbHC6in3nQryvTQBWKxebi3inG5OCgHgc4fRxL0ymc=", "zh:02a1675fd8de126a00460942aaae242e65ca3380b5bb192e8773ef3da9073fd2", "zh:53e30545ff8926a8e30ad30648991ca8b93b6fa496272cd23b26763c8ee84515", @@ -94,6 +98,7 @@ provider "registry.terraform.io/hashicorp/null" { provider "registry.terraform.io/hashicorp/random" { version = "3.1.0" hashes = [ + "h1:BZMEPucF+pbu9gsPk0G0BHx7YP04+tKdq2MrRDF1EDM=", "h1:rKYu5ZUbXwrLG1w81k7H3nce/Ys6yAxXhWcbtk36HjY=", "zh:2bbb3339f0643b5daa07480ef4397bd23a79963cc364cdfbb4e86354cb7725bc", "zh:3cd456047805bf639fbf2c761b1848880ea703a054f76db51852008b11008626", @@ -113,6 +118,7 @@ provider "registry.terraform.io/hashicorp/template" { version = "2.2.0" hashes = [ "h1:0wlehNaxBX7GJQnPfQwTNvvAf38Jm0Nv7ssKGMaG6Og=", + "h1:94qn780bi1qjrbC3uQtjJh3Wkfwd5+tTtJHOb7KTg9w=", "zh:01702196f0a0492ec07917db7aaa595843d8f171dc195f4c988d2ffca2a06386", "zh:09aae3da826ba3d7df69efeb25d146a1de0d03e951d35019a0f80e4f58c89b53", "zh:09ba83c0625b6fe0a954da6fbd0c355ac0b7f07f86c91a2a97849140fea49603", diff --git a/terraform/layer2-k8s/main.tf b/terraform/layer2-k8s/main.tf index 1080b53e..ccf774dd 100644 --- a/terraform/layer2-k8s/main.tf +++ b/terraform/layer2-k8s/main.tf @@ -1,18 +1,18 @@ terraform { - required_version = "~> 0.14.6" + required_version = "~> 0.15.1" required_providers { aws = { source = "aws" - version = "3.26.0" + version = "3.38.0" } kubernetes = { source = "kubernetes" - version = "2.0.2" + version = "2.1.0" } helm = { source = "helm" - version = "2.0.2" + version = "2.1.2" } } } From 0cddaef2c07ac9a62be173928356b6431e1bd0a0 Mon Sep 17 00:00:00 2001 From: Khalezin Dmitrii Date: Mon, 3 May 2021 16:41:55 +0300 Subject: [PATCH 2/4] #49 updated terraform version to 15.1 for github actions pipeline --- .github/workflows/terraform-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/terraform-ci.yml b/.github/workflows/terraform-ci.yml index 04c90d4b..55a85775 100644 --- a/.github/workflows/terraform-ci.yml +++ b/.github/workflows/terraform-ci.yml @@ -12,7 +12,7 @@ jobs: name: 'Terraform-validate' runs-on: ubuntu-latest container: - image: hashicorp/terraform:0.14.6 + image: hashicorp/terraform:0.15.1 env: PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin steps: @@ -36,7 +36,7 @@ jobs: name: 'Terraform-format' runs-on: ubuntu-latest container: - image: hashicorp/terraform:0.14.6 + image: hashicorp/terraform:0.15.1 env: PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin steps: From e9cfe90ae294036b71830da20f7dc6b52e59c7a4 Mon Sep 17 00:00:00 2001 From: Khalezin Dmitrii Date: Tue, 4 May 2021 09:30:19 +0300 Subject: [PATCH 3/4] #49 move .terraform-version file, removed nested .terraform-version files, pinned terraform version --- terraform/{layer1-aws => }/.terraform-version | 1 + terraform/layer1-aws/main.tf | 2 +- terraform/layer2-k8s/.terraform-version | 1 - terraform/layer2-k8s/main.tf | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename terraform/{layer1-aws => }/.terraform-version (87%) delete mode 100644 terraform/layer2-k8s/.terraform-version diff --git a/terraform/layer1-aws/.terraform-version b/terraform/.terraform-version similarity index 87% rename from terraform/layer1-aws/.terraform-version rename to terraform/.terraform-version index e815b861..232f96fd 100644 --- a/terraform/layer1-aws/.terraform-version +++ b/terraform/.terraform-version @@ -1 +1,2 @@ 0.15.1 + diff --git a/terraform/layer1-aws/main.tf b/terraform/layer1-aws/main.tf index eef56791..fa06a785 100644 --- a/terraform/layer1-aws/main.tf +++ b/terraform/layer1-aws/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 0.15.1" + required_version = "0.15.1" required_providers { aws = { diff --git a/terraform/layer2-k8s/.terraform-version b/terraform/layer2-k8s/.terraform-version deleted file mode 100644 index e815b861..00000000 --- a/terraform/layer2-k8s/.terraform-version +++ /dev/null @@ -1 +0,0 @@ -0.15.1 diff --git a/terraform/layer2-k8s/main.tf b/terraform/layer2-k8s/main.tf index ccf774dd..66a30779 100644 --- a/terraform/layer2-k8s/main.tf +++ b/terraform/layer2-k8s/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = "~> 0.15.1" + required_version = "0.15.1" required_providers { aws = { From 7d68f68f6c463f42146aead3332f73038c0ce4e2 Mon Sep 17 00:00:00 2001 From: Khalezin Dmitrii Date: Tue, 4 May 2021 10:49:59 +0300 Subject: [PATCH 4/4] #49 updated versions in README, and added information about terraform providers updates --- README.md | 37 +++++++++++++++++++++++++++++++++- terraform/layer1-aws/README.md | 8 ++++---- terraform/layer2-k8s/README.md | 14 ++++++------- 3 files changed, 47 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e9abecc0..ef994618 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ This repository contains the know-how of the Mad Devs team for the rapid deploym In our company’s work, we have tried many infrastructure solutions and services and traveled the path from on-premise hardware to serverless. As of today, Kubernetes has become our standard platform for deploying applications, and AWS has become the main cloud. -It is worth noting here that although 90% of our and our clients’ projects are hosted on AWS and [AWS EKS](https://aws.amazon.com/eks/) is used as the Kubernetes platform, we do not insist, do not drag everything to Kubernetes, and do not force anyone to be hosted on AWS. Kubernetes is offered only after the collection and analysis of service architecture requirements. +It is worth noting here that although 90% of our and our clients’ projects are hosted on AWS and [AWS EKS](https://aws.amazon.com/eks/) is used as the Kubernetes platform, we do not insist, do not drag everything to Kubernetes, and do not force anyone to be hosted on AWS. Kubernetes is offered only after the collection and analysis of service architecture requirements. And then, when choosing Kubernetes, it makes almost no difference to applications how the cluster itself is created—manually, through kops or using managed services from cloud providers—in essence, the Kubernetes platform is the same everywhere. So the choice of a particular provider is then made based on additional requirements, expertise, etc. @@ -369,6 +369,41 @@ You can get access to the cluster using this command: aws eks update-kubeconfig --name maddevs-demo-use1 --region us-east-1 ``` +## Update terraform version + +Change terraform version in this files + +`terraform/.terraform-version` - the main terraform version for tfenv tool + +`.github/workflows/terraform-ci.yml` - the terraform version for github actions need for `terraform-validate` and `terraform-format`. + +Terraform version in each layer. +``` +terraform/layer1-aws/main.tf +terraform/layer2-k8s/main.tf +``` + +## Updated terraform providers + +Change terraform providers version in this files + +``` +terraform/layer1-aws/main.tf +terraform/layer2-k8s/main.tf +``` + +When we changed terraform provider versions, we need to update terraform state. For update terraform state in layers we need to run this command: + +``` +terragrunt run-all init -upgrade +``` + +Or in each layer run command: + +``` +terragrunt init -upgrade +``` + ### examples Each layer has an `examples/` directory that contains working examples that expand the basic configuration. The files’ names and contents are in accordance with our coding conventions, so no additional description is required. If you need to use something, just move it from this folder to the root of the layer. diff --git a/terraform/layer1-aws/README.md b/terraform/layer1-aws/README.md index 60825d93..2301313d 100644 --- a/terraform/layer1-aws/README.md +++ b/terraform/layer1-aws/README.md @@ -2,15 +2,15 @@ | Name | Version | |------|---------| -| terraform | ~> 0.14.6 | -| aws | 3.26.0 | -| kubernetes | 2.0.2 | +| terraform | 0.15.1 | +| aws | 3.38.0 | +| kubernetes | 2.1.0 | ## Providers | Name | Version | |------|---------| -| aws | 3.26.0 | +| aws | 3.38.0 | ## Inputs diff --git a/terraform/layer2-k8s/README.md b/terraform/layer2-k8s/README.md index 3c60f3be..1851c079 100644 --- a/terraform/layer2-k8s/README.md +++ b/terraform/layer2-k8s/README.md @@ -2,18 +2,18 @@ | Name | Version | |------|---------| -| terraform | ~> 0.14.6 | -| aws | 3.26.0 | -| helm | 2.0.2 | -| kubernetes | 2.0.2 | +| terraform | 0.15.1 | +| aws | 3.38.0 | +| helm | 2.1.2 | +| kubernetes | 2.1.0 | ## Providers | Name | Version | |------|---------| -| aws | 3.26.0 | -| helm | 2.0.2 | -| kubernetes | 2.0.2 | +| aws | 3.38.0 | +| helm | 2.1.2 | +| kubernetes | 2.1.0 | | template | n/a | | terraform | n/a |