go-updates (#564)

* go-updates

- golang updates for 1.5.11 release
- some changes related to an upstream rig change
- updated the terraform example test updates to recent versions to match the terraform

Signed-off-by: James Nesbitt <[email protected]>

Author: james-nesbitt

.golangci.yml

@@ -59,10 +59,10 @@ linters:
     - reassign
     - revive
     - stylecheck
-    - tenv
     - unconvert
     - unparam
     - usestdlibvars
+    - usetesting
     - varnamelen
     - wastedassign
     - whitespace

examples/terraform/aws-simple/.terraform.lock.hcl

@@ -47,6 +47,18 @@ locals {
         }
       }
     }
+    "msr" = {
+      description = "MSR ingress for UI and docker"
+      nodegroups  = [for k, ng in var.nodegroups : k if ng.role == "msr"]
+
+      routes = {
+        "msr" = {
+          port_incoming = 443
+          port_target   = 443
+          protocol      = "TCP"
+        }
+      }
+    }
   }
 
   // standard MCR/MKE/MSR firewall rules [here we just leave it open until we can figure this out]
@@ -91,6 +103,7 @@ locals {
 locals {
   // The SAN URL for the MKE load balancer ingress that is for the MKE load balancer
   MKE_URL = module.provision.ingresses["mke"].lb_dns
+  MSR_URL = module.provision.ingresses["msr"].lb_dns
 
   // flatten nodegroups into a set of objects with the info needed for each node, by combining the group details with the node detains
   launchpad_hosts_ssh = merge([for k, ng in local.nodegroups : { for l, ngn in ng.nodes : ngn.label => {
@@ -124,8 +137,8 @@ locals {
 // ------- Ye old launchpad yaml (just for debugging)
 
 locals {
-  launchpad_yaml_14 = <<-EOT
-apiVersion: launchpad.mirantis.com/mke/v1.4
+  launchpad_yaml_15 = <<-EOT
+apiVersion: launchpad.mirantis.com/mke/v1.5
 kind: mke%{if local.has_msr}+msr%{endif}
 metadata:
   name: ${var.name}
@@ -156,7 +169,7 @@ spec:
     repoURL: https://repos.mirantis.com
     installURLLinux: https://get.mirantis.com/
     installURLWindows: https://get.mirantis.com/install.ps1
-    channel: stable
+    channel: stable-25.0
     prune: true
   mke:
     version: ${var.launchpad.mke_version}
@@ -177,6 +190,7 @@ spec:
     "replicaIDs": "sequential"
     installFlags:
     - "--ucp-insecure-tls"
+    - "--dtr-external-url=${local.MSR_URL}"
 %{endif}
 EOT
 
@@ -185,7 +199,7 @@ EOT
 output "launchpad_yaml" {
   description = "launchpad config file yaml (for debugging)"
   sensitive   = true
-  value       = local.launchpad_yaml_14
+  value       = local.launchpad_yaml_15
 }
 
 output "mke_connect" {

examples/terraform/aws-simple/launchpad.tf

@@ -1,5 +1,5 @@
 // used to name infrastructure (CHANGE THIS)
-//name = "test"
+//name = ""
 
 aws = {
   region = "us-east-2"
@@ -8,14 +8,14 @@ aws = {
 launchpad = {
   drain = false
 
-  mcr_version = "23.0.15"
-  mke_version = "3.7.15"
-  msr_version = ""
+  mcr_version = "25.0.2"
+  mke_version = "3.8.2"
+  msr_version = "2.9.23"
 
   mke_connect = {
     username = "admin"
     password = "" // an MKE passwords must be provided
-    insecure = false
+    insecure = true
   }
 
   skip_create  = false
@@ -25,17 +25,14 @@ launchpad = {
 // configure the network stack
 network = {
   "cidr": "172.31.0.0/16",
-  "enable_nat_gateway": false,
-  "enable_vpn_gateway": false,
-  "tags": {}
 }
 
 // configure the subnets in the vpc
 subnets = {
   "main" = {
     "cidr" = "172.31.0.0/17",
     "private" = false,
-    "nodegroups" = ["MngrUbuntu22",  "WrkUbuntu22"]
+    "nodegroups" = ["MngrUbuntu22",  "WrkUbuntu22", "MsrUbuntu22"]
   }
 }
 
@@ -46,7 +43,6 @@ nodegroups = {
     "count" = 1,
     "type" = "m6a.2xlarge",
     "volume_size" = "100",
-    "public" = true,
     "role" = "manager",
     "user_data" = "sudo ufw allow 7946/tcp ; sudo ufw allow 10250/tcp "
   },
@@ -55,10 +51,17 @@ nodegroups = {
     "count" = 1,
     "type" = "c6a.xlarge",
     "volume_size" = "100",
-    "public" = true,
     "role" = "worker",
     "user_data" = "sudo ufw allow 7946/tcp ; sudo ufw allow 10250/tcp "
   }
+  "MsrUbuntu22" = {
+    "platform" = "ubuntu_22.04",
+    "count" = 1,
+    "type" = "c6a.xlarge",
+    "volume_size" = "100",
+    "role" = "msr",
+    "user_data" = "sudo ufw allow 7946/tcp ; sudo ufw allow 10250/tcp "
+  }
 }
 
 // set a windows password, if you have windows nodes

examples/terraform/aws-simple/terraform.tfvars.template

@@ -1,20 +1,22 @@
 module github.com/Mirantis/launchpad
 
-go 1.23.2
+go 1.24
+
+toolchain go1.24.1
 
 require (
 	github.com/AlecAivazis/survey/v2 v2.3.7
-	github.com/a8m/envsubst v1.4.2
+	github.com/a8m/envsubst v1.4.3
 	github.com/alessio/shellescape v1.4.2
 	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/creasty/defaults v1.8.0
 	github.com/denisbrodbeck/machineid v1.0.1
 	github.com/gammazero/workerpool v1.1.3
-	github.com/go-playground/validator/v10 v10.24.0
+	github.com/go-playground/validator/v10 v10.25.0
 	github.com/gruntwork-io/terratest v0.46.11
 	github.com/hashicorp/go-version v1.7.0
 	github.com/k0sproject/dig v0.4.0
-	github.com/k0sproject/rig v0.19.0
+	github.com/k0sproject/rig v0.20.0
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/mattn/go-isatty v0.0.20
@@ -23,7 +25,7 @@ require (
 	github.com/schollz/progressbar/v3 v3.18.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/stretchr/testify v1.9.0
-	github.com/urfave/cli/v2 v2.27.5
+	github.com/urfave/cli/v2 v2.27.6
 	gopkg.in/segmentio/analytics-go.v3 v3.1.0
 	gopkg.in/yaml.v2 v2.4.0
 	helm.sh/helm/v3 v3.15.3
@@ -35,6 +37,7 @@ require (
 )
 
 require (
+	al.essio.dev/pkg/shellescape v1.6.0 // indirect
 	cloud.google.com/go v0.112.0 // indirect
 	cloud.google.com/go/compute/metadata v0.3.0 // indirect
 	cloud.google.com/go/iam v1.1.6 // indirect
@@ -62,8 +65,8 @@ require (
 	github.com/bodgit/windows v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chai2010/gettext-go v1.0.3 // indirect
-	github.com/containerd/containerd v1.7.21 // indirect
-	github.com/containerd/errdefs v0.1.0 // indirect
+	github.com/containerd/containerd v1.7.27 // indirect
+	github.com/containerd/errdefs v0.3.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
@@ -196,20 +199,20 @@ require (
 	go.opentelemetry.io/otel/metric v1.28.0 // indirect
 	go.opentelemetry.io/otel/trace v1.28.0 // indirect
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
-	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/crypto v0.36.0 // indirect
+	golang.org/x/net v0.37.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect
-	golang.org/x/sync v0.10.0 // indirect
-	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/term v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
+	golang.org/x/term v0.30.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
 	golang.org/x/time v0.6.0 // indirect
 	google.golang.org/api v0.169.0 // indirect
 	google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
 	google.golang.org/grpc v1.65.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	google.golang.org/protobuf v1.35.2 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect