From 07dc36e669e3c33f6a70cb8d1efd1539a0b6a386 Mon Sep 17 00:00:00 2001 From: Salah Al Saleh Date: Tue, 16 Jul 2024 10:51:02 -0700 Subject: [PATCH 1/2] Only send reporting info for embedded clusters (#4766) --- pkg/updatechecker/updatechecker.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkg/updatechecker/updatechecker.go b/pkg/updatechecker/updatechecker.go index 4e5d6ea032..44438d7134 100644 --- a/pkg/updatechecker/updatechecker.go +++ b/pkg/updatechecker/updatechecker.go @@ -67,9 +67,8 @@ func Configure(a *apptypes.App, updateCheckerSpec string) error { appId := a.GetID() appSlug := a.GetSlug() isAirgap := a.GetIsAirgap() - isEC := util.IsEmbeddedCluster() - if isAirgap || isEC { + if isAirgap { return nil } @@ -112,6 +111,14 @@ func Configure(a *apptypes.App, updateCheckerSpec string) error { jobAppSlug := appSlug _, err := job.AddFunc(cronSpec, func() { + // don't check for updates if it's an embedded cluster, only send reporting info + if util.IsEmbeddedCluster() { + if err := reporting.GetReporter().SubmitAppInfo(jobAppID); err != nil { + logger.Debugf("failed to submit app info for app %s", jobAppSlug) + } + return + } + logger.Debug("checking updates for app", zap.String("slug", jobAppSlug)) opts := types.CheckForUpdatesOpts{ From 27b950be1b188975f33c8647a2e4a6958a7168f6 Mon Sep 17 00:00:00 2001 From: replicated-ci-kots <91219917+replicated-ci-kots@users.noreply.github.com> Date: Wed, 17 Jul 2024 15:22:54 +0000 Subject: [PATCH 2/2] Update KOTS image dependency tags (#4765) 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 698ac7668f..9e77d33f00 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.20240713.014615-r0' +MINIO_TAG='0.20240715.190230-r0' RQLITE_TAG='8.26.7-r0' DEX_TAG='2.40.0-r3' SCHEMAHERO_TAG='0.17.9' diff --git a/Makefile b/Makefile index e8c70875d9..39cce09848 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.20240713.014615-r0 +MINIO_TAG ?= 0.20240715.190230-r0 RQLITE_TAG ?= 8.26.7-r0 DEX_TAG ?= 2.40.0-r3 LVP_TAG ?= v0.6.7 diff --git a/pkg/image/constants.go b/pkg/image/constants.go index 67f6453a12..69e6bce6b2 100644 --- a/pkg/image/constants.go +++ b/pkg/image/constants.go @@ -5,7 +5,7 @@ package image // image name. const ( - Minio = "kotsadm/minio:0.20240713.014615-r0" + Minio = "kotsadm/minio:0.20240715.190230-r0" Rqlite = "kotsadm/rqlite:8.26.7-r0" Dex = "kotsadm/dex:2.40.0-r3" Schemahero = "schemahero/schemahero:0.17.9"