Merge branch 'master' into pdn-node-release-1.6.2

stable/pdn-server/CHANGELOG.md

@@ -1,12 +1,42 @@
 # JFrog PDN Server Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [101.3.5] - Nov 22, 2022
-* Removed unused parameters from values.yaml
-* Added resources requests and limits to initContainers
+## [101.6.2] - Mar 06, 2023
+* Updated initContainerImage `ubi9/ubi-minimal:9.1.0.1793`
+* Removed unused global values
+* Added `logLevel` option to systemYaml.pdnServer
+* Added Bitnami nginx sub chart
+* Unify system.yaml
+
+## [101.5.5] - Jan 17, 2023
+* Aligned variables name with JFrog Platform helm chart
+* Updated initContainerImage to `ubi8/ubi-minimal:8.7.1049`
+* Aligned network policy with Artifactory helm chart
+
+## [101.5.1] - Jan 06, 2023
+* Aligned values.yaml parameters between node and server charts
+* Replaced readinessProbe with startupProbe
+
+## [101.5.0] - Dec 26, 2022
+* Renamed common chart to jfrog-common to avoid conflicts with Bitnami common chart
+* Changed selfAddress value from localhost:8095 to pdn-server:8095
 
-## [101.3.4] - Oct 21, 2022
+## [101.3.6] - Dec 7, 2022
+* Upgraded Filebeat version up to 7.17.7
+* Added additionaResorces and hostAliases
+
+## [101.3.5] - Dec 1, 2022
+* Upgraded common chart dependency up to 0.0.4
+* Added containerSecurityContext to initContainers
+* Updated fsGroup/runAsUser to 11055 to avoid host conflict
+* Increased persistence storage size up to 16 Gb
+* Updated initContainerImage to `ubi8/ubi-micro:8.7.1`
+
+## [101.3.4] - Nov 22, 2022
 * Updated chart to use jfrog common chart as dependency hence the prefix of `pdnServer.` is no more required when setting any flags
+* Updated router version to 7.51.0 and observability to 1.12.0
+* Removed unused parameters from values.yaml
+* Added resources requests and limits to initContainers
 
 ## [101.1.3] - Aug 2, 2022
 * Updated router version to 7.45.0

stable/pdn-server/Chart.lock

@@ -1,6 +1,9 @@
 dependencies:
-- name: common
+- name: jfrog-common
   repository: https://charts.jfrog.io/
-  version: 0.0.2
-digest: sha256:829c2cdd0746a9e3775cd41f74230673f7eb3d4e3900f772b0cc86a4320fee8b
-generated: "2022-08-02T16:58:56.966168+05:30"
+  version: 0.0.5
+- name: nginx
+  repository: https://charts.jfrog.io/
+  version: 13.2.13
+digest: sha256:17f094c80e9db4be374377fca372e52cd84fa4d45d6c2474eed48e9a9a051bbe
+generated: "2023-02-09T18:19:29.166636+02:00"

stable/pdn-server/Chart.yaml

@@ -1,9 +1,13 @@
 apiVersion: v2
-appVersion: 1.3.5
+appVersion: 1.6.2
 dependencies:
-- name: common
+- name: jfrog-common
   repository: https://charts.jfrog.io/
-  version: 0.0.2
+  version: 0.0.5
+- condition: nginx.enabled
+  name: nginx
+  repository: https://charts.jfrog.io/
+  version: 13.2.13
 description: Universal Repository Manager supporting all major packaging formats,
   build tools and CI servers.
 home: https://www.jfrog.com/artifactory/
@@ -20,4 +24,4 @@ name: pdn-server
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 101.3.5
+version: 101.6.2

stable/pdn-server/templates/_helpers.tpl

@@ -1,45 +1,53 @@
 {{/* vim: set filetype=mustache: */}}
 {{/*
-Expand the name of the chart.
+    Expand the name of the chart.
 */}}
-{{- define "pdnserver.name" -}}
+{{- define "pdn-server.name" -}}
 {{- include "common.names.name" . -}}
 {{- end -}}
 
 {{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
+    Create chart name and version as used by the chart label.
 */}}
-{{- define "pdnserver.fullname" -}}
+{{- define "pdn-server.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+    Create a default fully qualified app name.
+    We truncate at 63 chars because some Kubernetes name fields
+    are limited to this (by the DNS naming spec).
+    If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "pdn-server.fullname" -}}
 {{- include "common.names.fullname" . -}}
 {{- end -}}
 
 {{/*
-Return the proper pdnnode image name
+    Return the proper PDN Server image name
 */}}
-{{- define "pdnserver.image" -}}
+{{- define "pdn-server.image" -}}
 {{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "appVer" .Chart.AppVersion) }}
 {{- end -}}
 
 {{/*
-Return the proper image name (for the init container volume-permissions image)
+    Return the proper init container image name
 */}}
-{{- define "pdnserver.initContainers.image" -}}
+{{- define "pdn-server.initContainers.image" -}}
 {{ include "common.images.image" (dict "imageRoot" .Values.initContainers.image "global" .Values.global) }}
 {{- end -}}
 
 {{/*
-Return the proper Docker Image Registry Secret Names
+    Return the proper Docker Image Registry Secret Names
 */}}
-{{- define "pdnserver.imagePullSecrets" -}}
+{{- define "pdn-server.imagePullSecrets" -}}
 {{ include "common.images.pullSecrets" (dict "images" (list .Values.image .Values.initContainers.image) "global" .Values.global) }}
 {{- end -}}
 
 {{/*
-Return podAnnotations
+    Return podAnnotations
 */}}
-{{- define "pdnserver.podAnnotations" -}}
+{{- define "pdn-server.podAnnotations" -}}
 {{- if .Values.podAnnotations }}
 {{ include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) }}
 {{- end }}
@@ -51,157 +59,149 @@ Return podAnnotations
 {{/*
  Create the name of the service account to use
  */}}
-{{- define "pdnserver.serviceAccountName" -}}
+{{- define "pdn-server.serviceAccountName" -}}
 {{- if .Values.serviceAccount.create -}}
-    {{ default (include "pdnserver.fullname" .) .Values.serviceAccount.name }}
+    {{ default (include "pdn-server.fullname" .) .Values.serviceAccount.name }}
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Resolve pdnNodeJoinKey value
+    Resolve joinKey value
 */}}
-{{- define "pdnserver.pdnServerJoinKey" -}}
-{{- if .Values.global.pdnServerJoinKey -}}
-{{- .Values.global.pdnServerJoinKey -}}
-{{- else if .Values.pdnServerJoinKey -}}
-{{- .Values.pdnServerJoinKey -}}
+{{- define "pdn-server.joinKey" -}}
+{{- if .Values.global.joinKey -}}
+{{- .Values.global.joinKey -}}
+{{- else if .Values.joinKey -}}
+{{- .Values.joinKey -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Resolve joinKeySecretName value
+    Resolve joinKeySecretName value
 */}}
-{{- define "pdnserver.joinKeySecretName" -}}
+{{- define "pdn-server.joinKeySecretName" -}}
 {{- if .Values.global.joinKeySecretName -}}
 {{- .Values.global.joinKeySecretName -}}
 {{- else if .Values.joinKeySecretName -}}
 {{- .Values.joinKeySecretName -}}
 {{- else -}}
-{{ include "pdnserver.fullname" . }}
+{{ include "pdn-server.fullname" . }}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Resolve pdnNodeJoinKeySecretName value
+    Resolve masterKey value
 */}}
-{{- define "pdnserver.pdnServerJoinKeySecretName" -}}
-{{- if .Values.global.pdnServerJoinKeySecretName -}}
-{{- .Values.global.pdnServerJoinKeySecretName -}}
-{{- else if .Values.pdnServerJoinKeySecretName -}}
-{{- .Values.pdnServerJoinKeySecretName -}}
-{{- else -}}
-{{ include "pdnserver.fullname" . }}
+{{- define "pdn-server.masterKey" -}}
+{{- if .Values.global.masterKey -}}
+{{- .Values.global.masterKey -}}
+{{- else if .Values.masterKey -}}
+{{- .Values.masterKey -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Scheme (http/https) based on Access TLS enabled/disabled
+    Resolve masterKeySecretName value
 */}}
-{{- define "pdnserver.scheme" -}}
-{{- if .Values.router.tlsEnabled -}}
-{{- printf "%s" "https" -}}
+{{- define "pdn-server.masterKeySecretName" -}}
+{{- if .Values.global.masterKeySecretName -}}
+{{- .Values.global.masterKeySecretName -}}
+{{- else if .Values.masterKeySecretName -}}
+{{- .Values.masterKeySecretName -}}
 {{- else -}}
-{{- printf "%s" "http" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Resolve joinKey value
-*/}}
-{{- define "pdnserver.joinKey" -}}
-{{- if .Values.global.joinKey -}}
-{{- .Values.global.joinKey -}}
-{{- else if .Values.joinKey -}}
-{{- .Values.joinKey -}}
+{{ include "pdn-server.fullname" . }}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Resolve jfrogUrl value
+    Resolve pdnJoinKeySecretName value
 */}}
-{{- define "pdnserver.jfrogUrl" -}}
-{{- if .Values.global.jfrogUrl -}}
-{{- .Values.global.jfrogUrl -}}
-{{- else if .Values.jfrogUrl -}}
-{{- .Values.jfrogUrl -}}
+{{- define "pdn-server.pdnJoinKeySecretName" -}}
+{{- if .Values.global.pdnJoinKeySecretName -}}
+{{- .Values.global.pdnJoinKeySecretName -}}
+{{- else if .Values.pdnJoinKeySecretName -}}
+{{- .Values.pdnJoinKeySecretName -}}
+{{- else -}}
+{{ include "pdn-server.fullname" . }}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Resolve masterKey value
+    Scheme (http/https) based on Access TLS enabled/disabled
 */}}
-{{- define "pdnserver.masterKey" -}}
-{{- if .Values.global.masterKey -}}
-{{- .Values.global.masterKey -}}
-{{- else if .Values.masterKey -}}
-{{- .Values.masterKey -}}
+{{- define "pdn-server.scheme" -}}
+{{- if .Values.router.tlsEnabled -}}
+{{- printf "%s" "https" -}}
+{{- else -}}
+{{- printf "%s" "http" -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Resolve masterKeySecretName value
+    Resolve jfrogUrl value
 */}}
-{{- define "pdnserver.masterKeySecretName" -}}
-{{- if .Values.global.masterKeySecretName -}}
-{{- .Values.global.masterKeySecretName -}}
-{{- else if .Values.masterKeySecretName -}}
-{{- .Values.masterKeySecretName -}}
-{{- else -}}
-{{ include "pdnserver.fullname" . }}
+{{- define "pdn-server.jfrogUrl" -}}
+{{- if .Values.global.jfrogUrl -}}
+{{- .Values.global.jfrogUrl -}}
+{{- else if .Values.jfrogUrl -}}
+{{- .Values.jfrogUrl -}}
 {{- end -}}
 {{- end -}}
 
 {{/*
-Return the proper observability image name
+    Return the proper observability image name
 */}}
 {{- define "observability.image" -}}
 {{ include "common.images.image" (dict "imageRoot" .Values.observability.image "global" .Values.global) }}
 {{- end -}}
 
 {{/*
-Return the proper router image name
+    Return the proper router image name
 */}}
 {{- define "router.image" -}}
 {{ include "common.images.image" (dict "imageRoot" .Values.router.image "global" .Values.global) }}
 {{- end -}}
 
 {{/*
-Return the proper image name (for the init container volume-permissions image)
+    Custom certificate copy command
 */}}
-{{- define "event.initContainers.image" -}}
-{{ include "common.images.image" (dict "imageRoot" .Values.initContainers.image "global" .Values.global) }}
-{{- end -}}
+{{- define "pdn-server.copyCustomCertsCmd" -}}
+echo "Copy custom certificates to {{ .Values.persistence.mountPath }}/etc/security/keys/trusted"
+mkdir -p {{ .Values.persistence.mountPath }}/etc/security/keys/trusted
 
-{{/*
-Custom certificate copy command
-*/}}
-{{- define "pdnserver.copyCustomCerts" -}}
-echo "Copy custom certificates to {{ .Values.persistence.mountPath }}/etc/security/keys/trusted";
-mkdir -p {{ .Values.persistence.mountPath }}/etc/security/keys/trusted;
-for file in $(ls -1 /tmp/certs/* | grep -v .key | grep -v ":" | grep -v grep); do if [ -f "${file}" ]; then cp -v ${file} {{ .Values.persistence.mountPath }}/etc/security/keys/trusted; fi done;
-if [ -f {{ .Values.persistence.mountPath }}/etc/security/keys/trusted/tls.crt ]; then mv -v {{ .Values.persistence.mountPath }}/etc/security/keys/trusted/tls.crt {{ .Values.persistence.mountPath }}/etc/security/keys/trusted/ca.crt; fi;
+for file in $(ls -1 /tmp/certs/* | grep -v .key | grep -v ":" | grep -v grep)
+do
+    if [[ -f "${file}" ]]; then
+        cp -v "${file}" {{ .Values.persistence.mountPath }}/etc/security/keys/trusted
+    fi
+done
+
+if [[ -f {{ .Values.persistence.mountPath }}/etc/security/keys/trusted/tls.crt ]]; then
+    mv -v {{ .Values.persistence.mountPath }}/etc/security/keys/trusted/tls.crt \
+        {{ .Values.persistence.mountPath }}/etc/security/keys/trusted/ca.crt
+fi
 {{- end -}}
 
 {{/*
-pdnserver liveness probe
+    pdnserver liveness probe
 */}}
-{{- define "pdnserver.livenessProbe" -}}
+{{- define "pdn-server.livenessProbe" -}}
 {{- printf "%s" "/api/v1/system/liveness" -}}
 {{- end -}}
 
 {{/*
-pdnserver readiness probe
+    pdnserver startup probe
 */}}
-{{- define "pdnserver.readinessProbe" -}}
+{{- define "pdn-server.startupProbe" -}}
 {{- printf "%s" "/api/v1/system/readiness" -}}
 {{- end -}}
 
 {{/*
-Resolve pdnserver requiredServiceTypes value
+    Resolve pdnserver requiredServiceTypes value
 */}}
-{{- define "pdnserver.router.requiredServiceTypes" -}}
+{{- define "pdn-server.router.requiredServiceTypes" -}}
 {{- $requiredTypes := "jftrk,jfob" -}}
 {{- $requiredTypes -}}
-{{- end -}}
+{{- end -}}

stable/pdn-server/templates/additional-resources.yaml

@@ -0,0 +1,3 @@
+{{ if .Values.additionalResources }}
+{{ tpl .Values.additionalResources . }}
+{{- end -}}