kubeshop · vsukhin · Jan 25, 2024 · Nov 14, 2023 · Nov 14, 2023 · Nov 14, 2023
@@ -57,7 +57,7 @@ jobs:
           git pull origin develop
 
           export image_tag=${{ github.event.client_payload.image_tag_api }}
-          export executor_names="artillery curl cypress ginkgo gradle init jmeter jmeterd k6 kubepug maven playwright postman scraper soapui tracetest zap"
+          export executor_names="artillery curl cypress ginkgo gradle init jmeter jmeterd k6 kubepug maven playwright postman scraper soapui tracetest zap logs-sidecar"
           for executor_name in $executor_names; do
             sed -i "s/\(\"image\":.*$executor_name.*:\)[^\"]*\(\"\)/\1$image_tag\2/" ./charts/testkube-api/executors.json
           done
@@ -238,4 +238,4 @@ jobs:
           SLACK_USERNAME: GitHub
           SLACK_LINK_NAMES: true
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_FOOTER: "Kubeshop --> TestKube"
+          SLACK_FOOTER: "Kubeshop --> TestKube"
@@ -6,9 +6,9 @@ on:
   repository_dispatch:
     types:
       [
-          trigger-workflow-api-release,
-          trigger-workflow-dashboard-release,
-          trigger-workflow-operator-release,
+        trigger-workflow-api-release,
+        trigger-workflow-dashboard-release,
+        trigger-workflow-operator-release,
       ]
 
 env:
@@ -18,7 +18,6 @@ env:
   DEPLOYMENT_NAME: testkube-integration # Add your deployment name here.
   ENV: stage
 
-
 jobs:
   release_charts_if_image_updated:
     runs-on: ubuntu-latest
@@ -58,7 +57,7 @@ jobs:
           git pull origin develop
 
           export image_tag=${{ github.event.client_payload.image_tag_api }}
-          export executor_names="artillery curl cypress ginkgo gradle init jmeter jmeterd k6 kubepug maven playwright postman scraper soapui tracetest zap"
+          export executor_names="artillery curl cypress ginkgo gradle init jmeter jmeterd k6 kubepug maven playwright postman scraper soapui tracetest zap logs-sidecar"
           for executor_name in $executor_names; do
             sed -i "s/\(\"image\":.*$executor_name.*:\)[^\"]*\(\"\)/\1$image_tag\2/" ./charts/testkube-api/executors.json
           done
@@ -207,10 +206,10 @@ jobs:
 
       - name: Run Executor tests
         run: kubectl testkube run testsuite staging-testsuite -f --git-branch develop --namespace ${{ env.DEPLOYMENT_NAME }}
-      
+
       - name: Run Dashboard E2E tests
         run: kubectl testkube run test dashboard-e2e-tests -f --variable TESTKUBE_NAMESPACE=${{ env.DEPLOYMENT_NAME }} --namespace ${{ env.DEPLOYMENT_NAME }}
-      
+
   notify_slack_if_test_suite_stage_succeeds:
     runs-on: ubuntu-latest
     needs: test_suite_run
@@ -242,4 +241,4 @@ jobs:
           SLACK_USERNAME: GitHub
           SLACK_LINK_NAMES: true
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-          SLACK_FOOTER: "Kubeshop --> TestKube"
+          SLACK_FOOTER: "Kubeshop --> TestKube"
@@ -189,7 +189,7 @@ jobs:
       # Deploy the Docker image to the GKE cluster
       - name: Deploy
         run: |-
-          helm upgrade --install --atomic --timeout 180s testkube helm-charts/testkube --namespace testkube --create-namespace --values ./charts/testkube/values-demo.yaml --debug --set testkube-api.cliIngress.oauth.clientID=${{ secrets.TESTKUBE_DEMO_OAUTH_CLIENT_ID }} --set testkube-api.cliIngress.oauth.clientSecret=${{ secrets.TESTKUBE_DEMO_OAUTH_CLIENT_SECRET }} --set testkube-api.minio.storage=80Gi --set mongodb.livenessProbe.enabled=false --set mongodb.readinessProbe.enabled=false
+          helm upgrade --install --atomic --timeout 180s testkube helm-charts/testkube --namespace testkube --create-namespace --values ./charts/testkube/values-demo.yaml --debug --set testkube-api.cliIngress.oauth.clientID=${{ secrets.TESTKUBE_DEMO_OAUTH_CLIENT_ID }} --set testkube-api.cliIngress.oauth.clientSecret=${{ secrets.TESTKUBE_DEMO_OAUTH_CLIENT_SECRET }} --set mongodb.livenessProbe.enabled=false --set mongodb.readinessProbe.enabled=false
 
   notify_slack_if_deploy_dev_succeeds:
     runs-on: ubuntu-latest

@@ -189,7 +189,7 @@ jobs:
       # Deploy the Docker image to the GKE cluster
       - name: Deploy
         run: |-
-          helm upgrade --install --atomic --timeout 180s testkube helm-charts/testkube --namespace testkube --create-namespace --values ./charts/testkube/values-demo.yaml --debug --set testkube-api.cliIngress.oauth.clientID=${{ secrets.TESTKUBE_DEMO_OAUTH_CLIENT_ID }} --set testkube-api.cliIngress.oauth.clientSecret=${{ secrets.TESTKUBE_DEMO_OAUTH_CLIENT_SECRET }} --set testkube-api.minio.storage=80Gi --set mongodb.livenessProbe.enabled=false --set mongodb.readinessProbe.enabled=false
+          helm upgrade --install --atomic --timeout 180s testkube helm-charts/testkube --namespace testkube --create-namespace --values ./charts/testkube/values-demo.yaml --debug --set testkube-api.cliIngress.oauth.clientID=${{ secrets.TESTKUBE_DEMO_OAUTH_CLIENT_ID }} --set testkube-api.cliIngress.oauth.clientSecret=${{ secrets.TESTKUBE_DEMO_OAUTH_CLIENT_SECRET }} --set mongodb.livenessProbe.enabled=false --set mongodb.readinessProbe.enabled=false
 
   notify_slack_if_deploy_dev_succeeds:
     runs-on: ubuntu-latest

@@ -1,6 +1,6 @@
 # testkube-api
 
-![Version: 1.14.6](https://img.shields.io/badge/Version-1.14.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.14.6](https://img.shields.io/badge/AppVersion-1.14.6-informational?style=flat-square)
+![Version: 1.15.2](https://img.shields.io/badge/Version-1.15.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.15.2](https://img.shields.io/badge/AppVersion-1.15.2-informational?style=flat-square)
 
 A Helm chart for Testkube api
 
@@ -45,9 +45,11 @@ A Helm chart for Testkube api
 | cloud.migrate | string | `""` |  |
 | cloud.orgId | string | `""` |  |
 | cloud.url | string | `"agent.testkube.io:443"` |  |
+| cloud.uiUrl | string | `""` |  |
 | clusterName | string | `""` |  |
 | configValues | string | `""` |  |
 | dashboardUri | string | `""` |  |
+| dnsPolicy | string | `""` |  |
 | disableMongoMigrations | bool | `false` |  |
 | enableSecretsEndpoint | bool | `false` |  |
 | executors | string | `""` |  |
@@ -57,6 +59,7 @@ A Helm chart for Testkube api
 | global.imagePullSecrets | list | `[]` |  |
 | global.imageRegistry | string | `""` |  |
 | global.labels | object | `{}` |  |
+| hostNetwork | string | `""` |  |
 | httpReadBufferSize | int | `8192` |  |
 | image.digest | string | `""` |  |
 | image.pullPolicy | string | `"IfNotPresent"` |  |

@@ -48,6 +48,31 @@ spec:
         {{- end }}
       {{- end }}
       containers:
+      {{ if .Features.LogsV2 -}}
+      - name: "{{ .Name }}-logs"
+        {{- if .Registry }}
+        image: {{ .Registry }}/{{ .LogSidecarImage }}
+        {{- else }}
+        image: {{ .LogSidecarImage }}
+        {{- end }}
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: DEBUG
+          value: {{ .Debug }}
+        - name: NAMESPACE
+          value: {{ .Namespace }}
+        - name: NATS_URI
+          value: {{ .NatsUri }}
+        - name: GROUP
+          value: test
+        - name: SOURCE
+          value: "test:{{ .Name }}"
+        - name: ID
+          value: "{{ .Name }}"
+      {{- end }}
       - name: "{{ .Name }}"
         {{- if .Registry }}
         image: {{ .Registry }}/{{ .Image }}

@@ -10,6 +10,27 @@ spec:
   template:
     spec:
       containers:
+      {{ if .Features.LogsV2 -}}
+      - name: "{{ .Name }}-logs"
+        image: {{ .Registry }}/{{ .LogSidecarImage }}
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: DEBUG
+          value: {{ .Debug }}
+        - name: NAMESPACE
+          value: {{ .Namespace }}
+        - name: NATS_URI
+          value: {{ .NatsUri }}
+        - name: ID
+          value: {{ .Name }}
+        - name: GROUP
+          value: scraper
+        - name: SOURCE
+          value: "scraper:{{ .Name }}"
+      {{- end }}
       - name: {{ .Name }}-scraper
         {{- if .Registry }}
         image: {{ .Registry }}/{{ .ScraperImage }}

@@ -46,6 +46,31 @@ spec:
         {{- end }}
         {{- end }}
       containers:
+      {{ if .Features.LogsV2 -}}
+      - name: "{{ .Name }}-logs"
+        {{- if .Registry }}
+        image: {{ .Registry }}/{{ .LogSidecarImage }}
+        {{- else }}
+        image: {{ .LogSidecarImage }}
+        {{- end }}
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: DEBUG
+          value: {{ .Debug }}
+        - name: NAMESPACE
+          value: {{ .Namespace }}
+        - name: NATS_URI
+          value: {{ .NatsUri }}
+        - name: ID
+          value: {{ .Name }}
+        - name: GROUP
+          value: test
+        - name: SOURCE
+          value: "test:{{ .Name }}"
+      {{- end }}
       - name: "{{ .Name }}"
         {{- if .Registry }}
         image: {{ .Registry }}/{{ .Image }}

@@ -137,7 +137,7 @@ spec:
     {{- if and .ArtifactRequest.VolumeMountPath .ArtifactRequest.StorageClassName }}
   - name: artifact-volume
     persistentVolumeClaim:
-      claimName: {{ .Name }}-pvc
+      claimName: {{ .JobName }}-pvc
     {{- end }}
   {{- end }}
   {{- range $configmap := .EnvConfigMaps }}

@@ -39,9 +39,19 @@ spec:
       {{- if .Values.priorityClassName }}
       priorityClassName: {{ .Values.priorityClassName }}
       {{- end }}
+      {{- if .Values.hostNetwork }}
+      hostNetwork: {{ .Values.hostNetwork }}
+      {{- end }}
+      {{- if .Values.dnsPolicy }}
+      dnsPolicy: {{ .Values.dnsPolicy }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           env:
+            {{- if .Values.global.features.logsV2 }}
+            - name: FF_LOGS_V2
+              value:  "{{ .Values.global.features.logsV2 }}"
+            {{- end }}
             - name: APISERVER_PORT
               value: "{{ .Values.service.port }}"
             - name: API_MONGO_DSN
@@ -276,7 +286,19 @@ spec:
             {{- if .Values.cloud.url }}
             - name: TESTKUBE_CLOUD_URL
               value:  "{{ .Values.cloud.url }}"
+            {{- end }}
+            {{- if .Values.cloud.uiUrl}}
+            - name: TESTKUBE_CLOUD_UI_URL
+              value: "{{ .Values.cloud.uiUrl }}"
             {{- end}}
+            {{- if not .Values.cloud.tls.enabled }}
+            - name: TESTKUBE_PRO_TLS_INSECURE
+              value:  "true"
+            {{- end }}
+            {{- if .Values.cloud.tls.skipVerify }}
+            - name: TESTKUBE_PRO_SKIP_VERIFY
+              value:  "true"
+            {{- end }}
             {{- if .Values.cloud.orgId }}
             - name: TESTKUBE_CLOUD_ORG_ID
               value:  "{{ .Values.cloud.orgId }}"

@@ -36,3 +36,4 @@ metadata:
     {{- include "global.tplvalues.render" ( dict "value" .Values.global.annotations "context" $ ) | nindent 4 }}
     {{- end }}
 {{- end }}
+
@@ -12,8 +12,8 @@ metadata:
     {{- include "global.tplvalues.render" ( dict "value" .Values.global.labels "context" $ ) | nindent 4 }}
     {{- end }}
   annotations:
-    {{- if and .Values.cliIngress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.Version)) }}
-    kubernetes.io/ingress.class: {{ .Values.cliIngress.className }}
+    {{- if and .Values.uiIngress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.Version)) }}
+    kubernetes.io/ingress.class: {{ .Values.uiIngress.className }}
     {{- end }}
     {{- if .Values.uiIngress.annotations }}
     {{- include "global.tplvalues.render" (dict "value" .Values.uiIngress.annotations "context" $) | nindent 4 }}
@@ -43,7 +43,7 @@ spec:
       http:
         paths:
           - path: {{ $.Values.uiIngress.path }}
-            pathType: Prefix
+            pathType: {{ default "Prefix" $.Values.uiIngress.pathType }}
             backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.Version }}
               service:

@@ -11,6 +11,8 @@ global:
   imagePullSecrets: []
   labels: {}
   annotations: {}
+  features:
+    logsV2: false
 
 ### @section Common parameters
 ## Kubernetes version (using Helm capabilities if not set)
@@ -53,14 +55,16 @@ image:
 nameOverride: ""
 fullnameOverride: ""
 
-## Custom job-template.yml that will passed to Testkube API
+## Custom job-template.yml that will be passed to Testkube API
 configValues: ""
 
 ## Testkube API Deployment parameters
 ## Running Testkube in Agent mode
 cloud:
   ## URL of the Cloud Saas Control Plane
   url: "agent.testkube.io:443"
+  ## URL of the Cloud UI
+  uiUrl: ""
   ## License Key
   key: ""
   ## Organization ID
@@ -69,6 +73,11 @@ cloud:
   envId: ""
   ## true if migration from OSS
   migrate: ""
+  tls:
+    ## Toggle should the connection to Agent API in Cloud/Enterprise use secure GRPC (GRPCS) (if false, it will use insecure GRPC)
+    enabled: true
+    ## Toggle should the client skip verifying the Agent API server cert in Cloud/Enterprise
+    skipVerify: false
   ## Retrieve cloud information from existing secret
   existingSecret:
     ## Name of the secret. If set, this will be used instead of the above values
@@ -116,8 +125,8 @@ templates:
   scraperContainer: ""
   ## Base64 encoded PVC Container template
   pvcContainer: ""
-   ## Base64 encoded Slave Pod template
-  slavePod: "" 
+  ## Base64 encoded Slave Pod template
+  slavePod: ""
 
 ## base64 encoded executors.json alike data
 executors: ""
@@ -185,6 +194,12 @@ affinity: {}
 ## Specify priorityClassName for Testkube API Deployment
 priorityClassName: ""
 
+## Specify hostNetwork for Testkube API Deployment
+hostNetwork: ""
+
+## Specify dnsPolicy for Testkube API Deployment
+dnsPolicy: ""
+
 ## Additional volumes to be added
 ## ref: https://kubernetes.io/docs/concepts/storage/volumes/
 additionalVolumes: []
@@ -252,6 +267,16 @@ serviceAccount:
   ## If not set and create is true, a name is generated using the fullname template
   name: ""
 
+## Logs service and sidecar service account parameters
+logsServiceAccount:
+  ## Specifies whether a service account should be created
+  create: true
+  ## Annotations to add to the service account
+  annotations: {}
+  ## The name of the service account to use.
+  ## If not set and create is true, a name is generated using the fullname template
+  name: ""
+
 ## Test Job ServiceAccount parameters
 testServiceAccount:
   ## Specifies whether a service account should be created
@@ -424,6 +449,8 @@ uiIngress:
   annotations: {}
   ## The Path to Nginx.
   path: /results/(v\d/executions.*)
+  ## The PathType to Nginx.
+  pathType: Prefix
   ## Hostnames must be provided if Ingress is enabled.
   hosts: []
   # - testkube.example.com

@@ -43,7 +43,7 @@ spec:
       http:
         paths:
           - path: {{ $.Values.ingress.path }}
-            pathType: Prefix
+            pathType: {{ default "Prefix" $.Values.ingress.pathType }}
             backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.Version }}
               service:

@@ -113,6 +113,8 @@ ingress:
   annotations: {}
   ## The Path to Nginx.
   path: /
+  ## The PathType to Nginx.
+  pathType: Prefix
   ## Hostnames must be provided if Ingress is enabled.
   hosts: []
   #  - testkube.example.com
Original file line number	Diff line number	Diff line change
Expand Up		@@ -36,3 +36,4 @@ metadata:
		{{- include "global.tplvalues.render" ( dict "value" .Values.global.annotations "context" $ ) \| nindent 4 }}
		{{- end }}
		{{- end }}