Skip to content

Commit

Permalink
Fix release test golden files update target (#7051)
Browse files Browse the repository at this point in the history
  • Loading branch information
@g-gaston
g-gaston authored Nov 14, 2023
1 parent 1791f64 commit 51746f1
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion release/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ unit-test: ## Run go test against code.
$(GO) test -count=1 ./...

update-bundle-golden-files: ## Updates testdata files located under pkg/test/testdata
$(GO) test -count=1 ./pkg/operations -update
$(GO) test -C cli -count=1 ./pkg/operations -update
$(eval DIFF_LINE_COUNT=$(shell git diff cli/pkg/test/testdata | wc -l))
@if [[ $(DIFF_LINE_COUNT) != 0 ]]; then \
printf "\n\033[33mWarning:\033[0m Testdata files have been updated! Ensure that these changes were intentional.\n"; \
Expand Down
68 changes: 34 additions & 34 deletions release/cli/pkg/test/testdata/main-bundle-release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: bottlerocket-bootstrap
os: linux
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap:v1-24-29-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap:v1-24-30-eks-a-v0.0.0-dev-build.1
certManager:
acmesolver:
arch:
Expand Down Expand Up @@ -244,13 +244,13 @@ spec:
bottlerocket:
arch:
- amd64
description: Bottlerocket Ami image for EKS-D 1-24-29 release
name: bottlerocket-v1.24.17-eks-d-1-24-29-eks-a-v0.0.0-dev-build.0-amd64.img.gz
description: Bottlerocket Ami image for EKS-D 1-24-30 release
name: bottlerocket-v1.24.17-eks-d-1-24-30-eks-a-v0.0.0-dev-build.0-amd64.img.gz
os: linux
osName: bottlerocket
sha256: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
sha512: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/eks-distro/ami/1-24/1-24-29/bottlerocket-v1.24.17-eks-d-1-24-29-eks-a-v0.0.0-dev-build.0-amd64.img.gz
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/eks-distro/ami/1-24/1-24-30/bottlerocket-v1.24.17-eks-d-1-24-30-eks-a-v0.0.0-dev-build.0-amd64.img.gz
channel: 1-24
components: https://distro.eks.amazonaws.com/crds/releases.distro.eks.amazonaws.com-v1alpha1.yaml
containerd:
Expand Down Expand Up @@ -298,32 +298,32 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kind-node
os: linux
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/kind/node:v1.24.17-eks-d-1-24-29-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/kind/node:v1.24.17-eks-d-1-24-30-eks-a-v0.0.0-dev-build.1
kubeVersion: v1.24.17
manifestUrl: https://distro.eks.amazonaws.com/kubernetes-1-24/kubernetes-1-24-eks-29.yaml
name: kubernetes-1-24-eks-29
manifestUrl: https://distro.eks.amazonaws.com/kubernetes-1-24/kubernetes-1-24-eks-30.yaml
name: kubernetes-1-24-eks-30
ova:
bottlerocket:
arch:
- amd64
description: Bottlerocket Ova image for EKS-D 1-24-29 release
name: bottlerocket-v1.24.17-eks-d-1-24-29-eks-a-v0.0.0-dev-build.0-amd64.ova
description: Bottlerocket Ova image for EKS-D 1-24-30 release
name: bottlerocket-v1.24.17-eks-d-1-24-30-eks-a-v0.0.0-dev-build.0-amd64.ova
os: linux
osName: bottlerocket
sha256: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
sha512: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/eks-distro/ova/1-24/1-24-29/bottlerocket-v1.24.17-eks-d-1-24-29-eks-a-v0.0.0-dev-build.0-amd64.ova
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/eks-distro/ova/1-24/1-24-30/bottlerocket-v1.24.17-eks-d-1-24-30-eks-a-v0.0.0-dev-build.0-amd64.ova
raw:
bottlerocket:
arch:
- amd64
description: Bottlerocket Raw image for EKS-D 1-24-29 release
name: bottlerocket-v1.24.17-eks-d-1-24-29-eks-a-v0.0.0-dev-build.0-amd64.img.gz
description: Bottlerocket Raw image for EKS-D 1-24-30 release
name: bottlerocket-v1.24.17-eks-d-1-24-30-eks-a-v0.0.0-dev-build.0-amd64.img.gz
os: linux
osName: bottlerocket
sha256: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
sha512: 0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/eks-distro/raw/1-24/1-24-29/bottlerocket-v1.24.17-eks-d-1-24-29-eks-a-v0.0.0-dev-build.0-amd64.img.gz
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/eks-distro/raw/1-24/1-24-30/bottlerocket-v1.24.17-eks-d-1-24-30-eks-a-v0.0.0-dev-build.0-amd64.img.gz
eksa:
cliTools:
arch:
Expand Down Expand Up @@ -525,7 +525,7 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: bottlerocket-bootstrap-snow
os: linux
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap-snow:v1-24-29-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap-snow:v1-24-30-eks-a-v0.0.0-dev-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-aws-snow/manifests/infrastructure-snow/v0.1.27/infrastructure-components.yaml
kubeVip:
Expand Down Expand Up @@ -843,7 +843,7 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: bottlerocket-bootstrap
os: linux
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap:v1-25-25-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap:v1-25-26-eks-a-v0.0.0-dev-build.1
certManager:
acmesolver:
arch:
Expand Down Expand Up @@ -1075,10 +1075,10 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kind-node
os: linux
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/kind/node:v1.25.15-eks-d-1-25-25-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/kind/node:v1.25.15-eks-d-1-25-26-eks-a-v0.0.0-dev-build.1
kubeVersion: v1.25.15
manifestUrl: https://distro.eks.amazonaws.com/kubernetes-1-25/kubernetes-1-25-eks-25.yaml
name: kubernetes-1-25-eks-25
manifestUrl: https://distro.eks.amazonaws.com/kubernetes-1-25/kubernetes-1-25-eks-26.yaml
name: kubernetes-1-25-eks-26
ova:
bottlerocket: {}
raw:
Expand Down Expand Up @@ -1284,7 +1284,7 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: bottlerocket-bootstrap-snow
os: linux
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap-snow:v1-25-25-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap-snow:v1-25-26-eks-a-v0.0.0-dev-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-aws-snow/manifests/infrastructure-snow/v0.1.27/infrastructure-components.yaml
kubeVip:
Expand Down Expand Up @@ -1602,7 +1602,7 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: bottlerocket-bootstrap
os: linux
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap:v1-26-21-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap:v1-26-22-eks-a-v0.0.0-dev-build.1
certManager:
acmesolver:
arch:
Expand Down Expand Up @@ -1834,10 +1834,10 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kind-node
os: linux
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/kind/node:v1.26.10-eks-d-1-26-21-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/kind/node:v1.26.10-eks-d-1-26-22-eks-a-v0.0.0-dev-build.1
kubeVersion: v1.26.10
manifestUrl: https://distro.eks.amazonaws.com/kubernetes-1-26/kubernetes-1-26-eks-21.yaml
name: kubernetes-1-26-eks-21
manifestUrl: https://distro.eks.amazonaws.com/kubernetes-1-26/kubernetes-1-26-eks-22.yaml
name: kubernetes-1-26-eks-22
ova:
bottlerocket: {}
raw:
Expand Down Expand Up @@ -2043,7 +2043,7 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: bottlerocket-bootstrap-snow
os: linux
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap-snow:v1-26-21-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap-snow:v1-26-22-eks-a-v0.0.0-dev-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-aws-snow/manifests/infrastructure-snow/v0.1.27/infrastructure-components.yaml
kubeVip:
Expand Down Expand Up @@ -2361,7 +2361,7 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: bottlerocket-bootstrap
os: linux
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap:v1-27-15-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap:v1-27-16-eks-a-v0.0.0-dev-build.1
certManager:
acmesolver:
arch:
Expand Down Expand Up @@ -2593,10 +2593,10 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kind-node
os: linux
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/kind/node:v1.27.7-eks-d-1-27-15-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/kind/node:v1.27.7-eks-d-1-27-16-eks-a-v0.0.0-dev-build.1
kubeVersion: v1.27.7
manifestUrl: https://distro.eks.amazonaws.com/kubernetes-1-27/kubernetes-1-27-eks-15.yaml
name: kubernetes-1-27-eks-15
manifestUrl: https://distro.eks.amazonaws.com/kubernetes-1-27/kubernetes-1-27-eks-16.yaml
name: kubernetes-1-27-eks-16
ova:
bottlerocket: {}
raw:
Expand Down Expand Up @@ -2802,7 +2802,7 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: bottlerocket-bootstrap-snow
os: linux
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap-snow:v1-27-15-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap-snow:v1-27-16-eks-a-v0.0.0-dev-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-aws-snow/manifests/infrastructure-snow/v0.1.27/infrastructure-components.yaml
kubeVip:
Expand Down Expand Up @@ -3120,7 +3120,7 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: bottlerocket-bootstrap
os: linux
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap:v1-28-8-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap:v1-28-9-eks-a-v0.0.0-dev-build.1
certManager:
acmesolver:
arch:
Expand Down Expand Up @@ -3352,10 +3352,10 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: kind-node
os: linux
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/kind/node:v1.28.3-eks-d-1-28-8-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/kubernetes-sigs/kind/node:v1.28.3-eks-d-1-28-9-eks-a-v0.0.0-dev-build.1
kubeVersion: v1.28.3
manifestUrl: https://distro.eks.amazonaws.com/kubernetes-1-28/kubernetes-1-28-eks-8.yaml
name: kubernetes-1-28-eks-8
manifestUrl: https://distro.eks.amazonaws.com/kubernetes-1-28/kubernetes-1-28-eks-9.yaml
name: kubernetes-1-28-eks-9
ova:
bottlerocket: {}
raw:
Expand Down Expand Up @@ -3561,7 +3561,7 @@ spec:
imageDigest: sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
name: bottlerocket-bootstrap-snow
os: linux
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap-snow:v1-28-8-eks-a-v0.0.0-dev-build.1
uri: public.ecr.aws/release-container-registry/bottlerocket-bootstrap-snow:v1-28-9-eks-a-v0.0.0-dev-build.1
components:
uri: https://release-bucket/artifacts/v0.0.0-dev-build.0/cluster-api-provider-aws-snow/manifests/infrastructure-snow/v0.1.27/infrastructure-components.yaml
kubeVip:
Expand Down

0 comments on commit 51746f1

Please sign in to comment.