Skip to content

Commit fac1279

Browse files
committed
Fix goreleaser image repository configuration
Update the .goreleaser.yaml and CI action configurations and ensure the correct container image registry repository is provided when automation is triggered on the creation of a new git tag. Signed-off-by: timflannagan <[email protected]>
1 parent 20a4381 commit fac1279

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

Diff for: .github/workflows/goreleaser.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ jobs:
5353
args: release --rm-dist
5454
env:
5555
GITHUB_TOKEN: ${{ github.token }}
56-
IMAGE_REPO: ${{ secrets.QUAY_USERNAME }}/olm
56+
IMAGE_REPO: quay.io/operator-framework/olm
5757
PKG: github.com/operator-framework/operator-lifecycle-manager
5858

5959
- name: Generate quickstart release manifests
6060
if: startsWith(github.ref, 'refs/tags')
61-
run: make release ver=${{ env.IMAGE_TAG }} IMAGE_REPO=quay.io/${{ secrets.QUAY_USERNAME }}/olm
61+
run: make release ver=${{ env.IMAGE_TAG }} IMAGE_REPO=quay.io/operator-framework/olm
6262

63-
- name: Update release artifacts with rendered Kubernetes manifests
63+
- name: Update release artifacts with rendered Kubernetes release manifests
6464
uses: softprops/action-gh-release@v1
6565
if: startsWith(github.ref, 'refs/tags')
6666
with:

Diff for: .goreleaser.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -76,50 +76,50 @@ builds:
7676
- -X {{ .Env.PKG }}/pkg/version.OLMVersion={{ .Tag }}
7777
dockers:
7878
- image_templates:
79-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-amd64
79+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-amd64"
8080
dockerfile: Dockerfile.goreleaser
8181
use: buildx
8282
goos: linux
8383
goarch: amd64
8484
build_flag_templates:
8585
- --platform=linux/amd64
8686
- image_templates:
87-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-arm64
87+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-arm64"
8888
dockerfile: Dockerfile.goreleaser
8989
use: buildx
9090
goos: linux
9191
goarch: arm64
9292
build_flag_templates:
9393
- --platform=linux/arm64
9494
- image_templates:
95-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-ppc64le
95+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-ppc64le"
9696
dockerfile: Dockerfile.goreleaser
9797
use: buildx
9898
goos: linux
9999
goarch: ppc64le
100100
build_flag_templates:
101101
- --platform=linux/ppc64le
102102
- image_templates:
103-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-s390x
103+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-s390x"
104104
dockerfile: Dockerfile.goreleaser
105105
use: buildx
106106
goos: linux
107107
goarch: s390x
108108
build_flag_templates:
109109
- --platform=linux/s390x
110110
docker_manifests:
111-
- name_template: quay.io/{{ .Env.IMAGE_REPO }}:v{{ .Major }}.{{ .Minor }}
111+
- name_template: "{{ .Env.IMAGE_REPO }}:v{{ .Major }}.{{ .Minor }}"
112112
image_templates:
113-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-amd64
114-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-arm64
115-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-ppc64le
116-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-s390x
117-
- name_template: quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}
113+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-amd64"
114+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-arm64"
115+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-ppc64le"
116+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-s390x"
117+
- name_template: "{{ .Env.IMAGE_REPO }}:{{ .Tag }}"
118118
image_templates:
119-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-amd64
120-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-arm64
121-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-ppc64le
122-
- quay.io/{{ .Env.IMAGE_REPO }}:{{ .Tag }}-s390x
119+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-amd64"
120+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-arm64"
121+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-ppc64le"
122+
- "{{ .Env.IMAGE_REPO }}:{{ .Tag }}-s390x"
123123
checksum:
124124
name_template: 'checksums.txt'
125125
snapshot:

0 commit comments

Comments
 (0)