Merge pull request #347 from jumppad-labs/erik/k8s-cluster-resources

Add resources to k8s cluster

Author: eveld

pkg/config/resources/k8s/provider_cluster.go

@@ -459,6 +459,21 @@ func (p *ClusterProvider) createK3s(ctx context.Context) error {
 		})
 	}
 
+	if p.config.Resources != nil {
+		cc.Resources = &ctypes.Resources{
+			CPU:    p.config.Resources.CPU,
+			CPUPin: p.config.Resources.CPUPin,
+			Memory: p.config.Resources.Memory,
+		}
+
+		if p.config.Resources.GPU != nil {
+			cc.Resources.GPU = &ctypes.GPU{
+				Driver:    p.config.Resources.GPU.Driver,
+				DeviceIDs: p.config.Resources.GPU.DeviceIDs,
+			}
+		}
+	}
+
 	cc.Command = args
 
 	id, err := p.client.CreateContainer(cc)

pkg/config/resources/k8s/resource_cluster.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/jumppad-labs/hclconfig/types"
 	"github.com/jumppad-labs/jumppad/pkg/config"
-	ctypes "github.com/jumppad-labs/jumppad/pkg/config/resources/container"
+	"github.com/jumppad-labs/jumppad/pkg/config/resources/container"
 	"github.com/jumppad-labs/jumppad/pkg/utils"
 )
 
@@ -18,17 +18,29 @@ type Cluster struct {
 	// embedded type holding name, etc.
 	types.ResourceBase `hcl:",remain"`
 
-	Networks []ctypes.NetworkAttachment `hcl:"network,block" json:"networks,omitempty"` // Attach to the correct network // only when Image is specified
+	Networks []container.NetworkAttachment `hcl:"network,block" json:"networks,omitempty"` // Attach to the correct network // only when Image is specified
 
-	Image   *ctypes.Image   `hcl:"image,block" json:"images,omitempty"` // optional image to use when creating the cluster
-	Nodes   int             `hcl:"nodes,optional" json:"nodes,omitempty"`
-	Volumes []ctypes.Volume `hcl:"volume,block" json:"volumes,omitempty"` // volumes to attach to the cluster
+	Image   *container.Image   `hcl:"image,block" json:"images,omitempty"` // optional image to use when creating the cluster
+	Nodes   int                `hcl:"nodes,optional" json:"nodes,omitempty"`
+	Volumes []container.Volume `hcl:"volume,block" json:"volumes,omitempty"` // volumes to attach to the cluster
 
 	// Images that will be copied from the local docker cache to the cluster
-	CopyImages []ctypes.Image `hcl:"copy_image,block" json:"copy_images,omitempty"`
+	CopyImages []container.Image `hcl:"copy_image,block" json:"copy_images,omitempty"`
 
-	Ports      []ctypes.Port      `hcl:"port,block" json:"ports,omitempty"`             // ports to expose
-	PortRanges []ctypes.PortRange `hcl:"port_range,block" json:"port_ranges,omitempty"` // range of ports to expose
+	Ports      []container.Port      `hcl:"port,block" json:"ports,omitempty"`             // ports to expose
+	PortRanges []container.PortRange `hcl:"port_range,block" json:"port_ranges,omitempty"` // range of ports to expose
+
+	/*
+		Define resource constraints for the cluster
+
+		```hcl
+		resources {
+		  cpu = 100
+			memory = 1024
+		}
+		```
+	*/
+	Resources *container.Resources `hcl:"resources,block" json:"resources,omitempty"`
 
 	Environment map[string]string `hcl:"environment,optional" json:"environment,omitempty"` // environment variables to set when starting the container
 
@@ -83,13 +95,20 @@ func (k *Cluster) Process() error {
 	}
 
 	if k.Image == nil {
-		k.Image = &ctypes.Image{Name: fmt.Sprintf("%s:%s", k3sBaseImage, k3sBaseVersion)}
+		k.Image = &container.Image{Name: fmt.Sprintf("%s:%s", k3sBaseImage, k3sBaseVersion)}
 	}
 
 	for i, v := range k.Volumes {
 		k.Volumes[i].Source = utils.EnsureAbsolute(v.Source, k.Meta.File)
 	}
 
+	if k.Resources == nil {
+		k.Resources = &container.Resources{
+			CPU:    500,
+			Memory: 2024,
+		}
+	}
+
 	// do we have an existing resource in the state?
 	// if so we need to set any computed resources for dependents
 	c, err := config.LoadState()
@@ -104,6 +123,7 @@ func (k *Cluster) Process() error {
 			k.ConnectorPort = kstate.ConnectorPort
 			k.ExternalIP = kstate.ExternalIP
 			k.KubeConfig = kstate.KubeConfig
+			k.Resources = kstate.Resources
 
 			// add the network addresses
 			for _, a := range kstate.Networks {