Skip to content

Commit

Permalink
Update bundle to include new tink charts
Browse files Browse the repository at this point in the history
  • Loading branch information
ahreehong committed Jun 10, 2024
1 parent 305e2bb commit 70f53c4
Show file tree
Hide file tree
Showing 5 changed files with 702 additions and 492 deletions.
3 changes: 3 additions & 0 deletions release/api/v1alpha1/artifacts.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ func (vb *VersionsBundle) TinkerbellImages() []Image {
vb.Tinkerbell.TinkerbellStack.Tink.TinkController,
vb.Tinkerbell.TinkerbellStack.Tink.TinkServer,
vb.Tinkerbell.TinkerbellStack.Tink.TinkWorker,
vb.Tinkerbell.TinkerbellStack.Tink.Nginx,
}
}

Expand Down Expand Up @@ -230,5 +231,7 @@ func (vb *VersionsBundle) Charts() map[string]*Image {
"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,
}
}
3 changes: 3 additions & 0 deletions release/api/v1alpha1/bundle_types.go
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
39 changes: 39 additions & 0 deletions release/cli/pkg/assets/config/bundle_release.go
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
5 changes: 4 additions & 1 deletion release/cli/pkg/bundles/tinkerbell.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
)

func GetTinkerbellBundle(r *releasetypes.ReleaseConfig, imageDigests releasetypes.ImageDigestsTable) (anywherev1alpha1.TinkerbellBundle, error) {
projectsInBundle := []string{"cluster-api-provider-tinkerbell", "kube-vip", "envoy", "tink", "hegel", "boots", "hub", "hook", "rufio", "tinkerbell-chart"}
projectsInBundle := []string{"cluster-api-provider-tinkerbell", "kube-vip", "envoy", "tink", "hegel", "boots", "hub", "hook", "rufio", "stack", "tinkerbell-chart", "tinkerbell-crds"}
tinkerbellBundleArtifacts := map[string][]releasetypes.Artifact{}
for _, project := range projectsInBundle {
projectArtifacts, err := r.BundleArtifactsTable.Load(project)
Expand Down Expand Up @@ -153,12 +153,15 @@ func GetTinkerbellBundle(r *releasetypes.ReleaseConfig, imageDigests releasetype
},
},
Rufio: bundleImageArtifacts["rufio"],
Stack: bundleImageArtifacts["stack"],
Tink: anywherev1alpha1.TinkBundle{
Nginx: bundleImageArtifacts["nginx"],
TinkController: bundleImageArtifacts["tink-controller"],
TinkServer: bundleImageArtifacts["tink-server"],
TinkWorker: bundleImageArtifacts["tink-worker"],
},
TinkebellChart: bundleImageArtifacts["tinkerbell-chart"],
TinkerbellCrds: bundleImageArtifacts["tinkerbell-crds"],
},
}

Expand Down
Loading

0 comments on commit 70f53c4

Please sign in to comment.