plz: image as part of spec and registration

grafana · Jul 19, 2024 · 3174bce · 3174bce
1 parent 535c529
commit 3174bce
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/api/v1alpha1/privateloadzone_types.go b/api/v1alpha1/privateloadzone_types.go
@@ -36,6 +36,7 @@ type PrivateLoadZoneSpec struct {
 	Resources          corev1.ResourceRequirements `json:"resources"`
 	ServiceAccountName string                      `json:"serviceAccountName,omitempty"`
 	NodeSelector       map[string]string           `json:"nodeSelector,omitempty"`
+	Image              string                      `json:"image,omitempty"`
 }
 
 // PrivateLoadZoneStatus defines the observed state of PrivateLoadZone
@@ -81,6 +82,9 @@ func (plz *PrivateLoadZone) Register(ctx context.Context, logger logr.Logger, cl
 			CPU:    plz.Spec.Resources.Limits.Cpu().String(),
 			Memory: plz.Spec.Resources.Limits.Memory().String(),
 		},
+		LZConfig: cloud.LZConfig{
+			RunnerImage: plz.Spec.Image,
+		},
 		UID: uid,
 	}
 

diff --git a/config/crd/bases/k6.io_privateloadzones.yaml b/config/crd/bases/k6.io_privateloadzones.yaml
@@ -26,6 +26,8 @@ spec:
             type: object
           spec:
             properties:
+              image:
+                type: string
               nodeSelector:
                 additionalProperties:
                   type: string

diff --git a/pkg/cloud/plz.go b/pkg/cloud/plz.go
@@ -15,6 +15,10 @@ const (
 func RegisterPLZ(client *cloudapi.Client, data PLZRegistrationData) error {
 	url := fmt.Sprintf("%s/cloud-resources/v1/load-zones", strings.TrimSuffix(client.BaseURL(), "/v1"))
 
+	data.LZConfig = LZConfig{
+		RunnerImage: data.RunnerImage,
+	}
+
 	req, err := client.NewRequest("POST", url, data)
 	if err != nil {
 		return err

diff --git a/pkg/cloud/types.go b/pkg/cloud/types.go
@@ -66,10 +66,10 @@ type TestRunData struct {
 }
 
 type LZConfig struct {
-	RunnerImage   string            `json:"load_runner_image"`
-	InstanceCount int               `json:"instance_count"`
-	ArchiveURL    string            `json:"k6_archive_temp_public_url"`
-	Environment   map[string]string `json:"environment"`
+	RunnerImage   string            `json:"load_runner_image,omitempty"`
+	InstanceCount int               `json:"instance_count,omitempty"`
+	ArchiveURL    string            `json:"k6_archive_temp_public_url,omitempty"`
+	Environment   map[string]string `json:"environment,omitempty"`
 }
 
 func (trd *TestRunData) TestRunID() string {
@@ -104,6 +104,9 @@ type PLZRegistrationData struct {
 	// defined by user as `name`
 	LoadZoneID string       `json:"k6_load_zone_id"`
 	Resources  PLZResources `json:"pod_tiers"`
+
+	LZConfig `json:"config"`
+
 	// Unique identifier of PLZ, generated by k6-operator
 	// during PLZ registration. It's purpose is to distinguish
 	// between PLZs with accidentally duplicate names.