From eb19f312db61788075938a2eb63c03298065462d Mon Sep 17 00:00:00 2001 From: Ram <1331672+chukka@users.noreply.github.com> Date: Tue, 4 Oct 2022 12:45:06 +0530 Subject: [PATCH 1/3] [distribution] 2.15.0 release --- stable/distribution/CHANGELOG.md | 11 ++++- stable/distribution/Chart.yaml | 4 +- stable/distribution/README.md | 4 +- stable/distribution/ci/test-values.yaml | 24 +++++++++++ stable/distribution/templates/_helpers.tpl | 2 +- .../templates/distribution-statefulset.yaml | 15 +++++++ stable/distribution/values.yaml | 41 ++++++++++++++++--- 7 files changed, 90 insertions(+), 11 deletions(-) diff --git a/stable/distribution/CHANGELOG.md b/stable/distribution/CHANGELOG.md index d0512d61c..149ad3fd3 100644 --- a/stable/distribution/CHANGELOG.md +++ b/stable/distribution/CHANGELOG.md @@ -1,11 +1,20 @@ # JFrog Distribution Chart Changelog All changes to this project chart be documented in this file. -## [102.14.3] - Jul 18, 2022 +## [102.15.0] - Aug 25, 2022 +* Updated router version to `7.45.0` +* Added flag `distribution.schedulerName` to set for the pods the value of schedulerName field [GH-1606](https://github.com/jfrog/charts/issues/1606) +* Updated Observability version to `1.9.3` +* Added support for lifecycle hooks for all containers +* Updated logger Image to `ubi8/ubi-minimal:8.6-902` + +## [102.14.0] - Aug 25, 2022 * Updated Observability version to `1.9.2` * Use an alternate command for `find` to copy custom certificates * Updated router version to `7.42.0` * Increased distribution redis container probes timeout [GH-1655](https://github.com/jfrog/charts/issues/1655) +* Updated initContainerImage to `ubi8/ubi-minimal:8.6-854` +* Added support to truncate (> 63 chars) for unifiedCustomSecretVolumeName ## [102.13.0] - Apr 29, 2022 * Fixed loggers sidecars to tail a configured log diff --git a/stable/distribution/Chart.yaml b/stable/distribution/Chart.yaml index 81c152a75..e82aa6302 100644 --- a/stable/distribution/Chart.yaml +++ b/stable/distribution/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 2.14.3 +appVersion: 2.15.0 dependencies: - condition: postgresql.enabled name: postgresql @@ -19,4 +19,4 @@ name: distribution sources: - https://github.com/jfrog/charts type: application -version: 102.14.3 +version: 102.15.0 diff --git a/stable/distribution/README.md b/stable/distribution/README.md index a21533823..62297a025 100644 --- a/stable/distribution/README.md +++ b/stable/distribution/README.md @@ -3,7 +3,7 @@ **IMPORTANT!** Our Helm Chart docs have moved to our main documentation site. Below you will find the basic instructions for installing Distribution. For all other information, refer to [Installing Distribution](https://www.jfrog.com/confluence/display/JFROG/Installing+Distribution). ## Prerequisites Details -* Kubernetes 1.12+ +* Kubernetes 1.14+ ## Chart Details This chart does the following: @@ -17,7 +17,7 @@ This chart does the following: - Default StorageClass set to allow services using the default StorageClass for persistent storage - A running Artifactory Enterprise Plus - [Kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) installed and setup to use the cluster -- [Helm](https://helm.sh/) v2 or v3 installed +- [Helm](https://helm.sh/) v3 installed ## Installing the Chart diff --git a/stable/distribution/ci/test-values.yaml b/stable/distribution/ci/test-values.yaml index f954928e7..5103ffa1c 100644 --- a/stable/distribution/ci/test-values.yaml +++ b/stable/distribution/ci/test-values.yaml @@ -41,6 +41,14 @@ distribution: limits: memory: "3Gi" cpu: "2" + # Add lifecycle hooks for distribution container + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "echo Hello from the distribution postStart handler >> /tmp/message"] + preStop: + exec: + command: ["/bin/sh", "-c", "echo Hello from the distribution postStart handler >> /tmp/message"] javaOpts: xms: "1g" xmx: "3g" @@ -111,6 +119,14 @@ router: limits: memory: "1Gi" cpu: "1" + # Add lifecycle hooks for router container + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "echo Hello from the router postStart handler >> /tmp/message"] + preStop: + exec: + command: ["/bin/sh", "-c", "echo Hello from the router postStart handler >> /tmp/message"] observability: resources: @@ -120,3 +136,11 @@ observability: limits: memory: "1Gi" cpu: "1" + # Add lifecycle hooks for observability container + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "echo Hello from the observability postStart handler >> /tmp/message"] + preStop: + exec: + command: ["/bin/sh", "-c", "echo Hello from the observability postStart handler >> /tmp/message"] diff --git a/stable/distribution/templates/_helpers.tpl b/stable/distribution/templates/_helpers.tpl index 19a3b8044..840d8b28e 100644 --- a/stable/distribution/templates/_helpers.tpl +++ b/stable/distribution/templates/_helpers.tpl @@ -295,7 +295,7 @@ nodeSelector: Resolve unifiedCustomSecretVolumeName value */}} {{- define "distribution.unifiedCustomSecretVolumeName" -}} -{{- printf "%s-%s" (include "distribution.name" .) ("unified-secret-volume") -}} +{{- printf "%s-%s" (include "distribution.name" .) ("unified-secret-volume") | trunc 63 -}} {{- end -}} {{/* diff --git a/stable/distribution/templates/distribution-statefulset.yaml b/stable/distribution/templates/distribution-statefulset.yaml index 0cd059970..05524734c 100644 --- a/stable/distribution/templates/distribution-statefulset.yaml +++ b/stable/distribution/templates/distribution-statefulset.yaml @@ -46,6 +46,9 @@ spec: {{ $key }}: {{ $value | quote }} {{- end }} spec: + {{- if .Values.distribution.schedulerName }} + schedulerName: {{ .Values.distribution.schedulerName | quote }} + {{- end }} {{- if .Values.distribution.priorityClass.existingPriorityClass }} priorityClassName: {{ .Values.distribution.priorityClass.existingPriorityClass }} {{- else -}} @@ -256,6 +259,10 @@ spec: {{ tpl . $ }}; {{- end }} exec /opt/jfrog/distribution/app/bin/wrapper.sh; + {{- with .Values.distribution.lifecycle }} + lifecycle: +{{ toYaml . | indent 10 }} + {{- end }} env: {{- if or .Values.database.secrets.user .Values.database.user }} - name: JF_SHARED_DATABASE_USERNAME @@ -362,6 +369,10 @@ spec: {{ tpl . $ }}; {{- end }} exec /opt/jfrog/router/app/bin/entrypoint-router.sh; + {{- with .Values.router.lifecycle }} + lifecycle: +{{ toYaml . | indent 10 }} + {{- end }} env: - name: JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES value: {{ include "distribution.router.requiredServiceTypes" . }} @@ -409,6 +420,10 @@ spec: {{ tpl . $ }}; {{- end }} exec /opt/jfrog/observability/app/bin/entrypoint-observability.sh; + {{- with .Values.observability.lifecycle }} + lifecycle: +{{ toYaml . | indent 10 }} + {{- end }} volumeMounts: - name: distribution-data mountPath: "{{ .Values.observability.persistence.mountPath }}" diff --git a/stable/distribution/values.yaml b/stable/distribution/values.yaml index c7f3397fb..d83fcfb84 100644 --- a/stable/distribution/values.yaml +++ b/stable/distribution/values.yaml @@ -45,7 +45,7 @@ global: ## # fullnameOverride: -initContainerImage: releases-docker.jfrog.io/jfrog/ubi-minimal:8.5-204 +initContainerImage: releases-docker.jfrog.io/ubi8/ubi-minimal:8.6-902 # Init containers initContainers: @@ -336,8 +336,8 @@ common: logger: image: registry: releases-docker.jfrog.io - repository: jfrog/ubi-minimal - tag: 8.5-204 + repository: ubi8/ubi-minimal + tag: 8.6-902 distribution: name: distribution @@ -351,6 +351,9 @@ distribution: # unifiedSecretInstallation flag enables single unified secret holding all the distribution secrets unifiedSecretInstallation: false + ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ + schedulerName: + # Create a priority class for the Distribution pod or use an existing one # NOTE - Maximum allowed value of a user defined priority is 1000000000 priorityClass: @@ -362,6 +365,16 @@ distribution: # existingPriorityClass: labels: {} + + # Add lifecycle hooks for the distribution pods + lifecycle: {} + # postStart: + # exec: + # command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"] + # preStop: + # exec: + # command: ["/bin/sh", "-c", "echo Hello from the preStart handler > /usr/share/message"] + internalPort: 8080 externalPort: 80 ## Distribution requires a unique master key @@ -560,7 +573,7 @@ router: image: registry: releases-docker.jfrog.io repository: jfrog/router - tag: 7.42.0 + tag: 7.45.0 imagePullPolicy: IfNotPresent serviceRegistry: ## Service registry (Access) TLS verification skipped if enabled @@ -576,6 +589,15 @@ router: # memory: "1Gi" # cpu: "1" + # Add lifecycle hooks for the router pod + lifecycle: {} + # postStart: + # exec: + # command: ["/bin/sh", "-c", "echo Hello from the router postStart handler > /usr/share/message"] + # preStop: + # exec: + # command: ["/bin/sh", "-c", "echo Hello from the router preStart handler > /usr/share/message"] + ## Add custom volumesMounts customVolumeMounts: | # - name: custom-script @@ -637,7 +659,7 @@ observability: image: registry: releases-docker.jfrog.io repository: jfrog/observability - tag: 1.9.2 + tag: 1.9.3 imagePullPolicy: IfNotPresent internalPort: 8036 resources: {} @@ -648,6 +670,15 @@ observability: # memory: "1Gi" # cpu: "1" + # Add lifecycle hooks for the observability pod + lifecycle: {} + # postStart: + # exec: + # command: ["/bin/sh", "-c", "echo Hello from the observability postStart handler > /usr/share/message"] + # preStop: + # exec: + # command: ["/bin/sh", "-c", "echo Hello from the observability preStart handler > /usr/share/message"] + livenessProbe: enabled: true config: | From 718ba6622f58f444608ebe50830c5460f18925dc Mon Sep 17 00:00:00 2001 From: Ram <1331672+chukka@users.noreply.github.com> Date: Tue, 4 Oct 2022 12:45:39 +0530 Subject: [PATCH 2/3] [pdn-server] 1.2.0 release --- stable/pdn-server/CHANGELOG.md | 6 +++- stable/pdn-server/Chart.yaml | 4 +-- .../pdn-server/ci/global-section-values.yaml | 22 +++++++++++++ .../templates/pdnserver-deployment.yaml | 13 ++++++++ stable/pdn-server/values.yaml | 31 +++++++++++++++++-- 5 files changed, 71 insertions(+), 5 deletions(-) diff --git a/stable/pdn-server/CHANGELOG.md b/stable/pdn-server/CHANGELOG.md index 24ae61736..f4d3e008a 100644 --- a/stable/pdn-server/CHANGELOG.md +++ b/stable/pdn-server/CHANGELOG.md @@ -1,7 +1,11 @@ # JFrog PDN Server Chart Changelog All changes to this chart will be documented in this file. -## [101.1.3] - Aug 2, 2022 +## [101.2.0] - Aug 23, 2022 +* Updated initContainerImage and logger Image to `ubi8/ubi-minimal:8.6-902` +* Added support for lifecycle hooks in all containers + +## [101.1.0] - Aug 2, 2022 * Updated router version to 7.45.0 * Use an alternate command for `find` to copy custom certificates * Updated initContainerImage and logger Image to `ubi8/ubi-minimal:8.6-854` diff --git a/stable/pdn-server/Chart.yaml b/stable/pdn-server/Chart.yaml index cedd4b02f..adc671124 100644 --- a/stable/pdn-server/Chart.yaml +++ b/stable/pdn-server/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.1.3 +appVersion: 1.2.0 description: A Helm chart for JFrog PDN Server home: https://jfrog.com/pdn-server/ icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/pdn-server/logo/pdn-server-logo.png @@ -14,4 +14,4 @@ name: pdn-server sources: - https://github.com/jfrog/charts type: application -version: 101.1.3 +version: 101.2.0 diff --git a/stable/pdn-server/ci/global-section-values.yaml b/stable/pdn-server/ci/global-section-values.yaml index 04dfb4494..c95166b2d 100644 --- a/stable/pdn-server/ci/global-section-values.yaml +++ b/stable/pdn-server/ci/global-section-values.yaml @@ -6,6 +6,13 @@ pdnServer: limits: memory: "3Gi" cpu: "2" + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "echo Hello from the pdnServer postStart handler > /tmp/message"] + preStop: + exec: + command: ["/bin/sh", "-c", "echo Hello from the pdnServer preStart handler > /tmp/message"] customInitContainersBegin: | - name: "custom-init-begin-local" image: "{{ .Values.initContainerImage }}" @@ -118,6 +125,14 @@ router: limits: memory: "1Gi" cpu: "1" + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "echo Hello from the router postStart handler > /tmp/message"] + preStop: + exec: + command: ["/bin/sh", "-c", "echo Hello from the router preStart handler > /tmp/message"] + observability: resources: @@ -127,3 +142,10 @@ observability: limits: memory: "1Gi" cpu: "1" + lifecycle: + postStart: + exec: + command: ["/bin/sh", "-c", "echo Hello from the observability postStart handler > /tmp/message"] + preStop: + exec: + command: ["/bin/sh", "-c", "echo Hello from the observability preStart handler > /tmp/message"] diff --git a/stable/pdn-server/templates/pdnserver-deployment.yaml b/stable/pdn-server/templates/pdnserver-deployment.yaml index 3dece7aaf..5b1127d9b 100644 --- a/stable/pdn-server/templates/pdnserver-deployment.yaml +++ b/stable/pdn-server/templates/pdnserver-deployment.yaml @@ -169,6 +169,11 @@ spec: {{ tpl . $ }}; {{- end }} exec /opt/jfrog/pdnserver/app/pdnserver/bin/pdnserver.sh; + exec /opt/jfrog/router/app/bin/entrypoint-router.sh + {{- with .Values.pdnServer.lifecycle }} + lifecycle: +{{ toYaml . | indent 10 }} + {{- end }} env: - name: JF_SHARED_NODE_ID valueFrom: @@ -209,6 +214,10 @@ spec: - '-c' - > exec /opt/jfrog/router/app/bin/entrypoint-router.sh; + {{- with .Values.router.lifecycle }} + lifecycle: +{{ toYaml . | indent 10 }} + {{- end }} env: - name: JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES value: {{ include "pdn-server.router.requiredServiceTypes" . }} @@ -249,6 +258,10 @@ spec: - '-c' - > exec /opt/jfrog/observability/app/bin/entrypoint-observability.sh; + {{- with .Values.observability.lifecycle }} + lifecycle: +{{ toYaml . | indent 10 }} + {{- end }} volumeMounts: - name: pdnserver-data mountPath: "{{ .Values.observability.persistence.mountPath }}" diff --git a/stable/pdn-server/values.yaml b/stable/pdn-server/values.yaml index d3ecba1c2..029f7b235 100644 --- a/stable/pdn-server/values.yaml +++ b/stable/pdn-server/values.yaml @@ -45,7 +45,7 @@ global: ## # fullnameOverride: -initContainerImage: releases-docker.jfrog.io/ubi8/ubi-minimal:8.6-854 +initContainerImage: releases-docker.jfrog.io/ubi8/ubi-minimal:8.6-902 # Init containers initContainers: @@ -120,7 +120,7 @@ logger: image: registry: releases-docker.jfrog.io repository: ubi8/ubi-minimal - tag: 8.6-854 + tag: 8.6-902 pdnServer: name: pdn-server @@ -198,6 +198,15 @@ pdnServer: ## Custom command to run before pdnserver startup. Runs BEFORE any microservice-specific preStartCommand preStartCommand: + # Add lifecycle hooks for the pdnServer pod + lifecycle: {} + # postStart: + # exec: + # command: ["/bin/sh", "-c", "echo Hello from the pdnServer postStart handler > /usr/share/message"] + # preStop: + # exec: + # command: ["/bin/sh", "-c", "echo Hello from the pdnServer preStart handler > /usr/share/message"] + ## Add custom annotations for pipelines pods annotations: {} @@ -421,6 +430,15 @@ router: # memory: "1Gi" # cpu: "1" + # Add lifecycle hooks for router container + lifecycle: {} + # postStart: + # exec: + # command: ["/bin/sh", "-c", "echo Hello from the postStart handler"] + # preStop: + # exec: + # command: ["/bin/sh","-c","echo Hello from the preStop handler"] + ## Add custom volumesMounts customVolumeMounts: | # - name: custom-script @@ -496,6 +514,15 @@ observability: # memory: "1Gi" # cpu: "1" + # Add lifecycle hooks for the observability pod + lifecycle: {} + # postStart: + # exec: + # command: ["/bin/sh", "-c", "echo Hello from the observability postStart handler > /usr/share/message"] + # preStop: + # exec: + # command: ["/bin/sh", "-c", "echo Hello from the observability preStart handler > /usr/share/message"] + livenessProbe: enabled: true config: | From d227089ae7cf6503782f5311fe31617649defe27 Mon Sep 17 00:00:00 2001 From: Ram <1331672+chukka@users.noreply.github.com> Date: Tue, 4 Oct 2022 12:46:14 +0530 Subject: [PATCH 3/3] [jfrog-platform] 10.8.6 release --- stable/jfrog-platform/CHANGELOG.md | 5 +++++ stable/jfrog-platform/Chart.lock | 8 ++++---- stable/jfrog-platform/Chart.yaml | 6 +++--- stable/jfrog-platform/values.yaml | 4 ++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md index 17dd753e3..f42be325d 100644 --- a/stable/jfrog-platform/CHANGELOG.md +++ b/stable/jfrog-platform/CHANGELOG.md @@ -1,6 +1,11 @@ # JFrog Platform Chart Changelog (GA releases only) All changes to this chart will be documented in this file. +## [10.8.6] - Oct 4, 2022 +* Update dependency distribution chart version to 102.15.0 +* Update dependency pdn-server chart version to 101.2.0 +* Updated global.versions.router version to `7.49.0` + ## [10.8.5] - Sep 21, 2022 * Update dependency artifactory chart version to 107.41.13 * Update dependency xray chart version to 103.57.6 diff --git a/stable/jfrog-platform/Chart.lock b/stable/jfrog-platform/Chart.lock index 09107bac7..38c3b83f7 100644 --- a/stable/jfrog-platform/Chart.lock +++ b/stable/jfrog-platform/Chart.lock @@ -16,15 +16,15 @@ dependencies: version: 103.57.6 - name: distribution repository: https://charts.jfrog.io/ - version: 102.14.3 + version: 102.15.0 - name: insight repository: https://charts.jfrog.io/ version: 101.12.0 - name: pdn-server repository: https://charts.jfrog.io/ - version: 101.1.3 + version: 101.2.0 - name: pipelines repository: https://charts.jfrog.io/ version: 101.26.0 -digest: sha256:1a08ddbeaaaba1f26ab5a22ca555ca3050b485de063936762f40c79944d0e3cf -generated: "2022-09-21T11:36:24.164776+05:30" +digest: sha256:a9399ace319872bc393a317776f8060eb7096564565d716f819fa8cd0446b340 +generated: "2022-10-04T11:09:10.395095+05:30" diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml index 0071e18b9..bbfe8fe8d 100644 --- a/stable/jfrog-platform/Chart.yaml +++ b/stable/jfrog-platform/Chart.yaml @@ -24,7 +24,7 @@ dependencies: - condition: distribution.enabled name: distribution repository: https://charts.jfrog.io/ - version: 102.14.3 + version: 102.15.0 - condition: insight.enabled name: insight repository: https://charts.jfrog.io/ @@ -32,7 +32,7 @@ dependencies: - condition: pdnServer.enabled name: pdn-server repository: https://charts.jfrog.io/ - version: 101.1.3 + version: 101.2.0 - condition: pipelines.enabled name: pipelines repository: https://charts.jfrog.io/ @@ -59,4 +59,4 @@ name: jfrog-platform sources: - https://github.com/jfrog/charts type: application -version: 10.8.5 +version: 10.8.6 diff --git a/stable/jfrog-platform/values.yaml b/stable/jfrog-platform/values.yaml index 14d54f767..9c78b8233 100644 --- a/stable/jfrog-platform/values.yaml +++ b/stable/jfrog-platform/values.yaml @@ -21,7 +21,7 @@ global: ## For example : For artifactory, using global.versions.artifactory ## Note: Order of preference is 1) global.versions 2) .Values.artifactory.image.tag 3) Chart.AppVersion versions: - router: 7.42.0 + router: 7.49.0 # artifactory: # xray: # distribution: @@ -135,7 +135,7 @@ redis: usePassword: false artifactory: - installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.8.4-%s" .Chart.AppVersion }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}' + installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.8.6-%s" .Chart.AppVersion }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}' enabled: true postgresql: enabled: false