From c75b9a9fe130cc51af1e04d229ade224c2f24c40 Mon Sep 17 00:00:00 2001 From: TricentisDevOps Date: Fri, 18 Oct 2024 07:25:56 +0000 Subject: [PATCH 1/2] Update from Tricentis-qTest/qtest-chart --- Charts/qtest-session/Chart.yaml | 8 ++++++-- Charts/qtest-session/templates/configmap.yaml | 6 +++++- Charts/qtest-session/templates/deployment.yaml | 17 ++++++++++++++++- Charts/qtest-session/values.yaml | 6 ++++-- 4 files changed, 31 insertions(+), 6 deletions(-) diff --git a/Charts/qtest-session/Chart.yaml b/Charts/qtest-session/Chart.yaml index 7f6d97c5..60eaa7fe 100644 --- a/Charts/qtest-session/Chart.yaml +++ b/Charts/qtest-session/Chart.yaml @@ -18,14 +18,18 @@ dependencies: maintainers: - name: byangtri email: b.yang@tricentis.com + - name: pjaladi21 + email: p.jaladi@ext.tricentis.com + - name: liemng + email: l.nguyen@tricentis.com 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.4 +version: 1.6.0 # 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. # It is recommended to use it with quotes. -appVersion: "2024.2" +appVersion: 2024.2 diff --git a/Charts/qtest-session/templates/configmap.yaml b/Charts/qtest-session/templates/configmap.yaml index 7c13e8a5..474493e6 100644 --- a/Charts/qtest-session/templates/configmap.yaml +++ b/Charts/qtest-session/templates/configmap.yaml @@ -30,4 +30,8 @@ data: qTestSessionPort: "{{ .Values.service.targetHttpsPort }}" {{- else }} qTestSessionPort: "{{ .Values.service.targetPort }}" - {{- end -}} \ No newline at end of file + {{- end }} + qTestSessionNodeOptions: |- + {{- if and .Values.qTestSession.qTestSessionSSLRequired .Values.qTestSession.qTestSessionSSLCipherSuites }} + "--tls-cipher-list='{{- join ":" .Values.qTestSession.qTestSessionSSLCipherSuites -}}'" + {{- end }} \ No newline at end of file diff --git a/Charts/qtest-session/templates/deployment.yaml b/Charts/qtest-session/templates/deployment.yaml index 65a61b50..d47815a9 100644 --- a/Charts/qtest-session/templates/deployment.yaml +++ b/Charts/qtest-session/templates/deployment.yaml @@ -139,6 +139,16 @@ spec: configMapKeyRef: name: qtest-session-configmap key: qTestSessionDBPort + - name: SESSION_RO_DB_PW + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.name }} + key: sessionReadOnly + - name: INSIGHTS_RO_DB_PW + valueFrom: + secretKeyRef: + name: {{ .Values.secrets.name }} + key: insightsReadOnly {{- if .Values.qTestSession.qTestSessionCustomSchemaEnable }} - name: DATABASE_SCHEMA_SESSION valueFrom: @@ -228,7 +238,12 @@ spec: configMapKeyRef: name: qtest-session-configmap key: qTestSessionSSLKey - {{- end -}} + {{- 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 7b9af8e2..d5c51a62 100644 --- a/Charts/qtest-session/values.yaml +++ b/Charts/qtest-session/values.yaml @@ -9,7 +9,7 @@ secrets: image: repository: qasymphony/sessions pullPolicy: IfNotPresent - tag: "2024.2" + tag: 2024.2 imageCredentials: enabled: false # name: "" @@ -80,6 +80,8 @@ 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: @@ -141,7 +143,7 @@ vpaAutoscaling: updateMode: "Off" resourcePolicy: containerPolicies: - - containerName: "*" + - containerName: '*' controlledValues: RequestsAndLimits # HPA values autoscaling: From 70e753d2bb1db42ae5d8c1b8f83a74e497c9469a Mon Sep 17 00:00:00 2001 From: irunets Date: Fri, 18 Oct 2024 16:05:36 +0200 Subject: [PATCH 2/2] feat: changed tags to string --- Charts/qtest-session/Chart.yaml | 4 +--- Charts/qtest-session/templates/configmap.yaml | 6 +----- Charts/qtest-session/values.yaml | 4 +--- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Charts/qtest-session/Chart.yaml b/Charts/qtest-session/Chart.yaml index 60eaa7fe..74587533 100644 --- a/Charts/qtest-session/Chart.yaml +++ b/Charts/qtest-session/Chart.yaml @@ -18,8 +18,6 @@ dependencies: maintainers: - name: byangtri email: b.yang@tricentis.com - - name: pjaladi21 - email: p.jaladi@ext.tricentis.com - name: liemng email: l.nguyen@tricentis.com home: https://github.com/Tricentis-qTest/qtest-chart.git @@ -32,4 +30,4 @@ version: 1.6.0 # 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. # It is recommended to use it with quotes. -appVersion: 2024.2 +appVersion: "2024.2" diff --git a/Charts/qtest-session/templates/configmap.yaml b/Charts/qtest-session/templates/configmap.yaml index 474493e6..7f2149c8 100644 --- a/Charts/qtest-session/templates/configmap.yaml +++ b/Charts/qtest-session/templates/configmap.yaml @@ -30,8 +30,4 @@ data: qTestSessionPort: "{{ .Values.service.targetHttpsPort }}" {{- else }} qTestSessionPort: "{{ .Values.service.targetPort }}" - {{- end }} - qTestSessionNodeOptions: |- - {{- if and .Values.qTestSession.qTestSessionSSLRequired .Values.qTestSession.qTestSessionSSLCipherSuites }} - "--tls-cipher-list='{{- join ":" .Values.qTestSession.qTestSessionSSLCipherSuites -}}'" - {{- end }} \ No newline at end of file + {{- end -}} diff --git a/Charts/qtest-session/values.yaml b/Charts/qtest-session/values.yaml index d5c51a62..e068f8da 100644 --- a/Charts/qtest-session/values.yaml +++ b/Charts/qtest-session/values.yaml @@ -9,7 +9,7 @@ secrets: image: repository: qasymphony/sessions pullPolicy: IfNotPresent - tag: 2024.2 + tag: "2024.2" imageCredentials: enabled: false # name: "" @@ -80,8 +80,6 @@ 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: