Skip to content

Commit

Permalink
Merge branch 'main' into laverya/error-typo
Browse files Browse the repository at this point in the history
  • Loading branch information
laverya authored Jul 17, 2024
2 parents 2c9f581 + 27b950b commit 2a55c93
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .image.env
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/image/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 9 additions & 2 deletions pkg/updatechecker/updatechecker.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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{
Expand Down

0 comments on commit 2a55c93

Please sign in to comment.