diff --git a/examples/terraform/aws-complete/.terraform.lock.hcl b/examples/terraform/aws-complete/.terraform.lock.hcl index 2547b506..1f293bca 100644 --- a/examples/terraform/aws-complete/.terraform.lock.hcl +++ b/examples/terraform/aws-complete/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "6.2.0" - constraints = ">= 6.0.0" + version = "6.17.0" + constraints = ">= 6.0.0, >= 6.12.0" hashes = [ - "h1:+Qr9xg0yGTwNyrZtYQaBAnyf6BI2+/4JoTWF/kVLa5o=", - "zh:224b20371f7c7ce14d69a84e16ae94baa0a06c132474d4bc4d192d86936bc750", - "zh:2c079ad275c32b9abae7616d07c24901340207a85995ce0025ac38af16b317b7", - "zh:2d139c99d6e8e48cc5439c2945eee583bb3a2d7faf484639cdfd4590ebc294f2", - "zh:2f2dc72de43d845e5df5a1adeadd4a48f3cacfe413b89b95f50294a386a90124", - "zh:304d4e706ac34aba080a81867209c65cdd28f8e596c02b3565f6530ab697cf94", - "zh:40e69328ae11fe1711b34226d45aa4c685f73e8f958c76c49f4f6a6627a1a54f", - "zh:5c5c9faab6fe242b77f0d0ab6664313dd89409371123e2ec376c72e8f2cd97b3", - "zh:7824709f0226afec5e3ad41392233b4bd7d925bae0d35f4a2ac854b3516e955c", + "h1:65zxvr7oxROr5hqTWQtoS5HsGOBwUko7douoc9Azptc=", + "zh:157063d66cd4b5fc650f20f56127e19c9da5d135f4231f9ca0c19a1c0bf6e29d", + "zh:2050dc03304b42204e6c58bbb1a2afd4feeac7db55d7c06be77c6b1e2ab46a0f", + "zh:2a7f7751eef636ca064700cc4574b9b54a2596d9e2e86b91c45127410d9724c6", + "zh:335fd7bb44bebfc4dd1db1c013947e1dde2518c6f2d846aac13b7314414ce461", + "zh:545c248d2eb601a7b45a34313096cae0a5201ccf31e7fd99428357ef800051e0", + "zh:57d19883a6367c245e885856a1c5395c4c743c20feff631ea4ec7b5e16826281", + "zh:66d4f080b8c268d65e8c4758ed57234e5a19deff6073ffc3753b9a4cc177b54e", + "zh:6ad50de35970f15e1ed41d39742290c1be80600b7df3a9fbb4c02f353b9586cf", + "zh:7af42fa531e4dcb3ddb09f71ca988e90626abbf56a45981c2a6c01d0b364a51b", + "zh:9a6a535a879314a9137ec9d3e858b7c490a962050845cf62620ba2bf4ae916a8", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:ab5417435121e8f9a6f539a6972f20c060ebc78624c1ce7c190671f163c423e4", - "zh:d6939385de4931f9fe07c87b744468fbfa96bd4b47861020d68e7ba1efb4185f", - "zh:e51434d1ba106c55d04fdc223aaf403b897ff96cba9bfce4c51854c805c36ed8", - "zh:e6d1012bafe338759ac42a59f566f8c4ad64a67faa3152c7fb758704d890cd75", - "zh:ee24b989ee3b6be79a7f24e97c144535bf7053471ae65343220db3ae78c7632a", - "zh:f61ec9482b9887c4901946407992874531b0c2eadab0c743fdfca4e6cd6dd889", + "zh:ca213e0262c8f686fcd40e3fc84d67b8eea1596de988c13d4a8ecd4522ede669", + "zh:cc4132f682e9bf17c0649928ad92af4da07ffe7bccfe615d955225cdcf9e7f09", + "zh:dfe6de43496d2e2b6dff131fef6ada1e15f1fbba3d47235c751564d22003d05e", + "zh:e37d035fa02693a3d47fe636076cce50b6579b6adc0a36a7cf0456a2331c99ec", ] } @@ -44,21 +44,21 @@ provider "registry.terraform.io/hashicorp/helm" { } provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.37.1" + version = "2.38.0" hashes = [ - "h1:qo9Ue/rIEnvxOpiK9qizwRFV7rvb5gCziKVytIcZHyk=", - "zh:0ed097413c7fc804479e325966886b405dc0b75ad2b4f54ce4df1d8e4802b397", - "zh:17dcf4a685a00d2d048671124e8a1a8e836b58ecd2ef628a1c666fe0ced2e598", - "zh:36891284e5bced57c438f12d0b27856b0d4b70b562bd200b01919a6a89545be9", - "zh:3e49d86b508e641ba122d1b0af24cdc4d8ffa2ec1b30022436fb1d7c6ba696ea", - "zh:40be623e116708bdcb0fac32989db43720f031c5fe9a4dc63395078185d24403", - "zh:44fc0ac3bc39e289b67f9dde7ee9fef29eb8192197e5e68fee69098573021722", - "zh:957aa451573bcde5d57f6f8338ea3139010c7f61fefe8f6a140a8c267f056511", - "zh:c55fd85b7e8acaac17e30670ac3574b88b3530820dd004bcd2a5daa8624a46e9", - "zh:c743f06843a1f5ecde2b8ef639f4d3db654a334ef248dee57261c719ea843f3a", - "zh:c93cc71c64b838d89522ac5fb60f68e0e1e7f2fc39db6b0ead7afd78795e79ed", - "zh:eda1163c2266905adc54bc78cc3e7b606a164fbc6b59be607db933b302015ccd", + "h1:5CkveFo5ynsLdzKk+Kv+r7+U9rMrNjfZPT3a0N/fhgE=", + "zh:0af928d776eb269b192dc0ea0f8a3f0f5ec117224cd644bdacdc682300f84ba0", + "zh:1be998e67206f7cfc4ffe77c01a09ac91ce725de0abaec9030b22c0a832af44f", + "zh:326803fe5946023687d603f6f1bab24de7af3d426b01d20e51d4e6fbe4e7ec1b", + "zh:4a99ec8d91193af961de1abb1f824be73df07489301d62e6141a656b3ebfff12", + "zh:5136e51765d6a0b9e4dbcc3b38821e9736bd2136cf15e9aac11668f22db117d2", + "zh:63fab47349852d7802fb032e4f2b6a101ee1ce34b62557a9ad0f0f0f5b6ecfdc", + "zh:924fb0257e2d03e03e2bfe9c7b99aa73c195b1f19412ca09960001bee3c50d15", + "zh:b63a0be5e233f8f6727c56bed3b61eb9456ca7a8bb29539fba0837f1badf1396", + "zh:d39861aa21077f1bc899bc53e7233262e530ba8a3a2d737449b100daeb303e4d", + "zh:de0805e10ebe4c83ce3b728a67f6b0f9d18be32b25146aa89116634df5145ad4", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", + "zh:faf23e45f0090eef8ba28a8aac7ec5d4fdf11a36c40a8d286304567d71c1e7db", ] } diff --git a/examples/terraform/aws-complete/terraform.tfvars.template b/examples/terraform/aws-complete/terraform.tfvars.template index cbdd571d..46db5abb 100644 --- a/examples/terraform/aws-complete/terraform.tfvars.template +++ b/examples/terraform/aws-complete/terraform.tfvars.template @@ -8,8 +8,8 @@ aws = { launchpad = { drain = false - mcr_version = "23.0.15" - mke_version = "3.7.15" + mcr_version = "25.0.13" + mke_version = "3.8.8" msr_version = "" mke_connect = { @@ -54,4 +54,4 @@ nodegroups = { // set a windows password, if you have windows nodes // windows passwords must match a pattern, or connections will fail. // use something like: `testp@ss!` -// windows_password = "" \ No newline at end of file +// windows_password = "" diff --git a/examples/terraform/aws-simple/.terraform.lock.hcl b/examples/terraform/aws-simple/.terraform.lock.hcl index fd54823e..ddc81630 100644 --- a/examples/terraform/aws-simple/.terraform.lock.hcl +++ b/examples/terraform/aws-simple/.terraform.lock.hcl @@ -2,25 +2,25 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/aws" { - version = "6.2.0" - constraints = ">= 6.0.0" + version = "6.17.0" + constraints = ">= 6.0.0, >= 6.12.0" hashes = [ - "h1:+Qr9xg0yGTwNyrZtYQaBAnyf6BI2+/4JoTWF/kVLa5o=", - "zh:224b20371f7c7ce14d69a84e16ae94baa0a06c132474d4bc4d192d86936bc750", - "zh:2c079ad275c32b9abae7616d07c24901340207a85995ce0025ac38af16b317b7", - "zh:2d139c99d6e8e48cc5439c2945eee583bb3a2d7faf484639cdfd4590ebc294f2", - "zh:2f2dc72de43d845e5df5a1adeadd4a48f3cacfe413b89b95f50294a386a90124", - "zh:304d4e706ac34aba080a81867209c65cdd28f8e596c02b3565f6530ab697cf94", - "zh:40e69328ae11fe1711b34226d45aa4c685f73e8f958c76c49f4f6a6627a1a54f", - "zh:5c5c9faab6fe242b77f0d0ab6664313dd89409371123e2ec376c72e8f2cd97b3", - "zh:7824709f0226afec5e3ad41392233b4bd7d925bae0d35f4a2ac854b3516e955c", + "h1:65zxvr7oxROr5hqTWQtoS5HsGOBwUko7douoc9Azptc=", + "zh:157063d66cd4b5fc650f20f56127e19c9da5d135f4231f9ca0c19a1c0bf6e29d", + "zh:2050dc03304b42204e6c58bbb1a2afd4feeac7db55d7c06be77c6b1e2ab46a0f", + "zh:2a7f7751eef636ca064700cc4574b9b54a2596d9e2e86b91c45127410d9724c6", + "zh:335fd7bb44bebfc4dd1db1c013947e1dde2518c6f2d846aac13b7314414ce461", + "zh:545c248d2eb601a7b45a34313096cae0a5201ccf31e7fd99428357ef800051e0", + "zh:57d19883a6367c245e885856a1c5395c4c743c20feff631ea4ec7b5e16826281", + "zh:66d4f080b8c268d65e8c4758ed57234e5a19deff6073ffc3753b9a4cc177b54e", + "zh:6ad50de35970f15e1ed41d39742290c1be80600b7df3a9fbb4c02f353b9586cf", + "zh:7af42fa531e4dcb3ddb09f71ca988e90626abbf56a45981c2a6c01d0b364a51b", + "zh:9a6a535a879314a9137ec9d3e858b7c490a962050845cf62620ba2bf4ae916a8", "zh:9b12af85486a96aedd8d7984b0ff811a4b42e3d88dad1a3fb4c0b580d04fa425", - "zh:ab5417435121e8f9a6f539a6972f20c060ebc78624c1ce7c190671f163c423e4", - "zh:d6939385de4931f9fe07c87b744468fbfa96bd4b47861020d68e7ba1efb4185f", - "zh:e51434d1ba106c55d04fdc223aaf403b897ff96cba9bfce4c51854c805c36ed8", - "zh:e6d1012bafe338759ac42a59f566f8c4ad64a67faa3152c7fb758704d890cd75", - "zh:ee24b989ee3b6be79a7f24e97c144535bf7053471ae65343220db3ae78c7632a", - "zh:f61ec9482b9887c4901946407992874531b0c2eadab0c743fdfca4e6cd6dd889", + "zh:ca213e0262c8f686fcd40e3fc84d67b8eea1596de988c13d4a8ecd4522ede669", + "zh:cc4132f682e9bf17c0649928ad92af4da07ffe7bccfe615d955225cdcf9e7f09", + "zh:dfe6de43496d2e2b6dff131fef6ada1e15f1fbba3d47235c751564d22003d05e", + "zh:e37d035fa02693a3d47fe636076cce50b6579b6adc0a36a7cf0456a2331c99ec", ] } diff --git a/examples/terraform/aws-simple/terraform.tfvars.template b/examples/terraform/aws-simple/terraform.tfvars.template index a733ac7c..117c9fa4 100644 --- a/examples/terraform/aws-simple/terraform.tfvars.template +++ b/examples/terraform/aws-simple/terraform.tfvars.template @@ -8,9 +8,9 @@ aws = { launchpad = { drain = false - mcr_version = "25.0.2" - mke_version = "3.8.2" - msr_version = "2.9.23" + mcr_version = "25.0.13" + mke_version = "3.8.8" + msr_version = "2.9.28" mke_connect = { username = "admin" diff --git a/test/integration/integration_test.go b/test/integration/integration_test.go index 739d5d47..bdc42d06 100644 --- a/test/integration/integration_test.go +++ b/test/integration/integration_test.go @@ -28,9 +28,9 @@ var MKE_CONNECT = map[string]interface{}{ var LAUNCHPAD = map[string]interface{}{ "drain": false, - "mcr_version": "25.0.8", - "mke_version": "3.8.2", - "msr_version": "2.9.23", + "mcr_version": "25.0.13", + "mke_version": "3.8.8", + "msr_version": "2.9.28", "mke_connect": MKE_CONNECT, } diff --git a/test/smoke/smoke_test.go b/test/smoke/smoke_test.go index 8c946429..1df15e3d 100644 --- a/test/smoke/smoke_test.go +++ b/test/smoke/smoke_test.go @@ -22,11 +22,12 @@ var MKE_CONNECT = map[string]interface{}{ "insecure": true, } +// initial install var LAUNCHPAD = map[string]interface{}{ "drain": false, - "mcr_version": "25.0.8", - "mke_version": "3.8.2", - "msr_version": "2.9.23", + "mcr_version": "25.0.13", + "mke_version": "3.8.8", + "msr_version": "2.9.28", "mke_connect": MKE_CONNECT, } @@ -165,9 +166,10 @@ func TestSupportedMatrixCluster(t *testing.T) { err = product.Apply(true, true, 3, true) assert.NoError(t, err) - // Replace the version values for MCR,MKE,MSR in the mkeClusterConfig - mkeClusterConfig = strings.ReplaceAll(mkeClusterConfig, LAUNCHPAD["mcr_version"].(string), "23.0.15") - mkeClusterConfig = strings.ReplaceAll(mkeClusterConfig, LAUNCHPAD["mke_version"].(string), "3.7.15") + // Replace the version values for MCR,MKE,MSR in the mkeClusterConfig for an upgrade + mkeClusterConfig = strings.ReplaceAll(mkeClusterConfig, LAUNCHPAD["mcr_version"].(string), "25.0.13") + mkeClusterConfig = strings.ReplaceAll(mkeClusterConfig, LAUNCHPAD["mke_version"].(string), "3.8.8") + mkeClusterConfig = strings.ReplaceAll(mkeClusterConfig, LAUNCHPAD["msr_version"].(string), "2.9.28") productUpgrade, err := config.ProductFromYAML([]byte(mkeClusterConfig)) assert.NoError(t, err)