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.

Sign up for GitHub

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

Update bundle to include new tink charts #8277

Merged
merged 2 commits into from
Jun 11, 2024
Merged

Update bundle to include new tink charts #8277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70f53c4
Update bundle to include new tink charts
ahreehong Jun 10, 2024
7aef88d
Update generated files
ahreehong Jun 11, 2024
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
92 changes: 92 additions & 0 deletions config/crd/bases/anywhere.eks.amazonaws.com_bundles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2696,8 +2696,68 @@ spec:
description: The image repository, name, and tag
type: string
type: object
stack:
properties:
arch:
description: Architectures of the asset
items:
type: string
type: array
description:
type: string
imageDigest:
description: The SHA256 digest of the image manifest
type: string
name:
description: The asset name
type: string
os:
description: Operating system of the asset
enum:
- linux
- darwin
- windows
type: string
osName:
description: Name of the OS like ubuntu, bottlerocket
type: string
uri:
description: The image repository, name, and tag
type: string
type: object
tink:
properties:
nginx:
properties:
arch:
description: Architectures of the asset
items:
type: string
type: array
description:
type: string
imageDigest:
description: The SHA256 digest of the image
manifest
type: string
name:
description: The asset name
type: string
os:
description: Operating system of the asset
enum:
- linux
- darwin
- windows
type: string
osName:
description: Name of the OS like ubuntu, bottlerocket
type: string
uri:
description: The image repository, name, and
tag
type: string
type: object
tinkController:
properties:
arch:
Expand Down Expand Up @@ -2792,6 +2852,7 @@ spec:
type: string
type: object
required:
- nginx
- tinkController
- tinkServer
- tinkWorker
Expand Down Expand Up @@ -2825,14 +2886,45 @@ spec:
description: The image repository, name, and tag
type: string
type: object
tinkerbellCrds:
properties:
arch:
description: Architectures of the asset
items:
type: string
type: array
description:
type: string
imageDigest:
description: The SHA256 digest of the image manifest
type: string
name:
description: The asset name
type: string
os:
description: Operating system of the asset
enum:
- linux
- darwin
- windows
type: string
osName:
description: Name of the OS like ubuntu, bottlerocket
type: string
uri:
description: The image repository, name, and tag
type: string
type: object
required:
- actions
- boots
- hegel
- hook
- rufio
- stack
- tink
- tinkerbellChart
- tinkerbellCrds
type: object
version:
type: string
Expand Down
92 changes: 92 additions & 0 deletions config/manifest/eksa-components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2864,8 +2864,68 @@ spec:
description: The image repository, name, and tag
type: string
type: object
stack:
properties:
arch:
description: Architectures of the asset
items:
type: string
type: array
description:
type: string
imageDigest:
description: The SHA256 digest of the image manifest
type: string
name:
description: The asset name
type: string
os:
description: Operating system of the asset
enum:
- linux
- darwin
- windows
type: string
osName:
description: Name of the OS like ubuntu, bottlerocket
type: string
uri:
description: The image repository, name, and tag
type: string
type: object
tink:
properties:
nginx:
properties:
arch:
description: Architectures of the asset
items:
type: string
type: array
description:
type: string
imageDigest:
description: The SHA256 digest of the image
manifest
type: string
name:
description: The asset name
type: string
os:
description: Operating system of the asset
enum:
- linux
- darwin
- windows
type: string
osName:
description: Name of the OS like ubuntu, bottlerocket
type: string
uri:
description: The image repository, name, and
tag
type: string
type: object
tinkController:
properties:
arch:
Expand Down Expand Up @@ -2960,6 +3020,7 @@ spec:
type: string
type: object
required:
- nginx
- tinkController
- tinkServer
- tinkWorker
Expand Down Expand Up @@ -2993,14 +3054,45 @@ spec:
description: The image repository, name, and tag
type: string
type: object
tinkerbellCrds:
properties:
arch:
description: Architectures of the asset
items:
type: string
type: array
description:
type: string
imageDigest:
description: The SHA256 digest of the image manifest
type: string
name:
description: The asset name
type: string
os:
description: Operating system of the asset
enum:
- linux
- darwin
- windows
type: string
osName:
description: Name of the OS like ubuntu, bottlerocket
type: string
uri:
description: The image repository, name, and tag
type: string
type: object
required:
- actions
- boots
- hegel
- hook
- rufio
- stack
- tink
- tinkerbellChart
- tinkerbellCrds
type: object
version:
type: string
Expand Down
31 changes: 14 additions & 17 deletions internal/thirdparty/capc/api/v1beta3/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions release/api/v1alpha1/artifacts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
vb.Tinkerbell.TinkerbellStack.Tink.TinkController,
vb.Tinkerbell.TinkerbellStack.Tink.TinkServer,
vb.Tinkerbell.TinkerbellStack.Tink.TinkWorker,
vb.Tinkerbell.TinkerbellStack.Tink.Nginx,

Check warning on line 151 in release/api/v1alpha1/artifacts.go

View check run for this annotation

Codecov / codecov/patch

release/api/v1alpha1/artifacts.go#L151 

Added line #L151 was not covered by tests
}
}

Expand Down Expand Up @@ -230,5 +231,7 @@
"cilium": &vb.Cilium.HelmChart,
"eks-anywhere-packages": &vb.PackageController.HelmChart,
"tinkerbell-chart": &vb.Tinkerbell.TinkerbellStack.TinkebellChart,
"tinkerbell-crds": &vb.Tinkerbell.TinkerbellStack.TinkerbellCrds,
"tinkerbell-stack": &vb.Tinkerbell.TinkerbellStack.Stack,

Check warning on line 235 in release/api/v1alpha1/artifacts.go

View check run for this annotation

Codecov / codecov/patch

release/api/v1alpha1/artifacts.go#L234-L235 

Added lines #L234 - L235 were not covered by tests
}
}
3 changes: 3 additions & 0 deletions release/api/v1alpha1/bundle_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,8 @@ type TinkerbellStackBundle struct {
Hook HookBundle `json:"hook"`
Rufio Image `json:"rufio"`
Tink TinkBundle `json:"tink"`
TinkerbellCrds Image `json:"tinkerbellCrds"`
Stack Image `json:"stack"`
}

// Tinkerbell Template Actions.
Expand All @@ -303,6 +305,7 @@ type TinkBundle struct {
TinkController Image `json:"tinkController"`
TinkServer Image `json:"tinkServer"`
TinkWorker Image `json:"tinkWorker"`
Nginx Image `json:"nginx"`
}

// Tinkerbell hook OS.
Expand Down
3 changes: 3 additions & 0 deletions release/api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 39 additions & 0 deletions release/cli/pkg/assets/config/bundle_release.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,6 +825,9 @@ var bundleReleaseAssetsConfigMap = []assettypes.AssetConfig{
ProjectName: "tink",
ProjectPath: "projects/tinkerbell/tink",
Images: []*assettypes.Image{
{
RepoName: "nginx",
},
{
RepoName: "tink-controller",
},
Expand Down Expand Up @@ -860,6 +863,42 @@ var bundleReleaseAssetsConfigMap = []assettypes.AssetConfig{
"projectPath",
},
},
{
ProjectName: "stack",
ProjectPath: "projects/tinkerbell/charts",
Images: []*assettypes.Image{
{
RepoName: "stack",
TrimVersionSignifier: true,
ImageTagConfiguration: assettypes.ImageTagConfiguration{
NonProdSourceImageTagFormat: "<gitTag>",
},
},
},
ImageRepoPrefix: "tinkerbell",
ImageTagOptions: []string{
"gitTag",
"projectPath",
},
},
{
ProjectName: "tinkerbell-crds",
ProjectPath: "projects/tinkerbell/tinkerbell-crds",
Images: []*assettypes.Image{
{
RepoName: "tinkerbell-crds",
TrimVersionSignifier: true,
ImageTagConfiguration: assettypes.ImageTagConfiguration{
NonProdSourceImageTagFormat: "<gitTag>",
},
},
},
ImageRepoPrefix: "tinkerbell",
ImageTagOptions: []string{
"gitTag",
"projectPath",
},
},
// Upgrader artifacts
{
ProjectName: "upgrader",
Expand Down
Loading
Loading