plz: add support for env vars and secrets from cluster

Author: yorugac

api/v1alpha1/privateloadzone_types.go

@@ -38,6 +38,8 @@ type PrivateLoadZoneSpec struct {
 	NodeSelector       map[string]string             `json:"nodeSelector,omitempty"`
 	Image              string                        `json:"image,omitempty"`
 	ImagePullSecrets   []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
+
+	Config PrivateLoadZoneConfig `json:"config,omitempty"`
 }
 
 // PrivateLoadZoneStatus defines the observed state of PrivateLoadZone
@@ -66,6 +68,17 @@ type PrivateLoadZoneList struct {
 	Items           []PrivateLoadZone `json:"items"`
 }
 
+type PrivateLoadZoneConfig struct {
+	Secrets []PLZSecretsConfig `json:"secrets,omitempty"`
+}
+
+type PLZSecretsConfig struct {
+	// these definitions are copies from corev1.EnvFromSource - to be
+	// re-packed into that struct during TestRun creation
+	ConfigMapRef *corev1.ConfigMapEnvSource `json:"configMapRef,omitempty"`
+	SecretRef    *corev1.SecretEnvSource    `json:"secretRef,omitempty"`
+}
+
 func init() {
 	SchemeBuilder.Register(&PrivateLoadZone{}, &PrivateLoadZoneList{})
 }
@@ -115,3 +128,12 @@ func (plz *PrivateLoadZone) Deregister(ctx context.Context, logger logr.Logger,
 func uuid() string {
 	return guuid.New().String()
 }
+
+func (plzConfig *PrivateLoadZoneConfig) ToEnvFromSource() []corev1.EnvFromSource {
+	envFromSource := make([]corev1.EnvFromSource, len(plzConfig.Secrets))
+	for i := range plzConfig.Secrets {
+		envFromSource[i].ConfigMapRef = plzConfig.Secrets[i].ConfigMapRef
+		envFromSource[i].SecretRef = plzConfig.Secrets[i].SecretRef
+	}
+	return envFromSource
+}

api/v1alpha1/zz_generated.deepcopy.go

@@ -31,6 +31,32 @@ spec:
             type: object
           spec:
             properties:
+              config:
+                properties:
+                  secrets:
+                    items:
+                      properties:
+                        configMapRef:
+                          properties:
+                            name:
+                              default: ""
+                              type: string
+                            optional:
+                              type: boolean
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        secretRef:
+                          properties:
+                            name:
+                              default: ""
+                              type: string
+                            optional:
+                              type: boolean
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    type: array
+                type: object
               image:
                 type: string
               imagePullSecrets:

charts/k6-operator/templates/crds/plz.yaml

@@ -26,6 +26,32 @@ spec:
             type: object
           spec:
             properties:
+              config:
+                properties:
+                  secrets:
+                    items:
+                      properties:
+                        configMapRef:
+                          properties:
+                            name:
+                              default: ""
+                              type: string
+                            optional:
+                              type: boolean
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        secretRef:
+                          properties:
+                            name:
+                              default: ""
+                              type: string
+                            optional:
+                              type: boolean
+                          type: object
+                          x-kubernetes-map-type: atomic
+                      type: object
+                    type: array
+                type: object
               image:
                 type: string
               imagePullSecrets:

config/crd/bases/k6.io_privateloadzones.yaml

@@ -60,7 +60,8 @@ func NewPLZTestRun(plz *v1alpha1.PrivateLoadZone, token string, trData *cloud.Te
 				InitContainers: []v1alpha1.InitContainer{
 					initContainer,
 				},
-				Env: envVars,
+				Env:     envVars,
+				EnvFrom: plz.Spec.Config.ToEnvFromSource(),
 			},
 			Starter: v1alpha1.Pod{
 				ServiceAccountName: plz.Spec.ServiceAccountName,

pkg/testrun/plz.go

@@ -48,6 +48,7 @@ func Test_NewPLZTestRun(t *testing.T) {
 						Name:  "K6_CLOUD_HOST",
 						Value: mainIngest,
 					}},
+					EnvFrom: []corev1.EnvFromSource{},
 				},
 				Script: v1alpha1.K6Script{
 					LocalFile: "/test/archive.tar",