chore: latest changes

kubeshop · Dec 16, 2024 · 3bd0065 · 3bd0065
1 parent 11c9714
commit 3bd0065
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 61 deletions.
diff --git a/charts/testkube-cloud-api/templates/deployment.yaml b/charts/testkube-cloud-api/templates/deployment.yaml
@@ -36,35 +36,6 @@ spec:
       {{- end }}
       serviceAccountName: {{ include "testkube-cloud-api.serviceAccountName" . }}
       securityContext: {{ include "testkube-cloud-api.podSecurityContext" . | nindent 8 }}
-      {{- if .Values.init.enabled }}
-      initContainers:
-        - name: wait-for-mongo
-          image: {{ include "testkube-cloud-api.toolbox-image" . }}
-          imagePullPolicy: {{ .Values.toolboxImage.pullPolicy }}
-          securityContext: {{ include "init-wait-for-mongo.containerSecurityContext" . | nindent 12 }}
-          command: ["/testkube/toolbox"]
-          {{- if .Values.api.migrations.enabled }}
-          args: ["database", "status", "--wait"]
-          {{- else }}
-          args: ["database", "status", "--wait", "--skip-migrations"]
-          {{- end}}
-          env:
-            {{- $mongoDsnSecretRef := .Values.global.mongo.dsnSecretRef | default .Values.api.mongo.dsnSecretRef }}
-            {{- $mongoDsn := .Values.global.mongo.dsn | default .Values.api.mongo.dsn }}
-            {{- if $mongoDsnSecretRef }}
-            - name: API_MONGO_DSN
-              valueFrom:
-                secretKeyRef:
-                  key: MONGO_DSN
-                  name: {{ $mongoDsnSecretRef }}
-            {{- else if $mongoDsn }}
-            - name: API_MONGO_DSN
-              value: {{ $mongoDsn }}
-            {{- end }}
-            {{- $mongoDatabase := .Values.global.mongo.database | default .Values.api.mongo.database }}
-            - name: API_MONGO_DB
-              value: {{ $mongoDatabase }}
-      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           securityContext: {{ include "testkube-cloud-api.containerSecurityContext" . | nindent 12 }}
@@ -462,6 +433,8 @@ spec:
               value: "{{ .Values.api.storage.cleanup.retentionDays }}"
             - name: ENTERPRISE_ARTIFACT_MAX_STORAGE_SIZE_GB
               value: "{{ .Values.api.storage.cleanup.maxStorageSizeGb }}"
+            - name: MIGRATION_MIGRATE_DATABASE
+              value: "{{ .Values.api.migrations.enabled | quote }}"
           ports:
             - name: {{ if .Values.api.tls.serveHTTPS }}https{{ else }}http{{ end }}
               containerPort: {{ if .Values.api.tls.serveHTTPS }}{{ .Values.api.tls.apiPort }}{{ else }}8090{{ end }}

diff --git a/charts/testkube-cloud-api/templates/migration-job.yaml b/charts/testkube-cloud-api/templates/migration-job.yaml
@@ -5,6 +5,11 @@ metadata:
   name: {{ template "testkube-cloud-api.migration-jobname" . }}
   labels:
     {{- include "testkube-cloud-api.labels" . | nindent 4 }}
+  annotations:
+  {{- if .Values.api.migrations.useArgoHook }}
+    "argocd.argoproj.io/hook": "sync"
+    "argocd.argoproj.io/hook-delete-policy": "BeforeHookCreation"
+  {{- end }}
 spec:
   backoffLimit: 3
   ttlSecondsAfterFinished: {{ .Values.api.migrations.ttlSecondsAfterFinished }}

diff --git a/charts/testkube-cloud-api/values.yaml b/charts/testkube-cloud-api/values.yaml
@@ -141,24 +141,6 @@ enterpriseLicenseKeyPath: /testkube/license.key
 enterpriseLicenseFilePath: /testkube/license.lic
 # -- Api can allow to set demo organization id where user who don't have Kubernetes cluster can play around
 demoOrganizationId: ""
-## Init block defines settings for the dependency check containers
-init:
-  # -- Toggle whether to enable the dependency check containers
-  enabled: false
-  mongo:
-    image:
-      # -- MongoSH image registry
-      registry: "docker.io"
-      # -- MongoSH image repository
-      repository: alpine/mongosh
-      # -- MongoSH image tag
-      tag: 2.0.2
-      # -- MongoSH image pull policy
-      pullPolicy: IfNotPresent
-      # -- MongoSH image digest
-      digest: ""
-      # -- Init container Security Context
-    containerSecurityContext: {}
 analytics:
   segmentio:
     # -- Toggle whether to enable Segment.io analytics

diff --git a/charts/testkube-enterprise/values.yaml b/charts/testkube-enterprise/values.yaml
@@ -252,20 +252,6 @@ testkube-cloud-api:
   # -- Container Security Context
   securityContext:
     readOnlyRootFilesystem: true
-  ## Init block defines settings for the dependency check containers
-  init:
-    # -- Toggle whether to enable the dependency check containers
-    enabled: false
-    mongo:
-      image:
-        # -- MongoSH image repository
-        repository: kubeshop/bitnami-mongodb
-        # -- MongoSH image tag
-        tag: 7.0.12
-        # -- MongoSH image pull policy
-        pullPolicy: IfNotPresent
-      # -- Init container Security Context
-      securityContext: {}
   # -- Specifies the path to the directory (skip the trailing slash) where CA certificates should be mounted. The mounted file should container a PEM encoded CA certificate.
   customCaDirPath: ""
   # -- Specifies the path where the license key should be mounted.