Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-0.12] Checking if artifact image is nil #4119

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions release/pkg/helm/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
}
Expand Down
40 changes: 20 additions & 20 deletions release/pkg/test/testdata/main-bundle-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,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
Expand All @@ -451,7 +451,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
Expand All @@ -460,8 +460,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
Expand Down Expand Up @@ -1192,7 +1192,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
Expand All @@ -1201,7 +1201,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
Expand All @@ -1210,8 +1210,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
Expand Down Expand Up @@ -1942,7 +1942,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
Expand All @@ -1951,7 +1951,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
Expand All @@ -1960,8 +1960,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
Expand Down Expand Up @@ -2692,7 +2692,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
Expand All @@ -2701,7 +2701,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
Expand All @@ -2710,8 +2710,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
Expand Down Expand Up @@ -3424,7 +3424,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
Expand All @@ -3433,7 +3433,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
Expand All @@ -3442,8 +3442,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
Expand Down