[pipelines] 1.41.3 release

jfrog · Jul 7, 2023 · 7e05260 · 7e05260
1 parent ae5a56b
commit 7e05260
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 2 deletions.
diff --git a/stable/pipelines/CHANGELOG.md b/stable/pipelines/CHANGELOG.md
@@ -1,6 +1,11 @@
 # JFrog Pipelines Chart Changelog
 All changes to this chart to be documented in this file.
 
+## [101.41.3] - Jun 16, 2023
+* Add ability to work with redis.fullnameOverride
+* Add support to pass db metric parameters in system.yaml
+* Add hpa api version to autoscaling/v2 for missing conf
+
 ## [101.40.1] - May 31, 2023
 * Handle jfrogUrlUI if nothing is set
 * Added log-service

diff --git a/stable/pipelines/Chart.yaml b/stable/pipelines/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.40.1
+appVersion: 1.41.3
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -32,4 +32,4 @@ name: pipelines
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 101.40.1
+version: 101.41.3
diff --git a/stable/pipelines/templates/pipelines-hookhandler-hpa.yaml b/stable/pipelines/templates/pipelines-hookhandler-hpa.yaml
@@ -1,5 +1,9 @@
 {{- if and (.Values.splitServicesToPods) (.Values.pipelines.hookHandler.autoscaling.enabled) -}}
+{{ if semverCompare ">=v1.23.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: autoscaling/v2
+{{ else }}
 apiVersion: autoscaling/v2beta2
+{{ end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "pipelines.hookhandler.name" . }}

diff --git a/stable/pipelines/templates/pipelines-hpa.yaml b/stable/pipelines/templates/pipelines-hpa.yaml
@@ -1,5 +1,9 @@
 {{- if .Values.pipelines.autoscaling.enabled -}}
+{{ if semverCompare ">=v1.23.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: autoscaling/v2
+{{ else }}
 apiVersion: autoscaling/v2beta2
+{{ end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "pipelines.services.name" . }}

diff --git a/stable/pipelines/templates/pipelines-internalapi-hpa.yaml b/stable/pipelines/templates/pipelines-internalapi-hpa.yaml
@@ -1,5 +1,9 @@
 {{- if and (.Values.splitServicesToPods) (.Values.pipelines.internalapi.autoscaling.enabled) -}}
+{{ if semverCompare ">=v1.23.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: autoscaling/v2
+{{ else }}
 apiVersion: autoscaling/v2beta2
+{{ end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "pipelines.internalapi.name" . }}

diff --git a/stable/pipelines/templates/pipelines-internalapi-statefulset.yaml b/stable/pipelines/templates/pipelines-internalapi-statefulset.yaml
@@ -291,7 +291,11 @@ spec:
           {{- end }}
           {{- if .Values.redis.enabled }}
             echo "Waiting for Redis to come up...";
+          {{- if .Values.redis.fullnameOverride }}
+            until nc -z -w 2 {{ .Values.redis.fullnameOverride }}-master {{ .Values.redis.redisPort }} && echo redis ok; do
+          {{- else }}
             until nc -z -w 2 {{ .Release.Name }}-redis-master {{ .Values.redis.redisPort }} && echo redis ok; do
+          {{- end }}
               sleep 1;
             done;
           {{- end }}

diff --git a/stable/pipelines/templates/pipelines-statefulset.yaml b/stable/pipelines/templates/pipelines-statefulset.yaml
@@ -318,7 +318,11 @@ spec:
           {{- end }}
           {{- if .Values.redis.enabled }}
             echo "Waiting for Redis to come up...";
+          {{- if .Values.redis.fullnameOverride }}
+            until nc -z -w 2 {{ .Values.redis.fullnameOverride }}-master {{ .Values.redis.redisPort }} && echo redis ok; do
+          {{- else }}
             until nc -z -w 2 {{ .Release.Name }}-redis-master {{ .Values.redis.redisPort }} && echo redis ok; do
+          {{- end }}
               sleep 1;
             done;
           {{- end }}

diff --git a/stable/pipelines/templates/pipelines-sync-hpa.yaml b/stable/pipelines/templates/pipelines-sync-hpa.yaml
@@ -1,5 +1,9 @@
 {{- if and ( .Values.splitServicesToPods) (.Values.pipelines.pipelineSync.autoscaling.enabled) -}}
+{{ if semverCompare ">=v1.23.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: autoscaling/v2
+{{ else }}
 apiVersion: autoscaling/v2beta2
+{{ end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "pipelines.sync.name" . }}

diff --git a/stable/pipelines/templates/pipelines-trigger-hpa.yaml b/stable/pipelines/templates/pipelines-trigger-hpa.yaml
@@ -1,5 +1,9 @@
 {{- if and (.Values.splitServicesToPods) (.Values.pipelines.runTrigger.autoscaling.enabled) -}}
+{{ if semverCompare ">=v1.23.0-0" .Capabilities.KubeVersion.Version }}
+apiVersion: autoscaling/v2
+{{ else }}
 apiVersion: autoscaling/v2beta2
+{{ end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "pipelines.trigger.name" . }}

diff --git a/stable/pipelines/values.yaml b/stable/pipelines/values.yaml
@@ -308,6 +308,10 @@ pipelines:
       rotation:
         maxSizeMb: 10
         maxFiles: 10
+  db:
+    metrics:
+      enabled: false
+      maxTopSlowQueries: 10
 
   signedPipelines:
     enabled: true
@@ -1324,6 +1328,10 @@ pipelines:
         {{- else }}
         connectionString: "{{ tpl (printf "postgres://%s:%s@%v:%v/%s" .Values.global.postgresql.user .Values.global.postgresql.password .Values.global.postgresql.host .Values.global.postgresql.port .Values.global.postgresql.database) . }}"
         {{- end }}
+        metrics:
+          enabled: {{ .Values.pipelines.db.metrics.enabled }}
+          logging: false
+          maxTopSlowQueries: {{ .Values.pipelines.db.metrics.maxTopSlowQueries }}
 
       ## RabbitMQ configuration
       ##
@@ -1428,7 +1436,11 @@ pipelines:
       ## Redis configuration
       ##
       redis:
+        {{- if .Values.redis.fullnameOverride }}
+        ip: {{ .Values.redis.fullnameOverride }}-master
+        {{- else }}
         ip: {{ .Release.Name }}-redis-master
+        {{- end }}
         port: {{ .Values.redis.redisPort }}
         {{- if .Values.redis.usePassword }}
         password: {{ .Values.redis.password }}
@@ -1976,6 +1988,8 @@ redis:
 
   usePassword: false
 
+  fullnameOverride:
+
   master:
     configmap: |-
       appendonly yes