From db707a2b9e22b31631f0afa9eb80afe1472358a2 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Mon, 3 Feb 2025 08:13:27 +0100 Subject: [PATCH 1/3] Improve white spaces in release.yaml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 90263a1520..455949ecb2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -93,8 +93,8 @@ jobs: secret/data/github/repo/${{ github.repository }}/dockerhub/rancher/credentials password | DOCKER_PASSWORD ; secret/data/github/repo/${{ github.repository }}/rancher-prime-stg-registry/credentials username | STAGE_REGISTRY_USERNAME ; secret/data/github/repo/${{ github.repository }}/rancher-prime-stg-registry/credentials password | STAGE_REGISTRY_PASSWORD ; - secret/data/github/repo/${{ github.repository}}/rancher-prime-registry/credentials username | PRIME_REGISTRY_USERNAME ; - secret/data/github/repo/${{ github.repository}}/rancher-prime-registry/credentials password | PRIME_REGISTRY_PASSWORD ; + secret/data/github/repo/${{ github.repository }}/rancher-prime-registry/credentials username | PRIME_REGISTRY_USERNAME ; + secret/data/github/repo/${{ github.repository }}/rancher-prime-registry/credentials password | PRIME_REGISTRY_PASSWORD ; secret/data/github/repo/${{ github.repository }}/rancher-prime-registry/credentials registry | PRIME_REGISTRY; - name: Prepare Docker environment to support sbom/provenance parameters From d98e62572716a02703c551872ce7ff37f92b792b Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Mon, 3 Feb 2025 08:16:33 +0100 Subject: [PATCH 2/3] Create manifests for all docker containers --- .goreleaser.yaml | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 120034256a..73a8dd539b 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -310,18 +310,17 @@ docker_manifests: - "{{ .Env.REGISTRY }}/rancher/fleet-agent:{{ .Tag }}-linux-amd64" - "{{ .Env.REGISTRY }}/rancher/fleet-agent:{{ .Tag }}-linux-arm64" - # Creating a manifest does not work atm with Prime - # - name_template: "{{ .Env.PRIME_REGISTRY }}/rancher/fleet:{{ .Tag }}" - # id: fleet-manifest-private - # image_templates: - # - "{{ .Env.PRIME_REGISTRY }}/rancher/fleet:{{ .Tag }}-linux-amd64" - # - "{{ .Env.PRIME_REGISTRY }}/rancher/fleet:{{ .Tag }}-linux-arm64" - - # - name_template: "{{ .Env.PRIME_REGISTRY }}/rancher/fleet-agent:{{ .Tag }}" - # id: fleet-agent-manifest-private - # image_templates: - # - "{{ .Env.PRIME_REGISTRY }}/rancher/fleet-agent:{{ .Tag }}-linux-amd64" - # - "{{ .Env.PRIME_REGISTRY }}/rancher/fleet-agent:{{ .Tag }}-linux-arm64" + - name_template: "{{ .Env.PRIME_REGISTRY }}/rancher/fleet:{{ .Tag }}" + id: fleet-manifest-private + image_templates: + - "{{ .Env.PRIME_REGISTRY }}/rancher/fleet:{{ .Tag }}-linux-amd64" + - "{{ .Env.PRIME_REGISTRY }}/rancher/fleet:{{ .Tag }}-linux-arm64" + + - name_template: "{{ .Env.PRIME_REGISTRY }}/rancher/fleet-agent:{{ .Tag }}" + id: fleet-agent-manifest-private + image_templates: + - "{{ .Env.PRIME_REGISTRY }}/rancher/fleet-agent:{{ .Tag }}-linux-amd64" + - "{{ .Env.PRIME_REGISTRY }}/rancher/fleet-agent:{{ .Tag }}-linux-arm64" docker_signs: - # ID of the sign config, must be unique. @@ -361,6 +360,5 @@ docker_signs: - fleet-arm64-private - fleet-agent-amd64-private - fleet-agent-arm64-private - # Creating a manifest does not work atm with Prime - # - fleet-manifest-private - # - fleet-agent-manifest-private \ No newline at end of file + - fleet-manifest-private + - fleet-agent-manifest-private \ No newline at end of file From c36eba451a92ac45f786d62eb7382433cacb3235 Mon Sep 17 00:00:00 2001 From: Tim Hardeck Date: Mon, 3 Feb 2025 08:18:38 +0100 Subject: [PATCH 3/3] Specify exact slsactl version instead of hash. --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 455949ecb2..3cb9a49db9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -83,7 +83,7 @@ jobs: - name: Install Cosign uses: sigstore/cosign-installer@v3.7.0 - - uses: rancherlabs/slsactl/actions/install-slsactl@9ff9d2204e76cd84962630fd788fa4a7a9272310 + - uses: rancherlabs/slsactl/actions/install-slsactl@v0.0.8 - name: "Read Vault Secrets" uses: rancher-eio/read-vault-secrets@main