Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions examples/terraform/aws-complete/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions examples/terraform/aws-complete/terraform.tfvars.template
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = ""
// windows_password = ""
34 changes: 17 additions & 17 deletions examples/terraform/aws-simple/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions examples/terraform/aws-simple/terraform.tfvars.template
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions test/integration/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down
14 changes: 8 additions & 6 deletions test/smoke/smoke_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}

Expand Down Expand Up @@ -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)
Expand Down
Loading