chore: merged local branch from Yuliaa

charts/testkube-enterprise/Chart.lock

@@ -1,24 +1,27 @@
 dependencies:
-- name: common
-  repository: https://charts.bitnami.com/bitnami
-  version: 2.13.3
-- name: testkube-cloud-api
-  repository: file://../testkube-cloud-api
-  version: 1.22.1
-- name: testkube-cloud-ui
-  repository: file://../testkube-cloud-ui
-  version: 1.21.0
-- name: dex
-  repository: https://charts.dexidp.io
-  version: 0.16.0
-- name: mongodb
-  repository: https://charts.bitnami.com/bitnami
-  version: 14.3.0
-- name: nats
-  repository: https://nats-io.github.io/k8s/helm/charts/
-  version: 1.1.5
-- name: minio
-  repository: https://charts.bitnami.com/bitnami
-  version: 12.10.2
-digest: sha256:1824bb073dc1a27c7519d65ea3872c116321916655335fd9063264bcd4fa2d15
-generated: "2024-02-14T13:45:48.726309+02:00"
+  - name: common
+    repository: https://charts.bitnami.com/bitnami
+    version: 2.13.3
+  - name: testkube-cloud-api
+    repository: file://../testkube-cloud-api
+    version: 1.22.1
+  - name: testkube-cloud-ui
+    repository: file://../testkube-cloud-ui
+    version: 1.21.0
+  - name: testkube-logs-service
+    repository: file://../testkube-logs-service
+    version: 1.0.0
+  - name: dex
+    repository: https://charts.dexidp.io
+    version: 0.15.3
+  - name: mongodb
+    repository: https://charts.bitnami.com/bitnami
+    version: 14.3.0
+  - name: nats
+    repository: https://nats-io.github.io/k8s/helm/charts/
+    version: 1.1.5
+  - name: minio
+    repository: https://charts.bitnami.com/bitnami
+    version: 12.10.2
+digest: sha256:13b45da7009f9cdff76e3b99dadc251bceb6dfd921db3c6d96e191182f111eb5
+generated: "2024-02-19T10:42:28.967638+01:00"

charts/testkube-enterprise/Chart.yaml

@@ -13,10 +13,14 @@ dependencies:
   - name: testkube-cloud-ui
     version: 1.21.0
     repository: file://../testkube-cloud-ui
+  - name: testkube-logs-service
+    version: 1.0.0
+    repository: file://../testkube-logs-service
+    condition: global.features.logsV2
   - name: dex
     version: 0.16.0
     repository: https://charts.dexidp.io
-   # repository: file://../dex
+    # repository: file://../dex
     condition: dex.enabled
   - name: mongodb
     version: 14.3.0

charts/testkube-enterprise/values.yaml

@@ -41,7 +41,12 @@ global:
     enabled: true
   dex:
     # -- Global Dex issuer url which is configured both in Dex and API
-    issuer: ""
+    issuer: "http://testkube-enterprise-dex.testkube-enterprise.svc.cluster.local:5556/dex"
+  # -- Feature flags
+  features:
+    # -- logsV2 enable the new logs engine
+    logsV2: true
+
 minio:
   # -- To
   enabled: true
@@ -126,6 +131,28 @@ minio:
     tls:
       # -- TLS secret name which contains the certificate files
       tlsSecret: testkube-enterprise-minio-tls
+
+testkube-logs-service:
+  fullnameOverride: testkube-enterprise-logs-service
+  api:
+    tls:
+      serveHTTPS: false
+      certManager:
+        # -- Certificate Issuer kind (only used if `provider` is set to `cert-manager`)
+        issuerKind: ClusterIssuer
+      tlsSecret: testkube-enterprise-api-tls
+    mongo:
+      # -- Mongo DSN connection string
+      dsn: "mongodb://testkube-enterprise-mongodb:27017"
+      # -- Mongo database name
+      database: "testkubeEnterpriseDB"
+    nats:
+      # -- NATS URI
+      uri: "nats://testkube-enterprise-nats:4222"
+
+  image:
+    tag: v0-20240214-145418
+
 ## Testkube Cloud API chart parameters
 testkube-cloud-api:
   fullnameOverride: testkube-enterprise-api
@@ -398,10 +425,10 @@ dex:
         format: json
     # -- Additional static clients which will be appended to the dex staticClients config
     additionalStaticClients: []
-    #  - id: testkube-cloud-local
-    #    name: Testkube Cloud - localdev
-    #    redirectURIs:
-    #      - http://localhost:8090/auth/callback
+    #      - id: testkube-cloud-local
+    #        name: Testkube Cloud - localdev
+    #        redirectURIs:
+    #          - http://localhost:8090/auth/callback
     #    secret: some-secret
     # -- Additional config which will be appended to the config like `staticClients`, `staticPasswords ,`connectors`...
     additionalConfig: ""

charts/testkube-logs-service/Chart.yaml

@@ -1,13 +1,13 @@
 apiVersion: v2
-name: testkube-log-service
+name: testkube-logs-service
 description: A Helm chart for Testkube log Service
 type: application
-version: 1.29.0
-appVersion: 1.7.2
+version: 1.0.0
+appVersion: 1.0.0
 maintainers:
   - name: testkube
     url: https://testkube.io
 icon: https://assets.website-files.com/61e00b3936e571a4ea7a5a4c/623b2bb9387ad04955b1f82c_testkube.svg
 home: https://github.com/kubeshop/testkube-cloud-charts
 sources:
-  - https://github.com/kubeshop/testkube-log-service
+  - https://github.com/kubeshop/testkube-cloud-api

charts/testkube-logs-service/templates/deployment.yaml

@@ -37,6 +37,8 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
+            - name: DEBUG
+              value: "false"
             - name: GRPC_LISTEN_ADDR
               value: "0.0.0.0:8089"
             - name: GRPC_LISTEN_ADDR_TLS