Skip to content

Commit ce1beba

Browse files
chukkachukka
authored
Merge pull request #1672 from jfrog/pipelines-1.27.5
[pipelines] 1.27.5 release
2 parents bcc1de0 + 4bead0f commit ce1beba

File tree

6 files changed

+139
-92
lines changed

6 files changed

+139
-92
lines changed

Diff for: ‎stable/pipelines/CHANGELOG.md

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
# JFrog Pipelines Chart Changelog
22
All changes to this chart to be documented in this file.
33

4-
## [101.26.0] - Aug 2, 2022
4+
## [101.27.5] - Sep 28, 2022
5+
* Added `observability` service in pipelines
6+
* Removed `newProbes.enabled`, default to new probes
7+
* Fixed bug for `unifiedSecretInstallation` support in observability
8+
* Fixed stringData secret keys value issue, moving data to stringData vault.sql and postgresql-connection keys
9+
10+
## [101.26.0] - Aug 25, 2022
511
* Added flag `pipelines.schedulerName` to set for the pods the value of schedulerName field [GH-1606](https://github.com/jfrog/charts/issues/1606)
612
* Added config to reset log level
13+
* Change default go runtime images to 1.19
714

8-
## [101.25.0] - July 21, 2022
15+
## [101.25.0] - Aug 25, 2022
916
* Additional fix for default path for api external url
1017
* Fixed custom CA init container behavior
1118
* Updated rabbitmq version to `3.9.21-debian-11-r0`
19+
* Added support to truncate (> 63 chars) for unifiedCustomSecretVolumeName
1220

1321
## [101.24.2] - June 22, 2022
1422
* Only set k8sImagePullSecret key if one is configured in values.yaml

Diff for: ‎stable/pipelines/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v2
2-
appVersion: 1.26.0
2+
appVersion: 1.27.5
33
dependencies:
44
- condition: postgresql.enabled
55
name: postgresql
@@ -32,4 +32,4 @@ name: pipelines
3232
sources:
3333
- https://github.com/jfrog/charts
3434
type: application
35-
version: 101.26.0
35+
version: 101.27.5

Diff for: ‎stable/pipelines/templates/_helpers.tpl

+2-46
Original file line numberDiff line numberDiff line change
@@ -331,55 +331,11 @@ if [ -f /tmp/certs/tls.crt ]; then cp -v /tmp/certs/tls.crt {{ .Values.pipelines
331331
chown -R 1066:1066 {{ .Values.pipelines.mountPath }}
332332
{{- end -}}
333333

334-
{{/*
335-
pipelines liveness probe
336-
*/}}
337-
{{- define "pipelines.livenessProbe" -}}
338-
{{- if .Values.newProbes -}}
339-
{{- printf "%s" "/v1/system/liveness" -}}
340-
{{- else -}}
341-
{{- printf "%s" "/" -}}
342-
{{- end -}}
343-
{{- end -}}
344-
345-
{{/*
346-
pipelines readiness probe
347-
*/}}
348-
{{- define "pipelines.readinessProbe" -}}
349-
{{- if .Values.newProbes -}}
350-
{{- printf "%s" "/v1/system/readiness" -}}
351-
{{- else -}}
352-
{{- printf "%s" "/" -}}
353-
{{- end -}}
354-
{{- end -}}
355-
356-
{{/*
357-
router liveness probe
358-
*/}}
359-
{{- define "pipelines.router.livenessProbe" -}}
360-
{{- if .Values.newProbes -}}
361-
{{- printf "%s" "/router/api/v1/system/liveness" -}}
362-
{{- else -}}
363-
{{- printf "%s" "/router/api/v1/system/health" -}}
364-
{{- end -}}
365-
{{- end -}}
366-
367-
{{/*
368-
router readiness probe
369-
*/}}
370-
{{- define "pipelines.router.readinessProbe" -}}
371-
{{- if .Values.newProbes -}}
372-
{{- printf "%s" "/router/api/v1/system/readiness" -}}
373-
{{- else -}}
374-
{{- printf "%s" "/router/api/v1/system/health" -}}
375-
{{- end -}}
376-
{{- end -}}
377-
378334
{{/*
379335
Resolve pipelines requiredServiceTypes value
380336
*/}}
381337
{{- define "pipelines.router.requiredServiceTypes" -}}
382-
{{- $requiredTypes := "jfpip" -}}
338+
{{- $requiredTypes := "jfpip,jfob" -}}
383339
{{- $requiredTypes -}}
384340
{{- end -}}
385341

@@ -399,7 +355,7 @@ nodeSelector:
399355
Resolve unifiedCustomSecretVolumeName value
400356
*/}}
401357
{{- define "pipelines.unifiedCustomSecretVolumeName" -}}
402-
{{- printf "%s-%s" (include "pipelines.name" .) ("unified-secret-volume") -}}
358+
{{- printf "%s-%s" (include "pipelines.name" .) ("unified-secret-volume") | trunc 63 -}}
403359
{{- end -}}
404360

405361
{{/*

Diff for: ‎stable/pipelines/templates/pipelines-statefulset.yaml

+41
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,47 @@ spec:
454454
{{- if .Values.pipelines.router.readinessProbe.enabled }}
455455
readinessProbe:
456456
{{ tpl .Values.pipelines.router.readinessProbe.config . | indent 12 }}
457+
{{- end }}
458+
- name: observability
459+
image: {{ include "pipelines.getImageInfoByValue" (list . "pipelines" "observability" ) }}
460+
imagePullPolicy: {{ .Values.pipelines.observability.image.pullPolicy }}
461+
securityContext:
462+
runAsNonRoot: false
463+
allowPrivilegeEscalation: false
464+
capabilities:
465+
drop:
466+
- NET_RAW
467+
env:
468+
- name: JF_SHARED_SECURITY_MASTERKEY
469+
valueFrom:
470+
secretKeyRef:
471+
{{- if not .Values.pipelines.unifiedSecretInstallation }}
472+
name: "{{ include "pipelines.masterKeySecretName" . }}"
473+
{{- else }}
474+
name: "{{ template "pipelines.name" . }}-unified-secret"
475+
{{- end }}
476+
key: master-key
477+
- name: JF_SHARED_SECURITY_JOINKEY
478+
valueFrom:
479+
secretKeyRef:
480+
{{- if not .Values.pipelines.unifiedSecretInstallation }}
481+
name: "{{ include "pipelines.joinKeySecretName" . }}"
482+
{{- else }}
483+
name: "{{ template "pipelines.name" . }}-unified-secret"
484+
{{- end }}
485+
key: join-key
486+
resources:
487+
{{ toYaml .Values.pipelines.observability.resources | indent 12 }}
488+
{{- if .Values.pipelines.observability.startupProbe.enabled }}
489+
volumeMounts:
490+
- name: jfrog-pipelines-logs
491+
mountPath: {{ .Values.pipelines.observability.logPath }}
492+
startupProbe:
493+
{{ tpl .Values.pipelines.observability.startupProbe.config . | indent 12 }}
494+
{{- end }}
495+
{{- if .Values.pipelines.observability.livenessProbe.enabled }}
496+
livenessProbe:
497+
{{ tpl .Values.pipelines.observability.livenessProbe.config . | indent 12 }}
457498
{{- end }}
458499
- name: api
459500
image: {{ include "pipelines.getImageInfoByValue" (list . "pipelines" "api" ) }}

Diff for: ‎stable/pipelines/templates/pipelines-unified-secret.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,32 @@ stringData:
2323
{{- end }}
2424
{{- end }}
2525

26+
vault.sql: |
27+
CREATE TABLE IF NOT EXISTS vault_kv_store (
28+
parent_path TEXT COLLATE "C" NOT NULL,
29+
path TEXT COLLATE "C",
30+
key TEXT COLLATE "C",
31+
value BYTEA,
32+
CONSTRAINT pkey PRIMARY KEY (path, key)
33+
);
34+
35+
CREATE INDEX parent_path_idx ON vault_kv_store (parent_path);
36+
37+
CREATE TABLE IF NOT EXISTS vault_ha_locks (
38+
ha_key TEXT COLLATE "C" NOT NULL,
39+
ha_identity TEXT COLLATE "C" NOT NULL,
40+
ha_value TEXT COLLATE "C",
41+
valid_until TIMESTAMP WITH TIME ZONE NOT NULL,
42+
CONSTRAINT ha_key PRIMARY KEY (ha_key)
43+
);
44+
45+
postgresql-connection: |
46+
{{- if .Values.postgresql.enabled }}
47+
{{ .Release.Name }}-postgresql {{ .Values.postgresql.service.port }}
48+
{{- else }}
49+
{{ tpl .Values.global.postgresql.host . }} {{ .Values.global.postgresql.port }}
50+
{{- end }}
51+
2652
data:
2753
{{- if or .Values.pipelines.masterKey .Values.global.masterKey }}
2854
{{- if not (or .Values.pipelines.masterKeySecretName .Values.global.masterKeySecretName) }}

0 commit comments

Comments
 (0)