From 8d00e4eae2e727591007224ec5db50bff7e2a01b Mon Sep 17 00:00:00 2001 From: fgbe05191 Date: Thu, 22 Jun 2023 22:55:12 +0200 Subject: [PATCH 1/2] add xray statefulset GOMAXPROCS for analysis, server, indexer, persist and router --- stable/xray/templates/xray-statefulset.yaml | 25 +++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/stable/xray/templates/xray-statefulset.yaml b/stable/xray/templates/xray-statefulset.yaml index 0b8300b07..74f059a05 100644 --- a/stable/xray/templates/xray-statefulset.yaml +++ b/stable/xray/templates/xray-statefulset.yaml @@ -253,6 +253,11 @@ spec: env: - name: JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES value: {{ include "xray.router.requiredServiceTypes" . }} + - name: GOMAXPROCS + valueFrom: + resourceFieldRef: + containerName: {{ .Values.router.name }} + resource: limits.cpu ports: - name: http-router containerPort: {{ .Values.router.internalPort }} @@ -450,6 +455,11 @@ spec: name: "{{ template "xray.name" . }}-unified-secret" {{- end }} key: execution-service-aes-key + - name: GOMAXPROCS + valueFrom: + resourceFieldRef: + containerName: {{ .Values.server.name }} + resource: limits.cpu {{- if .Values.common.extraEnvVars }} {{- tpl .Values.common.extraEnvVars . | nindent 8 }} {{- end }} @@ -615,6 +625,11 @@ spec: name: "{{ template "xray.name" . }}-unified-secret" {{- end }} key: execution-service-aes-key + - name: GOMAXPROCS + valueFrom: + resourceFieldRef: + containerName: {{ .Values.analysis.name }} + resource: limits.cpu {{- if .Values.common.extraEnvVars }} {{- tpl .Values.common.extraEnvVars . | nindent 8 }} {{- end }} @@ -769,6 +784,11 @@ spec: fieldPath: metadata.name - name: XRAY_K8S_ENV value: "true" + - name: GOMAXPROCS + valueFrom: + resourceFieldRef: + containerName: {{ .Values.indexer.name }} + resource: limits.cpu {{- if .Values.common.extraEnvVars }} {{- tpl .Values.common.extraEnvVars . | nindent 8 }} {{- end }} @@ -919,6 +939,11 @@ spec: {{- end }} - name: XRAY_K8S_ENV value: "true" + - name: GOMAXPROCS + valueFrom: + resourceFieldRef: + containerName: {{ .Values.persist.name }} + resource: limits.cpu {{- if .Values.common.extraEnvVars }} {{- tpl .Values.common.extraEnvVars . | nindent 8 }} {{- end }} From 9dfd366bc6af9a698cd4eeb9c570f9fc6505eefd Mon Sep 17 00:00:00 2001 From: fgbe05191 Date: Thu, 22 Jun 2023 23:07:22 +0200 Subject: [PATCH 2/2] PR checklist --- stable/xray/CHANGELOG.md | 3 +++ stable/xray/Chart.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md index 385f073ed..e79380de8 100644 --- a/stable/xray/CHANGELOG.md +++ b/stable/xray/CHANGELOG.md @@ -1,6 +1,9 @@ # JFrog Xray Chart Changelog All changes to this chart will be documented in this file. +## [103.76.0] - Jun 22, 2023 +* Add GOMAXPROCS env configuration from `limits.cpu` for router, analysis, indexer, server, persist in sts. + ## [103.75.12] - May 19, 2023 * Fix lint issue when rabbitmq is disabled diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml index 6cc37ec69..23e41db28 100644 --- a/stable/xray/Chart.yaml +++ b/stable/xray/Chart.yaml @@ -24,4 +24,4 @@ name: xray sources: - https://github.com/jfrog/charts type: application -version: 103.75.12 +version: 103.76.0