Skip to content

Allow cluster image specification #1000

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

Merged
rmvangun merged 2 commits into from
Apr 12, 2025
+129 −16
Merged

Allow cluster image specification #1000

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
1ba74a9
Add Image field
rmvangun Apr 12, 2025
cbcbe40
Allow image parameterization for cluster nodes
rmvangun Apr 12, 2025
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
17 changes: 17 additions & 0 deletions api/v1alpha1/cluster/cluster_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ type ClusterConfig struct {
Platform *string `yaml:"platform,omitempty"`
Driver *string `yaml:"driver,omitempty"`
Endpoint *string `yaml:"endpoint,omitempty"`
Image *string `yaml:"image,omitempty"`
ControlPlanes NodeGroupConfig `yaml:"controlplanes,omitempty"`
Workers NodeGroupConfig `yaml:"workers,omitempty"`
}
Expand All @@ -15,6 +16,7 @@ type NodeConfig struct {
Hostname *string `yaml:"hostname,omitempty"`
Node *string `yaml:"node,omitempty"`
Endpoint *string `yaml:"endpoint,omitempty"`
Image *string `yaml:"image,omitempty"`
HostPorts []string `yaml:"hostports,omitempty"`
}

Expand All @@ -23,6 +25,7 @@ type NodeGroupConfig struct {
Count *int `yaml:"count,omitempty"`
CPU *int `yaml:"cpu,omitempty"`
Memory *int `yaml:"memory,omitempty"`
Image *string `yaml:"image,omitempty"`
Nodes map[string]NodeConfig `yaml:"nodes,omitempty"`
HostPorts []string `yaml:"hostports,omitempty"`
Volumes []string `yaml:"volumes,omitempty"`
Expand All @@ -42,6 +45,9 @@ func (base *ClusterConfig) Merge(overlay *ClusterConfig) {
if overlay.Endpoint != nil {
base.Endpoint = overlay.Endpoint
}
if overlay.Image != nil {
base.Image = overlay.Image
}
if overlay.ControlPlanes.Count != nil {
base.ControlPlanes.Count = overlay.ControlPlanes.Count
}
Expand All @@ -51,6 +57,9 @@ func (base *ClusterConfig) Merge(overlay *ClusterConfig) {
if overlay.ControlPlanes.Memory != nil {
base.ControlPlanes.Memory = overlay.ControlPlanes.Memory
}
if overlay.ControlPlanes.Image != nil {
base.ControlPlanes.Image = overlay.ControlPlanes.Image
}
if overlay.ControlPlanes.Nodes != nil {
base.ControlPlanes.Nodes = make(map[string]NodeConfig, len(overlay.ControlPlanes.Nodes))
for key, node := range overlay.ControlPlanes.Nodes {
Expand All @@ -74,6 +83,9 @@ func (base *ClusterConfig) Merge(overlay *ClusterConfig) {
if overlay.Workers.Memory != nil {
base.Workers.Memory = overlay.Workers.Memory
}
if overlay.Workers.Image != nil {
base.Workers.Image = overlay.Workers.Image
}
if overlay.Workers.Nodes != nil {
base.Workers.Nodes = make(map[string]NodeConfig, len(overlay.Workers.Nodes))
for key, node := range overlay.Workers.Nodes {
Expand Down Expand Up @@ -102,6 +114,7 @@ func (c *ClusterConfig) Copy() *ClusterConfig {
Hostname: node.Hostname,
Node: node.Node,
Endpoint: node.Endpoint,
Image: node.Image,
HostPorts: append([]string{}, node.HostPorts...),
}
}
Expand All @@ -116,6 +129,7 @@ func (c *ClusterConfig) Copy() *ClusterConfig {
Hostname: node.Hostname,
Node: node.Node,
Endpoint: node.Endpoint,
Image: node.Image,
HostPorts: append([]string{}, node.HostPorts...),
}
}
Expand All @@ -129,10 +143,12 @@ func (c *ClusterConfig) Copy() *ClusterConfig {
Platform: c.Platform,
Driver: c.Driver,
Endpoint: c.Endpoint,
Image: c.Image,
ControlPlanes: NodeGroupConfig{
Count: c.ControlPlanes.Count,
CPU: c.ControlPlanes.CPU,
Memory: c.ControlPlanes.Memory,
Image: c.ControlPlanes.Image,
Nodes: controlPlanesNodesCopy,
HostPorts: controlPlanesHostPortsCopy,
Volumes: controlPlanesVolumesCopy,
Expand All @@ -141,6 +157,7 @@ func (c *ClusterConfig) Copy() *ClusterConfig {
Count: c.Workers.Count,
CPU: c.Workers.CPU,
Memory: c.Workers.Memory,
Image: c.Workers.Image,
Nodes: workersNodesCopy,
HostPorts: workersHostPortsCopy,
Volumes: workersVolumesCopy,
Expand Down
Loading
Loading