From abe9f7306697bbecd68e7e73a09b9cb6273903d6 Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Mon, 9 Sep 2024 16:14:16 -0700 Subject: [PATCH 1/5] fix(proxy): use fqdn for kotsadm-rqlite and kotsadm-minio addresses (#4874) * fix(proxy): use fqdn for kotsadm-rqlite address * fix(proxy): use fqdn for kotsadm-minio address --- deploy/kurl/kotsadm/template/base/tmpl-secret-rqlite.yaml | 2 +- pkg/kotsadm/objects/kotsadm_objects.go | 6 +++--- pkg/kotsadm/objects/secrets_objects.go | 2 +- pkg/supportbundle/staticspecs/kurlspec.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/deploy/kurl/kotsadm/template/base/tmpl-secret-rqlite.yaml b/deploy/kurl/kotsadm/template/base/tmpl-secret-rqlite.yaml index 4d89709da6..c2bd9ea835 100644 --- a/deploy/kurl/kotsadm/template/base/tmpl-secret-rqlite.yaml +++ b/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"]}] diff --git a/pkg/kotsadm/objects/kotsadm_objects.go b/pkg/kotsadm/objects/kotsadm_objects.go index 348ab9a139..f2741bea62 100644 --- a/pkg/kotsadm/objects/kotsadm_objects.go +++ b/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", diff --git a/pkg/kotsadm/objects/secrets_objects.go b/pkg/kotsadm/objects/secrets_objects.go index b9c4bcf49d..a6a4bbc590 100644 --- a/pkg/kotsadm/objects/secrets_objects.go +++ b/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)), }, diff --git a/pkg/supportbundle/staticspecs/kurlspec.yaml b/pkg/supportbundle/staticspecs/kurlspec.yaml index 58703afc0f..36b9461d28 100644 --- a/pkg/supportbundle/staticspecs/kurlspec.yaml +++ b/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 From 6597d0c9a53cb4e490ff695c29fd41c1903532c2 Mon Sep 17 00:00:00 2001 From: replicated-ci-kots <91219917+replicated-ci-kots@users.noreply.github.com> Date: Tue, 10 Sep 2024 06:08:22 +0000 Subject: [PATCH 2/5] Update KOTS image dependency tags (#4875) Co-authored-by: dydx <25685+dydx@users.noreply.github.com> --- .image.env | 2 +- Makefile | 2 +- pkg/image/constants.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.image.env b/.image.env index a5d28be70a..90ab24f6a3 100644 --- a/.image.env +++ b/.image.env @@ -1,7 +1,7 @@ # 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' +MINIO_TAG='0.20240909.165928-r0' RQLITE_TAG='8.30.0-r0' DEX_TAG='2.41.1-r0' SCHEMAHERO_TAG='0.17.10' diff --git a/Makefile b/Makefile index 9e15a7fd7e..9d7c4d3117 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ include Makefile.build.mk CURRENT_USER := $(if $(GITHUB_USER),$(GITHUB_USER),$(shell id -u -n)) -MINIO_TAG ?= 0.20240829.014052-r0 +MINIO_TAG ?= 0.20240909.165928-r0 RQLITE_TAG ?= 8.30.0-r0 DEX_TAG ?= 2.41.1-r0 LVP_TAG ?= v0.6.7 diff --git a/pkg/image/constants.go b/pkg/image/constants.go index ef7abb9a33..b52c725c1c 100644 --- a/pkg/image/constants.go +++ b/pkg/image/constants.go @@ -5,7 +5,7 @@ package image // image name. const ( - Minio = "kotsadm/minio:0.20240829.014052-r0" + Minio = "kotsadm/minio:0.20240909.165928-r0" Rqlite = "kotsadm/rqlite:8.30.0-r0" Dex = "kotsadm/dex:2.41.1-r0" Schemahero = "schemahero/schemahero:0.17.10" From 9766cba2a56a844d52e1691a4016b04cd445424a Mon Sep 17 00:00:00 2001 From: replicated-ci-kots <91219917+replicated-ci-kots@users.noreply.github.com> Date: Wed, 11 Sep 2024 12:10:05 +0000 Subject: [PATCH 3/5] Update KOTS image dependency tags (#4876) Co-authored-by: dydx <25685+dydx@users.noreply.github.com> --- .image.env | 2 +- Makefile | 2 +- pkg/image/constants.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.image.env b/.image.env index 90ab24f6a3..cc869d4257 100644 --- a/.image.env +++ b/.image.env @@ -2,7 +2,7 @@ # most recent tag is interpolated from the source repository and used to generate a fully qualified image # name. MINIO_TAG='0.20240909.165928-r0' -RQLITE_TAG='8.30.0-r0' +RQLITE_TAG='8.30.2-r0' DEX_TAG='2.41.1-r0' SCHEMAHERO_TAG='0.17.10' LVP_TAG='v0.6.7' \ No newline at end of file diff --git a/Makefile b/Makefile index 9d7c4d3117..cd0e363eb1 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ include Makefile.build.mk CURRENT_USER := $(if $(GITHUB_USER),$(GITHUB_USER),$(shell id -u -n)) MINIO_TAG ?= 0.20240909.165928-r0 -RQLITE_TAG ?= 8.30.0-r0 +RQLITE_TAG ?= 8.30.2-r0 DEX_TAG ?= 2.41.1-r0 LVP_TAG ?= v0.6.7 diff --git a/pkg/image/constants.go b/pkg/image/constants.go index b52c725c1c..4704d34f48 100644 --- a/pkg/image/constants.go +++ b/pkg/image/constants.go @@ -6,7 +6,7 @@ package image const ( Minio = "kotsadm/minio:0.20240909.165928-r0" - Rqlite = "kotsadm/rqlite:8.30.0-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" From c23b04adf718a362f65b02573c3752b15097cbf3 Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Wed, 11 Sep 2024 15:34:07 -0700 Subject: [PATCH 4/5] chore(ec): add binaryOverrideUrl and metadataOverrideUrl (#4877) --- go.mod | 6 +++--- go.sum | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index c2bfc14bf5..55d91e314d 100644 --- a/go.mod +++ b/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 diff --git a/go.sum b/go.sum index dab3abd3cb..592fb2e533 100644 --- a/go.sum +++ b/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= From 99101de2623540c311e3da33515d5f30dbf6e8f2 Mon Sep 17 00:00:00 2001 From: Ethan Mosbaugh Date: Wed, 11 Sep 2024 18:54:24 -0700 Subject: [PATCH 5/5] chore: upgrade to go 1.23 (#4881) --- .github/actions/copy-assets/Dockerfile | 2 +- deploy/okteto/okteto-v2.Dockerfile | 2 +- deploy/okteto/okteto.Dockerfile | 2 +- hack/dev/skaffoldcache.Dockerfile | 4 ++-- kurl_proxy/go.mod | 4 +--- kurl_proxy/okteto.Dockerfile | 2 +- kurl_proxy/skaffold.Dockerfile | 2 +- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/actions/copy-assets/Dockerfile b/.github/actions/copy-assets/Dockerfile index 5ae63d6592..b3fe48ea31 100644 --- a/.github/actions/copy-assets/Dockerfile +++ b/.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 diff --git a/deploy/okteto/okteto-v2.Dockerfile b/deploy/okteto/okteto-v2.Dockerfile index 2a3582de3f..9abe88103d 100644 --- a/deploy/okteto/okteto-v2.Dockerfile +++ b/deploy/okteto/okteto-v2.Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1.3 -FROM golang:1.22 +FROM golang:1.23 EXPOSE 2345 diff --git a/deploy/okteto/okteto.Dockerfile b/deploy/okteto/okteto.Dockerfile index 93ea65e83e..42df698b54 100644 --- a/deploy/okteto/okteto.Dockerfile +++ b/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 diff --git a/hack/dev/skaffoldcache.Dockerfile b/hack/dev/skaffoldcache.Dockerfile index a0bc55fcfd..62b8bb3d92 100644 --- a/hack/dev/skaffoldcache.Dockerfile +++ b/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 diff --git a/kurl_proxy/go.mod b/kurl_proxy/go.mod index 52ff695b34..08f9967a8a 100644 --- a/kurl_proxy/go.mod +++ b/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 diff --git a/kurl_proxy/okteto.Dockerfile b/kurl_proxy/okteto.Dockerfile index 842b98b820..4a4b66c593 100644 --- a/kurl_proxy/okteto.Dockerfile +++ b/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 diff --git a/kurl_proxy/skaffold.Dockerfile b/kurl_proxy/skaffold.Dockerfile index c8d3ec5229..5da23c9272 100644 --- a/kurl_proxy/skaffold.Dockerfile +++ b/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