redo branch from main

grafana · Jul 31, 2024 · 8566329 · 8566329
1 parent f75facb
commit 8566329
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/api/v1alpha1/privateloadzone_types.go b/api/v1alpha1/privateloadzone_types.go
@@ -34,6 +34,7 @@ import (
 type PrivateLoadZoneSpec struct {
 	Token              string                        `json:"token"`
 	Resources          corev1.ResourceRequirements   `json:"resources"`
+	Tolerations        []corev1.Toleration           `json:tolerations`
 	ServiceAccountName string                        `json:"serviceAccountName,omitempty"`
 	NodeSelector       map[string]string             `json:"nodeSelector,omitempty"`
 	Image              string                        `json:"image,omitempty"`

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/k6.io_privateloadzones.yaml b/config/crd/bases/k6.io_privateloadzones.yaml
@@ -71,6 +71,22 @@ spec:
                       x-kubernetes-int-or-string: true
                     type: object
                 type: object
+              tolerations:
+                items:
+                  properties:
+                    effect:
+                      type: string
+                    key:
+                      type: string
+                    operator:
+                      type: string
+                    tolerationSeconds:
+                      format: int64
+                      type: integer
+                    value:
+                      type: string
+                  type: object
+                type: array
               serviceAccountName:
                 type: string
               token:

diff --git a/pkg/testrun/plz.go b/pkg/testrun/plz.go
@@ -51,6 +51,7 @@ func NewPLZTestRun(plz *v1alpha1.PrivateLoadZone, trData *cloud.TestRunData, ing
 				ServiceAccountName: plz.Spec.ServiceAccountName,
 				NodeSelector:       plz.Spec.NodeSelector,
 				Resources:          plz.Spec.Resources,
+				Tolerations:        plz.Spec.Tolerations,
 				Volumes: []corev1.Volume{
 					volume,
 				},
@@ -66,6 +67,7 @@ func NewPLZTestRun(plz *v1alpha1.PrivateLoadZone, trData *cloud.TestRunData, ing
 				ServiceAccountName: plz.Spec.ServiceAccountName,
 				NodeSelector:       plz.Spec.NodeSelector,
 				ImagePullSecrets:   plz.Spec.ImagePullSecrets,
+				Tolerations:        plz.Spec.Tolerations,
 			},
 			Script: v1alpha1.K6Script{
 				LocalFile: "/test/archive.tar",