Add server userdata to support server configuration and init scripts

unikorn-cloud · Dec 3, 2024 · fd1ddfd · fd1ddfd
1 parent 3debb83
commit fd1ddfd
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 55 deletions.
diff --git a/charts/region/crds/region.unikorn-cloud.org_servers.yaml b/charts/region/crds/region.unikorn-cloud.org_servers.yaml
@@ -137,6 +137,11 @@ spec:
                   - value
                   type: object
                 type: array
+              userData:
+                description: UserData contains configuration information or scripts
+                  to use upon launch.
+                format: byte
+                type: string
             required:
             - flavorID
             - image

diff --git a/pkg/apis/unikorn/v1alpha1/types.go b/pkg/apis/unikorn/v1alpha1/types.go
@@ -719,6 +719,8 @@ type ServerSpec struct {
 	PublicIPAllocation *ServerPublicIPAllocationSpec `json:"publicIPAllocation,omitempty"`
 	// Networks is the server network configuration.
 	Networks []ServerNetworkSpec `json:"networks,omitempty"`
+	// UserData contains configuration information or scripts to use upon launch.
+	UserData []byte `json:"userData,omitempty"`
 }
 
 type ServerSecurityGroupSpec struct {

diff --git a/pkg/handler/server/conversion.go b/pkg/handler/server/conversion.go
@@ -59,6 +59,7 @@ func convert(in *unikornv1.Server) *openapi.ServerRead {
 			Networks:           convertServerNetworks(in.Spec.Networks),
 			PublicIPAllocation: convertServerPublicIPAllocation(in.Spec.PublicIPAllocation),
 			SecurityGroups:     convertServerSecurityGroups(in.Spec.SecurityGroups),
+			UserData:           convertServerUserData(in.Spec.UserData),
 		},
 		Status: openapi.ServerReadStatus{
 			PrivateIP: in.Status.PrivateIP,
@@ -121,6 +122,14 @@ func convertServerSecurityGroup(in *unikornv1.ServerSecurityGroupSpec) openapi.S
 	}
 }
 
+func convertServerUserData(in []byte) *[]byte {
+	if in == nil {
+		return nil
+	}
+
+	return &in
+}
+
 type generator struct {
 	// client allows Kubernetes API access.
 	client client.Client
@@ -164,6 +173,7 @@ func (g *generator) generate(ctx context.Context, in *openapi.ServerWrite) (*uni
 			PublicIPAllocation: g.generatePublicIPAllocation(in.Spec.PublicIPAllocation),
 			SecurityGroups:     g.generateSecurityGroups(in.Spec.SecurityGroups),
 			Networks:           g.generateNetworks(in.Spec.Networks),
+			UserData:           g.generateUserData(in.Spec.UserData),
 		},
 	}
 
@@ -228,3 +238,11 @@ func (g *generator) generateNetworks(in openapi.ServerNetworkList) []unikornv1.S
 
 	return out
 }
+
+func (g *generator) generateUserData(in *[]byte) []byte {
+	if in == nil {
+		return nil
+	}
+
+	return *in
+}
diff --git a/pkg/openapi/schema.go b/pkg/openapi/schema.go
diff --git a/pkg/openapi/server.spec.yaml b/pkg/openapi/server.spec.yaml
@@ -1205,6 +1205,10 @@ components:
           $ref: '#/components/schemas/serverPublicIPAllocation'
         networks:
           $ref: '#/components/schemas/serverNetworkList'
+        userData:
+          description: UserData contains base64-encoded configuration information or scripts to use upon launch.
+          type: string
+          format: byte 
     serverNetworkList:
       description: A list of networks.
       type: array
@@ -1296,6 +1300,10 @@ components:
           $ref: '#/components/schemas/serverPublicIPAllocation'
         networks:
           $ref: '#/components/schemas/serverNetworkList'
+        userData:
+          description: UserData contains base64-encoded configuration information or scripts to use upon launch.
+          type: string
+          format: byte 
     serverWrite:
       description: A server request.
       type: object

diff --git a/pkg/openapi/types.go b/pkg/openapi/types.go
diff --git a/pkg/providers/openstack/compute.go b/pkg/providers/openstack/compute.go
@@ -269,7 +269,7 @@ func (c *ComputeClient) UpdateQuotas(ctx context.Context, projectID string) erro
 	return quotasets.Update(ctx, c.client, projectID, opts).Err
 }
 
-func (c *ComputeClient) CreateServer(ctx context.Context, name, imageID, flavorID, keyName string, networkIDs, securityGroupIDs []string, serverGroupID *string, metadata map[string]string) (*servers.Server, error) {
+func (c *ComputeClient) CreateServer(ctx context.Context, name, imageID, flavorID, keyName string, networkIDs, securityGroupIDs []string, serverGroupID *string, metadata map[string]string, userData []byte) (*servers.Server, error) {
 	tracer := otel.GetTracerProvider().Tracer(constants.Application)
 
 	_, span := tracer.Start(ctx, "POST /compute/v2/servers/")
@@ -293,6 +293,7 @@ func (c *ComputeClient) CreateServer(ctx context.Context, name, imageID, flavorI
 		Networks:       networks,
 		Metadata:       metadata,
 		SecurityGroups: securityGroupIDs,
+		UserData:       userData,
 	}
 
 	createOpts := keypairs.CreateOptsExt{

diff --git a/pkg/providers/openstack/provider.go b/pkg/providers/openstack/provider.go
@@ -1747,7 +1747,7 @@ func (p *Provider) createServer(ctx context.Context, computeService *ComputeClie
 		securityGroupIDs[i] = sg.ID
 	}
 
-	providerServer, err := computeService.CreateServer(ctx, server.Labels[coreconstants.NameLabel], image.ID, flavor.ID, *identity.Spec.SSHKeyName, networkIDs, securityGroupIDs, identity.Spec.ServerGroupID, metadata)
+	providerServer, err := computeService.CreateServer(ctx, server.Labels[coreconstants.NameLabel], image.ID, flavor.ID, *identity.Spec.SSHKeyName, networkIDs, securityGroupIDs, identity.Spec.ServerGroupID, metadata, server.Spec.UserData)
 	if err != nil {
 		return err
 	}