diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml index 4e40b9762..18ef8c100 100644 --- a/.github/workflows/dependencies.yaml +++ b/.github/workflows/dependencies.yaml @@ -31,8 +31,7 @@ jobs: K0S_MINOR_VERSION=$(make print-K0S_MINOR_VERSION) fi echo "k0s minor version: $K0S_MINOR_VERSION" - ./scripts/k0s-update-dependencies.sh "$K0S_MINOR_VERSION" \ - UPDATE_ALL_IMAGES=true + ./scripts/k0s-update-dependencies.sh "$K0S_MINOR_VERSION" - name: Troubleshoot env: diff --git a/.github/workflows/image-deps-updater.yaml b/.github/workflows/image-deps-updater.yaml index 4340e5874..f3a95613d 100644 --- a/.github/workflows/image-deps-updater.yaml +++ b/.github/workflows/image-deps-updater.yaml @@ -145,8 +145,7 @@ jobs: if [ -n "${{ github.event.inputs.k0s_minor_version }}" ]; then k0s_minor_version="${{ github.event.inputs.k0s_minor_version }}" fi - ./scripts/k0s-update-images.sh "$k0s_minor_version" \ - UPDATE_ALL_IMAGES=true + UPDATE_ALL_IMAGES=true ./scripts/k0s-update-images.sh "$k0s_minor_version" - name: Determine target branch id: determine-target diff --git a/cmd/buildtools/adminconsole.go b/cmd/buildtools/adminconsole.go index f42c8c049..000282522 100644 --- a/cmd/buildtools/adminconsole.go +++ b/cmd/buildtools/adminconsole.go @@ -58,10 +58,12 @@ var updateAdminConsoleAddonCommand = &cli.Command{ return nil } - upstream := "registry.replicated.com/library/admin-console" + upstream := "proxy.replicated.com/library/admin-console" + withproto := fmt.Sprintf("oci://%s", upstream) + newmeta := release.AddonMetadata{ Version: latest, - Location: fmt.Sprintf("oci://proxy.replicated.com/anonymous/%s", upstream), + Location: withproto, Images: make(map[string]release.AddonImage), } @@ -71,7 +73,6 @@ var updateAdminConsoleAddonCommand = &cli.Command{ } logrus.Infof("extracting images from chart") - withproto := fmt.Sprintf("oci://%s", upstream) images, err := helm.ExtractImagesFromChart(hcli, withproto, latest, values) if err != nil { return fmt.Errorf("failed to get images from admin console chart: %w", err) diff --git a/cmd/buildtools/embeddedclusteroperator.go b/cmd/buildtools/embeddedclusteroperator.go index c8e3f47df..da89ad778 100644 --- a/cmd/buildtools/embeddedclusteroperator.go +++ b/cmd/buildtools/embeddedclusteroperator.go @@ -18,11 +18,11 @@ var operatorImageComponents = map[string]addonComponent{ name: "embedded-cluster-operator", useUpstreamImage: true, }, - "registry.replicated.com/library/embedded-cluster-utils": { + "proxy.replicated.com/library/embedded-cluster-utils": { name: "utils", useUpstreamImage: true, }, - "registry.replicated.com/library/goldpinger": { + "proxy.replicated.com/library/goldpinger": { name: "goldpinger", useUpstreamImage: true, }, @@ -64,11 +64,11 @@ var updateOperatorAddonCommand = &cli.Command{ if chartURL != "" { logrus.Infof("using input override from INPUT_OPERATOR_CHART_URL: %s", chartURL) chartURL = strings.TrimPrefix(chartURL, "oci://") - chartURL = strings.TrimPrefix(chartURL, "proxy.replicated.com/anonymous/") } else { - chartURL = "registry.replicated.com/library/embedded-cluster-operator" + chartURL = "proxy.replicated.com/library/embedded-cluster-operator" } - chartURL = fmt.Sprintf("oci://proxy.replicated.com/anonymous/%s", chartURL) + chartURL = addProxyAnonymousPrefix(chartURL) + chartURL = fmt.Sprintf("oci://%s", chartURL) imageOverride := os.Getenv("INPUT_OPERATOR_IMAGE") if imageOverride != "" { @@ -136,8 +136,8 @@ func updateOperatorAddonImages(ctx context.Context, hcli helm.Client, chartURL s } // make sure we include the operator util and goldpinger images as they don't show up when rendering the helm chart. - images = append(images, "registry.replicated.com/library/embedded-cluster-utils:latest") - images = append(images, "registry.replicated.com/library/goldpinger:latest") + images = append(images, "proxy.replicated.com/library/embedded-cluster-utils:latest") + images = append(images, "proxy.replicated.com/library/goldpinger:latest") metaImages, err := UpdateImages(ctx, operatorImageComponents, embeddedclusteroperator.Metadata.Images, images, filteredImages) if err != nil { diff --git a/cmd/buildtools/k0s.go b/cmd/buildtools/k0s.go index 774d46c35..8fdb8cd14 100644 --- a/cmd/buildtools/k0s.go +++ b/cmd/buildtools/k0s.go @@ -18,7 +18,7 @@ var k0sImageComponents = map[string]addonComponent{ "quay.io/k0sproject/coredns": { name: "coredns", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/coredns" + ref := "proxy.replicated.com/library/coredns" return getLatestImageNameAndTag(opts.ctx, ref, nil) }, }, @@ -29,7 +29,7 @@ var k0sImageComponents = map[string]addonComponent{ if err != nil { return "", fmt.Errorf("failed to get calico release: %w", err) } - return fmt.Sprintf("registry.replicated.com/library/calico-node:%s", tag), nil + return fmt.Sprintf("proxy.replicated.com/library/calico-node:%s", tag), nil }, }, "quay.io/k0sproject/calico-cni": { @@ -39,7 +39,7 @@ var k0sImageComponents = map[string]addonComponent{ if err != nil { return "", fmt.Errorf("failed to get calico tag: %w", err) } - return fmt.Sprintf("registry.replicated.com/library/calico-cni:%s", tag), nil + return fmt.Sprintf("proxy.replicated.com/library/calico-cni:%s", tag), nil }, }, "quay.io/k0sproject/calico-kube-controllers": { @@ -49,27 +49,27 @@ var k0sImageComponents = map[string]addonComponent{ if err != nil { return "", fmt.Errorf("failed to get calico tag: %w", err) } - return fmt.Sprintf("registry.replicated.com/library/calico-kube-controllers:%s", tag), nil + return fmt.Sprintf("proxy.replicated.com/library/calico-kube-controllers:%s", tag), nil }, }, "registry.k8s.io/metrics-server/metrics-server": { name: "metrics-server", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/metrics-server" + ref := "proxy.replicated.com/library/metrics-server" return getLatestImageNameAndTag(opts.ctx, ref, nil) }, }, "quay.io/k0sproject/metrics-server": { name: "metrics-server", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/metrics-server" + ref := "proxy.replicated.com/library/metrics-server" return getLatestImageNameAndTag(opts.ctx, ref, nil) }, }, "quay.io/k0sproject/kube-proxy": { name: "kube-proxy", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/kube-proxy" + ref := "proxy.replicated.com/library/kube-proxy" constraints := mustParseSemverConstraints(latestPatchConstraint(opts.upstreamVersion)) return getLatestImageNameAndTag(opts.ctx, ref, constraints) }, @@ -79,8 +79,9 @@ var k0sImageComponents = map[string]addonComponent{ "quay.io/k0sproject/envoy-distroless": { name: "envoy-distroless", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/envoy" - return getLatestImageNameAndTag(opts.ctx, ref, nil) + ref := "proxy.replicated.com/library/envoy" + constraints := mustParseSemverConstraints(latestPatchConstraint(opts.upstreamVersion)) + return getLatestImageNameAndTag(opts.ctx, ref, constraints) }, }, } @@ -95,7 +96,7 @@ var pauseComponent = addonComponent{ return "", fmt.Errorf("failed to parse pause version: %w", err) } - ref := "registry.replicated.com/library/pause" + ref := "proxy.replicated.com/library/pause" constraints := mustParseSemverConstraints(latestPatchConstraint(sv)) return getLatestImageNameAndTag(opts.ctx, ref, constraints) }, diff --git a/cmd/buildtools/openebs.go b/cmd/buildtools/openebs.go index 76ab36b97..ebaf4ccb2 100644 --- a/cmd/buildtools/openebs.go +++ b/cmd/buildtools/openebs.go @@ -24,7 +24,7 @@ var openebsImageComponents = map[string]addonComponent{ "docker.io/openebs/provisioner-localpv": { name: "openebs-provisioner-localpv", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/openebs-provisioner-localpv" + ref := "proxy.replicated.com/library/openebs-provisioner-localpv" constraints := mustParseSemverConstraints(latestPatchConstraint(opts.upstreamVersion)) return getLatestImageNameAndTag(opts.ctx, ref, constraints) }, @@ -33,7 +33,7 @@ var openebsImageComponents = map[string]addonComponent{ "docker.io/openebs/linux-utils": { name: "openebs-linux-utils", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/openebs-linux-utils" + ref := "proxy.replicated.com/library/openebs-linux-utils" constraints := mustParseSemverConstraints(latestPatchConstraint(opts.upstreamVersion)) return getLatestImageNameAndTag(opts.ctx, ref, constraints) }, @@ -42,7 +42,7 @@ var openebsImageComponents = map[string]addonComponent{ "docker.io/bitnamilegacy/kubectl": { name: "kubectl", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/kubectl" + ref := "proxy.replicated.com/library/kubectl" constraints := mustParseSemverConstraints(latestPatchConstraint(opts.upstreamVersion)) return getLatestImageNameAndTag(opts.ctx, ref, constraints) }, @@ -51,7 +51,7 @@ var openebsImageComponents = map[string]addonComponent{ "docker.io/openebs/kubectl": { name: "kubectl", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/kubectl" + ref := "proxy.replicated.com/library/kubectl" return getLatestImageNameAndTag(opts.ctx, ref, nil) }, upstreamVersionInputOverride: "INPUT_KUBECTL_VERSION", @@ -97,7 +97,8 @@ var updateOpenEBSAddonCommand = &cli.Command{ } upstream := fmt.Sprintf("%s/openebs", os.Getenv("CHARTS_DESTINATION")) - withproto := fmt.Sprintf("oci://proxy.replicated.com/anonymous/%s", upstream) + upstream = addProxyAnonymousPrefix(upstream) + withproto := fmt.Sprintf("oci://%s", upstream) linuxUtilsVersion, err := findOpenEBSLinuxUtilsVersionFromChart(hcli, withproto, nextChartVersion) if err != nil { diff --git a/cmd/buildtools/registry.go b/cmd/buildtools/registry.go index ea5ad540e..bedc6f48f 100644 --- a/cmd/buildtools/registry.go +++ b/cmd/buildtools/registry.go @@ -24,7 +24,7 @@ var registryImageComponents = map[string]addonComponent{ "docker.io/library/registry": { name: "registry", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/registry" + ref := "proxy.replicated.com/library/registry" // TODO: unpin this return fmt.Sprintf("%s:%s", ref, "2.8.3"), nil // constraints := mustParseSemverConstraints(latestPatchConstraint(opts.upstreamVersion)) @@ -73,7 +73,8 @@ var updateRegistryAddonCommand = &cli.Command{ } upstream := fmt.Sprintf("%s/docker-registry", os.Getenv("CHARTS_DESTINATION")) - withproto := fmt.Sprintf("oci://proxy.replicated.com/anonymous/%s", upstream) + upstream = addProxyAnonymousPrefix(upstream) + withproto := fmt.Sprintf("oci://%s", upstream) logrus.Infof("updating registry images") diff --git a/cmd/buildtools/seaweedfs.go b/cmd/buildtools/seaweedfs.go index 0d9d2ad56..004d4380e 100644 --- a/cmd/buildtools/seaweedfs.go +++ b/cmd/buildtools/seaweedfs.go @@ -23,7 +23,7 @@ var seaweedfsImageComponents = map[string]addonComponent{ "docker.io/chrislusf/seaweedfs": { name: "seaweedfs", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/seaweedfs" + ref := "proxy.replicated.com/library/seaweedfs" constraints := mustParseSemverConstraints(latestPatchConstraint(opts.upstreamVersion)) return getLatestImageNameAndTag(opts.ctx, ref, constraints) }, @@ -70,7 +70,8 @@ var updateSeaweedFSAddonCommand = &cli.Command{ } upstream := fmt.Sprintf("%s/seaweedfs", os.Getenv("CHARTS_DESTINATION")) - withproto := fmt.Sprintf("oci://proxy.replicated.com/anonymous/%s", upstream) + upstream = addProxyAnonymousPrefix(upstream) + withproto := fmt.Sprintf("oci://%s", upstream) logrus.Infof("updating seaweedfs images") diff --git a/cmd/buildtools/velero.go b/cmd/buildtools/velero.go index 8bf98f48b..ec5bc9ef3 100644 --- a/cmd/buildtools/velero.go +++ b/cmd/buildtools/velero.go @@ -25,7 +25,7 @@ var veleroImageComponents = map[string]addonComponent{ "docker.io/velero/velero": { name: "velero", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/velero" + ref := "proxy.replicated.com/library/velero" constraints := mustParseSemverConstraints(latestPatchConstraint(opts.upstreamVersion)) return getLatestImageNameAndTag(opts.ctx, ref, constraints) }, @@ -34,7 +34,7 @@ var veleroImageComponents = map[string]addonComponent{ "docker.io/velero/velero-plugin-for-aws": { name: "velero-plugin-for-aws", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/velero-plugin-for-aws" + ref := "proxy.replicated.com/library/velero-plugin-for-aws" constraints := mustParseSemverConstraints(latestPatchConstraint(opts.upstreamVersion)) return getLatestImageNameAndTag(opts.ctx, ref, constraints) }, @@ -43,7 +43,7 @@ var veleroImageComponents = map[string]addonComponent{ "docker.io/bitnamilegacy/kubectl": { name: "kubectl", getCustomImageName: func(opts addonComponentOptions) (string, error) { - ref := "registry.replicated.com/library/kubectl" + ref := "proxy.replicated.com/library/kubectl" return getLatestImageNameAndTag(opts.ctx, ref, nil) }, upstreamVersionInputOverride: "INPUT_KUBECTL_VERSION", @@ -93,7 +93,8 @@ var updateVeleroAddonCommand = &cli.Command{ } upstream := fmt.Sprintf("%s/velero", os.Getenv("CHARTS_DESTINATION")) - withproto := fmt.Sprintf("oci://proxy.replicated.com/anonymous/%s", upstream) + upstream = addProxyAnonymousPrefix(upstream) + withproto := fmt.Sprintf("oci://%s", upstream) veleroVersion, err := findVeleroVersionFromChart(c.Context, hcli, withproto, nextChartVersion) if err != nil { diff --git a/e2e/cluster/cmx/cluster.go b/e2e/cluster/cmx/cluster.go index 9c43b9ddb..971a29b9a 100644 --- a/e2e/cluster/cmx/cluster.go +++ b/e2e/cluster/cmx/cluster.go @@ -149,7 +149,7 @@ func NewNodes(in *ClusterInput) ([]Node, error) { privateIP, err := discoverPrivateIP(nodes[i]) if err != nil { - return nil, fmt.Errorf("discover node private IP: %v", err) + return nodes, fmt.Errorf("discover node private IP: %v", err) } nodes[i].privateIP = privateIP @@ -612,9 +612,14 @@ func (c *Cluster) waitUntilRunning(node Node, nodeNum int, timeoutDuration time. } func (c *Cluster) CollectNetworkReport() ([]NetworkEvent, error) { - output, err := exec.Command("replicated", "network", "report", fmt.Sprintf("--id=%v", c.network.ID)).Output() + cmd := exec.Command("replicated", "network", "report", fmt.Sprintf("--id=%v", c.network.ID)) + + var stderr bytes.Buffer + cmd.Stderr = &stderr + + output, err := cmd.Output() if err != nil { - return nil, fmt.Errorf("collect network report: %v", err) + return nil, fmt.Errorf("collect network report: %v, stdout: %s, stderr: %s", err, string(output), stderr.String()) } report := NetworkReport{} diff --git a/pkg/addons/adminconsole/static/metadata.yaml b/pkg/addons/adminconsole/static/metadata.yaml index 59fda3541..3ba418402 100644 --- a/pkg/addons/adminconsole/static/metadata.yaml +++ b/pkg/addons/adminconsole/static/metadata.yaml @@ -6,7 +6,7 @@ # $ output/bin/buildtools update addon # version: 1.128.1-ec.0 -location: oci://proxy.replicated.com/anonymous/registry.replicated.com/library/admin-console +location: oci://proxy.replicated.com/library/admin-console images: kotsadm: repo: proxy.replicated.com/anonymous/kotsadm/kotsadm diff --git a/pkg/addons/embeddedclusteroperator/static/metadata.yaml b/pkg/addons/embeddedclusteroperator/static/metadata.yaml index e0a70dd25..d805a080f 100644 --- a/pkg/addons/embeddedclusteroperator/static/metadata.yaml +++ b/pkg/addons/embeddedclusteroperator/static/metadata.yaml @@ -6,7 +6,7 @@ # $ output/bin/buildtools update addon # version: 1.19.0+k8s-1.30 -location: oci://proxy.replicated.com/anonymous/registry.replicated.com/library/embedded-cluster-operator +location: oci://proxy.replicated.com/library/embedded-cluster-operator images: embedded-cluster-operator: repo: proxy.replicated.com/anonymous/replicated/embedded-cluster-operator-image @@ -14,12 +14,12 @@ images: amd64: v1.19.0-k8s-1.30 arm64: v1.19.0-k8s-1.30 goldpinger: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/goldpinger + repo: proxy.replicated.com/library/goldpinger tag: amd64: latest arm64: latest utils: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/embedded-cluster-utils + repo: proxy.replicated.com/library/embedded-cluster-utils tag: amd64: latest arm64: latest \ No newline at end of file diff --git a/pkg/addons/openebs/static/metadata.yaml b/pkg/addons/openebs/static/metadata.yaml index 31ddb6a86..7feceeed2 100644 --- a/pkg/addons/openebs/static/metadata.yaml +++ b/pkg/addons/openebs/static/metadata.yaml @@ -9,17 +9,17 @@ version: 4.3.3 location: oci://proxy.replicated.com/anonymous/registry.replicated.com/ec-charts/openebs images: kubectl: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/kubectl + repo: proxy.replicated.com/library/kubectl tag: amd64: 1.33.4-amd64@sha256:9084bb2bec2f55312e122ae16641e4f65dbaf4c4047b59870503d9be6a7ed0d9 arm64: 1.33.4-arm64@sha256:0460a21d2bf7ecc841609bfcb6f590c3d59be6126c37217c82582cabffe68f53 openebs-linux-utils: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/openebs-linux-utils + repo: proxy.replicated.com/library/openebs-linux-utils tag: amd64: 4.2.0-amd64@sha256:c4feecc9086d9877c7c6542fe3f0c2b7401f86d60cc8458e0bcfea94c96e61ee arm64: 4.2.0-arm64@sha256:43d98cdd27171c68d265b14321ede1c7eb65a13da46dd01b8f4b1d12fc65c3a8 openebs-provisioner-localpv: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/openebs-provisioner-localpv + repo: proxy.replicated.com/library/openebs-provisioner-localpv tag: amd64: 4.3.0-amd64@sha256:0837e2fec03e7f8d119487a4133310cf9a0028a90061045b672607f7b18d1280 arm64: 4.3.0-arm64@sha256:b3d128e5a9b21c848f84055d2618be58d18b9234afb4d296ab413e247be08892 diff --git a/pkg/addons/openebs/static/values.tpl.yaml b/pkg/addons/openebs/static/values.tpl.yaml index 993ac5121..5b618154a 100644 --- a/pkg/addons/openebs/static/values.tpl.yaml +++ b/pkg/addons/openebs/static/values.tpl.yaml @@ -13,8 +13,8 @@ localpv-provisioner: {{- if .ReplaceImages }} helperPod: image: - registry: proxy.replicated.com/anonymous/ - repository: '{{ TrimPrefix "proxy.replicated.com/anonymous/" (index .Images "openebs-linux-utils").Repo }}' + registry: proxy.replicated.com/ + repository: '{{ TrimPrefix "proxy.replicated.com/" (index .Images "openebs-linux-utils").Repo }}' tag: '{{ index (index .Images "openebs-linux-utils").Tag .GOARCH }}' {{- end }} hostpathClass: @@ -23,8 +23,8 @@ localpv-provisioner: localpv: {{- if .ReplaceImages }} image: - registry: proxy.replicated.com/anonymous/ - repository: '{{ TrimPrefix "proxy.replicated.com/anonymous/" (index .Images "openebs-provisioner-localpv").Repo }}' + registry: proxy.replicated.com/ + repository: '{{ TrimPrefix "proxy.replicated.com/" (index .Images "openebs-provisioner-localpv").Repo }}' tag: '{{ index (index .Images "openebs-provisioner-localpv").Tag .GOARCH }}' {{- end }} basePath: "/var/lib/embedded-cluster/openebs-local" @@ -42,8 +42,8 @@ mayastor: {{- if .ReplaceImages }} preUpgradeHook: image: - registry: proxy.replicated.com/anonymous - repo: '{{ TrimPrefix "proxy.replicated.com/anonymous/" (index .Images "kubectl").Repo }}' + registry: proxy.replicated.com + repo: '{{ TrimPrefix "proxy.replicated.com/" (index .Images "kubectl").Repo }}' tag: '{{ index (index .Images "kubectl").Tag .GOARCH }}' {{- end }} zfs-localpv: diff --git a/pkg/addons/registry/static/metadata.yaml b/pkg/addons/registry/static/metadata.yaml index 10d926dc9..694aa1bea 100644 --- a/pkg/addons/registry/static/metadata.yaml +++ b/pkg/addons/registry/static/metadata.yaml @@ -9,7 +9,7 @@ version: 3.0.0 location: oci://proxy.replicated.com/anonymous/registry.replicated.com/ec-charts/docker-registry images: registry: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/registry + repo: proxy.replicated.com/library/registry tag: amd64: 2.8.3-amd64@sha256:17463f6aefd46554c4552187ceb569b04bc7c12e9e6dd614dcd5ae2ac257a2f1 arm64: 2.8.3-arm64@sha256:3a71ff9a1b458a39a30444da7db3fa6ee0d99411e03ce6c3cb83aa49c161de61 diff --git a/pkg/addons/seaweedfs/static/metadata.yaml b/pkg/addons/seaweedfs/static/metadata.yaml index 1f131d369..8ddc51e73 100644 --- a/pkg/addons/seaweedfs/static/metadata.yaml +++ b/pkg/addons/seaweedfs/static/metadata.yaml @@ -9,7 +9,7 @@ version: 4.0.393 location: oci://proxy.replicated.com/anonymous/registry.replicated.com/ec-charts/seaweedfs images: seaweedfs: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/seaweedfs + repo: proxy.replicated.com/library/seaweedfs tag: amd64: 3.93-amd64@sha256:76770fc6ec0921b149eb3475c6447b722922966b8b1cc20c8ef057b2b23bf3a7 arm64: 3.93-arm64@sha256:ed0df980c54a1debf963b8160cc56fd70a4115fa018382fc75bd0d41bf3340c4 diff --git a/pkg/addons/velero/static/metadata.yaml b/pkg/addons/velero/static/metadata.yaml index 67358841e..2c28f08af 100644 --- a/pkg/addons/velero/static/metadata.yaml +++ b/pkg/addons/velero/static/metadata.yaml @@ -9,17 +9,17 @@ version: 10.1.3 location: oci://proxy.replicated.com/anonymous/registry.replicated.com/ec-charts/velero images: kubectl: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/kubectl + repo: proxy.replicated.com/library/kubectl tag: amd64: 1.33.4-amd64@sha256:9084bb2bec2f55312e122ae16641e4f65dbaf4c4047b59870503d9be6a7ed0d9 arm64: 1.33.4-arm64@sha256:0460a21d2bf7ecc841609bfcb6f590c3d59be6126c37217c82582cabffe68f53 velero: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/velero + repo: proxy.replicated.com/library/velero tag: amd64: v1.16.2-amd64@sha256:62be6088bfb135717ee9e34298bef63cc54e83f5fbcb22a3f6e543f50fa203c1 arm64: v1.16.2-arm64@sha256:68f948d13bcba493e3e933a1a47a0e5e9bc1ad2f3f8c089d857a71c289b6e557 velero-plugin-for-aws: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/velero-plugin-for-aws + repo: proxy.replicated.com/library/velero-plugin-for-aws tag: amd64: v1.12.2-amd64@sha256:ed81243ad31caacd7c22c07d27ab69ed401cc13b03899671327b78478e934aef arm64: v1.12.2-arm64@sha256:41a9484bc45415b88fbe7f41f64c347fc24bafa6aed494199b9ad31410afdea5 diff --git a/pkg/config/static/metadata-1_29.yaml b/pkg/config/static/metadata-1_29.yaml index 6e226be9a..b42d33dd0 100644 --- a/pkg/config/static/metadata-1_29.yaml +++ b/pkg/config/static/metadata-1_29.yaml @@ -7,20 +7,20 @@ # images: calico-cni: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-cni + repo: proxy.replicated.com/library/calico-cni tag: - amd64: v3.28.5-amd64@sha256:a79595aafcfc35d2f3ee2f06526f7dd7152c31ebb83206298f352dd5448ea8d1 - arm64: v3.28.5-arm64@sha256:1ff48a63eed799cc4e1068d6e1e982fc5827552dfd5a9e0e97d0e95f6046eeb4 + amd64: v3.28.5-amd64@sha256:3b784ed277522deca9a92b464685e077a86dcad4a95897928b3598b6ebc75e5a + arm64: v3.28.5-arm64@sha256:15bc091e0293451033566284967f17acb79360d72dd19f6a2624e4b280892087 calico-kube-controllers: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-kube-controllers + repo: proxy.replicated.com/library/calico-kube-controllers tag: - amd64: v3.28.5-amd64@sha256:724e17f2a6c987cd6d3a684834dbd8599f8d7985add0c761e1970bf34d75543c - arm64: v3.28.5-arm64@sha256:0c3ce120674e4d5695ed1967c553148f12315cba73b590da5eb56c79b7b31f69 + amd64: v3.28.5-amd64@sha256:5fc2576d846389a2132f92350bb28965f5edb04adc50260ec5a5b4421c31df4d + arm64: v3.28.5-arm64@sha256:d8efad1d5fa1444285fd8db5193b2baad1f81edde46ce2e2e966431982b3d02d calico-node: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-node + repo: proxy.replicated.com/library/calico-node tag: - amd64: v3.28.5-amd64@sha256:9153cb273b0a8784f3016fb65f92768bde3e9abbdc2b9ba37cdd74e0d417e7f6 - arm64: v3.28.5-arm64@sha256:7ab2e4d0b3bc2063628095abccdd7cfcc8a4c8605c492e8cb5d5ee515aaed7f8 + amd64: v3.28.5-amd64@sha256:05682568c1e184f91fab40f1a01dc22bdec9f1acda1991f26078f8a11fd276f4 + arm64: v3.28.5-arm64@sha256:331db2cff8075859402cc3479357126238c2953715c852f21a234913fe7f0f14 coredns: repo: proxy.replicated.com/anonymous/replicated/ec-coredns tag: diff --git a/pkg/config/static/metadata-1_30.yaml b/pkg/config/static/metadata-1_30.yaml index e8e25b971..c9d3c58bd 100644 --- a/pkg/config/static/metadata-1_30.yaml +++ b/pkg/config/static/metadata-1_30.yaml @@ -7,20 +7,20 @@ # images: calico-cni: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-cni + repo: proxy.replicated.com/library/calico-cni tag: - amd64: v3.28.5-amd64@sha256:ef5de07ad63171948ac9565a76db12d1e7eee0c76be5f43a3398ae4a9c0fe2cd - arm64: v3.28.5-arm64@sha256:10a40963aae9071fb99e186bc6331993bdbbfd2625ee0554fb722f32205a1b77 + amd64: v3.28.5-amd64@sha256:3b784ed277522deca9a92b464685e077a86dcad4a95897928b3598b6ebc75e5a + arm64: v3.28.5-arm64@sha256:15bc091e0293451033566284967f17acb79360d72dd19f6a2624e4b280892087 calico-kube-controllers: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-kube-controllers + repo: proxy.replicated.com/library/calico-kube-controllers tag: - amd64: v3.28.5-amd64@sha256:40550985a3421a2cdab2677ae8cee29eb394dc97d0feb1ffe0182fcae07618c8 - arm64: v3.28.5-arm64@sha256:ea76ae2a1cb6e4cf7bbcd7ba5c411028917383d51ec52e4e2e1d355af7ce0ab6 + amd64: v3.28.5-amd64@sha256:5fc2576d846389a2132f92350bb28965f5edb04adc50260ec5a5b4421c31df4d + arm64: v3.28.5-arm64@sha256:d8efad1d5fa1444285fd8db5193b2baad1f81edde46ce2e2e966431982b3d02d calico-node: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-node + repo: proxy.replicated.com/library/calico-node tag: - amd64: v3.28.5-amd64@sha256:e4a2be256c0e88d6425d73d5f366a17e6a4ddd4c9fe854b7bbb44a7c0b06f52c - arm64: v3.28.5-arm64@sha256:940c86fd5ca14788a42906c6058b5ea8c3f9cd1ca8e5448fbdc607a4f91345d6 + amd64: v3.28.5-amd64@sha256:05682568c1e184f91fab40f1a01dc22bdec9f1acda1991f26078f8a11fd276f4 + arm64: v3.28.5-arm64@sha256:331db2cff8075859402cc3479357126238c2953715c852f21a234913fe7f0f14 coredns: repo: proxy.replicated.com/anonymous/replicated/ec-coredns tag: diff --git a/pkg/config/static/metadata-1_31.yaml b/pkg/config/static/metadata-1_31.yaml index c175889b5..746e20c0f 100644 --- a/pkg/config/static/metadata-1_31.yaml +++ b/pkg/config/static/metadata-1_31.yaml @@ -7,42 +7,42 @@ # images: calico-cni: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-cni + repo: proxy.replicated.com/library/calico-cni tag: amd64: v3.28.5-amd64@sha256:3b784ed277522deca9a92b464685e077a86dcad4a95897928b3598b6ebc75e5a arm64: v3.28.5-arm64@sha256:15bc091e0293451033566284967f17acb79360d72dd19f6a2624e4b280892087 calico-kube-controllers: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-kube-controllers + repo: proxy.replicated.com/library/calico-kube-controllers tag: amd64: v3.28.5-amd64@sha256:5fc2576d846389a2132f92350bb28965f5edb04adc50260ec5a5b4421c31df4d arm64: v3.28.5-arm64@sha256:d8efad1d5fa1444285fd8db5193b2baad1f81edde46ce2e2e966431982b3d02d calico-node: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-node + repo: proxy.replicated.com/library/calico-node tag: amd64: v3.28.5-amd64@sha256:05682568c1e184f91fab40f1a01dc22bdec9f1acda1991f26078f8a11fd276f4 arm64: v3.28.5-arm64@sha256:331db2cff8075859402cc3479357126238c2953715c852f21a234913fe7f0f14 coredns: - repo: proxy.replicated.com/anonymous/replicated/ec-coredns + repo: proxy.replicated.com/library/coredns tag: - amd64: 1.12.3-r1-amd64@sha256:719ff870dfdc7468824c68153604e3a00b02ef4e84ce41fe12bd22a59999f202 - arm64: 1.12.3-r1-arm64@sha256:b611200517fb973ef3c4d9e55dcb0a453e2bf461ed551ee65512f8b7d13496b7 + amd64: v1.12.3-amd64@sha256:8f5f7a0b7e43ba7efc18d3c2d1eb4a9b0d92969be27abb87af1c3bb1ffb5f359 + arm64: v1.12.3-arm64@sha256:27b89e34043cd283d36be797f36da6e18b22c01a6547cfbda5fe21d6a9ea8d39 envoy-distroless: - repo: proxy.replicated.com/anonymous/replicated/ec-envoy-distroless + repo: proxy.replicated.com/library/envoy tag: - amd64: 1.31.2-r0-amd64@sha256:f6032476349dc87c7c3755f3a981fc1a61036c1586abf065dde20603f6ebe716 - arm64: 1.31.2-r0-arm64@sha256:f818ce57852a92e5f9ca5dc408939793ea251786bfdb54689ca653138f0bb08d + amd64: 1.31.2-amd64@sha256:6d243ea9bce274e50106eb5cd7e16a9a6d73fcb9e54879b2be53656adb50ec5c + arm64: 1.31.2-arm64@sha256:8394aba8c1cbe52bd27e276c8c1e7333cefaffde0ba7591f78525700d5005ad9 kube-proxy: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/kube-proxy + repo: proxy.replicated.com/library/kube-proxy tag: amd64: v1.31.13-amd64@sha256:d63d06ab7a723f6db85a79f7e1d0da7b2e9fb1b45b53b45519a3188c8da3585d arm64: v1.31.13-arm64@sha256:4978486772d26b1fe52050e8addeef8c5d26ee52e4a147ed82d5a9f91e8098c5 metrics-server: - repo: proxy.replicated.com/anonymous/replicated/ec-metrics-server + repo: proxy.replicated.com/library/metrics-server tag: - amd64: 0.8.0-r3-amd64@sha256:9f430c0b58d988361e4c5dc2436a26b7b60ff3d231b28ad131d33a6466e1998e - arm64: 0.8.0-r3-arm64@sha256:b4a73a422fed4eaeee14d744f483aa2b53106e7f5a6f4c536f8b111ea92785bc + amd64: v0.8.0-amd64@sha256:7a37510b20c6d506df5db21430f099e17e77ca2a6b70ca649c14600738465900 + arm64: v0.8.0-arm64@sha256:8535a486080aa611544a5d7f75da02d3896f7f5187cdcef36b9ed7f658e7bd7e pause: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/pause + repo: proxy.replicated.com/library/pause tag: amd64: 3.9-amd64@sha256:cd19cab33e09447f2f49b7661cf5058d88f26ee9f4a16f514b66794cd1dc8904 arm64: 3.9-arm64@sha256:b73d34c3a5e7f8cab7a600fadf88c2d802cef024694fe8c7885da017e3d890b4 diff --git a/pkg/config/static/metadata-1_32.yaml b/pkg/config/static/metadata-1_32.yaml index b8c11cdba..9310fc903 100644 --- a/pkg/config/static/metadata-1_32.yaml +++ b/pkg/config/static/metadata-1_32.yaml @@ -7,42 +7,42 @@ # images: calico-cni: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-cni + repo: proxy.replicated.com/library/calico-cni tag: amd64: v3.29.3-amd64@sha256:ba9e67b77a964fb95c836430140e77a3f3605a4453ceb7df1f4c43dd04852f97 arm64: v3.29.3-arm64@sha256:bcb96f11f5aedbfb92e860e0006dfcd4e3a0e48aa94476d8b71fa186e4705b56 calico-kube-controllers: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-kube-controllers + repo: proxy.replicated.com/library/calico-kube-controllers tag: amd64: v3.29.3-amd64@sha256:314527adba1b9f445e181ded800dfcb65873853d55333d92c9a2f5c0888fe72c arm64: v3.29.3-arm64@sha256:69b1a6acb9aeef1324ee5574ef217b54c59cf2aee7933fc41c5c2f0402840955 calico-node: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-node + repo: proxy.replicated.com/library/calico-node tag: amd64: v3.29.3-amd64@sha256:48288e892adb30b610dff84424111d72671c3e179570482da5aae048ed2645b0 arm64: v3.29.3-arm64@sha256:d6e97d84515fe4569a783a86d9410253ae7d8a1f0cefdbebc0ef7bbfb31405d9 coredns: - repo: proxy.replicated.com/anonymous/replicated/ec-coredns + repo: proxy.replicated.com/library/coredns tag: - amd64: 1.12.3-r1-amd64@sha256:719ff870dfdc7468824c68153604e3a00b02ef4e84ce41fe12bd22a59999f202 - arm64: 1.12.3-r1-arm64@sha256:b611200517fb973ef3c4d9e55dcb0a453e2bf461ed551ee65512f8b7d13496b7 + amd64: v1.12.3-amd64@sha256:8f5f7a0b7e43ba7efc18d3c2d1eb4a9b0d92969be27abb87af1c3bb1ffb5f359 + arm64: v1.12.3-arm64@sha256:27b89e34043cd283d36be797f36da6e18b22c01a6547cfbda5fe21d6a9ea8d39 envoy-distroless: - repo: proxy.replicated.com/anonymous/replicated/ec-envoy-distroless + repo: proxy.replicated.com/library/envoy tag: - amd64: 1.31.2-r0-amd64@sha256:f6032476349dc87c7c3755f3a981fc1a61036c1586abf065dde20603f6ebe716 - arm64: 1.31.2-r0-arm64@sha256:f818ce57852a92e5f9ca5dc408939793ea251786bfdb54689ca653138f0bb08d + amd64: 1.31.2-amd64@sha256:6d243ea9bce274e50106eb5cd7e16a9a6d73fcb9e54879b2be53656adb50ec5c + arm64: 1.31.2-arm64@sha256:8394aba8c1cbe52bd27e276c8c1e7333cefaffde0ba7591f78525700d5005ad9 kube-proxy: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/kube-proxy + repo: proxy.replicated.com/library/kube-proxy tag: amd64: v1.32.9-amd64@sha256:8797e3485b7367544ae8546af1b9b6d883711934b6a68bed4a3f2cfe48c6d4b3 arm64: v1.32.9-arm64@sha256:666b29c62f6b9b2b2824b6a605aa4a76c99c172f2ec54e4a789957fd2ddd1da0 metrics-server: - repo: proxy.replicated.com/anonymous/replicated/ec-metrics-server + repo: proxy.replicated.com/library/metrics-server tag: - amd64: 0.8.0-r3-amd64@sha256:9f430c0b58d988361e4c5dc2436a26b7b60ff3d231b28ad131d33a6466e1998e - arm64: 0.8.0-r3-arm64@sha256:b4a73a422fed4eaeee14d744f483aa2b53106e7f5a6f4c536f8b111ea92785bc + amd64: v0.8.0-amd64@sha256:7a37510b20c6d506df5db21430f099e17e77ca2a6b70ca649c14600738465900 + arm64: v0.8.0-arm64@sha256:8535a486080aa611544a5d7f75da02d3896f7f5187cdcef36b9ed7f658e7bd7e pause: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/pause + repo: proxy.replicated.com/library/pause tag: amd64: 3.9-amd64@sha256:cd19cab33e09447f2f49b7661cf5058d88f26ee9f4a16f514b66794cd1dc8904 arm64: 3.9-arm64@sha256:b73d34c3a5e7f8cab7a600fadf88c2d802cef024694fe8c7885da017e3d890b4 diff --git a/pkg/config/static/metadata-1_33.yaml b/pkg/config/static/metadata-1_33.yaml index 2152c0548..638054464 100644 --- a/pkg/config/static/metadata-1_33.yaml +++ b/pkg/config/static/metadata-1_33.yaml @@ -7,42 +7,42 @@ # images: calico-cni: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-cni + repo: proxy.replicated.com/library/calico-cni tag: amd64: v3.29.3-amd64@sha256:ba9e67b77a964fb95c836430140e77a3f3605a4453ceb7df1f4c43dd04852f97 arm64: v3.29.3-arm64@sha256:bcb96f11f5aedbfb92e860e0006dfcd4e3a0e48aa94476d8b71fa186e4705b56 calico-kube-controllers: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-kube-controllers + repo: proxy.replicated.com/library/calico-kube-controllers tag: amd64: v3.29.3-amd64@sha256:314527adba1b9f445e181ded800dfcb65873853d55333d92c9a2f5c0888fe72c arm64: v3.29.3-arm64@sha256:69b1a6acb9aeef1324ee5574ef217b54c59cf2aee7933fc41c5c2f0402840955 calico-node: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/calico-node + repo: proxy.replicated.com/library/calico-node tag: amd64: v3.29.3-amd64@sha256:48288e892adb30b610dff84424111d72671c3e179570482da5aae048ed2645b0 arm64: v3.29.3-arm64@sha256:d6e97d84515fe4569a783a86d9410253ae7d8a1f0cefdbebc0ef7bbfb31405d9 coredns: - repo: proxy.replicated.com/anonymous/replicated/ec-coredns + repo: proxy.replicated.com/library/coredns tag: - amd64: 1.12.3-r1-amd64@sha256:719ff870dfdc7468824c68153604e3a00b02ef4e84ce41fe12bd22a59999f202 - arm64: 1.12.3-r1-arm64@sha256:b611200517fb973ef3c4d9e55dcb0a453e2bf461ed551ee65512f8b7d13496b7 + amd64: v1.12.3-amd64@sha256:8f5f7a0b7e43ba7efc18d3c2d1eb4a9b0d92969be27abb87af1c3bb1ffb5f359 + arm64: v1.12.3-arm64@sha256:27b89e34043cd283d36be797f36da6e18b22c01a6547cfbda5fe21d6a9ea8d39 envoy-distroless: - repo: proxy.replicated.com/anonymous/replicated/ec-envoy-distroless + repo: proxy.replicated.com/library/envoy tag: - amd64: 1.31.2-r0-amd64@sha256:f6032476349dc87c7c3755f3a981fc1a61036c1586abf065dde20603f6ebe716 - arm64: 1.31.2-r0-arm64@sha256:f818ce57852a92e5f9ca5dc408939793ea251786bfdb54689ca653138f0bb08d + amd64: 1.31.2-amd64@sha256:6d243ea9bce274e50106eb5cd7e16a9a6d73fcb9e54879b2be53656adb50ec5c + arm64: 1.31.2-arm64@sha256:8394aba8c1cbe52bd27e276c8c1e7333cefaffde0ba7591f78525700d5005ad9 kube-proxy: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/kube-proxy + repo: proxy.replicated.com/library/kube-proxy tag: amd64: v1.33.5-amd64@sha256:6f6dec84370a352a37f77b5452c8a467b64b510519dfbe917ce1a4bcba0d632a arm64: v1.33.5-arm64@sha256:8a3a325957cb1f3b0398999cb1df4bdc1f90b3b0d506af8d5bfe651fa94c218b metrics-server: - repo: proxy.replicated.com/anonymous/replicated/ec-metrics-server + repo: proxy.replicated.com/library/metrics-server tag: - amd64: 0.8.0-r3-amd64@sha256:9f430c0b58d988361e4c5dc2436a26b7b60ff3d231b28ad131d33a6466e1998e - arm64: 0.8.0-r3-arm64@sha256:b4a73a422fed4eaeee14d744f483aa2b53106e7f5a6f4c536f8b111ea92785bc + amd64: v0.8.0-amd64@sha256:7a37510b20c6d506df5db21430f099e17e77ca2a6b70ca649c14600738465900 + arm64: v0.8.0-arm64@sha256:8535a486080aa611544a5d7f75da02d3896f7f5187cdcef36b9ed7f658e7bd7e pause: - repo: proxy.replicated.com/anonymous/registry.replicated.com/library/pause + repo: proxy.replicated.com/library/pause tag: amd64: 3.10.1-amd64@sha256:0733e6feb71bd4882f6b47135b2e21c2fe0e567e73cba1e4a0ca0f97fa87583c arm64: 3.10.1-arm64@sha256:136810ca7962f9b7d78d6fa363c7b59e338b7353fa0e0f741d364e61024a5305 diff --git a/pkg/helm/values_test.go b/pkg/helm/values_test.go index 1d5210f6d..d73be2fe3 100644 --- a/pkg/helm/values_test.go +++ b/pkg/helm/values_test.go @@ -117,7 +117,7 @@ func TestSetValue(t *testing.T) { }, "localpv": map[string]interface{}{ "image": map[string]interface{}{ - "registry": "proxy.replicated.com/anonymous/", + "registry": "proxy.replicated.com/", }, "basePath": "/var/lib/embedded-cluster/openebs-local", }, @@ -133,7 +133,7 @@ func TestSetValue(t *testing.T) { }, "localpv": map[string]interface{}{ "image": map[string]interface{}{ - "registry": "proxy.replicated.com/anonymous/", + "registry": "proxy.replicated.com/", }, "basePath": "/var/ec/openebs-local", }, diff --git a/scripts/k0s-update-dependencies.sh b/scripts/k0s-update-dependencies.sh index 54e6f0b99..6a14f5a7a 100755 --- a/scripts/k0s-update-dependencies.sh +++ b/scripts/k0s-update-dependencies.sh @@ -48,13 +48,16 @@ function main() { # pin to the current major.minor version sed "${SED_ARGS[@]}" "s/^K0S_MINOR_VERSION \?= .*$/K0S_MINOR_VERSION ?= $minor_version/" versions.mk - # update images for all major.minor versions - ./scripts/k0s-update-images.sh "$minor_version" + # only update images and code if there has been a change to the versions.mk file + if ! git diff --exit-code --name-only versions.mk > /dev/null; then + # update images for all major.minor versions + UPDATE_ALL_IMAGES=true ./scripts/k0s-update-images.sh "$minor_version" - # prepare the code for the current major.minor version - export K0S_MINOR_VERSION="$minor_version" - update_go_dependencies - generate_crd_manifests + # prepare the code for the current major.minor version + export K0S_MINOR_VERSION="$minor_version" + update_go_dependencies + generate_crd_manifests + fi echo "Done" } diff --git a/tests/dryrun/install_test.go b/tests/dryrun/install_test.go index bf598e29b..de7a52905 100644 --- a/tests/dryrun/install_test.go +++ b/tests/dryrun/install_test.go @@ -69,9 +69,9 @@ func testDefaultInstallationImpl(t *testing.T) { assert.Equal(t, "openebs", openebsOpts.ReleaseName) assertHelmValues(t, openebsOpts.Values, map[string]interface{}{ "['localpv-provisioner'].localpv.basePath": "/var/lib/embedded-cluster/openebs-local", - "['localpv-provisioner'].helperPod.image.registry": "fake-replicated-proxy.test.net/anonymous/", - "['localpv-provisioner'].localpv.image.registry": "fake-replicated-proxy.test.net/anonymous/", - "['preUpgradeHook'].image.registry": "fake-replicated-proxy.test.net/anonymous", + "['localpv-provisioner'].helperPod.image.registry": "fake-replicated-proxy.test.net/", + "['localpv-provisioner'].localpv.image.registry": "fake-replicated-proxy.test.net/", + "['preUpgradeHook'].image.registry": "fake-replicated-proxy.test.net", }) // embedded cluster operator @@ -89,7 +89,7 @@ func testDefaultInstallationImpl(t *testing.T) { assert.Equal(t, "velero", veleroOpts.ReleaseName) assertHelmValues(t, veleroOpts.Values, map[string]interface{}{ "nodeAgent.podVolumePath": "/var/lib/embedded-cluster/k0s/kubelet/pods", - "image.repository": "fake-replicated-proxy.test.net/anonymous/registry.replicated.com/library/velero", + "image.repository": "fake-replicated-proxy.test.net/library/velero", }) // admin console @@ -195,13 +195,13 @@ func testDefaultInstallationImpl(t *testing.T) { assert.Equal(t, "10.244.128.0/17", k0sConfig.Spec.Network.ServiceCIDR) assert.Contains(t, k0sConfig.Spec.API.SANs, "kubernetes.default.svc.cluster.local") - assert.Contains(t, k0sConfig.Spec.Images.MetricsServer.Image, "fake-replicated-proxy.test.net/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.KubeProxy.Image, "fake-replicated-proxy.test.net/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.CoreDNS.Image, "fake-replicated-proxy.test.net/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.Pause.Image, "fake-replicated-proxy.test.net/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.Calico.CNI.Image, "fake-replicated-proxy.test.net/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.Calico.Node.Image, "fake-replicated-proxy.test.net/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.Calico.KubeControllers.Image, "fake-replicated-proxy.test.net/anonymous") + assert.Contains(t, k0sConfig.Spec.Images.MetricsServer.Image, "fake-replicated-proxy.test.net/library") + assert.Contains(t, k0sConfig.Spec.Images.KubeProxy.Image, "fake-replicated-proxy.test.net/library") + assert.Contains(t, k0sConfig.Spec.Images.CoreDNS.Image, "fake-replicated-proxy.test.net/library") + assert.Contains(t, k0sConfig.Spec.Images.Pause.Image, "fake-replicated-proxy.test.net/library") + assert.Contains(t, k0sConfig.Spec.Images.Calico.CNI.Image, "fake-replicated-proxy.test.net/library") + assert.Contains(t, k0sConfig.Spec.Images.Calico.Node.Image, "fake-replicated-proxy.test.net/library") + assert.Contains(t, k0sConfig.Spec.Images.Calico.KubeControllers.Image, "fake-replicated-proxy.test.net/library") } func TestCustomDataDir(t *testing.T) { @@ -541,9 +541,9 @@ func TestNoDomains(t *testing.T) { assert.Equal(t, "openebs", openebsOpts.ReleaseName) assertHelmValues(t, openebsOpts.Values, map[string]interface{}{ "['localpv-provisioner'].localpv.basePath": "/var/lib/embedded-cluster/openebs-local", - "['localpv-provisioner'].helperPod.image.registry": "proxy.staging.replicated.com/anonymous/", - "['localpv-provisioner'].localpv.image.registry": "proxy.staging.replicated.com/anonymous/", - "['preUpgradeHook'].image.registry": "proxy.staging.replicated.com/anonymous", + "['localpv-provisioner'].helperPod.image.registry": "proxy.staging.replicated.com/", + "['localpv-provisioner'].localpv.image.registry": "proxy.staging.replicated.com/", + "['preUpgradeHook'].image.registry": "proxy.staging.replicated.com", }) // embedded cluster operator @@ -560,7 +560,7 @@ func TestNoDomains(t *testing.T) { assert.Equal(t, "velero", veleroOpts.ReleaseName) assertHelmValues(t, veleroOpts.Values, map[string]interface{}{ "nodeAgent.podVolumePath": "/var/lib/embedded-cluster/k0s/kubelet/pods", - "image.repository": "proxy.staging.replicated.com/anonymous/registry.replicated.com/library/velero", + "image.repository": "proxy.staging.replicated.com/library/velero", }) // admin console @@ -594,13 +594,13 @@ func TestNoDomains(t *testing.T) { // --- validate k0s cluster config --- // k0sConfig := readK0sConfig(t) - assert.Contains(t, k0sConfig.Spec.Images.MetricsServer.Image, "proxy.staging.replicated.com/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.KubeProxy.Image, "proxy.staging.replicated.com/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.CoreDNS.Image, "proxy.staging.replicated.com/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.Pause.Image, "proxy.staging.replicated.com/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.Calico.CNI.Image, "proxy.staging.replicated.com/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.Calico.Node.Image, "proxy.staging.replicated.com/anonymous") - assert.Contains(t, k0sConfig.Spec.Images.Calico.KubeControllers.Image, "proxy.staging.replicated.com/anonymous") + assert.Contains(t, k0sConfig.Spec.Images.MetricsServer.Image, "proxy.staging.replicated.com/library") + assert.Contains(t, k0sConfig.Spec.Images.KubeProxy.Image, "proxy.staging.replicated.com/library") + assert.Contains(t, k0sConfig.Spec.Images.CoreDNS.Image, "proxy.staging.replicated.com/library") + assert.Contains(t, k0sConfig.Spec.Images.Pause.Image, "proxy.staging.replicated.com/library") + assert.Contains(t, k0sConfig.Spec.Images.Calico.CNI.Image, "proxy.staging.replicated.com/library") + assert.Contains(t, k0sConfig.Spec.Images.Calico.Node.Image, "proxy.staging.replicated.com/library") + assert.Contains(t, k0sConfig.Spec.Images.Calico.KubeControllers.Image, "proxy.staging.replicated.com/library") t.Logf("%s: test complete", time.Now().Format(time.RFC3339)) }