From 59ecb15b435eeba9d910c4f5e3180f0844b4918a Mon Sep 17 00:00:00 2001 From: TricentisDevOps Date: Wed, 6 Nov 2024 12:17:36 +0000 Subject: [PATCH] PCR-5150 Release new version of charts due to 2024.3 SaaS release --- Charts/qtest-insights-etl/Chart.yaml | 8 ++----- Charts/qtest-insights/Chart.yaml | 12 +++------- .../qtest-insights/templates/configmap.yaml | 4 ++++ Charts/qtest-insights/values.yaml | 2 ++ Charts/qtest-launch/Chart.yaml | 10 +++----- Charts/qtest-launch/templates/configmap.yaml | 7 +++++- Charts/qtest-launch/templates/deployment.yaml | 7 +++++- Charts/qtest-launch/values.yaml | 3 +++ Charts/qtest-mgr/Chart.yaml | 10 +++----- Charts/qtest-mgr/templates/configmap.yaml | 13 ++++++---- Charts/qtest-mgr/templates/deployment.yaml | 24 +++++++++++++++++-- Charts/qtest-mgr/templates/hpa.yaml | 2 +- Charts/qtest-mgr/values.yaml | 20 +++++++++++----- Charts/qtest-parameters/Chart.yaml | 10 +++----- .../qtest-parameters/templates/configmap.yaml | 7 +++++- .../templates/deployment.yaml | 5 ++++ Charts/qtest-parameters/values.yaml | 3 +++ Charts/qtest-pulse/Chart.yaml | 10 +++----- Charts/qtest-pulse/templates/configmap.yaml | 7 +++++- Charts/qtest-pulse/templates/deployment.yaml | 12 +++++++++- Charts/qtest-pulse/values.yaml | 3 +++ Charts/qtest-scenario/Chart.yaml | 10 +++----- .../qtest-scenario/templates/configmap.yaml | 7 +++++- .../qtest-scenario/templates/deployment.yaml | 7 +++++- Charts/qtest-scenario/values.yaml | 5 +++- Charts/qtest-session/Chart.yaml | 8 +++---- Charts/qtest-session/templates/configmap.yaml | 7 +++++- .../qtest-session/templates/deployment.yaml | 5 ++++ Charts/qtest-session/values.yaml | 3 +++ 29 files changed, 153 insertions(+), 78 deletions(-) diff --git a/Charts/qtest-insights-etl/Chart.yaml b/Charts/qtest-insights-etl/Chart.yaml index 9deaa300..9d2d8c77 100644 --- a/Charts/qtest-insights-etl/Chart.yaml +++ b/Charts/qtest-insights-etl/Chart.yaml @@ -16,12 +16,8 @@ dependencies: repository: "https://stakater.github.io/stakater-charts" condition: reloader.enabled maintainers: - - name: byangtri - email: b.yang@tricentis.com - - name: pjaladi21 - email: p.jaladi@ext.tricentis.com - - name: liemng - email: l.nguyen@tricentis.com + - name: Tricentis support + url: https://support-hub.tricentis.com/open kubeVersion: ">=1.24.0-0" # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. diff --git a/Charts/qtest-insights/Chart.yaml b/Charts/qtest-insights/Chart.yaml index c91eafe8..975203df 100644 --- a/Charts/qtest-insights/Chart.yaml +++ b/Charts/qtest-insights/Chart.yaml @@ -16,14 +16,8 @@ dependencies: repository: "https://stakater.github.io/stakater-charts" condition: reloader.enabled maintainers: - - name: byangtri - email: b.yang@tricentis.com - - name: pjaladi21 - email: p.jaladi@ext.tricentis.com - - name: liemng - email: l.nguyen@tricentis.com - - name: KaranKanojiya - email: k.kanojiya@tricentis.com + - name: Tricentis support + url: https://support-hub.tricentis.com/open home: https://github.com/Tricentis-qTest/qtest-chart.git kubeVersion: ">=1.24.0-0" icon: https://images.g2crowd.com/uploads/product/image/social_landscape/social_landscape_c2d6524c36c94138504f7a18bf179d76/tricentis-qtest.png @@ -31,7 +25,7 @@ icon: https://images.g2crowd.com/uploads/product/image/social_landscape/social_l # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.7.2 +version: 1.7.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/Charts/qtest-insights/templates/configmap.yaml b/Charts/qtest-insights/templates/configmap.yaml index cd3849b2..d3b5ae52 100644 --- a/Charts/qtest-insights/templates/configmap.yaml +++ b/Charts/qtest-insights/templates/configmap.yaml @@ -25,3 +25,7 @@ data: SMTP_ACCOUNT: "{{ .Values.qTestInsights.smtp.account }}" SMTP_SERVER: "{{ .Values.qTestInsights.smtp.server }}" SSL_MOUNT_PATH: "{{ .Values.qTestInsights.server.sslMountPath }}" + IS_SSL_REQUIRED: "{{ .Values.qTestInsights.serverAppSSLRequired }}" + {{- if .Values.qTestInsights.qTestInsightsSSLCipherSuites }} + SSL_CIPHERS: "ciphers=\"{{- join "," .Values.qTestInsights.qTestInsightsSSLCipherSuites -}}\"" + {{- end -}} \ No newline at end of file diff --git a/Charts/qtest-insights/values.yaml b/Charts/qtest-insights/values.yaml index bdcff0df..fe8ee84e 100644 --- a/Charts/qtest-insights/values.yaml +++ b/Charts/qtest-insights/values.yaml @@ -101,6 +101,8 @@ qTestInsights: qTestInsightsSessionDBPort: 5432 qTestInsightsCSRFAllowPattern: \"$insights_security_csrf_trusted_source_pattern\" serverAppSSLRequired: false + # Array of cipher suites for SSL/TLS connection in OpenSSL format (e.g. ["TLS_AES_256_GCM_SHA384", "TLS_CHACHA20_POLY1305_SHA256"]) + qTestInsightsSSLCipherSuites: [] server: sslMountPath: "/mnt/secrets/tls" smtp: diff --git a/Charts/qtest-launch/Chart.yaml b/Charts/qtest-launch/Chart.yaml index 8bb44989..20326f4d 100644 --- a/Charts/qtest-launch/Chart.yaml +++ b/Charts/qtest-launch/Chart.yaml @@ -16,19 +16,15 @@ dependencies: repository: "https://stakater.github.io/stakater-charts" condition: reloader.enabled maintainers: - - name: byangtri - email: b.yang@tricentis.com - - name: pjaladi21 - email: p.jaladi@ext.tricentis.com - - name: liemng - email: l.nguyen@tricentis.com + - name: Tricentis support + url: https://support-hub.tricentis.com/open home: https://github.com/Tricentis-qTest/qtest-chart.git kubeVersion: ">=1.24.0-0" # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.5.1 +version: 1.5.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/Charts/qtest-launch/templates/configmap.yaml b/Charts/qtest-launch/templates/configmap.yaml index 3911bcea..9bb46f8a 100644 --- a/Charts/qtest-launch/templates/configmap.yaml +++ b/Charts/qtest-launch/templates/configmap.yaml @@ -24,4 +24,9 @@ data: qTestLaunchPort: "{{ .Values.service.targetHttpsPort }}" {{- else }} qTestLaunchPort: "{{ .Values.service.targetPort }}" - {{- end -}} + {{- end }} + {{- $nodeOptions := .Values.qTestLaunch.qTestLaunchNodeOptions -}} + {{- if (and .Values.qTestLaunch.qTestLaunchSSLRequired .Values.qTestLaunch.qTestLaunchSSLCipherSuites) -}} + {{- $nodeOptions = print $nodeOptions " --tls-cipher-list='" (join ":" .Values.qTestLaunch.qTestLaunchSSLCipherSuites) "'" -}} + {{- end }} + qTestLaunchNodeOptions: "{{ $nodeOptions }}" diff --git a/Charts/qtest-launch/templates/deployment.yaml b/Charts/qtest-launch/templates/deployment.yaml index 1f48d939..e1e4546f 100644 --- a/Charts/qtest-launch/templates/deployment.yaml +++ b/Charts/qtest-launch/templates/deployment.yaml @@ -180,7 +180,12 @@ spec: configMapKeyRef: name: qtest-launch-configmap key: qTestLaunchSSLKey - {{- end -}} + {{- end }} + - name: NODE_OPTIONS + valueFrom: + configMapKeyRef: + name: qtest-launch-configmap + key: qTestLaunchNodeOptions {{- with .Values.extraEnv }} {{ toYaml . | indent 12 }} {{- end }} diff --git a/Charts/qtest-launch/values.yaml b/Charts/qtest-launch/values.yaml index 60b00951..f8e18d02 100644 --- a/Charts/qtest-launch/values.yaml +++ b/Charts/qtest-launch/values.yaml @@ -76,7 +76,10 @@ qTestLaunch: qTestLaunchDBSSLMountPath: "/etc/ssl" qTestLaunchDBSSL: "" qTestLaunchDBCRT: "" + # Array of cipher suites for SSL/TLS connection in OpenSSL format (e.g. ["TLS_AES_256_GCM_SHA384", "TLS_CHACHA20_POLY1305_SHA256"]) + qTestLaunchSSLCipherSuites: [] qTestLaunchDeploymentEnv: "op" + qTestLaunchNodeOptions: "" #### Ingress/IngressClass (> K8s 1.24-1.30+) ##### ingressClass: enabled: false diff --git a/Charts/qtest-mgr/Chart.yaml b/Charts/qtest-mgr/Chart.yaml index 786311ef..3cd17f99 100644 --- a/Charts/qtest-mgr/Chart.yaml +++ b/Charts/qtest-mgr/Chart.yaml @@ -52,12 +52,8 @@ dependencies: repository: "https://stakater.github.io/stakater-charts" condition: reloader.enabled maintainers: - - name: byangtri - email: b.yang@tricentis.com - - name: pjaladi21 - email: p.jaladi@ext.tricentis.com - - name: liemng - email: l.nguyen@tricentis.com + - name: Tricentis support + url: https://support-hub.tricentis.com/open home: https://github.com/Tricentis-qTest/qtest-chart.git kubeVersion: ">=1.24.0-0" icon: https://images.g2crowd.com/uploads/product/image/social_landscape/social_landscape_c2d6524c36c94138504f7a18bf179d76/tricentis-qtest.png @@ -65,7 +61,7 @@ icon: https://images.g2crowd.com/uploads/product/image/social_landscape/social_l # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.9.2 +version: 1.9.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/Charts/qtest-mgr/templates/configmap.yaml b/Charts/qtest-mgr/templates/configmap.yaml index 63329b27..08c9dc27 100644 --- a/Charts/qtest-mgr/templates/configmap.yaml +++ b/Charts/qtest-mgr/templates/configmap.yaml @@ -21,7 +21,7 @@ data: client.jdbc.postgres.username: "{{ .Values.qTestManager.client.jdbc.postgresUserName }}" client.jdbc.postgres.sessionsschema: "{{ .Values.qTestManager.client.jdbc.sessionsSchema }}" --- -{{- end -}} +{{- end }} apiVersion: v1 kind: ConfigMap metadata: @@ -56,7 +56,6 @@ data: serverapp.ssl.required: "{{ .Values.qTestManager.serverAppSSLRequired }}" serverapp.ssl.redirect.custom.status.enabled: "{{ .Values.qTestManager.serverAppSSLRequired }}" parameter.page.size: "{{ .Values.qTestManager.parameterPageSize }}" - pentaho.usingClientId: "{{ .Values.qTestManager.pentaho.usingClientId }}" preUrl: "{{ .Values.qTestManager.preUrl }}" preUrl.https: "{{ .Values.qTestManager.preUrlHttps }}" qasymphonyUrlPostfix: "{{ .Values.qTestManager.qasymphonyUrlPostfix }}" @@ -82,13 +81,17 @@ data: qtest.od.private: "{{ .Values.qTestManager.qTest.ODPrivate }}" secret.volume.mount.path: "{{ .Values.qTestManager.secret.appVolumeMount }}" emailchange.allow.clients: "{{ .Values.qTestManager.emailchange.allowClients }}" - report.http.url: "{{ .Values.qTestManager.report.httpUrl }}" - report.url: "{{ .Values.qTestManager.report.url }}" request.execution.time.upper.threshold: "{{ .Values.qTestManager.requestExecutionTimeUpperThreshold }}" task.execution.time.upper.threshold: "{{ .Values.qTestManager.taskExecutionTimeUpperThreshold }}" vera.auto.testrun.beta.clients: "{{ .Values.qTestManager.vera.auto.testrun.beta.clients }}" sslMountPath: "{{ .Values.qTestManager.server.sslMountPath }}" + sslCiphers: "ciphers=\"{{- join "," .Values.qTestManager.serverAppSSLCipherSuites -}}\"" isSSLRequired: "{{ .Values.qTestManager.serverAppSSLRequired }}" + system.passwords.encryption.mode: "{{ .Values.qTestManager.system.passwords.encryption.mode }}" + system.passwords.encryption.percentage: "{{ .Values.qTestManager.system.passwords.encryption.percentage }}" + system.passwords.encryption.tenants: "{{ .Values.qTestManager.system.passwords.encryption.tenants }}" + system.passwords.encryption.batch.size: "{{ .Values.qTestManager.system.passwords.encryption.batch.size }}" + scheduler.cron.system.passwords.encryption.interval: "{{ .Values.qTestManager.system.passwords.encryption.scheduler.cron }}" {{ if .Values.qTestManager.l2c.enabled }} l2c.config.url: "{{ .Values.qTestManager.l2c.config.url }}" l2c.config.pemfile: "{{ .Values.qTestManager.l2c.config.pemfile }}" @@ -237,4 +240,4 @@ data: testconductor.app.path: "{{ .Values.poller.testconductorAppPath }}" queue.manager.task.scheduler.enabled: "{{ .Values.poller.queue.manager.scheduler.enabled }}" queue.manager.worker.enabled: "{{ .Values.poller.queue.manager.worker.enabled }}" -{{- end -}} \ No newline at end of file +{{- end }} diff --git a/Charts/qtest-mgr/templates/deployment.yaml b/Charts/qtest-mgr/templates/deployment.yaml index 58c95482..56a8ddc4 100644 --- a/Charts/qtest-mgr/templates/deployment.yaml +++ b/Charts/qtest-mgr/templates/deployment.yaml @@ -162,6 +162,11 @@ spec: {{ else }} value: {{ $uiProfile }} {{- end }} + - name: AES_SECRET_KEYS + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.aesSecretKeysName }} + key: AESsecretKeys {{- with .Values.extraEnv }} {{ toYaml . | indent 8 }} {{- end }} @@ -381,7 +386,12 @@ spec: value: {{ $pollerProfile }} {{- with .Values.extraEnv }} {{ toYaml . | indent 8 }} -{{- end }} +{{- end }} + - name: AES_SECRET_KEYS + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.aesSecretKeysName }} + key: AESsecretKeys volumeMounts: - name: qtest-data mountPath: {{ .Values.qTestManager.data.volumeMount }} @@ -599,6 +609,11 @@ spec: {{- with .Values.extraEnv }} {{ toYaml . | indent 8 }} {{- end }} + - name: AES_SECRET_KEYS + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.aesSecretKeysName }} + key: AESsecretKeys volumeMounts: - name: qtest-data mountPath: {{ .Values.qTestManager.data.volumeMount }} @@ -815,7 +830,12 @@ spec: value: {{ $apiProfile }} {{- with .Values.extraEnv }} {{ toYaml . | indent 8 }} -{{- end }} +{{- end }} + - name: AES_SECRET_KEYS + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.aesSecretKeysName }} + key: AESsecretKeys volumeMounts: - name: qtest-data mountPath: {{ .Values.qTestManager.data.volumeMount }} diff --git a/Charts/qtest-mgr/templates/hpa.yaml b/Charts/qtest-mgr/templates/hpa.yaml index 425650f9..39eb758b 100644 --- a/Charts/qtest-mgr/templates/hpa.yaml +++ b/Charts/qtest-mgr/templates/hpa.yaml @@ -99,7 +99,6 @@ spec: averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} --- -{{- end -}} apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: @@ -132,3 +131,4 @@ spec: averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- end }} +{{- end }} diff --git a/Charts/qtest-mgr/values.yaml b/Charts/qtest-mgr/values.yaml index d2de2f25..a6c2a475 100644 --- a/Charts/qtest-mgr/values.yaml +++ b/Charts/qtest-mgr/values.yaml @@ -73,6 +73,7 @@ secrets: useExistingTls: false ## existingConfigs must be qtest-manager-secret # existingConfigs: "qtest-manager-secret" + aesSecretKeysName: qtest-aes-secret-keys serviceAccount: create: true name: @@ -183,6 +184,8 @@ qTestManager: pattern: "" serverAppUseSecureCookie: true serverAppSSLRequired: false + # Array of cipher suites for SSL/TLS connection in OpenSSL format (e.g. ["TLS_AES_256_GCM_SHA384", "TLS_CHACHA20_POLY1305_SHA256"]) + serverAppSSLCipherSuites: [] preUrl: http://nephele.qtest.local preUrlHttps: https://nephele.qtest.local qasymphonyUrlPostfix: .qtest.local @@ -199,8 +202,6 @@ qTestManager: notification: urlExternal: "https://notification.qtest.local" urlInternal: "http://notification.qtest.local" - pentaho: - usingClientId: "" qTest: serverMapUrl: "http://qtest.local/public/jira-widget/server-map" instance: US @@ -209,9 +210,6 @@ qTestManager: nonce: disabled: true mode: HighPrecision - report: - httpUrl: http://localhost/pentaho - url: https://localhost/pentaho requestExecutionTimeUpperThreshold: -1 siteFieldTemplateAssigningProjectBatchSize: 50 taskExecutionTimeUpperThreshold: -1 @@ -267,6 +265,16 @@ qTestManager: redis: host: localhost port: 6379 + system: + passwords: + encryption: + mode: INCREMENTAL + percentage: 0 + tenants: "" + batch: + size: 100 + scheduler: + cron: 0 0 * * * * ui: action: task: @@ -512,7 +520,7 @@ vpaAutoscaling: updateMode: "Off" resourcePolicy: containerPolicies: - - containerName: '*' + - containerName: "*" controlledValues: RequestsAndLimits # HPA values autoscaling: diff --git a/Charts/qtest-parameters/Chart.yaml b/Charts/qtest-parameters/Chart.yaml index 6ba5404f..c3871e37 100644 --- a/Charts/qtest-parameters/Chart.yaml +++ b/Charts/qtest-parameters/Chart.yaml @@ -16,18 +16,14 @@ dependencies: repository: "https://stakater.github.io/stakater-charts" condition: reloader.enabled maintainers: - - name: byangtri - email: b.yang@tricentis.com - - name: pjaladi21 - email: p.jaladi@ext.tricentis.com - - name: liemng - email: l.nguyen@tricentis.com + - name: Tricentis support + url: https://support-hub.tricentis.com/open home: https://github.com/Tricentis-qTest/qtest-chart.git kubeVersion: ">=1.24.0-0" # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.2 +version: 1.4.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/Charts/qtest-parameters/templates/configmap.yaml b/Charts/qtest-parameters/templates/configmap.yaml index ad318e33..701097ae 100644 --- a/Charts/qtest-parameters/templates/configmap.yaml +++ b/Charts/qtest-parameters/templates/configmap.yaml @@ -25,4 +25,9 @@ data: {{- else }} qTestParametersPort: "{{ .Values.service.targetPort }}" qTestParametersDeploymentEnv: "{{ .Values.qTestParameters.qTestParametersDeploymentEnv }}" - {{- end -}} + {{- end }} + {{- $nodeOptions := .Values.qTestParameters.qTestParametersNodeOptions -}} + {{- if (and .Values.qTestParameters.qTestParametersSSLRequired .Values.qTestParameters.qTestParametersSSLCipherSuites) -}} + {{- $nodeOptions = print $nodeOptions " --tls-cipher-list='" (join ":" .Values.qTestParameters.qTestParametersSSLCipherSuites) "'" -}} + {{- end }} + qTestParametersNodeOptions: "{{ $nodeOptions }}" diff --git a/Charts/qtest-parameters/templates/deployment.yaml b/Charts/qtest-parameters/templates/deployment.yaml index 4ad694cc..95951f5f 100644 --- a/Charts/qtest-parameters/templates/deployment.yaml +++ b/Charts/qtest-parameters/templates/deployment.yaml @@ -181,6 +181,11 @@ spec: name: qtest-parameters-configmap key: qTestParametersSSLKey {{- end }} + - name: NODE_OPTIONS + valueFrom: + configMapKeyRef: + name: qtest-parameters-configmap + key: qTestParametersNodeOptions {{- with .Values.extraEnv }} {{ toYaml . | indent 12 }} {{- end }} diff --git a/Charts/qtest-parameters/values.yaml b/Charts/qtest-parameters/values.yaml index 00b64f6a..20cc9fd0 100644 --- a/Charts/qtest-parameters/values.yaml +++ b/Charts/qtest-parameters/values.yaml @@ -75,8 +75,11 @@ qTestParameters: qTestParametersDBCRT: "" qTestParametersSSLRequired: false qTestParametersSSLMountPath: "/mnt/secrets/tls" + # Array of cipher suites for SSL/TLS connection in OpenSSL format (e.g. ["TLS_AES_256_GCM_SHA384", "TLS_CHACHA20_POLY1305_SHA256"]) + qTestParametersSSLCipherSuites: [] qTestParametersCorsOrigin: "tricentis.com" qTestParametersDeploymentEnv: "saas" + qTestParametersNodeOptions: "" #### Ingress/IngressClass (> K8s 1.24-1.30+) ##### ingressClass: enabled: false diff --git a/Charts/qtest-pulse/Chart.yaml b/Charts/qtest-pulse/Chart.yaml index 7ab3097d..3a686429 100644 --- a/Charts/qtest-pulse/Chart.yaml +++ b/Charts/qtest-pulse/Chart.yaml @@ -16,18 +16,14 @@ dependencies: repository: "https://stakater.github.io/stakater-charts" condition: reloader.enabled maintainers: - - name: byangtri - email: b.yang@tricentis.com - - name: pjaladi21 - email: p.jaladi@ext.tricentis.com - - name: liemng - email: l.nguyen@tricentis.com + - name: Tricentis support + url: https://support-hub.tricentis.com/open home: https://github.com/Tricentis-qTest/qtest-chart.git kubeVersion: ">=1.24.0-0" # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.3.3 +version: 1.3.4 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/Charts/qtest-pulse/templates/configmap.yaml b/Charts/qtest-pulse/templates/configmap.yaml index ad3df895..312b349f 100644 --- a/Charts/qtest-pulse/templates/configmap.yaml +++ b/Charts/qtest-pulse/templates/configmap.yaml @@ -28,4 +28,9 @@ data: {{- else }} qTestPulsePort: "{{ .Values.service.targetPort }}" qTestPulseDeploymentEnv: "{{ .Values.qTestPulse.qTestPulseDeploymentEnv }}" - {{- end -}} + {{- end }} + {{- $nodeOptions := .Values.qTestPulse.qTestPulseNodeOptions -}} + {{- if (and .Values.qTestPulse.qTestPulseSSLRequired .Values.qTestPulse.qTestPulseSSLCipherSuites) -}} + {{- $nodeOptions = print $nodeOptions " --tls-cipher-list='" (join ":" .Values.qTestPulse.qTestPulseSSLCipherSuites) "'" -}} + {{- end }} + qTestPulseNodeOptions: "{{ $nodeOptions }}" diff --git a/Charts/qtest-pulse/templates/deployment.yaml b/Charts/qtest-pulse/templates/deployment.yaml index 73746864..136049d3 100644 --- a/Charts/qtest-pulse/templates/deployment.yaml +++ b/Charts/qtest-pulse/templates/deployment.yaml @@ -169,6 +169,11 @@ spec: configMapKeyRef: name: {{ include "qtest-pulse.fullname" . }}-configmap key: qtestPulseExecutorUrl + - name: EXECUTOR_API_KEY + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.name }} + key: qtestPulseExecutorApiKey - name: SWAGGER_URL valueFrom: configMapKeyRef: @@ -195,7 +200,12 @@ spec: configMapKeyRef: name: {{ include "qtest-pulse.fullname" . }}-configmap key: qTestPulseSSLKey - {{- end -}} + {{- end }} + - name: NODE_OPTIONS + valueFrom: + configMapKeyRef: + name: {{ include "qtest-pulse.fullname" . }}-configmap + key: qTestPulseNodeOptions {{- with .Values.extraEnv }} {{ toYaml . | indent 12 }} {{- end }} diff --git a/Charts/qtest-pulse/values.yaml b/Charts/qtest-pulse/values.yaml index 6d006bda..cf82c7bd 100644 --- a/Charts/qtest-pulse/values.yaml +++ b/Charts/qtest-pulse/values.yaml @@ -75,11 +75,14 @@ qTestPulse: qTestPulseDBSSLMountPath: "/etc/ssl" qTestPulseDBSSL: "" qTestPulseDBCRT: "" + # Array of cipher suites for SSL/TLS connection in OpenSSL format (e.g. ["TLS_AES_256_GCM_SHA384", "TLS_CHACHA20_POLY1305_SHA256"]) + qTestPulseSSLCipherSuites: [] qTestPulseType: "qtest-pulse" # Optional Value to specify a seperate Pulse executor URL. qtestPulseExecutorUrl: "" swaggerUrl: https://qtest.dev.tricentis.com qTestPulseDeploymentEnv: "op" + qTestPulseNodeOptions: "" #### Ingress/IngressClass (> K8s 1.24-1.30+) ##### ingressClass: enabled: false diff --git a/Charts/qtest-scenario/Chart.yaml b/Charts/qtest-scenario/Chart.yaml index c308e21e..db9241c2 100644 --- a/Charts/qtest-scenario/Chart.yaml +++ b/Charts/qtest-scenario/Chart.yaml @@ -16,19 +16,15 @@ dependencies: repository: "https://stakater.github.io/stakater-charts" condition: reloader.enabled maintainers: - - name: byangtri - email: b.yang@tricentis.com - - name: pjaladi21 - email: p.jaladi@ext.tricentis.com - - name: liemng - email: l.nguyen@tricentis.com + - name: Tricentis support + url: https://support-hub.tricentis.com/open home: https://github.com/Tricentis-qTest/qtest-chart.git kubeVersion: ">=1.24.0-0" icon: https://images.g2crowd.com/uploads/product/image/social_landscape/social_landscape_c2d6524c36c94138504f7a18bf179d76/tricentis-qtest.png # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.4.4 +version: 1.4.5 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/Charts/qtest-scenario/templates/configmap.yaml b/Charts/qtest-scenario/templates/configmap.yaml index 76b31a4b..52ed0513 100644 --- a/Charts/qtest-scenario/templates/configmap.yaml +++ b/Charts/qtest-scenario/templates/configmap.yaml @@ -26,4 +26,9 @@ data: qTestScenarioPort: "{{ .Values.service.targetHttpsPort }}" {{- else }} qTestScenarioPort: "{{ .Values.service.targetPort }}" - {{- end -}} + {{- end }} + {{- $nodeOptions := .Values.qTestScenario.qTestScenarioNodeOptions -}} + {{- if (and .Values.qTestScenario.qTestScenarioSSLRequired .Values.qTestScenario.qTestScenarioSSLCipherSuites) -}} + {{- $nodeOptions = print $nodeOptions " --tls-cipher-list='" (join ":" .Values.qTestScenario.qTestScenarioSSLCipherSuites) "'" -}} + {{- end }} + qTestScenarioNodeOptions: "{{ $nodeOptions }}" diff --git a/Charts/qtest-scenario/templates/deployment.yaml b/Charts/qtest-scenario/templates/deployment.yaml index dbda05e8..e33bd337 100644 --- a/Charts/qtest-scenario/templates/deployment.yaml +++ b/Charts/qtest-scenario/templates/deployment.yaml @@ -190,7 +190,12 @@ spec: configMapKeyRef: name: qtest-scenario-configmap key: qTestScenarioSSLKey - {{- end }} + {{- end }} + - name: NODE_OPTIONS + valueFrom: + configMapKeyRef: + name: qtest-scenario-configmap + key: qTestScenarioNodeOptions {{- with .Values.extraEnv }} {{ toYaml . | indent 12 }} {{- end }} diff --git a/Charts/qtest-scenario/values.yaml b/Charts/qtest-scenario/values.yaml index dc78222c..795ce63e 100644 --- a/Charts/qtest-scenario/values.yaml +++ b/Charts/qtest-scenario/values.yaml @@ -79,7 +79,10 @@ qTestScenario: qTestScenarioDBSSLMountPath: "/etc/ssl" qTestScenarioDBSSL: "" qTestScenarioDBCRT: "" + # Array of cipher suites for SSL/TLS connection in OpenSSL format (e.g. ["TLS_AES_256_GCM_SHA384", "TLS_CHACHA20_POLY1305_SHA256"]) + qTestScenarioSSLCipherSuites: [] qTestScenarioDeploymentEnv: "op" + qTestScenarioNodeOptions: "" #### Ingress/IngressClass (> K8s 1.24-1.30+) ##### ingressClass: enabled: false @@ -127,7 +130,7 @@ vpaAutoscaling: updateMode: "Off" resourcePolicy: containerPolicies: - - containerName: "*" + - containerName: '*' controlledValues: RequestsAndLimits # HPA values autoscaling: diff --git a/Charts/qtest-session/Chart.yaml b/Charts/qtest-session/Chart.yaml index 845fbc90..ebab2be1 100644 --- a/Charts/qtest-session/Chart.yaml +++ b/Charts/qtest-session/Chart.yaml @@ -16,16 +16,14 @@ dependencies: repository: "https://stakater.github.io/stakater-charts" condition: reloader.enabled maintainers: - - name: byangtri - email: b.yang@tricentis.com - - name: liemng - email: l.nguyen@tricentis.com + - name: Tricentis support + url: https://support-hub.tricentis.com/open home: https://github.com/Tricentis-qTest/qtest-chart.git kubeVersion: ">=1.24.0-0" # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.6.2 +version: 1.6.3 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. diff --git a/Charts/qtest-session/templates/configmap.yaml b/Charts/qtest-session/templates/configmap.yaml index 7f2149c8..428a4e69 100644 --- a/Charts/qtest-session/templates/configmap.yaml +++ b/Charts/qtest-session/templates/configmap.yaml @@ -30,4 +30,9 @@ data: qTestSessionPort: "{{ .Values.service.targetHttpsPort }}" {{- else }} qTestSessionPort: "{{ .Values.service.targetPort }}" - {{- end -}} + {{- end }} + {{- $nodeOptions := .Values.qTestSession.qTestSessionNodeOptions -}} + {{- if (and .Values.qTestSession.qTestSessionSSLRequired .Values.qTestSession.qTestSessionSSLCipherSuites) -}} + {{- $nodeOptions = print $nodeOptions " --tls-cipher-list='" (join ":" .Values.qTestSession.qTestSessionSSLCipherSuites) "'" -}} + {{- end }} + qTestSessionNodeOptions: "{{ $nodeOptions }}" \ No newline at end of file diff --git a/Charts/qtest-session/templates/deployment.yaml b/Charts/qtest-session/templates/deployment.yaml index 1d997d66..d47815a9 100644 --- a/Charts/qtest-session/templates/deployment.yaml +++ b/Charts/qtest-session/templates/deployment.yaml @@ -239,6 +239,11 @@ spec: name: qtest-session-configmap key: qTestSessionSSLKey {{- end }} + - name: NODE_OPTIONS + valueFrom: + configMapKeyRef: + name: qtest-session-configmap + key: qTestSessionNodeOptions {{- with .Values.extraEnv }} {{ toYaml . | indent 12 }} {{- end }} diff --git a/Charts/qtest-session/values.yaml b/Charts/qtest-session/values.yaml index e068f8da..82a28a09 100644 --- a/Charts/qtest-session/values.yaml +++ b/Charts/qtest-session/values.yaml @@ -80,11 +80,14 @@ qTestSession: qTestSessionDBSSLMountPath: "/etc/ssl" qTestSessionDBSSL: "" qTestSessionDBCRT: "" + # Array of cipher suites for SSL/TLS connection in OpenSSL format (e.g. ["TLS_AES_256_GCM_SHA384", "TLS_CHACHA20_POLY1305_SHA256"]) + qTestSessionSSLCipherSuites: [] qTestSessionCustomSchemaEnable: false qTestSessionCustomSchemaName: public postgresDBPassword: secret: qtest-manager-secret qTestSessionDeploymentEnv: "op" + qTestSessionNodeOptions: "" #### Ingress/IngressClass (> K8s 1.18-1.22+) ##### ingressClass: enabled: false