Merge branch 'main' into pr-enhanced-security

.github/ISSUE_TEMPLATE/bug.yaml

@@ -16,9 +16,14 @@ body:
       label: k6-operator version or image
     validations:
       required: true
+  - type: input
+    attributes:
+      label: Helm chart version (if applicable)
+    validations:
+      required: false
   - type: textarea
     attributes:
-      label: K6 YAML
+      label: TestRun / PrivateLoadZone YAML
     validations:
       required: true
   - type: input

Makefile

@@ -1,5 +1,5 @@
 # Current Operator version
-VERSION ?= 0.0.11
+VERSION ?= 0.0.12
 # Default bundle image tag
 BUNDLE_IMG ?= k6-controller-bundle:$(VERSION)
 # Options for 'bundle-build'

api/v1alpha1/k6conditions.go

@@ -73,13 +73,14 @@ func Initialize(k6 TestRunI) {
 		},
 	}
 
+	UpdateCondition(k6, CloudTestRunAborted, metav1.ConditionFalse)
+
 	// PLZ test run case
 	if len(k6.GetSpec().TestRunID) > 0 {
 		UpdateCondition(k6, CloudTestRun, metav1.ConditionTrue)
 		UpdateCondition(k6, CloudPLZTestRun, metav1.ConditionTrue)
 		UpdateCondition(k6, CloudTestRunCreated, metav1.ConditionTrue)
 		UpdateCondition(k6, CloudTestRunFinalized, metav1.ConditionFalse)
-		UpdateCondition(k6, CloudTestRunAborted, metav1.ConditionFalse)
 
 		k6.GetStatus().TestRunID = k6.GetSpec().TestRunID
 	} else {
@@ -151,17 +152,23 @@ func (k6status *TestRunStatus) SetIfNewer(proposedStatus TestRunStatus) (isNewer
 				isNewer = true
 			}
 		case "created":
-			if proposedStatus.Stage == "started" || proposedStatus.Stage == "finished" || proposedStatus.Stage == "error" {
+			if proposedStatus.Stage == "started" ||
+				proposedStatus.Stage == "finished" ||
+				proposedStatus.Stage == "error" ||
+				proposedStatus.Stage == "stopped" {
 				k6status.Stage = proposedStatus.Stage
 				isNewer = true
 			}
 		case "started":
-			if proposedStatus.Stage == "stopped" || proposedStatus.Stage == "finished" || proposedStatus.Stage == "error" {
+			if proposedStatus.Stage == "stopped" ||
+				proposedStatus.Stage == "finished" ||
+				proposedStatus.Stage == "error" {
 				k6status.Stage = proposedStatus.Stage
 				isNewer = true
 			}
 		case "stopped":
-			if proposedStatus.Stage == "finished" || proposedStatus.Stage == "error" {
+			if proposedStatus.Stage == "finished" ||
+				proposedStatus.Stage == "error" {
 				k6status.Stage = proposedStatus.Stage
 				isNewer = true
 			}

api/v1alpha1/testruni.go

@@ -20,3 +20,14 @@ type TestRunI interface {
 	GetSpec() *TestRunSpec
 	NamespacedName() types.NamespacedName
 }
+
+// TestRunID is a tiny helper to get k6 Cloud test run ID.
+// PLZ test run will have test run ID as part of spec
+// while cloud output test run as part of status.
+func TestRunID(k6 TestRunI) string {
+	specId := k6.GetSpec().TestRunID
+	if len(specId) > 0 {
+		return specId
+	}
+	return k6.GetStatus().TestRunID
+}