Skip to content

Commit

Permalink
Merge pull request #1671 from jfrog/jp-10.8.6
Browse files Browse the repository at this point in the history
[jfrog-platform] 10.8.6 release
  • Loading branch information
chukka authored Oct 4, 2022
2 parents 8a7ac35 + d227089 commit bcc1de0
Show file tree
Hide file tree
Showing 16 changed files with 175 additions and 25 deletions.
11 changes: 10 additions & 1 deletion stable/distribution/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions stable/distribution/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 2.14.3
appVersion: 2.15.0
dependencies:
- condition: postgresql.enabled
name: postgresql
Expand All @@ -19,4 +19,4 @@ name: distribution
sources:
- https://github.com/jfrog/charts
type: application
version: 102.14.3
version: 102.15.0
4 changes: 2 additions & 2 deletions stable/distribution/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down
24 changes: 24 additions & 0 deletions stable/distribution/ci/test-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand All @@ -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"]
2 changes: 1 addition & 1 deletion stable/distribution/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}

{{/*
Expand Down
15 changes: 15 additions & 0 deletions stable/distribution/templates/distribution-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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" . }}
Expand Down Expand Up @@ -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 }}"
Expand Down
41 changes: 36 additions & 5 deletions stable/distribution/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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: {}
Expand All @@ -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: |
Expand Down
5 changes: 5 additions & 0 deletions stable/jfrog-platform/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions stable/jfrog-platform/Chart.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions stable/jfrog-platform/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ 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/
version: 101.12.0
- 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/
Expand All @@ -59,4 +59,4 @@ name: jfrog-platform
sources:
- https://github.com/jfrog/charts
type: application
version: 10.8.5
version: 10.8.6
4 changes: 2 additions & 2 deletions stable/jfrog-platform/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion stable/pdn-server/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
4 changes: 2 additions & 2 deletions stable/pdn-server/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -14,4 +14,4 @@ name: pdn-server
sources:
- https://github.com/jfrog/charts
type: application
version: 101.1.3
version: 101.2.0
22 changes: 22 additions & 0 deletions stable/pdn-server/ci/global-section-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down Expand Up @@ -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:
Expand All @@ -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"]
Loading

0 comments on commit bcc1de0

Please sign in to comment.