From adddcf08ea69fa6b3c89d2da0e8dde9559a4295d Mon Sep 17 00:00:00 2001 From: ahreehong <46465244+ahreehong@users.noreply.github.com> Date: Tue, 11 Jun 2024 13:46:15 -0700 Subject: [PATCH] Set asset name to have -helm suffix for new tinkerbell charts (#8292) --- .../cli/pkg/assets/config/bundle_release.go | 2 + .../testdata/main-bundle-release.yaml | 132 +++--------------- 2 files changed, 20 insertions(+), 114 deletions(-) diff --git a/release/cli/pkg/assets/config/bundle_release.go b/release/cli/pkg/assets/config/bundle_release.go index 98dd2c026dff..f933db401f6e 100644 --- a/release/cli/pkg/assets/config/bundle_release.go +++ b/release/cli/pkg/assets/config/bundle_release.go @@ -869,6 +869,7 @@ var bundleReleaseAssetsConfigMap = []assettypes.AssetConfig{ Images: []*assettypes.Image{ { RepoName: "stack", + AssetName: "stack-helm", TrimVersionSignifier: true, ImageTagConfiguration: assettypes.ImageTagConfiguration{ NonProdSourceImageTagFormat: "", @@ -887,6 +888,7 @@ var bundleReleaseAssetsConfigMap = []assettypes.AssetConfig{ Images: []*assettypes.Image{ { RepoName: "tinkerbell-crds", + AssetName: "tinkerbell-crds-helm", TrimVersionSignifier: true, ImageTagConfiguration: assettypes.ImageTagConfiguration{ NonProdSourceImageTagFormat: "", diff --git a/release/cli/pkg/operations/testdata/main-bundle-release.yaml b/release/cli/pkg/operations/testdata/main-bundle-release.yaml index aa79105d6c95..e6022e9c87ba 100644 --- a/release/cli/pkg/operations/testdata/main-bundle-release.yaml +++ b/release/cli/pkg/operations/testdata/main-bundle-release.yaml @@ -252,7 +252,7 @@ spec: os: linux sha256: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef sha512: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.17/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz + uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.18/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz crictl: arch: - amd64 @@ -698,15 +698,7 @@ spec: name: rufio os: linux uri: public.ecr.aws/release-container-registry/tinkerbell/rufio:v0.3.3-eks-a-v0.0.0-dev-build.1 - stack: - arch: - - amd64 - - arm64 - description: Container image for stack image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: stack - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/stack:0.4.4-eks-a-v0.0.0-dev-build.1 + stack: {} tink: nginx: arch: @@ -749,15 +741,7 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: tinkerbell-chart uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-chart:0.2.6-eks-a-v0.0.0-dev-build.1 - tinkerbellCrds: - arch: - - amd64 - - arm64 - description: Container image for tinkerbell-crds image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: tinkerbell-crds - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-crds:0.2.5-eks-a-v0.0.0-dev-build.1 + tinkerbellCrds: {} version: v0.5.2+abcdef1 upgrader: upgrader: @@ -1057,7 +1041,7 @@ spec: os: linux sha256: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef sha512: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.17/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz + uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.18/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz crictl: arch: - amd64 @@ -1503,15 +1487,7 @@ spec: name: rufio os: linux uri: public.ecr.aws/release-container-registry/tinkerbell/rufio:v0.3.3-eks-a-v0.0.0-dev-build.1 - stack: - arch: - - amd64 - - arm64 - description: Container image for stack image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: stack - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/stack:0.4.4-eks-a-v0.0.0-dev-build.1 + stack: {} tink: nginx: arch: @@ -1554,15 +1530,7 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: tinkerbell-chart uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-chart:0.2.6-eks-a-v0.0.0-dev-build.1 - tinkerbellCrds: - arch: - - amd64 - - arm64 - description: Container image for tinkerbell-crds image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: tinkerbell-crds - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-crds:0.2.5-eks-a-v0.0.0-dev-build.1 + tinkerbellCrds: {} version: v0.5.2+abcdef1 upgrader: upgrader: @@ -1862,7 +1830,7 @@ spec: os: linux sha256: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef sha512: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.17/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz + uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.18/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz crictl: arch: - amd64 @@ -2308,15 +2276,7 @@ spec: name: rufio os: linux uri: public.ecr.aws/release-container-registry/tinkerbell/rufio:v0.3.3-eks-a-v0.0.0-dev-build.1 - stack: - arch: - - amd64 - - arm64 - description: Container image for stack image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: stack - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/stack:0.4.4-eks-a-v0.0.0-dev-build.1 + stack: {} tink: nginx: arch: @@ -2359,15 +2319,7 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: tinkerbell-chart uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-chart:0.2.6-eks-a-v0.0.0-dev-build.1 - tinkerbellCrds: - arch: - - amd64 - - arm64 - description: Container image for tinkerbell-crds image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: tinkerbell-crds - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-crds:0.2.5-eks-a-v0.0.0-dev-build.1 + tinkerbellCrds: {} version: v0.5.2+abcdef1 upgrader: upgrader: @@ -2667,7 +2619,7 @@ spec: os: linux sha256: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef sha512: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.17/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz + uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.18/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz crictl: arch: - amd64 @@ -3113,15 +3065,7 @@ spec: name: rufio os: linux uri: public.ecr.aws/release-container-registry/tinkerbell/rufio:v0.3.3-eks-a-v0.0.0-dev-build.1 - stack: - arch: - - amd64 - - arm64 - description: Container image for stack image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: stack - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/stack:0.4.4-eks-a-v0.0.0-dev-build.1 + stack: {} tink: nginx: arch: @@ -3164,15 +3108,7 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: tinkerbell-chart uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-chart:0.2.6-eks-a-v0.0.0-dev-build.1 - tinkerbellCrds: - arch: - - amd64 - - arm64 - description: Container image for tinkerbell-crds image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: tinkerbell-crds - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-crds:0.2.5-eks-a-v0.0.0-dev-build.1 + tinkerbellCrds: {} version: v0.5.2+abcdef1 upgrader: upgrader: @@ -3472,7 +3408,7 @@ spec: os: linux sha256: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef sha512: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.17/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz + uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.18/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz crictl: arch: - amd64 @@ -3918,15 +3854,7 @@ spec: name: rufio os: linux uri: public.ecr.aws/release-container-registry/tinkerbell/rufio:v0.3.3-eks-a-v0.0.0-dev-build.1 - stack: - arch: - - amd64 - - arm64 - description: Container image for stack image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: stack - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/stack:0.4.4-eks-a-v0.0.0-dev-build.1 + stack: {} tink: nginx: arch: @@ -3969,15 +3897,7 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: tinkerbell-chart uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-chart:0.2.6-eks-a-v0.0.0-dev-build.1 - tinkerbellCrds: - arch: - - amd64 - - arm64 - description: Container image for tinkerbell-crds image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: tinkerbell-crds - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-crds:0.2.5-eks-a-v0.0.0-dev-build.1 + tinkerbellCrds: {} version: v0.5.2+abcdef1 upgrader: upgrader: @@ -4277,7 +4197,7 @@ spec: os: linux sha256: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef sha512: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.17/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz + uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/containerd/v1.7.18/containerd-v0.0.0-dev-build.0-linux-amd64.tar.gz crictl: arch: - amd64 @@ -4723,15 +4643,7 @@ spec: name: rufio os: linux uri: public.ecr.aws/release-container-registry/tinkerbell/rufio:v0.3.3-eks-a-v0.0.0-dev-build.1 - stack: - arch: - - amd64 - - arm64 - description: Container image for stack image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: stack - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/stack:0.4.4-eks-a-v0.0.0-dev-build.1 + stack: {} tink: nginx: arch: @@ -4774,15 +4686,7 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: tinkerbell-chart uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-chart:0.2.6-eks-a-v0.0.0-dev-build.1 - tinkerbellCrds: - arch: - - amd64 - - arm64 - description: Container image for tinkerbell-crds image - imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef - name: tinkerbell-crds - os: linux - uri: public.ecr.aws/release-container-registry/tinkerbell/tinkerbell-crds:0.2.5-eks-a-v0.0.0-dev-build.1 + tinkerbellCrds: {} version: v0.5.2+abcdef1 upgrader: upgrader: