Skip to content

Commit 919997b

Browse files
JGAntunesJGAntunes
committed
chore: use proxy library endpoint for EC images
1 parent 813959b commit 919997b

File tree

8 files changed

+65
-74
lines changed

8 files changed

+65
-74
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
2222
ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE =
2323

2424
# TODO: move this to a manifest file
25-
LOCAL_ARTIFACT_MIRROR_IMAGE ?= proxy.replicated.com/anonymous/replicated/embedded-cluster-local-artifact-mirror:$(VERSION)
25+
LOCAL_ARTIFACT_MIRROR_IMAGE ?= proxy.replicated.com/library/replicated/embedded-cluster-local-artifact-mirror:$(VERSION)
2626
# These are used to override the binary urls in dev and e2e tests
2727
METADATA_K0S_BINARY_URL_OVERRIDE =
2828
METADATA_KOTS_BINARY_URL_OVERRIDE =
@@ -296,7 +296,7 @@ build-ttl.sh:
296296
$(MAKE) -C local-artifact-mirror build-ttl.sh \
297297
IMAGE_NAME=$(CURRENT_USER)/embedded-cluster-local-artifact-mirror
298298
make embedded-cluster-linux-$(ARCH) \
299-
LOCAL_ARTIFACT_MIRROR_IMAGE=proxy.replicated.com/anonymous/$(shell cat local-artifact-mirror/build/image)
299+
LOCAL_ARTIFACT_MIRROR_IMAGE=proxy.replicated.com/library/$(shell cat local-artifact-mirror/build/image)
300300

301301
.PHONY: clean
302302
clean:

‎pkg/addons/adminconsole/adminconsole.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func getBackupLabels() map[string]string {
7474
func (a *AdminConsole) ChartLocation(domains ecv1beta1.Domains) string {
7575
chartName := Metadata.Location
7676
if AdminConsoleChartRepoOverride != "" {
77-
chartName = fmt.Sprintf("oci://proxy.replicated.com/anonymous/%s", AdminConsoleChartRepoOverride)
77+
chartName = fmt.Sprintf("oci://proxy.replicated.com/library/%s", AdminConsoleChartRepoOverride)
7878
}
7979

8080
if domains.ProxyRegistryDomain != "" {

‎pkg/addons/seaweedfs/static/values.tpl.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ global:
22
enableReplication: true
33
replicationPlacment: "001"
44
{{- if .ReplaceImages }}
5-
registry: "proxy.replicated.com/anonymous/"
5+
registry: "proxy.replicated.com/library/"
66
{{- end }}
77

88
master:

‎pkg/addons/upgrade_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func Test_getAddOnsForUpgrade(t *testing.T) {
2828
},
2929
},
3030
Images: []string{
31-
"proxy.replicated.com/anonymous/replicated/embedded-cluster-operator-image:1.22.0-k8s-1.30-amd64@sha256:929b6cb42add383a69e3b26790c06320bd4eac0ecd60b509212c1864d69c6a88",
32-
"proxy.replicated.com/anonymous/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70",
31+
"proxy.replicated.com/library/replicated/embedded-cluster-operator-image:1.22.0-k8s-1.30-amd64@sha256:929b6cb42add383a69e3b26790c06320bd4eac0ecd60b509212c1864d69c6a88",
32+
"proxy.replicated.com/library/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70",
3333
},
3434
}
3535

@@ -61,9 +61,9 @@ func Test_getAddOnsForUpgrade(t *testing.T) {
6161
assert.Nil(t, eco.Proxy, "ECO should not have a proxy")
6262
assert.Equal(t, "replicated/embedded-cluster-operator", eco.ChartLocationOverride)
6363
assert.Equal(t, "1.22.0+k8s-1.30", eco.ChartVersionOverride)
64-
assert.Equal(t, "proxy.replicated.com/anonymous/replicated/embedded-cluster-operator-image", eco.ImageRepoOverride)
64+
assert.Equal(t, "proxy.replicated.com/library/replicated/embedded-cluster-operator-image", eco.ImageRepoOverride)
6565
assert.Equal(t, "1.22.0-k8s-1.30-amd64@sha256:929b6cb42add383a69e3b26790c06320bd4eac0ecd60b509212c1864d69c6a88", eco.ImageTagOverride)
66-
assert.Equal(t, "proxy.replicated.com/anonymous/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70", eco.UtilsImageOverride)
66+
assert.Equal(t, "proxy.replicated.com/library/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70", eco.UtilsImageOverride)
6767

6868
adminConsole, ok := addons[2].(*adminconsole.AdminConsole)
6969
require.True(t, ok, "third addon should be AdminConsole")
@@ -96,9 +96,9 @@ func Test_getAddOnsForUpgrade(t *testing.T) {
9696
assert.Nil(t, eco.Proxy, "ECO should not have a proxy")
9797
assert.Equal(t, "replicated/embedded-cluster-operator", eco.ChartLocationOverride)
9898
assert.Equal(t, "1.22.0+k8s-1.30", eco.ChartVersionOverride)
99-
assert.Equal(t, "proxy.replicated.com/anonymous/replicated/embedded-cluster-operator-image", eco.ImageRepoOverride)
99+
assert.Equal(t, "proxy.replicated.com/library/replicated/embedded-cluster-operator-image", eco.ImageRepoOverride)
100100
assert.Equal(t, "1.22.0-k8s-1.30-amd64@sha256:929b6cb42add383a69e3b26790c06320bd4eac0ecd60b509212c1864d69c6a88", eco.ImageTagOverride)
101-
assert.Equal(t, "proxy.replicated.com/anonymous/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70", eco.UtilsImageOverride)
101+
assert.Equal(t, "proxy.replicated.com/library/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70", eco.UtilsImageOverride)
102102

103103
reg, ok := addons[2].(*registry.Registry)
104104
require.True(t, ok, "third addon should be Registry")
@@ -137,9 +137,9 @@ func Test_getAddOnsForUpgrade(t *testing.T) {
137137
assert.Nil(t, eco.Proxy, "ECO should not have a proxy")
138138
assert.Equal(t, "replicated/embedded-cluster-operator", eco.ChartLocationOverride)
139139
assert.Equal(t, "1.22.0+k8s-1.30", eco.ChartVersionOverride)
140-
assert.Equal(t, "proxy.replicated.com/anonymous/replicated/embedded-cluster-operator-image", eco.ImageRepoOverride)
140+
assert.Equal(t, "proxy.replicated.com/library/replicated/embedded-cluster-operator-image", eco.ImageRepoOverride)
141141
assert.Equal(t, "1.22.0-k8s-1.30-amd64@sha256:929b6cb42add383a69e3b26790c06320bd4eac0ecd60b509212c1864d69c6a88", eco.ImageTagOverride)
142-
assert.Equal(t, "proxy.replicated.com/anonymous/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70", eco.UtilsImageOverride)
142+
assert.Equal(t, "proxy.replicated.com/library/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70", eco.UtilsImageOverride)
143143

144144
vel, ok := addons[2].(*velero.Velero)
145145
require.True(t, ok, "third addon should be Velero")
@@ -184,9 +184,9 @@ func Test_getAddOnsForUpgrade(t *testing.T) {
184184
assert.Equal(t, "localhost,127.0.0.1", eco.Proxy.NoProxy)
185185
assert.Equal(t, "replicated/embedded-cluster-operator", eco.ChartLocationOverride)
186186
assert.Equal(t, "1.22.0+k8s-1.30", eco.ChartVersionOverride)
187-
assert.Equal(t, "proxy.replicated.com/anonymous/replicated/embedded-cluster-operator-image", eco.ImageRepoOverride)
187+
assert.Equal(t, "proxy.replicated.com/library/replicated/embedded-cluster-operator-image", eco.ImageRepoOverride)
188188
assert.Equal(t, "1.22.0-k8s-1.30-amd64@sha256:929b6cb42add383a69e3b26790c06320bd4eac0ecd60b509212c1864d69c6a88", eco.ImageTagOverride)
189-
assert.Equal(t, "proxy.replicated.com/anonymous/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70", eco.UtilsImageOverride)
189+
assert.Equal(t, "proxy.replicated.com/library/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70", eco.UtilsImageOverride)
190190

191191
reg, ok := addons[2].(*registry.Registry)
192192
require.True(t, ok, "third addon should be Registry")

0 commit comments

Comments
 (0)