diff --git a/release/pkg/helm/helm.go b/release/pkg/helm/helm.go index 26e486e5aa32..699edea3fbac 100644 --- a/release/pkg/helm/helm.go +++ b/release/pkg/helm/helm.go @@ -440,8 +440,10 @@ func GetPackagesImageTags(eksArtifacts map[string][]releasetypes.Artifact) (map[ m := make(map[string]string) for _, artifacts := range eksArtifacts { for _, artifact := range artifacts { - if artifact.Image.AssetName == "eks-anywhere-packages" || artifact.Image.AssetName == "ecr-token-refresher" { - m[artifact.Image.AssetName] = artifact.Image.ReleaseImageURI + if artifact.Image != nil { + if artifact.Image.AssetName == "eks-anywhere-packages" || artifact.Image.AssetName == "ecr-token-refresher" { + m[artifact.Image.AssetName] = artifact.Image.ReleaseImageURI + } } } } diff --git a/release/pkg/test/testdata/main-bundle-release.yaml b/release/pkg/test/testdata/main-bundle-release.yaml index dc9dbd50c000..02e4c41bca3e 100644 --- a/release/pkg/test/testdata/main-bundle-release.yaml +++ b/release/pkg/test/testdata/main-bundle-release.yaml @@ -451,7 +451,7 @@ spec: description: Helm chart for eks-anywhere-packages imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: eks-anywhere-packages - uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:0.2.19-eks-a-v0.0.0-dev-build.1 + uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:0.2.20-eks-a-v0.0.0-dev-build.1 packageController: arch: - amd64 @@ -460,7 +460,7 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: eks-anywhere-packages os: linux - uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:v0.2.19-eks-a-v0.0.0-dev-build.1 + uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:v0.2.20-eks-a-v0.0.0-dev-build.1 tokenRefresher: arch: - amd64 @@ -469,8 +469,8 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: ecr-token-refresher os: linux - uri: public.ecr.aws/release-container-registry/ecr-token-refresher:v0.2.19-eks-a-v0.0.0-dev-build.1 - version: v0.2.19+abcdef1 + uri: public.ecr.aws/release-container-registry/ecr-token-refresher:v0.2.20-eks-a-v0.0.0-dev-build.1 + version: v0.2.20+abcdef1 snow: components: uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-aws-snow/manifests/infrastructure-snow/v0.1.8/infrastructure-components.yaml @@ -1210,7 +1210,7 @@ spec: description: Helm chart for eks-anywhere-packages imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: eks-anywhere-packages - uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:0.2.19-eks-a-v0.0.0-dev-build.1 + uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:0.2.20-eks-a-v0.0.0-dev-build.1 packageController: arch: - amd64 @@ -1219,7 +1219,7 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: eks-anywhere-packages os: linux - uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:v0.2.19-eks-a-v0.0.0-dev-build.1 + uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:v0.2.20-eks-a-v0.0.0-dev-build.1 tokenRefresher: arch: - amd64 @@ -1228,8 +1228,8 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: ecr-token-refresher os: linux - uri: public.ecr.aws/release-container-registry/ecr-token-refresher:v0.2.19-eks-a-v0.0.0-dev-build.1 - version: v0.2.19+abcdef1 + uri: public.ecr.aws/release-container-registry/ecr-token-refresher:v0.2.20-eks-a-v0.0.0-dev-build.1 + version: v0.2.20+abcdef1 snow: components: uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-aws-snow/manifests/infrastructure-snow/v0.1.8/infrastructure-components.yaml @@ -1969,7 +1969,7 @@ spec: description: Helm chart for eks-anywhere-packages imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: eks-anywhere-packages - uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:0.2.19-eks-a-v0.0.0-dev-build.1 + uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:0.2.20-eks-a-v0.0.0-dev-build.1 packageController: arch: - amd64 @@ -1978,7 +1978,7 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: eks-anywhere-packages os: linux - uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:v0.2.19-eks-a-v0.0.0-dev-build.1 + uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:v0.2.20-eks-a-v0.0.0-dev-build.1 tokenRefresher: arch: - amd64 @@ -1987,8 +1987,8 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: ecr-token-refresher os: linux - uri: public.ecr.aws/release-container-registry/ecr-token-refresher:v0.2.19-eks-a-v0.0.0-dev-build.1 - version: v0.2.19+abcdef1 + uri: public.ecr.aws/release-container-registry/ecr-token-refresher:v0.2.20-eks-a-v0.0.0-dev-build.1 + version: v0.2.20+abcdef1 snow: components: uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-aws-snow/manifests/infrastructure-snow/v0.1.8/infrastructure-components.yaml @@ -2728,7 +2728,7 @@ spec: description: Helm chart for eks-anywhere-packages imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: eks-anywhere-packages - uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:0.2.19-eks-a-v0.0.0-dev-build.1 + uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:0.2.20-eks-a-v0.0.0-dev-build.1 packageController: arch: - amd64 @@ -2737,7 +2737,7 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: eks-anywhere-packages os: linux - uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:v0.2.19-eks-a-v0.0.0-dev-build.1 + uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:v0.2.20-eks-a-v0.0.0-dev-build.1 tokenRefresher: arch: - amd64 @@ -2746,8 +2746,8 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: ecr-token-refresher os: linux - uri: public.ecr.aws/release-container-registry/ecr-token-refresher:v0.2.19-eks-a-v0.0.0-dev-build.1 - version: v0.2.19+abcdef1 + uri: public.ecr.aws/release-container-registry/ecr-token-refresher:v0.2.20-eks-a-v0.0.0-dev-build.1 + version: v0.2.20+abcdef1 snow: components: uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-aws-snow/manifests/infrastructure-snow/v0.1.8/infrastructure-components.yaml @@ -3469,7 +3469,7 @@ spec: description: Helm chart for eks-anywhere-packages imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: eks-anywhere-packages - uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:0.2.19-eks-a-v0.0.0-dev-build.1 + uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:0.2.20-eks-a-v0.0.0-dev-build.1 packageController: arch: - amd64 @@ -3478,7 +3478,7 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: eks-anywhere-packages os: linux - uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:v0.2.19-eks-a-v0.0.0-dev-build.1 + uri: public.ecr.aws/release-container-registry/eks-anywhere-packages:v0.2.20-eks-a-v0.0.0-dev-build.1 tokenRefresher: arch: - amd64 @@ -3487,8 +3487,8 @@ spec: imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef name: ecr-token-refresher os: linux - uri: public.ecr.aws/release-container-registry/ecr-token-refresher:v0.2.19-eks-a-v0.0.0-dev-build.1 - version: v0.2.19+abcdef1 + uri: public.ecr.aws/release-container-registry/ecr-token-refresher:v0.2.20-eks-a-v0.0.0-dev-build.1 + version: v0.2.20+abcdef1 snow: components: uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-aws-snow/manifests/infrastructure-snow/v0.1.8/infrastructure-components.yaml