From 919997bb0e6d27e4e8866e810a8eb110973b932f Mon Sep 17 00:00:00 2001 From: JGAntunes Date: Thu, 16 Oct 2025 11:51:10 +0100 Subject: [PATCH] chore: use proxy library endpoint for EC images --- Makefile | 4 +- pkg/addons/adminconsole/adminconsole.go | 2 +- pkg/addons/seaweedfs/static/values.tpl.yaml | 2 +- pkg/addons/upgrade_test.go | 20 ++--- pkg/addons/util_test.go | 96 ++++++++++----------- pkg/config/images.go | 11 +-- pkg/config/images_test.go | 2 +- scripts/ci-build-bin.sh | 2 +- 8 files changed, 65 insertions(+), 74 deletions(-) diff --git a/Makefile b/Makefile index 4b73589230..365f66daf8 100644 --- a/Makefile +++ b/Makefile @@ -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 = @@ -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: diff --git a/pkg/addons/adminconsole/adminconsole.go b/pkg/addons/adminconsole/adminconsole.go index 79663a6035..713d558bc4 100644 --- a/pkg/addons/adminconsole/adminconsole.go +++ b/pkg/addons/adminconsole/adminconsole.go @@ -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 != "" { diff --git a/pkg/addons/seaweedfs/static/values.tpl.yaml b/pkg/addons/seaweedfs/static/values.tpl.yaml index 97f1f29b21..975fc5fe6e 100644 --- a/pkg/addons/seaweedfs/static/values.tpl.yaml +++ b/pkg/addons/seaweedfs/static/values.tpl.yaml @@ -2,7 +2,7 @@ global: enableReplication: true replicationPlacment: "001" {{- if .ReplaceImages }} - registry: "proxy.replicated.com/anonymous/" + registry: "proxy.replicated.com/library/" {{- end }} master: diff --git a/pkg/addons/upgrade_test.go b/pkg/addons/upgrade_test.go index 2c4d352335..a62e5a8aa8 100644 --- a/pkg/addons/upgrade_test.go +++ b/pkg/addons/upgrade_test.go @@ -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", }, } @@ -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") @@ -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") @@ -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") @@ -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") diff --git a/pkg/addons/util_test.go b/pkg/addons/util_test.go index 5774003163..dcd16fa2c3 100644 --- a/pkg/addons/util_test.go +++ b/pkg/addons/util_test.go @@ -54,33 +54,33 @@ func Test_operatorImages(t *testing.T) { { name: "normal input", images: []string{ - "proxy.replicated.com/anonymous/kotsadm/kotsadm-migrations:v1.117.3-amd64@sha256:56d2765497a57c06ef6e9f7705cf5218d21a978d197575a3c22fe7d84db07f0a", - "proxy.replicated.com/anonymous/kotsadm/kotsadm:v1.117.3-amd64@sha256:d47ac4df627ac357452efffb717776adb452c3ab9b466ef3ccaf808df722b7a6", - "proxy.replicated.com/anonymous/kotsadm/kurl-proxy:v1.117.3-amd64@sha256:816bcbc273ec51255d7b459e49831ce09fd361db4a295d31f61d7af02177860f", - "proxy.replicated.com/anonymous/kotsadm/rqlite:8.30.4-r0-amd64@sha256:884ac56b236e059e420858c94d90a083fe48b666c8b3433da612b9380906ce41", - "proxy.replicated.com/anonymous/registry.k8s.io/kube-proxy:v1.29.9-amd64@sha256:eb9e12af6de3613c05afcb9743a30589c16454bfa085c3091248a6f55b799304", - "proxy.replicated.com/anonymous/registry.k8s.io/pause:3.9-amd64@sha256:8d4106c88ec0bd28001e34c975d65175d994072d65341f62a8ab0754b0fafe10", - "proxy.replicated.com/anonymous/replicated/ec-calico-cni:3.28.2-r0-amd64@sha256:61de906f9ca1b2abdcca4e15769fa289b2949f0ece27a9247d21a960e70c31eb", - "proxy.replicated.com/anonymous/replicated/ec-calico-kube-controllers:3.28.2-r0-amd64@sha256:10774c8200c36b8e7af3ad9c88bbf637eb553bbe4dc97810aee9d1a899a9da4a", - "proxy.replicated.com/anonymous/replicated/ec-calico-node:3.28.2-r0-amd64@sha256:8946806cce8889d63feb26440e2cb1781b372083d41c882020faaebf834bfa3b", - "proxy.replicated.com/anonymous/replicated/ec-coredns:1.11.3-r7-amd64@sha256:1258b039d78e85c17bec40e587f5cb963998c6039a7d727bef09a84d7eedddba", - "proxy.replicated.com/anonymous/replicated/ec-kubectl:1.31.1-r0-amd64@sha256:92701c7575ffd5ddf025099451add26aa9484c68646d6fc865a7f8b95ccf1168", - "proxy.replicated.com/anonymous/replicated/ec-metrics-server:0.7.2-r1-amd64@sha256:05e3db63e7ecce0a543fad1a3c7292ce14e49efbc2ef65524266990df52c95a5", - "proxy.replicated.com/anonymous/replicated/ec-openebs-linux-utils:4.1.1-amd64@sha256:aecf4bc398935bc74d7b1c008b5394ba01fea8d25d79d758666de8e6dc9994fb", - "proxy.replicated.com/anonymous/replicated/ec-openebs-provisioner-localpv:4.1.1-r0-amd64@sha256:de7f0330f19d50d9f1f804ae44d388998a2d1d1eb11e45965005404463f0d0bd", - "proxy.replicated.com/anonymous/replicated/ec-registry:2.8.3-r0@sha256:5b76ebd0a362009e31a05ac487c690f5ece0e11f6c4d9261ca63a3f162b57660", - "proxy.replicated.com/anonymous/replicated/ec-seaweedfs:3.71-r1-amd64@sha256:fe06f85b49d3cf35718a62851e4712617fbeca16fb9100fdd8bfd09c202b98dc", - "proxy.replicated.com/anonymous/replicated/embedded-cluster-utils:latest-amd64@sha256:2f3c5d81565eae3aea22f408af9a8ee91cd4ba010612c50c6be564869390639f", - "proxy.replicated.com/anonymous/replicated/ec-velero-plugin-for-aws:1.10.1-r1-amd64@sha256:0766116b831d1028bfc8a47ed6c9c23a2890ae013592a5ef7eb613b9c70e5f97", - "proxy.replicated.com/anonymous/replicated/ec-velero-restore-helper:1.14.1-r1-amd64@sha256:aef818ef819274578240a8dfaf70546c762db98090d292ab3e8e44a6658fae95", - "proxy.replicated.com/anonymous/replicated/ec-velero:1.14.1-r1-amd64@sha256:9a3b8341b74cef8deadea4b3cbaa1d91a0cda06a57821a0dc376428ef44ddfe7", - "proxy.replicated.com/anonymous/replicated/embedded-cluster-local-artifact-mirror:v1.14.2-k8s-1.29@sha256:54463ce6b6fba13a25138890aa1ac28ae4f93f53cdb78a99d15abfdc1b5eddf5", - "proxy.replicated.com/anonymous/replicated/embedded-cluster-operator-image:v1.14.2-k8s-1.29-amd64@sha256:45a45e2ec6b73d2db029354cccfe7eb150dd7ef9dffe806db36de9b9ba0a66c6", + "proxy.replicated.com/library/kotsadm/kotsadm-migrations:v1.117.3-amd64@sha256:56d2765497a57c06ef6e9f7705cf5218d21a978d197575a3c22fe7d84db07f0a", + "proxy.replicated.com/library/kotsadm/kotsadm:v1.117.3-amd64@sha256:d47ac4df627ac357452efffb717776adb452c3ab9b466ef3ccaf808df722b7a6", + "proxy.replicated.com/library/kotsadm/kurl-proxy:v1.117.3-amd64@sha256:816bcbc273ec51255d7b459e49831ce09fd361db4a295d31f61d7af02177860f", + "proxy.replicated.com/library/kotsadm/rqlite:8.30.4-r0-amd64@sha256:884ac56b236e059e420858c94d90a083fe48b666c8b3433da612b9380906ce41", + "proxy.replicated.com/library/registry.k8s.io/kube-proxy:v1.29.9-amd64@sha256:eb9e12af6de3613c05afcb9743a30589c16454bfa085c3091248a6f55b799304", + "proxy.replicated.com/library/registry.k8s.io/pause:3.9-amd64@sha256:8d4106c88ec0bd28001e34c975d65175d994072d65341f62a8ab0754b0fafe10", + "proxy.replicated.com/library/replicated/ec-calico-cni:3.28.2-r0-amd64@sha256:61de906f9ca1b2abdcca4e15769fa289b2949f0ece27a9247d21a960e70c31eb", + "proxy.replicated.com/library/replicated/ec-calico-kube-controllers:3.28.2-r0-amd64@sha256:10774c8200c36b8e7af3ad9c88bbf637eb553bbe4dc97810aee9d1a899a9da4a", + "proxy.replicated.com/library/replicated/ec-calico-node:3.28.2-r0-amd64@sha256:8946806cce8889d63feb26440e2cb1781b372083d41c882020faaebf834bfa3b", + "proxy.replicated.com/library/replicated/ec-coredns:1.11.3-r7-amd64@sha256:1258b039d78e85c17bec40e587f5cb963998c6039a7d727bef09a84d7eedddba", + "proxy.replicated.com/library/replicated/ec-kubectl:1.31.1-r0-amd64@sha256:92701c7575ffd5ddf025099451add26aa9484c68646d6fc865a7f8b95ccf1168", + "proxy.replicated.com/library/replicated/ec-metrics-server:0.7.2-r1-amd64@sha256:05e3db63e7ecce0a543fad1a3c7292ce14e49efbc2ef65524266990df52c95a5", + "proxy.replicated.com/library/replicated/ec-openebs-linux-utils:4.1.1-amd64@sha256:aecf4bc398935bc74d7b1c008b5394ba01fea8d25d79d758666de8e6dc9994fb", + "proxy.replicated.com/library/replicated/ec-openebs-provisioner-localpv:4.1.1-r0-amd64@sha256:de7f0330f19d50d9f1f804ae44d388998a2d1d1eb11e45965005404463f0d0bd", + "proxy.replicated.com/library/replicated/ec-registry:2.8.3-r0@sha256:5b76ebd0a362009e31a05ac487c690f5ece0e11f6c4d9261ca63a3f162b57660", + "proxy.replicated.com/library/replicated/ec-seaweedfs:3.71-r1-amd64@sha256:fe06f85b49d3cf35718a62851e4712617fbeca16fb9100fdd8bfd09c202b98dc", + "proxy.replicated.com/library/replicated/embedded-cluster-utils:latest-amd64@sha256:2f3c5d81565eae3aea22f408af9a8ee91cd4ba010612c50c6be564869390639f", + "proxy.replicated.com/library/replicated/ec-velero-plugin-for-aws:1.10.1-r1-amd64@sha256:0766116b831d1028bfc8a47ed6c9c23a2890ae013592a5ef7eb613b9c70e5f97", + "proxy.replicated.com/library/replicated/ec-velero-restore-helper:1.14.1-r1-amd64@sha256:aef818ef819274578240a8dfaf70546c762db98090d292ab3e8e44a6658fae95", + "proxy.replicated.com/library/replicated/ec-velero:1.14.1-r1-amd64@sha256:9a3b8341b74cef8deadea4b3cbaa1d91a0cda06a57821a0dc376428ef44ddfe7", + "proxy.replicated.com/library/replicated/embedded-cluster-local-artifact-mirror:v1.14.2-k8s-1.29@sha256:54463ce6b6fba13a25138890aa1ac28ae4f93f53cdb78a99d15abfdc1b5eddf5", + "proxy.replicated.com/library/replicated/embedded-cluster-operator-image:v1.14.2-k8s-1.29-amd64@sha256:45a45e2ec6b73d2db029354cccfe7eb150dd7ef9dffe806db36de9b9ba0a66c6", }, domains: ecv1beta1.Domains{}, - wantRepo: "proxy.replicated.com/anonymous/replicated/embedded-cluster-operator-image", + wantRepo: "proxy.replicated.com/library/replicated/embedded-cluster-operator-image", wantTag: "v1.14.2-k8s-1.29-amd64@sha256:45a45e2ec6b73d2db029354cccfe7eb150dd7ef9dffe806db36de9b9ba0a66c6", - wantUtilsImage: "proxy.replicated.com/anonymous/replicated/embedded-cluster-utils:latest-amd64@sha256:2f3c5d81565eae3aea22f408af9a8ee91cd4ba010612c50c6be564869390639f", + wantUtilsImage: "proxy.replicated.com/library/replicated/embedded-cluster-utils:latest-amd64@sha256:2f3c5d81565eae3aea22f408af9a8ee91cd4ba010612c50c6be564869390639f", }, { name: "images with proxy registry", @@ -98,35 +98,35 @@ func Test_operatorImages(t *testing.T) { { name: "normal input with proxy registry", images: []string{ - "proxy.replicated.com/anonymous/kotsadm/kotsadm-migrations:v1.117.3-amd64@sha256:56d2765497a57c06ef6e9f7705cf5218d21a978d197575a3c22fe7d84db07f0a", - "proxy.replicated.com/anonymous/kotsadm/kotsadm:v1.117.3-amd64@sha256:d47ac4df627ac357452efffb717776adb452c3ab9b466ef3ccaf808df722b7a6", - "proxy.replicated.com/anonymous/kotsadm/kurl-proxy:v1.117.3-amd64@sha256:816bcbc273ec51255d7b459e49831ce09fd361db4a295d31f61d7af02177860f", - "proxy.replicated.com/anonymous/kotsadm/rqlite:8.30.4-r0-amd64@sha256:884ac56b236e059e420858c94d90a083fe48b666c8b3433da612b9380906ce41", - "proxy.replicated.com/anonymous/registry.k8s.io/kube-proxy:v1.29.9-amd64@sha256:eb9e12af6de3613c05afcb9743a30589c16454bfa085c3091248a6f55b799304", - "proxy.replicated.com/anonymous/registry.k8s.io/pause:3.9-amd64@sha256:8d4106c88ec0bd28001e34c975d65175d994072d65341f62a8ab0754b0fafe10", - "proxy.replicated.com/anonymous/replicated/ec-calico-cni:3.28.2-r0-amd64@sha256:61de906f9ca1b2abdcca4e15769fa289b2949f0ece27a9247d21a960e70c31eb", - "proxy.replicated.com/anonymous/replicated/ec-calico-kube-controllers:3.28.2-r0-amd64@sha256:10774c8200c36b8e7af3ad9c88bbf637eb553bbe4dc97810aee9d1a899a9da4a", - "proxy.replicated.com/anonymous/replicated/ec-calico-node:3.28.2-r0-amd64@sha256:8946806cce8889d63feb26440e2cb1781b372083d41c882020faaebf834bfa3b", - "proxy.replicated.com/anonymous/replicated/ec-coredns:1.11.3-r7-amd64@sha256:1258b039d78e85c17bec40e587f5cb963998c6039a7d727bef09a84d7eedddba", - "proxy.replicated.com/anonymous/replicated/ec-kubectl:1.31.1-r0-amd64@sha256:92701c7575ffd5ddf025099451add26aa9484c68646d6fc865a7f8b95ccf1168", - "proxy.replicated.com/anonymous/replicated/ec-metrics-server:0.7.2-r1-amd64@sha256:05e3db63e7ecce0a543fad1a3c7292ce14e49efbc2ef65524266990df52c95a5", - "proxy.replicated.com/anonymous/replicated/ec-openebs-linux-utils:4.1.1-amd64@sha256:aecf4bc398935bc74d7b1c008b5394ba01fea8d25d79d758666de8e6dc9994fb", - "proxy.replicated.com/anonymous/replicated/ec-openebs-provisioner-localpv:4.1.1-r0-amd64@sha256:de7f0330f19d50d9f1f804ae44d388998a2d1d1eb11e45965005404463f0d0bd", - "proxy.replicated.com/anonymous/replicated/ec-registry:2.8.3-r0@sha256:5b76ebd0a362009e31a05ac487c690f5ece0e11f6c4d9261ca63a3f162b57660", - "proxy.replicated.com/anonymous/replicated/ec-seaweedfs:3.71-r1-amd64@sha256:fe06f85b49d3cf35718a62851e4712617fbeca16fb9100fdd8bfd09c202b98dc", - "proxy.replicated.com/anonymous/replicated/embedded-cluster-utils:latest-amd64@sha256:2f3c5d81565eae3aea22f408af9a8ee91cd4ba010612c50c6be564869390639f", - "proxy.replicated.com/anonymous/replicated/ec-velero-plugin-for-aws:1.10.1-r1-amd64@sha256:0766116b831d1028bfc8a47ed6c9c23a2890ae013592a5ef7eb613b9c70e5f97", - "proxy.replicated.com/anonymous/replicated/ec-velero-restore-helper:1.14.1-r1-amd64@sha256:aef818ef819274578240a8dfaf70546c762db98090d292ab3e8e44a6658fae95", - "proxy.replicated.com/anonymous/replicated/ec-velero:1.14.1-r1-amd64@sha256:9a3b8341b74cef8deadea4b3cbaa1d91a0cda06a57821a0dc376428ef44ddfe7", - "proxy.replicated.com/anonymous/replicated/embedded-cluster-local-artifact-mirror:v1.14.2-k8s-1.29@sha256:54463ce6b6fba13a25138890aa1ac28ae4f93f53cdb78a99d15abfdc1b5eddf5", - "proxy.replicated.com/anonymous/replicated/embedded-cluster-operator-image:v1.14.2-k8s-1.29-amd64@sha256:45a45e2ec6b73d2db029354cccfe7eb150dd7ef9dffe806db36de9b9ba0a66c6", + "proxy.replicated.com/library/kotsadm/kotsadm-migrations:v1.117.3-amd64@sha256:56d2765497a57c06ef6e9f7705cf5218d21a978d197575a3c22fe7d84db07f0a", + "proxy.replicated.com/library/kotsadm/kotsadm:v1.117.3-amd64@sha256:d47ac4df627ac357452efffb717776adb452c3ab9b466ef3ccaf808df722b7a6", + "proxy.replicated.com/library/kotsadm/kurl-proxy:v1.117.3-amd64@sha256:816bcbc273ec51255d7b459e49831ce09fd361db4a295d31f61d7af02177860f", + "proxy.replicated.com/library/kotsadm/rqlite:8.30.4-r0-amd64@sha256:884ac56b236e059e420858c94d90a083fe48b666c8b3433da612b9380906ce41", + "proxy.replicated.com/library/registry.k8s.io/kube-proxy:v1.29.9-amd64@sha256:eb9e12af6de3613c05afcb9743a30589c16454bfa085c3091248a6f55b799304", + "proxy.replicated.com/library/registry.k8s.io/pause:3.9-amd64@sha256:8d4106c88ec0bd28001e34c975d65175d994072d65341f62a8ab0754b0fafe10", + "proxy.replicated.com/library/replicated/ec-calico-cni:3.28.2-r0-amd64@sha256:61de906f9ca1b2abdcca4e15769fa289b2949f0ece27a9247d21a960e70c31eb", + "proxy.replicated.com/library/replicated/ec-calico-kube-controllers:3.28.2-r0-amd64@sha256:10774c8200c36b8e7af3ad9c88bbf637eb553bbe4dc97810aee9d1a899a9da4a", + "proxy.replicated.com/library/replicated/ec-calico-node:3.28.2-r0-amd64@sha256:8946806cce8889d63feb26440e2cb1781b372083d41c882020faaebf834bfa3b", + "proxy.replicated.com/library/replicated/ec-coredns:1.11.3-r7-amd64@sha256:1258b039d78e85c17bec40e587f5cb963998c6039a7d727bef09a84d7eedddba", + "proxy.replicated.com/library/replicated/ec-kubectl:1.31.1-r0-amd64@sha256:92701c7575ffd5ddf025099451add26aa9484c68646d6fc865a7f8b95ccf1168", + "proxy.replicated.com/library/replicated/ec-metrics-server:0.7.2-r1-amd64@sha256:05e3db63e7ecce0a543fad1a3c7292ce14e49efbc2ef65524266990df52c95a5", + "proxy.replicated.com/library/replicated/ec-openebs-linux-utils:4.1.1-amd64@sha256:aecf4bc398935bc74d7b1c008b5394ba01fea8d25d79d758666de8e6dc9994fb", + "proxy.replicated.com/library/replicated/ec-openebs-provisioner-localpv:4.1.1-r0-amd64@sha256:de7f0330f19d50d9f1f804ae44d388998a2d1d1eb11e45965005404463f0d0bd", + "proxy.replicated.com/library/replicated/ec-registry:2.8.3-r0@sha256:5b76ebd0a362009e31a05ac487c690f5ece0e11f6c4d9261ca63a3f162b57660", + "proxy.replicated.com/library/replicated/ec-seaweedfs:3.71-r1-amd64@sha256:fe06f85b49d3cf35718a62851e4712617fbeca16fb9100fdd8bfd09c202b98dc", + "proxy.replicated.com/library/replicated/embedded-cluster-utils:latest-amd64@sha256:2f3c5d81565eae3aea22f408af9a8ee91cd4ba010612c50c6be564869390639f", + "proxy.replicated.com/library/replicated/ec-velero-plugin-for-aws:1.10.1-r1-amd64@sha256:0766116b831d1028bfc8a47ed6c9c23a2890ae013592a5ef7eb613b9c70e5f97", + "proxy.replicated.com/library/replicated/ec-velero-restore-helper:1.14.1-r1-amd64@sha256:aef818ef819274578240a8dfaf70546c762db98090d292ab3e8e44a6658fae95", + "proxy.replicated.com/library/replicated/ec-velero:1.14.1-r1-amd64@sha256:9a3b8341b74cef8deadea4b3cbaa1d91a0cda06a57821a0dc376428ef44ddfe7", + "proxy.replicated.com/library/replicated/embedded-cluster-local-artifact-mirror:v1.14.2-k8s-1.29@sha256:54463ce6b6fba13a25138890aa1ac28ae4f93f53cdb78a99d15abfdc1b5eddf5", + "proxy.replicated.com/library/replicated/embedded-cluster-operator-image:v1.14.2-k8s-1.29-amd64@sha256:45a45e2ec6b73d2db029354cccfe7eb150dd7ef9dffe806db36de9b9ba0a66c6", }, domains: ecv1beta1.Domains{ ProxyRegistryDomain: "myproxy.test", }, - wantRepo: "myproxy.test/anonymous/replicated/embedded-cluster-operator-image", + wantRepo: "myproxy.test/library/replicated/embedded-cluster-operator-image", wantTag: "v1.14.2-k8s-1.29-amd64@sha256:45a45e2ec6b73d2db029354cccfe7eb150dd7ef9dffe806db36de9b9ba0a66c6", - wantUtilsImage: "myproxy.test/anonymous/replicated/embedded-cluster-utils:latest-amd64@sha256:2f3c5d81565eae3aea22f408af9a8ee91cd4ba010612c50c6be564869390639f", + wantUtilsImage: "myproxy.test/library/replicated/embedded-cluster-utils:latest-amd64@sha256:2f3c5d81565eae3aea22f408af9a8ee91cd4ba010612c50c6be564869390639f", }, } for _, tt := range tests { diff --git a/pkg/config/images.go b/pkg/config/images.go index 304cc993dd..6d8737ee85 100644 --- a/pkg/config/images.go +++ b/pkg/config/images.go @@ -5,7 +5,6 @@ import ( "github.com/k0sproject/k0s/pkg/airgap" k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1" - "github.com/k0sproject/k0s/pkg/constant" "github.com/replicatedhq/embedded-cluster/pkg/helpers" ) @@ -19,15 +18,7 @@ func ListK0sImages(cfg *k0sv1beta1.ClusterConfig) []string { cfg.Spec.Images.Konnectivity.URI(), cfg.Spec.Images.PushGateway.URI(): default: - if strings.Contains(image, constant.KubePauseContainerImage) { - // there's a bug in GetImageURIs where it always returns the original pause image - // instead of the one in the config, make sure to use the one in the config. - // This has been fixed in k0s 1.31, so we can drop it once we drop support for older k0s versions - // https://github.com/k0sproject/k0s/pull/5520 - images = append(images, cfg.Spec.Images.Pause.URI()) - } else { - images = append(images, image) - } + images = append(images, image) } } return images diff --git a/pkg/config/images_test.go b/pkg/config/images_test.go index f5e2a2aa9a..7f237a2c2b 100644 --- a/pkg/config/images_test.go +++ b/pkg/config/images_test.go @@ -48,7 +48,7 @@ func TestListK0sImages(t *testing.T) { } // make sure images are proxied - rx := regexp.MustCompile("proxy.replicated.com/(anonymous|library)/") + rx := regexp.MustCompile("proxy.replicated.com/library/") for _, image := range filtered { assert.Regexp(t, rx, image, "image %s should be proxied", image) } diff --git a/scripts/ci-build-bin.sh b/scripts/ci-build-bin.sh index a118104d88..b29114e5dd 100755 --- a/scripts/ci-build-bin.sh +++ b/scripts/ci-build-bin.sh @@ -60,7 +60,7 @@ function binary() { kots_binary_url="https://$S3_BUCKET.s3.amazonaws.com/kots-binaries/$(url_encode_semver "$(make print-KOTS_VERSION)")-$ARCH.tar.gz" operator_binary_url="https://$S3_BUCKET.s3.amazonaws.com/operator-binaries/$(url_encode_semver "$EC_VERSION")-$ARCH.tar.gz" fi - local_artifact_mirror_image="proxy.replicated.com/anonymous/$(cat local-artifact-mirror/build/image)" + local_artifact_mirror_image="proxy.replicated.com/library/$(cat local-artifact-mirror/build/image)" make "embedded-cluster-linux-$ARCH" \ K0S_VERSION="$K0S_VERSION" \