Merge branch 'main' into laverya/sc-111792/support-installing-behind-…

…a-mitm-proxy-that

.github/actions/copy-assets/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22 as builder
+FROM golang:1.23 as builder
 WORKDIR /action
 COPY . /action
 

.image.env

@@ -1,8 +1,8 @@
 # Generated file, do not modify.  This file is generated from a text file containing a list of images. The
 # most recent tag is interpolated from the source repository and used to generate a fully qualified image
 # name.
-MINIO_TAG='0.20240829.014052-r0'
-RQLITE_TAG='8.30.0-r0'
+MINIO_TAG='0.20240909.165928-r0'
+RQLITE_TAG='8.30.2-r0'
 DEX_TAG='2.41.1-r0'
 SCHEMAHERO_TAG='0.17.10'
 LVP_TAG='v0.6.7'

Makefile

@@ -1,7 +1,7 @@
 include Makefile.build.mk
 CURRENT_USER := $(if $(GITHUB_USER),$(GITHUB_USER),$(shell id -u -n))
-MINIO_TAG ?= 0.20240829.014052-r0
-RQLITE_TAG ?= 8.30.0-r0
+MINIO_TAG ?= 0.20240909.165928-r0
+RQLITE_TAG ?= 8.30.2-r0
 DEX_TAG ?= 2.41.1-r0
 LVP_TAG ?= v0.6.7
 

deploy/kurl/kotsadm/template/base/tmpl-secret-rqlite.yaml

@@ -6,7 +6,7 @@ metadata:
     kots.io/kotsadm: 'true'
     kots.io/backup: velero
 stringData:
-  uri: http://kotsadm:${RQLITE_PASSWORD}@kotsadm-rqlite:4001?timeout=60&disableClusterDiscovery=true
+  uri: http://kotsadm:${RQLITE_PASSWORD}@kotsadm-rqlite.default.svc.cluster.local:4001?timeout=60&disableClusterDiscovery=true
   password: ${RQLITE_PASSWORD}
   authconfig.json: |
     [{"username": "kotsadm", "password": "${RQLITE_PASSWORD}", "perms": ["all"]}, {"username": "*", "perms": ["status", "ready"]}]

deploy/okteto/okteto-v2.Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.3
-FROM golang:1.22
+FROM golang:1.23
 
 EXPOSE 2345
 

deploy/okteto/okteto.Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.3
-FROM golang:1.22-bookworm as builder
+FROM golang:1.23-bookworm as builder
 
 EXPOSE 2345
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/replicatedhq/kots
 
-go 1.22.4
+go 1.23.0
 
 require (
 	cloud.google.com/go/storage v1.40.0
@@ -48,7 +48,7 @@ require (
 	github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
 	github.com/pkg/errors v0.9.1
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
-	github.com/replicatedhq/embedded-cluster/kinds v1.11.1
+	github.com/replicatedhq/embedded-cluster/kinds v0.0.0-20240911124703-aaa8c0236e21
 	github.com/replicatedhq/kotskinds v0.0.0-20240718194123-1018dd404e95
 	github.com/replicatedhq/kurlkinds v1.5.0
 	github.com/replicatedhq/troubleshoot v0.99.0
@@ -248,7 +248,7 @@ require (
 	github.com/jmoiron/sqlx v1.3.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/k0sproject/k0s v1.29.7-0.20240618090010-edbb703218fd // indirect
+	github.com/k0sproject/k0s v1.29.9-0.20240821114611-d76eb6bb05a7 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/klauspost/pgzip v1.2.6 // indirect

go.sum

@@ -1029,8 +1029,8 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/k0sproject/k0s v1.29.7-0.20240618090010-edbb703218fd h1:pkByvcnH+qalVSjViBxr+eewQ/BilsSOamvzdYUErtM=
-github.com/k0sproject/k0s v1.29.7-0.20240618090010-edbb703218fd/go.mod h1:/KnUpfHy5N58YOZ+PUGiGraJM2bbJqZuZpOGi5468Sg=
+github.com/k0sproject/k0s v1.29.9-0.20240821114611-d76eb6bb05a7 h1:pxtk/512ibsry6nNx8EfBhFOeeJ/gad1Igjr+7Th6A0=
+github.com/k0sproject/k0s v1.29.9-0.20240821114611-d76eb6bb05a7/go.mod h1:eAO/EjCQxfHGnfxOUs061GdLYISLLYbXdexOPMn048g=
 github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
 github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
 github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw=
@@ -1328,8 +1328,8 @@ github.com/redis/go-redis/v9 v9.0.5/go.mod h1:WqMKv5vnQbRuZstUwxQI195wHy+t4PuXDO
 github.com/redis/go-redis/v9 v9.5.1 h1:H1X4D3yHPaYrkL5X06Wh6xNVM/pX0Ft4RV0vMGvLBh8=
 github.com/redis/go-redis/v9 v9.5.1/go.mod h1:hdY0cQFCN4fnSYT6TkisLufl/4W5UIXyv0b/CLO2V2M=
 github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
-github.com/replicatedhq/embedded-cluster/kinds v1.11.1 h1:VuXMwXIupdbGeFkF8m2O5oYOq4DmymP6AzM2Qn7H9ck=
-github.com/replicatedhq/embedded-cluster/kinds v1.11.1/go.mod h1:i9L1S45numg5giWKuzwI6+Ag9tH9+/RQ5B3SsX/fPgE=
+github.com/replicatedhq/embedded-cluster/kinds v0.0.0-20240911124703-aaa8c0236e21 h1:WV2ISkxxamW596PMm+YnKEQJ+e+GDaUq5jxbQ1YPcBw=
+github.com/replicatedhq/embedded-cluster/kinds v0.0.0-20240911124703-aaa8c0236e21/go.mod h1:W2AQug7u0e9afPL0oUZyHcmn1+5ur6Y0TRcdnI5te2g=
 github.com/replicatedhq/kotskinds v0.0.0-20240718194123-1018dd404e95 h1:JhwPz4Bgbz5iYl3UV2EB+HnF9oW/eCRi+hASAz+J6XI=
 github.com/replicatedhq/kotskinds v0.0.0-20240718194123-1018dd404e95/go.mod h1:QjhIUu3+OmHZ09u09j3FCoTt8F3BYtQglS+OLmftu9I=
 github.com/replicatedhq/kurlkinds v1.5.0 h1:zZ0PKNeh4kXvSzVGkn62DKTo314GxhXg1TSB3azURMc=

hack/dev/skaffoldcache.Dockerfile

@@ -1,6 +1,6 @@
-FROM golang:1.22 as deps
+FROM golang:1.23 as deps
 
-RUN go install github.com/go-delve/delve/cmd/dlv@v1.22.1
+RUN go install github.com/go-delve/delve/cmd/dlv@v1.23.0
 
 ENV PROJECTPATH=/go/src/github.com/replicatedhq/kots
 WORKDIR $PROJECTPATH

kurl_proxy/go.mod

@@ -1,8 +1,6 @@
 module github.com/replicatedhq/kots/kurl_proxy
 
-go 1.22.0
-
-toolchain go1.22.2
+go 1.23.0
 
 require (
 	github.com/gin-gonic/gin v1.10.0

kurl_proxy/okteto.Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.3
-FROM golang:1.22-bookworm
+FROM golang:1.23-bookworm
 
 ENV PROJECTPATH=/go/src/github.com/replicatedhq/kots/kurl_proxy
 WORKDIR $PROJECTPATH

kurl_proxy/skaffold.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22-bookworm
+FROM golang:1.23-bookworm
 
 ENV PROJECTPATH=/go/src/github.com/replicatedhq/kots/kurl_proxy
 WORKDIR $PROJECTPATH

pkg/image/constants.go

@@ -5,8 +5,8 @@ package image
 // image name.
 
 const (
-	Minio      = "kotsadm/minio:0.20240829.014052-r0"
-	Rqlite     = "kotsadm/rqlite:8.30.0-r0"
+	Minio      = "kotsadm/minio:0.20240909.165928-r0"
+	Rqlite     = "kotsadm/rqlite:8.30.2-r0"
 	Dex        = "kotsadm/dex:2.41.1-r0"
 	Schemahero = "schemahero/schemahero:0.17.10"
 	Lvp        = "replicated/local-volume-provider:v0.6.7"

pkg/kotsadm/objects/kotsadm_objects.go

@@ -290,7 +290,7 @@ func KotsadmDeployment(deployOptions types.DeployOptions) (*appsv1.Deployment, e
 		},
 		{
 			Name:  "S3_ENDPOINT",
-			Value: "http://kotsadm-minio:9000",
+			Value: fmt.Sprintf("http://kotsadm-minio.%s.svc.cluster.local:9000", deployOptions.Namespace),
 		},
 		{
 			Name:  "S3_BUCKET_NAME",
@@ -562,7 +562,7 @@ func KotsadmDeployment(deployOptions types.DeployOptions) (*appsv1.Deployment, e
 							Env: []corev1.EnvVar{
 								{
 									Name:  "S3_ENDPOINT",
-									Value: "http://kotsadm-minio:9000",
+									Value: fmt.Sprintf("http://kotsadm-minio.%s.svc.cluster.local:9000", deployOptions.Namespace),
 								},
 								{
 									Name:  "S3_BUCKET_NAME",
@@ -1082,7 +1082,7 @@ func KotsadmStatefulSet(deployOptions types.DeployOptions, size resource.Quantit
 							Env: []corev1.EnvVar{
 								{
 									Name:  "S3_ENDPOINT",
-									Value: "http://kotsadm-minio:9000",
+									Value: fmt.Sprintf("http://kotsadm-minio.%s.svc.cluster.local:9000", deployOptions.Namespace),
 								},
 								{
 									Name:  "S3_BUCKET_NAME",

pkg/kotsadm/objects/secrets_objects.go

@@ -49,7 +49,7 @@ func RqliteSecret(namespace string, password string) *corev1.Secret {
 			Labels:    types.GetKotsadmLabels(),
 		},
 		Data: map[string][]byte{
-			"uri":             []byte(fmt.Sprintf("http://kotsadm:%s@kotsadm-rqlite:4001?timeout=60&disableClusterDiscovery=true", password)),
+			"uri":             []byte(fmt.Sprintf("http://kotsadm:%s@kotsadm-rqlite.%s.svc.cluster.local:4001?timeout=60&disableClusterDiscovery=true", password, namespace)),
 			"password":        []byte(password),
 			"authconfig.json": []byte(fmt.Sprintf(`[{"username": "kotsadm", "password": "%s", "perms": ["all"]}, {"username": "*", "perms": ["status", "ready"]}]`, password)),
 		},

pkg/supportbundle/staticspecs/kurlspec.yaml

@@ -121,7 +121,7 @@ spec:
             - name: rqlite-status
               image: busybox:1
               command: ["wget"]
-              args: ["-q", "-T", "5", "http://kotsadm-rqlite:4001/status?pretty", "-O-"]
+              args: ["-q", "-T", "5", "http://kotsadm-rqlite.default.svc.cluster.local:4001/status?pretty", "-O-"]
     - runPod:
         collectorName: "rqlite-nodes"
         name: rqlite-nodes
@@ -131,7 +131,7 @@ spec:
             - name: rqlite-nodes
               image: busybox:1
               command: ["wget"]
-              args: ["-q", "-T", "5", "http://kotsadm-rqlite:4001/nodes?pretty&ver=2", "-O-"]
+              args: ["-q", "-T", "5", "http://kotsadm-rqlite.default.svc.cluster.local:4001/nodes?pretty&ver=2", "-O-"]
     - copyFromHost:
         collectorName: kurl-host-preflights
         name: kots/kurl/host-preflights