Merge remote-tracking branch 'origin/main' into sandbox/image-inventory

kubeshop · Oct 29, 2024 · fbfe8a4 · fbfe8a4
2 parents 9e8855b + d67462b
commit fbfe8a4
Show file tree

Hide file tree

Showing 13 changed files with 203 additions and 31 deletions.
diff --git a/charts/testkube-api/Chart.yaml b/charts/testkube-api/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: testkube-api
 description: A Helm chart for Testkube api
 type: application
-version: 2.1.48
-appVersion: 2.1.48
+version: 2.1.52
+appVersion: 2.1.52
 dependencies:
   - name: global
     version: 0.1.2

diff --git a/charts/testkube-api/templates/deployment.yaml b/charts/testkube-api/templates/deployment.yaml
@@ -72,6 +72,8 @@ spec:
             {{- end }}
             - name: APISERVER_PORT
               value: "{{ .Values.service.port }}"
+            - name: GRPCSERVER_PORT
+              value: "{{ .Values.service.grpcPort }}"
             - name: POSTMANEXECUTOR_URI
               value: "{{ .Values.postmanExecutorURI }}"
             - name: TESTKUBE_ANALYTICS_ENABLED
@@ -223,14 +225,25 @@ spec:
             - name: http
               containerPort: 8088
               protocol: TCP
-          livenessProbe:
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
+            - name: grpc
+              containerPort: 8089
+              protocol: TCP
+          startupProbe:
+            initialDelaySeconds: 3
+            periodSeconds: 3
+            timeoutSeconds: 3
+            failureThreshold: 20
             httpGet:
               path: /health
               port: {{ .Values.service.port }}
               scheme: HTTP
           readinessProbe:
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
+            httpGet:
+              path: /health
+              port: {{ .Values.service.port }}
+              scheme: HTTP
+          livenessProbe:
+            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
             httpGet:
               path: /health
               port: {{ .Values.service.port }}

diff --git a/charts/testkube-api/templates/service.yaml b/charts/testkube-api/templates/service.yaml
@@ -20,8 +20,12 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: {{ .Values.service.port }}
-      targetPort: {{ .Values.service.port }}
-      protocol: TCP
-      name: http
+  - port: {{ .Values.service.port }}
+    targetPort: {{ .Values.service.port }}
+    protocol: TCP
+    name: http
+  - port: {{ .Values.service.grpcPort }}
+    targetPort: {{ .Values.service.grpcPort }}
+    protocol: TCP
+    name: grpc
   selector: {{- include "testkube-api.selectorLabels" . | nindent 4 }}
diff --git a/charts/testkube-api/values.yaml b/charts/testkube-api/values.yaml
@@ -453,6 +453,8 @@ service:
   type: ClusterIP
   ## HTTP Port
   port: 8088
+  ## gRPC Port
+  grpcPort: 8089
   ## Annotations
   annotations: {}
   ## Service labels
@@ -673,10 +675,6 @@ testConnection:
 livenessProbe:
   initialDelaySeconds: 30
 
-## Testkube API Readiness probe
-readinessProbe:
-  initialDelaySeconds: 45
-
 ## Testkube API HTTP body size limit
 ## httpBodyLimit: 1073741824
 

diff --git a/charts/testkube-operator/Chart.yaml b/charts/testkube-operator/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: testkube-operator
 description: A Helm chart for the testkube-operator (installs needed CRDs only for now)
 type: application
-version: 2.1.20
-appVersion: 2.1.20
+version: 2.1.21
+appVersion: 2.1.21
 dependencies:
   - name: global
     version: 0.1.2

diff --git a/charts/testkube-operator/templates/tests.testkube.io_testexecutions.yaml b/charts/testkube-operator/templates/tests.testkube.io_testexecutions.yaml
@@ -241,6 +241,7 @@ spec:
                         - scheduler
                         - testexecution
                         - testsuiteexecution
+                        - testworkflow
                         type: string
                     required:
                     - type
@@ -701,6 +702,7 @@ spec:
                         - scheduler
                         - testexecution
                         - testsuiteexecution
+                        - testworkflow
                         type: string
                     required:
                     - type

diff --git a/charts/testkube-operator/templates/testworkflows.testkube.io_testworkflowexecutions.yaml b/charts/testkube-operator/templates/testworkflows.testkube.io_testworkflowexecutions.yaml
@@ -56,6 +56,60 @@ spec:
                     name:
                       description: custom execution name
                       type: string
+                    runningContext:
+                      description: running context for the test workflow execution (Pro edition only)
+                      properties:
+                        actor:
+                          description: running context actor for test workflow execution
+                          properties:
+                            email:
+                              description: actor email
+                              type: string
+                            executionId:
+                              description: test workflow execution id
+                              type: string
+                            executionPath:
+                              description: all test workflow execution ids starting
+                                from the root
+                              type: string
+                            name:
+                              description: actor name
+                              type: string
+                            type:
+                              description: supported actors for test workflow running context
+                              enum:
+                                - cron
+                                - testtrigger
+                                - user
+                                - testworkflow
+                                - testworkflowexecution
+                                - program
+                              type: string
+                          required:
+                            - type
+                          type: object
+                        interface:
+                          description: running context interface for test workflow execution
+                          properties:
+                            name:
+                              description: interface name
+                              type: string
+                            type:
+                              description: supported interfaces for test workflow running context
+                              enum:
+                                - cli
+                                - ui
+                                - api
+                                - ci/cd
+                                - internal
+                              type: string
+                          required:
+                          - type
+                          type: object
+                      required:
+                        - actor
+                        - interface
+                      type: object
                     tags:
                       additionalProperties:
                         type: string
@@ -299,6 +353,60 @@ spec:
                         - predictedStatus
                         - status
                       type: object
+                    runningContext:
+                      description: running context for the test workflow execution (Pro edition only)
+                      properties:
+                        actor:
+                          description: running context actor for test workflow execution
+                          properties:
+                            email:
+                              description: actor email
+                              type: string
+                            executionId:
+                              description: test workflow execution id
+                              type: string
+                            executionPath:
+                              description: all test workflow execution ids starting
+                                from the root
+                              type: string
+                            name:
+                              description: actor name
+                              type: string
+                            type:
+                              description: supported actors for test workflow running context'
+                              enum:
+                                - cron
+                                - testtrigger
+                                - user
+                                - testworkflow
+                                - testworkflowexecution
+                                - program
+                              type: string
+                          required:
+                            - type
+                          type: object
+                        interface:
+                          description: running context interface for test workflow execution
+                          properties:
+                            name:
+                              description: interface name
+                              type: string
+                            type:
+                              description: supported interfaces for test workflow running context
+                              enum:
+                                - cli
+                                - ui
+                                - api
+                                - ci/cd
+                                - internal
+                              type: string
+                          required:
+                            - type
+                          type: object
+                      required:
+                        - actor
+                        - interface
+                      type: object
                     scheduledAt:
                       description: when the execution has been scheduled to run
                       format: date-time

diff --git a/charts/testkube-operator/templates/testworkflows.testkube.io_testworkflows.yaml b/charts/testkube-operator/templates/testworkflows.testkube.io_testworkflows.yaml
@@ -10741,6 +10741,59 @@ spec:
                         - status
                         - totalDurationMs
                       type: object
+                    runningContext:
+                      description: running context for the test workflow execution (Pro edition only)
+                      properties:
+                        actor:
+                          description: running context actor for test workflow execution
+                          properties:
+                            email:
+                              description: actor email
+                              type: string
+                            executionId:
+                              description: test workflow execution id
+                              type: string
+                            executionPath:
+                              description: all test workflow execution ids starting from the root
+                              type: string
+                            name:
+                              description: actor name
+                              type: string
+                            type:
+                              description: supported actors for test workflow running context
+                              enum:
+                                - cron
+                                - testtrigger
+                                - user
+                                - testworkflow
+                                - testworkflowexecution
+                                - program
+                              type: string
+                          required:
+                            - type
+                          type: object
+                        interface:
+                          description: running context interface for test workflow execution
+                          properties:
+                            name:
+                              description: interface name
+                              type: string
+                            type:
+                              description: supported interfaces for test workflow running context
+                              enum:
+                                - cli
+                                - ui
+                                - api
+                                - ci/cd
+                                - internal
+                              type: string
+                          required:
+                            - type
+                          type: object
+                      required:
+                        - actor
+                        - interface
+                      type: object
                     scheduledAt:
                       description: when the execution has been scheduled to run
                       format: date-time

diff --git a/charts/testkube/Chart.yaml b/charts/testkube/Chart.yaml
@@ -2,10 +2,10 @@ apiVersion: v2
 name: testkube
 description: Testkube is an open-source platform that simplifies the deployment and management of automated testing infrastructure.
 type: application
-version: 2.1.62
+version: 2.1.69
 dependencies:
   - name: testkube-operator
-    version: 2.1.20
+    version: 2.1.21
     #repository: https://kubeshop.github.io/helm-charts
     repository: "file://../testkube-operator"
     condition: testkube-operator.enabled
@@ -18,7 +18,7 @@ dependencies:
     version: 1.2.6
     repository: https://nats-io.github.io/k8s/helm/charts/
   - name: testkube-api
-    version: 2.1.48
+    version: 2.1.52
     #repository: https://kubeshop.github.io/helm-charts
     repository: "file://../testkube-api"
   - name: testkube-logs

diff --git a/charts/testkube/values-demo.yaml b/charts/testkube/values-demo.yaml
@@ -151,6 +151,7 @@ testkube-api:
   service:
     type: ClusterIP
     port: 8088
+    grpcPort: 8089
   minio:
     enabled: true
     tolerations: []
@@ -331,8 +332,6 @@ testkube-api:
       scheme: HTTP
     ## Amount of request failures before the container receives a terminate signal
     failureThreshold: 3
-    ## Time to wait after the initial deployment before performing first probe
-    initialDelaySeconds: 60
     ## How often (in seconds) to perform the probes. This value sends one probe every 30 seconds
     periodSeconds: 30
     ## Minimum consecutive successes for the probe to be considered successful after having failed

diff --git a/charts/testkube/values-develop.yaml b/charts/testkube/values-develop.yaml
@@ -148,6 +148,7 @@ testkube-api:
   service:
     type: ClusterIP
     port: 8088
+    grpcPort: 8089
   minio:
     enabled: true
     nodeSelector: {}
@@ -260,7 +261,7 @@ testkube-api:
     ## Amount of request failures before the container receives a terminate signal
     failureThreshold: 3
     ## Time to wait after the initial deployment before performing first probe
-    initialDelaySeconds: 180
+    initialDelaySeconds: 60
     ## How often (in seconds) to perform the probes. This value sends one probe every 30 seconds
     periodSeconds: 30
     ## Minimum consecutive successes for the probe to be considered successful after having failed
@@ -277,8 +278,6 @@ testkube-api:
       scheme: HTTP
     ## Amount of request failures before the container receives a terminate signal
     failureThreshold: 3
-    ## Time to wait after the initial deployment before performing first probe
-    initialDelaySeconds: 60
     ## How often (in seconds) to perform the probes. This value sends one probe every 30 seconds
     periodSeconds: 30
     ## Minimum consecutive successes for the probe to be considered successful after having failed

diff --git a/charts/testkube/values-stage.yaml b/charts/testkube/values-stage.yaml
@@ -144,6 +144,7 @@ testkube-api:
   service:
     type: ClusterIP
     port: 8088
+    grpcPort: 8089
   minio:
     enabled: true
     tolerations: []
@@ -275,8 +276,6 @@ testkube-api:
       scheme: HTTP
     ## Amount of request failures before the container receives a terminate signal
     failureThreshold: 3
-    ## Time to wait after the initial deployment before performing first probe
-    initialDelaySeconds: 60
     ## How often (in seconds) to perform the probes. This value sends one probe every 30 seconds
     periodSeconds: 30
     ## Minimum consecutive successes for the probe to be considered successful after having failed