Skip to content

Commit c657f8d

Browse files
Simon Emmsroboquat
Simon Emms
authored andcommitted
[installer]: set minio azure image to last supported version
Azure support has been removed from the latest version of minio gateway. If Azure is selected as the object store, this uses the last supported version of Minio gateway with Azure support.
1 parent 47a0941 commit c657f8d

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// Copyright (c) 2022 Gitpod GmbH. All rights reserved.
2+
// Licensed under the MIT License. See License-MIT.txt in the project root for license information.
3+
4+
package azure
5+
6+
const (
7+
ImageTag = "2022.4.29-debian-10-r0" // Last tag with Azure gateway support @link https://github.com/bitnami/charts/issues/10258
8+
)

install/installer/pkg/components/minio/azure/minio.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package azure
66

77
import (
88
"fmt"
9+
910
"github.com/gitpod-io/gitpod/installer/pkg/common"
1011
"github.com/gitpod-io/gitpod/installer/pkg/helm"
1112
"github.com/gitpod-io/gitpod/installer/third_party/charts"
@@ -21,6 +22,7 @@ var Helm = func(apiPort int32, consolePort int32, commonHelmValues []string) com
2122
Values: append(
2223
[]string{
2324
helm.KeyValue("minio.gateway.enabled", "true"),
25+
helm.KeyValue("minio.image.tag", ImageTag),
2426
helm.KeyValue("minio.gateway.auth.azure.accessKey", cfg.Values.StorageAccessKey), // Azure value actually taken from secret - used for console/API access
2527
helm.KeyValue("minio.gateway.auth.azure.secretKey", cfg.Values.StorageSecretKey), // Ditto
2628
helm.KeyValue("minio.gateway.auth.azure.storageAccountNameExistingSecret", cfg.Config.ObjectStorage.Azure.Credentials.Name),

install/kots/manifests/gitpod-installation-status.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
containers:
3131
- name: installation-status
3232
# This will normally be the release tag
33-
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-registry-s3-fork.3"
33+
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-azure-minio-gateway.0"
3434
command:
3535
- /bin/sh
3636
- -c

install/kots/manifests/gitpod-installer-job.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
containers:
2929
- name: installer
3030
# This will normally be the release tag
31-
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-registry-s3-fork.3"
31+
image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-azure-minio-gateway.0"
3232
volumeMounts:
3333
- mountPath: /config-patch
3434
name: config-patch

0 commit comments

Comments
 (0)