From 2187b659028de7570d7d85e8340ddf5f4a00186a Mon Sep 17 00:00:00 2001 From: sgalsaleh <39952863+sgalsaleh@users.noreply.github.com> Date: Wed, 24 Jul 2024 17:17:46 +0000 Subject: [PATCH 1/3] Update KOTS image dependency tags --- .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 9e77d33f00..08827491c4 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.20240715.190230-r0' +MINIO_TAG='0.20240716.234641-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 259eb567a6..e6d5c92ab2 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.20240715.190230-r0 +MINIO_TAG ?= 0.20240716.234641-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 69e6bce6b2..c30a0ec378 100644 --- a/pkg/image/constants.go +++ b/pkg/image/constants.go @@ -5,7 +5,7 @@ package image // image name. const ( - Minio = "kotsadm/minio:0.20240715.190230-r0" + Minio = "kotsadm/minio:0.20240716.234641-r0" Rqlite = "kotsadm/rqlite:8.26.7-r0" Dex = "kotsadm/dex:2.40.0-r3" Schemahero = "schemahero/schemahero:0.17.9" From e2b345c093242ba35640e61f9229ff8fe91912ad Mon Sep 17 00:00:00 2001 From: Salah Al Saleh Date: Wed, 24 Jul 2024 17:22:43 +0000 Subject: [PATCH 2/3] add busybox --- deploy/dex/apko.yaml.tmpl | 2 +- deploy/minio/apko.yaml.tmpl | 2 +- deploy/rqlite/apko.yaml.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/dex/apko.yaml.tmpl b/deploy/dex/apko.yaml.tmpl index 8f078918e2..8688bcc902 100644 --- a/deploy/dex/apko.yaml.tmpl +++ b/deploy/dex/apko.yaml.tmpl @@ -6,7 +6,7 @@ contents: packages: - dex=__DEX_VERSION__ - gomplate - - bash + - busybox accounts: groups: diff --git a/deploy/minio/apko.yaml.tmpl b/deploy/minio/apko.yaml.tmpl index ff2c151f8c..025130479e 100644 --- a/deploy/minio/apko.yaml.tmpl +++ b/deploy/minio/apko.yaml.tmpl @@ -6,7 +6,7 @@ contents: packages: - minio=__MINIO_VERSION__ - mc - - bash + - busybox accounts: groups: diff --git a/deploy/rqlite/apko.yaml.tmpl b/deploy/rqlite/apko.yaml.tmpl index beae8dc9b4..d348d71713 100644 --- a/deploy/rqlite/apko.yaml.tmpl +++ b/deploy/rqlite/apko.yaml.tmpl @@ -6,7 +6,7 @@ contents: packages: - rqlite=__RQLITE_VERSION__ - rqlite-oci-entrypoint=__RQLITE_VERSION__ - - bash + - busybox accounts: groups: From be31e50b58261e9b29dc040baa8c27f1ce7f2ee2 Mon Sep 17 00:00:00 2001 From: Salah Al Saleh Date: Wed, 24 Jul 2024 18:10:47 +0000 Subject: [PATCH 3/3] add bash --- deploy/dex/apko.yaml.tmpl | 1 + deploy/minio/apko.yaml.tmpl | 1 + deploy/rqlite/apko.yaml.tmpl | 1 + 3 files changed, 3 insertions(+) diff --git a/deploy/dex/apko.yaml.tmpl b/deploy/dex/apko.yaml.tmpl index 8688bcc902..e2a396c2a9 100644 --- a/deploy/dex/apko.yaml.tmpl +++ b/deploy/dex/apko.yaml.tmpl @@ -6,6 +6,7 @@ contents: packages: - dex=__DEX_VERSION__ - gomplate + - bash - busybox accounts: diff --git a/deploy/minio/apko.yaml.tmpl b/deploy/minio/apko.yaml.tmpl index 025130479e..5829a2dd1f 100644 --- a/deploy/minio/apko.yaml.tmpl +++ b/deploy/minio/apko.yaml.tmpl @@ -6,6 +6,7 @@ contents: packages: - minio=__MINIO_VERSION__ - mc + - bash - busybox accounts: diff --git a/deploy/rqlite/apko.yaml.tmpl b/deploy/rqlite/apko.yaml.tmpl index d348d71713..d469a16e51 100644 --- a/deploy/rqlite/apko.yaml.tmpl +++ b/deploy/rqlite/apko.yaml.tmpl @@ -6,6 +6,7 @@ contents: packages: - rqlite=__RQLITE_VERSION__ - rqlite-oci-entrypoint=__RQLITE_VERSION__ + - bash - busybox accounts: