wip: add cloud init to machine spec

Author: sp-yduck

api/v1beta1/cloudinit_types.go

@@ -0,0 +1,63 @@
+package v1beta1
+
+// CloudInit defines options related to the bootstrapping systems where
+// CloudInit is used.
+type CloudInit struct {
+	User    User    `json:"user,omitempty"`
+	Meta    Meta    `json:"meta,omitempty"`
+	Network Network `json:"network,omitempty"`
+}
+
+type User struct {
+	GrowPart       GrowPart     `yaml:"growpart,omitempty" json:"-"`
+	HostName       string       `yaml:"hostname,omitempty" json:"-"`
+	ManageEtcHosts bool         `yaml:"manage_etc_hosts,omitempty" json:"-"`
+	User           string       `yaml:"user,omitempty" json:"user,omitempty"`
+	ChPasswd       ChPasswd     `yaml:"chpasswd,omitempty" json:"-"`
+	Users          []string     `yaml:"users,omitempty" json:"-"`
+	Password       string       `yaml:"password,omitempty" json:"password,omitempty"`
+	Packages       []string     `yaml:"packages,omitempty" json:"-"`
+	PackageUpgrade bool         `yaml:"package_upgrade,omitempty" json:"-"`
+	WriteFiles     []WriteFiles `yaml:"write_files,omitempty" json:"-"`
+	RunCmd         []string     `yaml:"runcmd,omitempty" json:"-"`
+}
+
+type Network struct {
+	Version int             `json:"version,omitempty"`
+	Config  []NetworkConfig `json:"config,omitempty"`
+}
+
+type NetworkConfig struct {
+	Type        string   `json:"type,omitempty"`
+	Name        string   `json:"name,omitempty"`
+	MacAddress  string   `json:"mac_address,omitempty"`
+	Subnets     []Subnet `json:"subnets,omitempty"`
+	Destination string   `json:"destination,omitempty"`
+	Gateway     string   `json:"gateway,omitempty"`
+}
+
+type Subnet struct {
+	Type    string `json:"type,omitempty"`
+	Address string `json:"address,omitempty"`
+	Gateway string `json:"gateway,omitempty"`
+}
+
+type Meta struct {
+}
+
+type GrowPart struct {
+	Mode                   string   `yaml:"mode,omitempty" json:"-"`
+	Devices                []string `yaml:"devices,omitempty" json:"-"`
+	IgnoreGrowrootDisabled bool     `yaml:"ignore_growroot_disabled,omitempty" json:"-"`
+}
+
+type ChPasswd struct {
+	Expire string `yaml:"expire,omitempty" json:"-"`
+}
+
+type WriteFiles struct {
+	Path        string `yaml:"path,omitempty" json:"-"`
+	Owner       string `yaml:"owner,omitempty" json:"-"`
+	Permissions string `yaml:"permissions,omitempty" json:"-"`
+	Content     string `yaml:"content,omitempty" json:"-"`
+}

api/v1beta1/proxmoxcluster_types.go

@@ -55,6 +55,8 @@ type ProxmoxClusterStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="ControlPlaneEndpoint",type=string,JSONPath=`.spec.controlPlaneEndpoint`
+// +kubebuilder:printcolumn:name="Ready",type=string,JSONPath=`.status.ready`
 
 // ProxmoxCluster is the Schema for the proxmoxclusters API
 type ProxmoxCluster struct {

api/v1beta1/proxmoxmachine_types.go

@@ -38,6 +38,9 @@ type ProxmoxMachineSpec struct {
 	// ProviderID
 	ProviderID *string `json:"providerID,omitempty"`
 
+	// Image is the image to be provisioned
+	// Image Image `json:"image"`
+
 	// CloudInit defines options related to the bootstrapping systems where
 	// CloudInit is used.
 	// +optional
@@ -47,9 +50,6 @@ type ProxmoxMachineSpec struct {
 	// For this infrastructure provider, the ID is equivalent to an AWS Availability Zone.
 	// If multiple subnets are matched for the availability zone, the first one returned is picked.
 	FailureDomain *string `json:"failureDomain,omitempty"`
-
-	// Foo is an example field of ProxmoxMachine. Edit proxmoxmachine_types.go to remove/update
-	Foo string `json:"foo,omitempty"`
 }
 
 // ProxmoxMachineStatus defines the observed state of ProxmoxMachine
@@ -72,11 +72,14 @@ type ProxmoxMachineStatus struct {
 
 	// InstanceStatus is the status of the GCP instance for this machine.
 	// +optional
-	InstanceStatus *InstanceStatus `json:"instanceState,omitempty"` // InstanceStatus
+	InstanceStatus *InstanceStatus `json:"instanceStatus,omitempty"` // InstanceStatus
 }
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Addresses",type=string,JSONPath=`.status.addresses`
+// +kubebuilder:printcolumn:name="ProviderID",type=string,JSONPath=`.spec.providerID`
+// +kubebuilder:printcolumn:name="InstanceStatus",type=string,JSONPath=`.status.instanceStatus`
 
 // ProxmoxMachine is the Schema for the proxmoxmachines API
 type ProxmoxMachine struct {

api/v1beta1/type.go

@@ -16,11 +16,19 @@ type ObjectReference struct {
 	Name string `json:"name"`
 }
 
-// CloudInit defines options related to the bootstrapping systems where
-// CloudInit is used.
-type CloudInit struct {
-}
+// Image is the image to be provisioned
+// type Image struct {
+// 	// URL is a location of an image to deploy.
+// 	URL string `json:"url"`
+
+// 	// Checksum
+// 	Checksum string `json:"checksum,omitempty"`
+
+// 	// ChecksumType
+// 	ChecksumType *string `json:"checksumType,omitempty"`
+// }
 
+// Storage for image and snippets
 type Storage struct {
 	Name string `json:"name"`
 	Path string `json:"path,omitempty"`

api/v1beta1/zz_generated.deepcopy.go

@@ -0,0 +1,10 @@
+package cloudinit
+
+func IsValidType(cloudInitType string) bool {
+	switch cloudInitType {
+	case "user", "meta", "network":
+		return true
+	default:
+		return false
+	}
+}

cloud/cloudinit/common.go

@@ -0,0 +1,23 @@
+package cloudinit
+
+import (
+	"gopkg.in/yaml.v3"
+
+	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
+)
+
+func ParseNetwork(content string) (*infrav1.Network, error) {
+	var config *infrav1.Network
+	if err := yaml.Unmarshal([]byte(content), &config); err != nil {
+		return nil, err
+	}
+	return config, nil
+}
+
+func GenerateNetworkYaml(config infrav1.Network) (string, error) {
+	b, err := yaml.Marshal(&config)
+	if err != nil {
+		return "", err
+	}
+	return string(b), nil
+}

cloud/cloudinit/network.go

@@ -0,0 +1 @@
+package cloudinit

cloud/cloudinit/types.go

@@ -0,0 +1,33 @@
+package cloudinit
+
+import (
+	"fmt"
+
+	"github.com/imdario/mergo"
+	"gopkg.in/yaml.v3"
+
+	infrav1 "github.com/sp-yduck/cluster-api-provider-proxmox/api/v1beta1"
+)
+
+func ParseUser(content string) (*infrav1.User, error) {
+	var config *infrav1.User
+	if err := yaml.Unmarshal([]byte(content), &config); err != nil {
+		return nil, err
+	}
+	return config, nil
+}
+
+func GenerateUserYaml(config infrav1.User) (string, error) {
+	b, err := yaml.Marshal(&config)
+	if err != nil {
+		return "", err
+	}
+	return fmt.Sprintf("#cloud-config\n%s", string(b)), nil
+}
+
+func MergeUsers(a, b infrav1.User) (*infrav1.User, error) {
+	if err := mergo.Merge(&a, b, mergo.WithAppendSlice); err != nil {
+		return nil, err
+	}
+	return &a, nil
+}