Skip to content

Commit

Permalink
fix(ci): eco update addon is broken (#830)
Browse files Browse the repository at this point in the history
* fix(ci): eco update addon is broken

* f
  • Loading branch information
emosbaugh authored Jul 24, 2024
1 parent 77a1836 commit 3a0f78b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmd/buildtools/embeddedclusteroperator.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ var updateOperatorAddonCommand = &cli.Command{

// make sure we include the operator util image as it does not show up
// when rendering the helm chart.
images = append(images, "busybox:1.36")
images = append(images, "docker.io/library/busybox:1.36")

logrus.Infof("fetching digest for images")
for _, image := range images {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ func (e *EmbeddedClusterOperator) GenerateHelmConfig(onlyDefaults bool) ([]embed
}

func (e *EmbeddedClusterOperator) GetAdditionalImages() []string {
if tag, ok := Metadata.Images["busybox"]; ok {
if tag, ok := Metadata.Images["docker.io/library/busybox"]; ok {
return []string{fmt.Sprintf("proxy.replicated.com/anonymous/busybox:%s", tag)}
}
return nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/addons/embeddedclusteroperator/static/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
version: 0.41.1
location: oci://proxy.replicated.com/anonymous/registry.replicated.com/library/embedded-cluster-operator
images:
busybox: 1.36@sha256:50aa4698fa6262977cff89181b2664b99d8a56dbca847bf62f2ef04854597cf8
docker.io/library/busybox: 1.36@sha256:50aa4698fa6262977cff89181b2664b99d8a56dbca847bf62f2ef04854597cf8
docker.io/replicated/embedded-cluster-operator-image: 0.41.1@sha256:9d7ee55329f05d7d69a949ee83c9fa226f5e32497befbe3354346c24ba0eab78
gcr.io/kubebuilder/kube-rbac-proxy: v0.13.1@sha256:18f12fc3a0085bbc303cfbd2ad1151127c1c959c4641e36027547b6b66eb4c92
2 changes: 1 addition & 1 deletion pkg/addons/embeddedclusteroperator/static/values.tpl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ image:
repository: proxy.replicated.com/anonymous/replicated/embedded-cluster-operator-image
tag: {{ index .Images "docker.io/replicated/embedded-cluster-operator-image" }}
kubeProxyImage: 'proxy.replicated.com/anonymous/gcr.io/kubebuilder/kube-rbac-proxy:{{ index .Images "gcr.io/kubebuilder/kube-rbac-proxy" }}'
utilsImage: 'proxy.replicated.com/anonymous/busybox:{{ index .Images "busybox" }}'
utilsImage: 'proxy.replicated.com/anonymous/busybox:{{ index .Images "docker.io/library/busybox" }}'
{{- end }}

0 comments on commit 3a0f78b

Please sign in to comment.