Skip to content

Commit

Permalink
Merge pull request #1825 from imjasmeet/pipe-1.44.5
Browse files Browse the repository at this point in the history
[pipelines] 1.44.5 release
  • Loading branch information
chukka authored Oct 6, 2023
2 parents 3fe84c4 + 3d5d8ec commit 13dffae
Show file tree
Hide file tree
Showing 17 changed files with 462 additions and 610 deletions.
12 changes: 12 additions & 0 deletions stable/pipelines/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# JFrog Pipelines Chart Changelog
All changes to this chart to be documented in this file.

## [101.44.5] - Aug 7, 2023
* Upadate chart version of vault to 0.25.0 to work with 1.25 of kubernetes
* Added option to stream logs in json
* Add support to work without vault on modifying corresponding flags
* Remove steptrigger from pipelines
* Remove logup from pipelines
* Add ability to pass filebeat metric configuration
* Updated nodePollerInterval from 15 seconds to 5 seconds
* Fixed #adding colon in image registry breaks deployment with meta label error
* Add observability container to non api pods
* Add terminationGracePeriodSeconds for all the pods

## [101.41.3] - Jun 16, 2023
* Add ability to work with redis.fullnameOverride
* Add support to pass db metric parameters in system.yaml
Expand Down
6 changes: 3 additions & 3 deletions stable/pipelines/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ dependencies:
version: 12.10.1
- name: vault
repository: https://charts.jfrog.io/
version: 0.16.1
digest: sha256:70447f57bec8971f2c77adbf8acced07cbba97acc00c063b994f801be853cf5c
generated: "2022-04-21T12:53:31.324192+05:30"
version: 0.25.0
digest: sha256:9d9b9eaa7258294872a09b31aae9d39fb4f0970ce5c17220d2d6ab889562e3b5
generated: "2023-08-07T15:59:25.511241+05:30"
6 changes: 3 additions & 3 deletions stable/pipelines/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.41.3
appVersion: 1.44.5
dependencies:
- condition: postgresql.enabled
name: postgresql
Expand All @@ -16,7 +16,7 @@ dependencies:
- condition: vault.enabled
name: vault
repository: https://charts.jfrog.io/
version: 0.16.1
version: 0.25.0
description: A Helm chart for JFrog Pipelines
home: https://jfrog.com/pipelines/
icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/pipelines/icon/pipelines-logo.png
Expand All @@ -32,4 +32,4 @@ name: pipelines
sources:
- https://github.com/jfrog/charts
type: application
version: 101.41.3
version: 101.44.5
36 changes: 0 additions & 36 deletions stable/pipelines/ci/default-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,24 +47,6 @@ pipelines:
cpu: 25m
memory: 40Mi

runTrigger:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

stepTrigger:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

cron:
resources:
limits:
Expand Down Expand Up @@ -92,24 +74,6 @@ pipelines:
cpu: 25m
memory: 40Mi

marshaller:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 60Mi

logup:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

extensionSync:
resources:
limits:
Expand Down
36 changes: 0 additions & 36 deletions stable/pipelines/ci/global-section-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -88,24 +88,6 @@ pipelines:
cpu: 25m
memory: 40Mi

runTrigger:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

stepTrigger:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

cron:
resources:
limits:
Expand Down Expand Up @@ -133,24 +115,6 @@ pipelines:
cpu: 25m
memory: 40Mi

marshaller:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 60Mi

logup:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

extensionSync:
resources:
limits:
Expand Down
36 changes: 0 additions & 36 deletions stable/pipelines/ci/ha-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,24 +41,6 @@ pipelines:
cpu: 25m
memory: 40Mi

runTrigger:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

stepTrigger:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

cron:
resources:
limits:
Expand Down Expand Up @@ -86,24 +68,6 @@ pipelines:
cpu: 25m
memory: 40Mi

marshaller:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 60Mi

logup:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

extensionSync:
resources:
limits:
Expand Down
36 changes: 0 additions & 36 deletions stable/pipelines/ci/hpa-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,6 @@ pipelines:
cpu: 25m
memory: 40Mi

runTrigger:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

stepTrigger:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

cron:
resources:
limits:
Expand Down Expand Up @@ -84,24 +66,6 @@ pipelines:
cpu: 25m
memory: 40Mi

marshaller:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 60Mi

logup:
resources:
limits:
cpu: 500m
memory: 500Mi
requests:
cpu: 5m
memory: 40Mi

extensionSync:
resources:
limits:
Expand Down
58 changes: 26 additions & 32 deletions stable/pipelines/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@ The services name
{{- printf "%s-%s-trigger" $name .Chart.Name | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{- define "pipelines.steptrigger.name" -}}
{{- $name := .Release.Name | trunc 29 -}}
{{- printf "%s-%s-steptrigger" $name .Chart.Name | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{- define "pipelines.extensionsync.name" -}}
{{- $name := .Release.Name | trunc 29 -}}
{{- printf "%s-%s-extensionsync" $name .Chart.Name | trunc 63 | trimSuffix "-" -}}
Expand Down Expand Up @@ -224,7 +219,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}

{{/*
Common labels for runtrigger
Common labels for runservice
*/}}
{{- define "pipelines.trigger.labels" -}}
helm.sh/chart: {{ include "pipelines.chart" . }}
Expand All @@ -236,11 +231,11 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- end -}}

{{/*
Common labels for steptrigger
Common labels for stepservice
*/}}
{{- define "pipelines.steptrigger.labels" -}}
{{- define "pipelines.stepservice.labels" -}}
helm.sh/chart: {{ include "pipelines.chart" . }}
{{ include "pipelines.steptrigger.selectorLabels" . }}
{{ include "pipelines.stepservice.selectorLabels" . }}
{{- if .Chart.AppVersion }}
app.kubernetes.io/version: {{ include "pipelines.app.version" . | quote }}
{{- end }}
Expand Down Expand Up @@ -348,10 +343,10 @@ app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}

{{/*
Selector labels for steptrigger pod
Selector labels for stepservice pod
*/}}
{{- define "pipelines.steptrigger.selectorLabels" -}}
app.kubernetes.io/name: {{ include "pipelines.steptrigger.name" . }}
{{- define "pipelines.stepservice.selectorLabels" -}}
app.kubernetes.io/name: {{ include "pipelines.stepservice.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
{{- end -}}

Expand Down Expand Up @@ -560,24 +555,24 @@ Resolve customInitContainers value for internalapi
{{- end -}}

{{/*
Resolve customInitContainersBegin value for steptrigger
Resolve customInitContainersBegin value for stepservice
*/}}
{{- define "pipelines.steptrigger.customInitContainersBegin" -}}
{{- define "pipelines.stepservice.customInitContainersBegin" -}}
{{- if .Values.global.customInitContainersBegin -}}
{{- .Values.global.customInitContainersBegin -}}
{{- else if .Values.pipelines.stepTrigger.customInitContainersBegin -}}
{{- .Values.pipelines.stepTrigger.customInitContainersBegin -}}
{{- else if .Values.pipelines.stepservice.customInitContainersBegin -}}
{{- .Values.pipelines.stepservice.customInitContainersBegin -}}
{{- end -}}
{{- end -}}

{{/*
Resolve customInitContainers value for steptrigger
Resolve customInitContainers value for stepservice
*/}}
{{- define "pipelines.steptrigger.customInitContainers" -}}
{{- define "pipelines.stepservice.customInitContainers" -}}
{{- if .Values.global.customInitContainers -}}
{{- .Values.global.customInitContainers -}}
{{- else if .Values.pipelines.stepTrigger.customInitContainers -}}
{{- .Values.pipelines.stepTrigger.customInitContainers -}}
{{- else if .Values.pipelines.stepservice.customInitContainers -}}
{{- .Values.pipelines.stepservice.customInitContainers -}}
{{- end -}}
{{- end -}}

Expand Down Expand Up @@ -609,8 +604,8 @@ Resolve customInitContainersBegin value for trigger
{{- define "pipelines.trigger.customInitContainersBegin" -}}
{{- if .Values.global.customInitContainersBegin -}}
{{- .Values.global.customInitContainersBegin -}}
{{- else if .Values.pipelines.runTrigger.customInitContainersBegin -}}
{{- .Values.pipelines.runTrigger.customInitContainersBegin -}}
{{- else if .Values.pipelines.runservice.customInitContainersBegin -}}
{{- .Values.pipelines.runservice.customInitContainersBegin -}}
{{- end -}}
{{- end -}}

Expand All @@ -620,8 +615,8 @@ Resolve customInitContainers value for trigger
{{- define "pipelines.trigger.customInitContainers" -}}
{{- if .Values.global.customInitContainers -}}
{{- .Values.global.customInitContainers -}}
{{- else if .Values.pipelines.runTrigger.customInitContainers -}}
{{- .Values.pipelines.runTrigger.customInitContainers -}}
{{- else if .Values.pipelines.runservice.customInitContainers -}}
{{- .Values.pipelines.runservice.customInitContainers -}}
{{- end -}}
{{- end -}}

Expand Down Expand Up @@ -698,14 +693,14 @@ Resolve customSidecarContainers value for internalapi
{{- end -}}

{{/*
Resolve customSidecarContainers value for steptrigger
Resolve customSidecarContainers value for stepservice
*/}}
{{- define "pipelines.steptrigger.customSidecarContainers" -}}
{{- define "pipelines.stepservice.customSidecarContainers" -}}
{{- if .Values.global.customSidecarContainers -}}
{{- .Values.global.customSidecarContainers -}}
{{- end -}}
{{- if .Values.pipelines.stepTrigger.customSidecarContainers -}}
{{- .Values.pipelines.stepTrigger.customSidecarContainers -}}
{{- if .Values.pipelines.stepservice.customSidecarContainers -}}
{{- .Values.pipelines.stepservice.customSidecarContainers -}}
{{- end -}}
{{- end -}}

Expand All @@ -728,8 +723,8 @@ Resolve customSidecarContainers value for trigger
{{- if .Values.global.customSidecarContainers -}}
{{- .Values.global.customSidecarContainers -}}
{{- end -}}
{{- if .Values.pipelines.runTrigger.customSidecarContainers -}}
{{- .Values.pipelines.runTrigger.customSidecarContainers -}}
{{- if .Values.pipelines.runservice.customSidecarContainers -}}
{{- .Values.pipelines.runservice.customSidecarContainers -}}
{{- end -}}
{{- end -}}

Expand Down Expand Up @@ -797,8 +792,7 @@ Return the proper vault image name
Return the proper pipelines app version
*/}}
{{- define "pipelines.app.version" -}}
{{- $image := split ":" ((include "pipelines.getImageInfoByValue" (list . "pipelines" "pipelinesInit" )) | toString) -}}
{{- $tag := $image._1 -}}
{{- $tag := (splitList ":" ((include "pipelines.getImageInfoByValue" (list . "pipelines" "pipelinesInit" )))) | last | toString -}}
{{- printf "%s" $tag -}}
{{- end -}}

Expand Down
Loading

0 comments on commit 13dffae

Please sign in to comment.