From 2a7f487a23674a282c8eec4da81f7500373455dc Mon Sep 17 00:00:00 2001 From: Craig O'Donnell Date: Tue, 14 Nov 2023 19:10:07 +0000 Subject: [PATCH] remove minio/mc --- .github/workflows/alpha.yaml | 28 ----------- .github/workflows/build-test.yaml | 77 ++++++++++++------------------- .github/workflows/release.yaml | 1 - .image.env | 1 - Makefile | 8 ---- cmd/imagedeps/image-spec | 1 - cmd/imagedeps/main.go | 1 - cmd/imagedeps/tag-finder.go | 5 -- pkg/image/constants.go | 1 - pkg/kotsadm/objects/images.go | 6 --- 10 files changed, 29 insertions(+), 100 deletions(-) diff --git a/.github/workflows/alpha.yaml b/.github/workflows/alpha.yaml index be00eb7cfa..1078355859 100644 --- a/.github/workflows/alpha.yaml +++ b/.github/workflows/alpha.yaml @@ -258,34 +258,6 @@ jobs: sarif_file: 'minio-scan-output.sarif' - scan_mc: - runs-on: ubuntu-20.04 - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Read image tags from env file - uses: falti/dotenv-action@v1 - id: dotenv - with: - path: .image.env - - name: Scan minio client for vulnerabilities - id: scan - uses: aquasecurity/trivy-action@master - with: - image-ref: "docker.io/minio/mc:${{ steps.dotenv.outputs.mc_tag }}" - format: 'template' - template: '@/contrib/sarif.tpl' - output: 'mc-scan-output.sarif' - exit-code: '0' - ignore-unfixed: true - severity: 'CRITICAL,HIGH,MEDIUM' - - - name: Upload scan report - uses: github/codeql-action/upload-sarif@v2 - with: - sarif_file: 'mc-scan-output.sarif' - - scan_dex: runs-on: ubuntu-20.04 steps: diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index 44135edd3b..fc38dd3db9 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -481,25 +481,6 @@ jobs: docker push ttl.sh/automated-${{ github.run_id }}/minio:${{ steps.dotenv.outputs.minio_tag }} - push-mc: - runs-on: ubuntu-20.04 - needs: [ can-run-ci ] - steps: - - uses: actions/checkout@v3 - - - name: load environment variables from .image.env - uses: falti/dotenv-action@v1 - id: dotenv - with: - path: .image.env - - - name: push minio client for e2e - run: | - docker pull minio/mc:${{ steps.dotenv.outputs.mc_tag }} - docker tag minio/mc:${{ steps.dotenv.outputs.mc_tag }} ttl.sh/automated-${{ github.run_id }}/mc:${{ steps.dotenv.outputs.mc_tag }} - docker push ttl.sh/automated-${{ github.run_id }}/mc:${{ steps.dotenv.outputs.mc_tag }} - - push-rqlite: runs-on: ubuntu-20.04 needs: [ can-run-ci ] @@ -619,7 +600,7 @@ jobs: validate-existing-online-install-minimal: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] steps: - name: Checkout uses: actions/checkout@v3 @@ -654,7 +635,7 @@ jobs: validate-smoke-test: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -693,7 +674,7 @@ jobs: validate-minimal-rbac: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -805,7 +786,7 @@ jobs: validate-backup-and-restore: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -844,7 +825,7 @@ jobs: validate-no-required-config: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -884,7 +865,7 @@ jobs: validate-strict-preflight-checks: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -993,7 +974,7 @@ jobs: validate-config: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -1033,7 +1014,7 @@ jobs: validate-version-history-pagination: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -1072,7 +1053,7 @@ jobs: validate-change-license: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -1112,7 +1093,7 @@ jobs: validate-minimal-rbac-override: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -1288,7 +1269,7 @@ jobs: validate-multi-namespace: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -1400,7 +1381,7 @@ jobs: validate-kots-pull: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -1510,7 +1491,7 @@ jobs: validate-app-version-label: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -1668,7 +1649,7 @@ jobs: validate-helm-install-order: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -1767,7 +1748,7 @@ jobs: validate-no-redeploy-on-restart: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -1889,7 +1870,7 @@ jobs: validate-kubernetes-installer-preflight: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -2026,7 +2007,7 @@ jobs: validate-kots-push-images-anonymous: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] steps: - name: Checkout uses: actions/checkout@v3 @@ -2047,7 +2028,7 @@ jobs: validate-kots-admin-console-generate-manifests: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -2242,7 +2223,7 @@ jobs: validate-min-kots-version: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-e2e, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite, generate-tag ] + needs: [ enable-tests, can-run-ci, build-e2e, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite, generate-tag ] env: APP_SLUG: min-kots-version strategy: @@ -2312,7 +2293,7 @@ jobs: validate-target-kots-version: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-e2e, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite, generate-tag ] + needs: [ enable-tests, can-run-ci, build-e2e, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite, generate-tag ] strategy: fail-fast: false matrix: @@ -2379,7 +2360,7 @@ jobs: validate-range-kots-version: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-e2e, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite, generate-tag ] + needs: [ enable-tests, can-run-ci, build-e2e, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite, generate-tag ] strategy: fail-fast: false matrix: @@ -2446,7 +2427,7 @@ jobs: validate-kots-upgrade: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, cmx-versions, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -2585,7 +2566,7 @@ jobs: validate-kots-helm-release-secret-migration: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -2772,7 +2753,7 @@ jobs: validate-multi-app-backup-and-restore: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -2812,7 +2793,7 @@ jobs: validate-multi-app-install: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -2852,7 +2833,7 @@ jobs: validate-airgap-smoke-test: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-e2e, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -3167,7 +3148,7 @@ jobs: validate-native-helm-v2: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -3393,7 +3374,7 @@ jobs: validate-deployment-orchestration: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: @@ -3561,7 +3542,7 @@ jobs: validate-replicated-sdk: runs-on: ubuntu-20.04 - needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-mc, push-rqlite ] + needs: [ enable-tests, can-run-ci, build-push-kotsadm-image, build-kurl-proxy, build-migrations, push-minio, push-rqlite ] strategy: fail-fast: false matrix: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7b344f1383..e28d537342 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -400,7 +400,6 @@ jobs: - name: Make kotsadm airgap archive without minio image run: | rm -rf ./docker-archive/minio - rm -rf ./docker-archive/mc rm -f ./kotsadm.tar.gz tar czf ./kotsadm-nominio.tar.gz -C ./ ./docker-archive - name: Upload airgap bundle without minio image diff --git a/.image.env b/.image.env index 7116ba3584..cb5fd3bde3 100644 --- a/.image.env +++ b/.image.env @@ -2,7 +2,6 @@ # most recent tag is interpolated from the source repository and used to generate a fully qualified image # name. MINIO_TAG='RELEASE.2023-11-11T08-14-41Z' -MC_TAG='RELEASE.2023-10-14T01-57-03Z' RQLITE_TAG='7.21.4' DEX_TAG='v2.37.0' SCHEMAHERO_TAG='0.16.0' diff --git a/Makefile b/Makefile index 5c36d8df10..1c0ee04e2f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,6 @@ include Makefile.build.mk CURRENT_USER := $(shell id -u -n) MINIO_TAG ?= RELEASE.2023-11-11T08-14-41Z -MC_TAG ?= RELEASE.2023-10-14T01-57-03Z RQLITE_TAG ?= 7.21.4 DEX_TAG ?= v2.37.0 LVP_TAG ?= v0.5.5 @@ -123,10 +122,6 @@ all-ttl.sh: build-ttl.sh docker tag minio/minio:${MINIO_TAG} ttl.sh/${CURRENT_USER}/minio:${MINIO_TAG} docker push ttl.sh/${CURRENT_USER}/minio:${MINIO_TAG} - docker pull minio/mc:${MC_TAG} - docker tag minio/mc:${MC_TAG} ttl.sh/${CURRENT_USER}/mc:${MC_TAG} - docker push ttl.sh/${CURRENT_USER}/mc:${MC_TAG} - docker pull rqlite/rqlite:${RQLITE_TAG} docker tag rqlite/rqlite:${RQLITE_TAG} ttl.sh/${CURRENT_USER}/rqlite:${RQLITE_TAG} docker push ttl.sh/${CURRENT_USER}/rqlite:${RQLITE_TAG} @@ -154,9 +149,6 @@ build-release: mkdir -p bin/docker-archive/minio skopeo copy docker://minio/minio:${MINIO_TAG} docker-archive:bin/docker-archive/minio/${MINIO_TAG} - mkdir -p bin/docker-archive/mc - skopeo copy docker://minio/mc:${MC_TAG} docker-archive:bin/docker-archive/mc/${MC_TAG} - mkdir -p bin/docker-archive/local-volume-provider skopeo copy docker://replicated/local-volume-provider:${LVP_TAG} docker-archive:bin/docker-archive/local-volume-provider/${LVP_TAG} diff --git a/cmd/imagedeps/image-spec b/cmd/imagedeps/image-spec index 7ab0fed8ee..66a0ae252a 100644 --- a/cmd/imagedeps/image-spec +++ b/cmd/imagedeps/image-spec @@ -1,5 +1,4 @@ minio minio/minio -mc minio/mc rqlite rqlite/rqlite ^([0-9]|[1-9][0-9]*)\.([0-9]|[1-9][0-9]*)\.([0-9]|[1-9][0-9]*)$ dex ghcr.io/dexidp/dex schemahero schemahero/schemahero ^([0-9]|[1-9][0-9]*)\.([0-9]|[1-9][0-9]*)\.([0-9]|[1-9][0-9]*)$ diff --git a/cmd/imagedeps/main.go b/cmd/imagedeps/main.go index 5a3fdad863..97897a16fb 100644 --- a/cmd/imagedeps/main.go +++ b/cmd/imagedeps/main.go @@ -18,7 +18,6 @@ import ( const ( schemaheroReference = "schemahero" minioReference = "minio" - minioClientReference = "mc" dexReference = "dex" rqliteReference = "rqlite" lvpReference = "lvp" diff --git a/cmd/imagedeps/tag-finder.go b/cmd/imagedeps/tag-finder.go index d6d588f1a6..eac106a303 100644 --- a/cmd/imagedeps/tag-finder.go +++ b/cmd/imagedeps/tag-finder.go @@ -123,11 +123,6 @@ func getTagFinder(opts ...func(c *configuration)) tagFinderFn { if err != nil { return nil, fmt.Errorf("failed to get release tag for minio/minio %w", err) } - case minioClientReference: - latestReleaseTag, err = getLatestTagFromGithub(config.releaseFinder, "minio", "mc", matcherFn) - if err != nil { - return nil, fmt.Errorf("failed to get release tag for minio/mc %w", err) - } case dexReference: latestReleaseTag, err = getLatestTagFromGithub(config.releaseFinder, "dexidp", "dex", matcherFn) if err != nil { diff --git a/pkg/image/constants.go b/pkg/image/constants.go index 1c7295077a..f1b491f53d 100644 --- a/pkg/image/constants.go +++ b/pkg/image/constants.go @@ -6,7 +6,6 @@ package image const ( Minio = "minio/minio:RELEASE.2023-11-11T08-14-41Z" - Mc = "minio/mc:RELEASE.2023-10-14T01-57-03Z" Rqlite = "rqlite/rqlite:7.21.4" Dex = "ghcr.io/dexidp/dex:v2.37.0" Schemahero = "schemahero/schemahero:0.16.0" diff --git a/pkg/kotsadm/objects/images.go b/pkg/kotsadm/objects/images.go index 91dd0dd9ce..1d097d2611 100644 --- a/pkg/kotsadm/objects/images.go +++ b/pkg/kotsadm/objects/images.go @@ -15,24 +15,20 @@ func GetAdminConsoleImage(deployOptions types.DeployOptions, imageKey string) st func GetAdminConsoleImages(deployOptions types.DeployOptions) map[string]string { // TODO: Add error handling to this function minioTag, _ := image.GetTag(image.Minio) - minioClientTag, _ := image.GetTag(image.Mc) rqliteTag, _ := image.GetTag(image.Rqlite) dexTag, _ := image.GetTag(image.Dex) minioImage := fmt.Sprintf("minio/minio:%s", minioTag) - minioClientImage := fmt.Sprintf("minio/mc:%s", minioClientTag) rqliteImage := fmt.Sprintf("rqlite/rqlite:%s", rqliteTag) dexImage := fmt.Sprintf("kotsadm/dex:%s", dexTag) if s := kotsadmversion.KotsadmPullSecret(deployOptions.Namespace, deployOptions.RegistryConfig); s != nil { minioImage = fmt.Sprintf("%s/minio:%s", kotsadmversion.KotsadmRegistry(deployOptions.RegistryConfig), minioTag) - minioClientImage = fmt.Sprintf("%s/mc:%s", kotsadmversion.KotsadmRegistry(deployOptions.RegistryConfig), minioClientTag) rqliteImage = fmt.Sprintf("%s/rqlite:%s", kotsadmversion.KotsadmRegistry(deployOptions.RegistryConfig), rqliteTag) dexImage = fmt.Sprintf("%s/dex:%s", kotsadmversion.KotsadmRegistry(deployOptions.RegistryConfig), dexTag) } else if deployOptions.RegistryConfig.OverrideRegistry != "" { // if there is a registry specified, use images there and not the ones from docker hub - even though there's not a username/password specified minioImage = fmt.Sprintf("%s/minio:%s", kotsadmversion.KotsadmRegistry(deployOptions.RegistryConfig), minioTag) - minioClientImage = fmt.Sprintf("%s/mc:%s", kotsadmversion.KotsadmRegistry(deployOptions.RegistryConfig), minioClientTag) rqliteImage = fmt.Sprintf("%s/rqlite:%s", kotsadmversion.KotsadmRegistry(deployOptions.RegistryConfig), rqliteTag) dexImage = fmt.Sprintf("%s/dex:%s", kotsadmversion.KotsadmRegistry(deployOptions.RegistryConfig), dexTag) } @@ -41,7 +37,6 @@ func GetAdminConsoleImages(deployOptions types.DeployOptions) map[string]string "kotsadm-migrations": fmt.Sprintf("%s/kotsadm-migrations:%s", kotsadmversion.KotsadmRegistry(deployOptions.RegistryConfig), kotsadmversion.KotsadmTag(deployOptions.RegistryConfig)), "kotsadm": fmt.Sprintf("%s/kotsadm:%s", kotsadmversion.KotsadmRegistry(deployOptions.RegistryConfig), kotsadmversion.KotsadmTag(deployOptions.RegistryConfig)), "minio": minioImage, - "minio-client": minioClientImage, "rqlite": rqliteImage, "dex": dexImage, } @@ -53,7 +48,6 @@ func GetOriginalAdminConsoleImages(deployOptions types.DeployOptions) map[string "kotsadm-migrations": fmt.Sprintf("kotsadm/kotsadm-migrations:%s", kotsadmversion.KotsadmTag(deployOptions.RegistryConfig)), "kotsadm": fmt.Sprintf("kotsadm/kotsadm:%s", kotsadmversion.KotsadmTag(deployOptions.RegistryConfig)), "minio": image.Minio, - "minio-client": image.Mc, "rqlite": image.Rqlite, "dex": fmt.Sprintf("kotsadm/dex:%s", dexTag), }