Skip to content

Commit d764e9b

Browse files
authored
fix(ci): add back LDFLAGS for kots regression tests (#766)
1 parent de55529 commit d764e9b

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ VERSION ?= $(shell git describe --tags --dirty)
22
UNAME := $(shell uname)
33
ARCH := $(shell uname -m)
44
APP_NAME = embedded-cluster
5+
ADMIN_CONSOLE_CHART_REPO_OVERRIDE =
56
ADMIN_CONSOLE_CHART_VERSION = 1.109.13
67
ADMIN_CONSOLE_IMAGE_OVERRIDE =
78
ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
@@ -32,6 +33,7 @@ LD_FLAGS = -X github.com/replicatedhq/embedded-cluster/pkg/defaults.K0sVersion=$
3233
-X github.com/replicatedhq/embedded-cluster/pkg/defaults.TroubleshootVersion=$(TROUBLESHOOT_VERSION) \
3334
-X github.com/replicatedhq/embedded-cluster/pkg/defaults.KubectlVersion=$(KUBECTL_VERSION) \
3435
-X github.com/replicatedhq/embedded-cluster/pkg/defaults.LocalArtifactMirrorImage=$(LOCAL_ARTIFACT_MIRROR_IMAGE_LOCATION) \
36+
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ChartRepoOverride=$(ADMIN_CONSOLE_CHART_REPO_OVERRIDE) \
3537
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.Version=$(ADMIN_CONSOLE_CHART_VERSION) \
3638
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ImageOverride=$(ADMIN_CONSOLE_IMAGE_OVERRIDE) \
3739
-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.MigrationsImageOverride=$(ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE) \

pkg/addons/adminconsole/adminconsole.go

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@ import (
3030
)
3131

3232
const (
33+
chartRepo = "registry.replicated.com/library/admin-console"
3334
releaseName = "admin-console"
34-
chartURL = "oci://proxy.replicated.com/anonymous/registry.replicated.com/library/admin-console"
3535
)
3636

3737
// Overwritten by -ldflags in Makefile
3838
var (
39+
// ChartRepoOverride is used by KOTS regression automation to override the default chart repo.
40+
ChartRepoOverride = ""
3941
Version = "v0.0.0"
4042
ImageOverride = ""
4143
MigrationsImageOverride = ""
@@ -156,9 +158,17 @@ func (a *AdminConsole) GenerateHelmConfig(onlyDefaults bool) ([]v1beta1.Chart, [
156158
if err != nil {
157159
return nil, nil, fmt.Errorf("unable to marshal helm values: %w", err)
158160
}
161+
162+
var chartName string
163+
if ChartRepoOverride != "" {
164+
chartName = fmt.Sprintf("oci://proxy.replicated.com/anonymous/%s", ChartRepoOverride)
165+
} else {
166+
chartName = fmt.Sprintf("oci://proxy.replicated.com/anonymous/%s", chartRepo)
167+
}
168+
159169
chartConfig := v1beta1.Chart{
160170
Name: releaseName,
161-
ChartName: chartURL,
171+
ChartName: chartName,
162172
Version: Version,
163173
Values: string(values),
164174
TargetNS: a.namespace,

0 commit comments

Comments
 (0)