Skip to content

Commit 2a55c93

Browse files
authored
Merge branch 'main' into laverya/error-typo
2 parents 2c9f581 + 27b950b commit 2a55c93

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

.image.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Generated file, do not modify. This file is generated from a text file containing a list of images. The
22
# most recent tag is interpolated from the source repository and used to generate a fully qualified image
33
# name.
4-
MINIO_TAG='0.20240713.014615-r0'
4+
MINIO_TAG='0.20240715.190230-r0'
55
RQLITE_TAG='8.26.7-r0'
66
DEX_TAG='2.40.0-r3'
77
SCHEMAHERO_TAG='0.17.9'

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include Makefile.build.mk
22
CURRENT_USER := $(if $(GITHUB_USER),$(GITHUB_USER),$(shell id -u -n))
3-
MINIO_TAG ?= 0.20240713.014615-r0
3+
MINIO_TAG ?= 0.20240715.190230-r0
44
RQLITE_TAG ?= 8.26.7-r0
55
DEX_TAG ?= 2.40.0-r3
66
LVP_TAG ?= v0.6.7

pkg/image/constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package image
55
// image name.
66

77
const (
8-
Minio = "kotsadm/minio:0.20240713.014615-r0"
8+
Minio = "kotsadm/minio:0.20240715.190230-r0"
99
Rqlite = "kotsadm/rqlite:8.26.7-r0"
1010
Dex = "kotsadm/dex:2.40.0-r3"
1111
Schemahero = "schemahero/schemahero:0.17.9"

pkg/updatechecker/updatechecker.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@ func Configure(a *apptypes.App, updateCheckerSpec string) error {
6767
appId := a.GetID()
6868
appSlug := a.GetSlug()
6969
isAirgap := a.GetIsAirgap()
70-
isEC := util.IsEmbeddedCluster()
7170

72-
if isAirgap || isEC {
71+
if isAirgap {
7372
return nil
7473
}
7574

@@ -112,6 +111,14 @@ func Configure(a *apptypes.App, updateCheckerSpec string) error {
112111
jobAppSlug := appSlug
113112

114113
_, err := job.AddFunc(cronSpec, func() {
114+
// don't check for updates if it's an embedded cluster, only send reporting info
115+
if util.IsEmbeddedCluster() {
116+
if err := reporting.GetReporter().SubmitAppInfo(jobAppID); err != nil {
117+
logger.Debugf("failed to submit app info for app %s", jobAppSlug)
118+
}
119+
return
120+
}
121+
115122
logger.Debug("checking updates for app", zap.String("slug", jobAppSlug))
116123

117124
opts := types.CheckForUpdatesOpts{

0 commit comments

Comments
 (0)