Skip to content

chore: use proxy library endpoint for EC images #3065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: use proxy library endpoint for EC images #3065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE =

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

.PHONY: clean
clean:
Expand Down
2 changes: 1 addition & 1 deletion pkg/addons/adminconsole/adminconsole.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ func getBackupLabels() map[string]string {
func (a *AdminConsole) ChartLocation(domains ecv1beta1.Domains) string {
chartName := Metadata.Location
if AdminConsoleChartRepoOverride != "" {
chartName = fmt.Sprintf("oci://proxy.replicated.com/anonymous/%s", AdminConsoleChartRepoOverride)
chartName = fmt.Sprintf("oci://proxy.replicated.com/library/%s", AdminConsoleChartRepoOverride)
}

if domains.ProxyRegistryDomain != "" {
Expand Down
2 changes: 1 addition & 1 deletion pkg/addons/seaweedfs/static/values.tpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ global:
enableReplication: true
replicationPlacment: "001"
{{- if .ReplaceImages }}
registry: "proxy.replicated.com/anonymous/"
registry: "proxy.replicated.com/library/"
{{- end }}

master:
Expand Down
20 changes: 10 additions & 10 deletions pkg/addons/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ func Test_getAddOnsForUpgrade(t *testing.T) {
},
},
Images: []string{
"proxy.replicated.com/anonymous/replicated/embedded-cluster-operator-image:1.22.0-k8s-1.30-amd64@sha256:929b6cb42add383a69e3b26790c06320bd4eac0ecd60b509212c1864d69c6a88",
"proxy.replicated.com/anonymous/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70",
"proxy.replicated.com/library/replicated/embedded-cluster-operator-image:1.22.0-k8s-1.30-amd64@sha256:929b6cb42add383a69e3b26790c06320bd4eac0ecd60b509212c1864d69c6a88",
"proxy.replicated.com/library/replicated/embedded-cluster-utils:latest-amd64@sha256:f499ed26bd5899bc5a1ae14d9d13853d1fc615ae21bde86fe250960772fd2c70",
},
}

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

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

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

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

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