Skip to content

Commit

Permalink
Source Bottlerocket artifacts from new upload location (#6703)
Browse files Browse the repository at this point in the history
  • Loading branch information
@abhay-krishna
abhay-krishna authored Sep 19, 2023
1 parent 8f307c9 commit 7419a27
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 26 deletions.
2 changes: 1 addition & 1 deletion release/pkg/assets/archives/archives.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func EksDistroArtifactPathGetter(rc *releasetypes.ReleaseConfig, archive *assett

if rc.DevRelease || rc.ReleaseEnvironment == "development" {
sourceS3Key = fmt.Sprintf("%s.%s", archive.OSName, imageExtension)
sourceS3Prefix = fmt.Sprintf("%s/%s/%s/%s/%s", projectPath, eksDReleaseChannel, archive.Format, archive.OSName, latestPath)
sourceS3Prefix = fmt.Sprintf("%s/%s/%s/%s/%s/%s", projectPath, eksDReleaseChannel, archive.Format, archive.OSName, archive.OSVersion, latestPath)
} else {
sourceS3Key = fmt.Sprintf("%s-%s-eks-d-%s-%s-eks-a-%d-%s.%s",
archive.OSName,
Expand Down
3 changes: 2 additions & 1 deletion release/pkg/assets/archives/archives_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,12 +125,13 @@ func TestGenerateArchiveAssets(t *testing.T) {
archive: &assettypes.Archive{
Name: "baz",
OSName: "lorem",
OSVersion: "v1.2.3",
Format: "ova",
ArchiveS3PathGetter: EksDistroArtifactPathGetter,
},
wantArchiveArtifact: &releasetypes.ArchiveArtifact{
SourceS3Key: "lorem.ova",
SourceS3Prefix: "projects/foo/bar/1-21/ova/lorem/latest",
SourceS3Prefix: "projects/foo/bar/1-21/ova/lorem/v1.2.3/latest",
ArtifactPath: "artifacts/baz-ova/1-21",
ReleaseName: "lorem-1.21.9-eks-d-1-21-8-eks-a-v0.0.0-dev-build.0-amd64.ova",
ReleaseS3Path: "artifacts/v0.0.0-dev-build.0/eks-distro/ova/1-21/1-21-8",
Expand Down
3 changes: 3 additions & 0 deletions release/pkg/assets/config/bundle_release.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,18 +599,21 @@ var bundleReleaseAssetsConfigMap = []assettypes.AssetConfig{
{
Name: "eks-distro",
OSName: "bottlerocket",
OSVersion: "1",
Format: "ami",
ArchiveS3PathGetter: archives.EksDistroArtifactPathGetter,
},
{
Name: "eks-distro",
OSName: "bottlerocket",
OSVersion: "1",
Format: "ova",
ArchiveS3PathGetter: archives.EksDistroArtifactPathGetter,
},
{
Name: "eks-distro",
OSName: "bottlerocket",
OSVersion: "1",
Format: "raw",
ArchiveS3PathGetter: archives.EksDistroArtifactPathGetter,
},
Expand Down
1 change: 1 addition & 0 deletions release/pkg/assets/types/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ type Archive struct {
Name string
Format string
OSName string
OSVersion string
ArchitectureOverride string
ArchiveS3PathGetter ArchiveS3PathGenerator
}
Expand Down
48 changes: 24 additions & 24 deletions release/pkg/test/testdata/main-bundle-release.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,18 +37,18 @@ spec:
arch:
- amd64
description: Container image for bottlerocket-admin image
imageDigest: sha256:a1b07272379f62ed857c3dd29e0624773a634eec24716c249e7d2fc8b6ef98ec
imageDigest: sha256:2a81ceb8d2f40c1573d2358398da97c12d516888a702e710ea46d0ef5380e5a3
name: bottlerocket-admin
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.10.2
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.0
control:
arch:
- amd64
description: Container image for bottlerocket-control image
imageDigest: sha256:104b9e8def8f9cb07b77d407f774a1d731ef785dd880007cec68d0003d7f1900
imageDigest: sha256:551be0f7ec17780e766e2ed9d8162b9a65c9f455d32f32aa095f1c5ba5c32118
name: bottlerocket-control
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.3
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.4
kubeadmBootstrap:
arch:
- amd64
Expand Down Expand Up @@ -823,18 +823,18 @@ spec:
arch:
- amd64
description: Container image for bottlerocket-admin image
imageDigest: sha256:a1b07272379f62ed857c3dd29e0624773a634eec24716c249e7d2fc8b6ef98ec
imageDigest: sha256:2a81ceb8d2f40c1573d2358398da97c12d516888a702e710ea46d0ef5380e5a3
name: bottlerocket-admin
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.10.2
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.0
control:
arch:
- amd64
description: Container image for bottlerocket-control image
imageDigest: sha256:104b9e8def8f9cb07b77d407f774a1d731ef785dd880007cec68d0003d7f1900
imageDigest: sha256:551be0f7ec17780e766e2ed9d8162b9a65c9f455d32f32aa095f1c5ba5c32118
name: bottlerocket-control
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.3
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.4
kubeadmBootstrap:
arch:
- amd64
Expand Down Expand Up @@ -1609,18 +1609,18 @@ spec:
arch:
- amd64
description: Container image for bottlerocket-admin image
imageDigest: sha256:a1b07272379f62ed857c3dd29e0624773a634eec24716c249e7d2fc8b6ef98ec
imageDigest: sha256:2a81ceb8d2f40c1573d2358398da97c12d516888a702e710ea46d0ef5380e5a3
name: bottlerocket-admin
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.10.2
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.0
control:
arch:
- amd64
description: Container image for bottlerocket-control image
imageDigest: sha256:104b9e8def8f9cb07b77d407f774a1d731ef785dd880007cec68d0003d7f1900
imageDigest: sha256:551be0f7ec17780e766e2ed9d8162b9a65c9f455d32f32aa095f1c5ba5c32118
name: bottlerocket-control
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.3
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.4
kubeadmBootstrap:
arch:
- amd64
Expand Down Expand Up @@ -2368,18 +2368,18 @@ spec:
arch:
- amd64
description: Container image for bottlerocket-admin image
imageDigest: sha256:a1b07272379f62ed857c3dd29e0624773a634eec24716c249e7d2fc8b6ef98ec
imageDigest: sha256:2a81ceb8d2f40c1573d2358398da97c12d516888a702e710ea46d0ef5380e5a3
name: bottlerocket-admin
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.10.2
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.0
control:
arch:
- amd64
description: Container image for bottlerocket-control image
imageDigest: sha256:104b9e8def8f9cb07b77d407f774a1d731ef785dd880007cec68d0003d7f1900
imageDigest: sha256:551be0f7ec17780e766e2ed9d8162b9a65c9f455d32f32aa095f1c5ba5c32118
name: bottlerocket-control
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.3
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.4
kubeadmBootstrap:
arch:
- amd64
Expand Down Expand Up @@ -3127,18 +3127,18 @@ spec:
arch:
- amd64
description: Container image for bottlerocket-admin image
imageDigest: sha256:a1b07272379f62ed857c3dd29e0624773a634eec24716c249e7d2fc8b6ef98ec
imageDigest: sha256:2a81ceb8d2f40c1573d2358398da97c12d516888a702e710ea46d0ef5380e5a3
name: bottlerocket-admin
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.10.2
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.0
control:
arch:
- amd64
description: Container image for bottlerocket-control image
imageDigest: sha256:104b9e8def8f9cb07b77d407f774a1d731ef785dd880007cec68d0003d7f1900
imageDigest: sha256:551be0f7ec17780e766e2ed9d8162b9a65c9f455d32f32aa095f1c5ba5c32118
name: bottlerocket-control
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.3
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.4
kubeadmBootstrap:
arch:
- amd64
Expand Down Expand Up @@ -3886,18 +3886,18 @@ spec:
arch:
- amd64
description: Container image for bottlerocket-admin image
imageDigest: sha256:a1b07272379f62ed857c3dd29e0624773a634eec24716c249e7d2fc8b6ef98ec
imageDigest: sha256:2a81ceb8d2f40c1573d2358398da97c12d516888a702e710ea46d0ef5380e5a3
name: bottlerocket-admin
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.10.2
uri: public.ecr.aws/bottlerocket/bottlerocket-admin:v0.11.0
control:
arch:
- amd64
description: Container image for bottlerocket-control image
imageDigest: sha256:104b9e8def8f9cb07b77d407f774a1d731ef785dd880007cec68d0003d7f1900
imageDigest: sha256:551be0f7ec17780e766e2ed9d8162b9a65c9f455d32f32aa095f1c5ba5c32118
name: bottlerocket-control
os: linux
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.3
uri: public.ecr.aws/bottlerocket/bottlerocket-control:v0.7.4
kubeadmBootstrap:
arch:
- amd64
Expand Down

0 comments on commit 7419a27

Please sign in to comment.