diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md index cf37138be..5eed2e275 100644 --- a/stable/jfrog-platform/CHANGELOG.md +++ b/stable/jfrog-platform/CHANGELOG.md @@ -1,6 +1,14 @@ # JFrog Platform Chart Changelog (GA releases only) All changes to this chart will be documented in this file. +## [10.14.0] - Jul 12, 2023 +* Update dependency artifactory chart version to 107.63.5 +* Update dependency xray chart version to 103.78.9 +* Update dependency distribution chart version to 102.19.1 +* Update dependency pipelines chart version to 101.41.3 +* Update global.versions.router version to `7.70.2` +* Added list pods permission for rabbitmq's feature flag conditions, pre-upgrade hook command execution + ## [10.13.3] - Jul 1, 2023 * Update dependency artifactory chart version to 107.59.11 * Update dependency xray chart version to 103.76.7 diff --git a/stable/jfrog-platform/Chart.lock b/stable/jfrog-platform/Chart.lock index 9b5a3b980..12e836580 100644 --- a/stable/jfrog-platform/Chart.lock +++ b/stable/jfrog-platform/Chart.lock @@ -10,13 +10,13 @@ dependencies: version: 12.10.1 - name: artifactory repository: https://charts.jfrog.io/ - version: 107.59.11 + version: 107.63.5 - name: xray repository: https://charts.jfrog.io/ - version: 103.76.7 + version: 103.78.9 - name: distribution repository: https://charts.jfrog.io/ - version: 102.18.1 + version: 102.19.1 - name: insight repository: https://charts.jfrog.io/ version: 101.14.0 @@ -25,6 +25,6 @@ dependencies: version: 101.2.0 - name: pipelines repository: https://charts.jfrog.io/ - version: 101.40.5 -digest: sha256:bb148a45e3949aca61ed216edd65f2b7b36e650f1cf3ebc4c3a036beb6a08112 -generated: "2023-07-01T12:41:11.191052+05:30" + version: 101.41.3 +digest: sha256:192c693c2d360f1ca2b8271fe9de00da789f8ecf144c2098f5826f88b160d5c7 +generated: "2023-07-12T20:19:55.532777+05:30" diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml index f2e5ae0ed..646524a24 100644 --- a/stable/jfrog-platform/Chart.yaml +++ b/stable/jfrog-platform/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 7.59.11 +appVersion: 7.63.5 dependencies: - condition: postgresql.enabled name: postgresql @@ -16,15 +16,15 @@ dependencies: - condition: artifactory.enabled name: artifactory repository: https://charts.jfrog.io/ - version: 107.59.11 + version: 107.63.5 - condition: xray.enabled name: xray repository: https://charts.jfrog.io/ - version: 103.76.7 + version: 103.78.9 - condition: distribution.enabled name: distribution repository: https://charts.jfrog.io/ - version: 102.18.1 + version: 102.19.1 - condition: insight.enabled name: insight repository: https://charts.jfrog.io/ @@ -36,7 +36,7 @@ dependencies: - condition: pipelines.enabled name: pipelines repository: https://charts.jfrog.io/ - version: 101.40.5 + version: 101.41.3 description: The Helm chart for JFrog Platform (Universal, hybrid, end-to-end DevOps automation) home: https://jfrog.com/platform/ @@ -59,4 +59,4 @@ name: jfrog-platform sources: - https://github.com/jfrog/charts type: application -version: 10.13.3 +version: 10.14.0 diff --git a/stable/jfrog-platform/templates/_helpers.tpl b/stable/jfrog-platform/templates/_helpers.tpl index a254a9ad7..fb6b19d48 100644 --- a/stable/jfrog-platform/templates/_helpers.tpl +++ b/stable/jfrog-platform/templates/_helpers.tpl @@ -255,4 +255,19 @@ Create the name of the service account to use for rabbitmq migration {{- else -}} {{ default "rabbitmq-migration" .Values.rabbitmq.migration.serviceAccount.name }} {{- end -}} +{{- end -}} + +{{/* +Create external Rabbitmq URL for platform chart scenario. +*/}} +{{- define "xray.rabbitmq.extRabbitmq.url" -}} +{{- if .Values.global.rabbitmq.auth.tls.enabled -}} +{{- $rabbitmqPort := .Values.rabbitmq.service.ports.amqpTls -}} +{{- $name := default (printf "%s" "rabbitmq") .Values.rabbitmq.nameOverride -}} +{{- printf "%s://%s-%s:%g/" "amqps" .Release.Name $name $rabbitmqPort -}} +{{- else -}} +{{- $rabbitmqPort := .Values.rabbitmq.service.ports.amqp -}} +{{- $name := default (printf "%s" "rabbitmq") .Values.rabbitmq.nameOverride -}} +{{- printf "%s://%s-%s:%g/" "amqp" .Release.Name $name $rabbitmqPort -}} +{{- end -}} {{- end -}} \ No newline at end of file diff --git a/stable/jfrog-platform/values.yaml b/stable/jfrog-platform/values.yaml index 8bc9dbec6..3c8260df2 100644 --- a/stable/jfrog-platform/values.yaml +++ b/stable/jfrog-platform/values.yaml @@ -23,7 +23,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.70.1 + router: 7.70.2 # artifactory: # xray: # distribution: @@ -59,6 +59,18 @@ global: customVolumes: | {{ template "initdb-volume" . }} + rabbitmq: + auth: + tls: + ## Please note: The below two lines SHOULD BE same as rabbitmq.auth.tls.enabled, rabbitmq.auth.tls.autoGenerated values in order to share the settings with Xray and Pipelines charts. + # By default TLS certs are autogenerated, if you wish to add your own certs, please set this to false. + enabled: false + autoGenerated: true + + ## If you want to provide self generated certs as a secret, Uncomment the below line and provide the secret name. + ## **NOTE**: Please uncomment line rabbitmq.auth.tls.existingSecret as well. + # existingSecret: + ## This Postgresql is used by all products , set postgresql.enabled: false, when you want to use external postgresql for all products postgresql: enabled: true @@ -82,6 +94,29 @@ rabbitmq: repository: bitnami/rabbitmq tag: 3.11.10-debian-11-r5 auth: + ## Enable encryption to rabbitmq + ## ref: https://www.rabbitmq.com/ssl.html + ## + tls: + ## Please note that the below two lines SHOULD BE same as global.rabbitmq.auth.tls.enabled,global.rabbitmq.auth.tls.autoGenerated values in order to share the settings with Xray and Pipelines charts. + enabled: false + autoGenerated: true + failIfNoPeerCert: false + sslOptionsVerify: verify_peer + failIfNoCert: false + sslOptionsPassword: + enabled: false + existingSecret: "" + key: "" + password: "" + caCertificate: + serverCertificate: + serverKey: + + ## Uncomment the below line ONLY IF you provided self generated certs as a secret in global section. + # existingSecret: '{{ .Values.global.rabbitmq.auth.tls.existingSecret }}' + existingSecretFullChain: false + overrideCaCertificate: "" username: admin password: password erlangCookie: secretcookie @@ -164,6 +199,13 @@ rabbitmq: verbs: - create - get + - list + +## Uncomment these two lines to enable Rabbitmq Management Portal in https mode. +## If you are using pipelines then don't as pipelines are presently not supporting this feature. + +# extraConfiguration: |- +# management.listener.ssl = {{ .Values.global.rabbitmq.auth.tls.enabled }} ## This Redis is used by pipelines only, set redis.enabled: false, when pipelines is not enabled redis: @@ -176,7 +218,7 @@ redis: usePassword: false artifactory: - installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.13.3-%s" .Chart.AppVersion }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}' + installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.14.0-%s" .Chart.AppVersion }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}' enabled: true postgresql: enabled: false @@ -216,16 +258,6 @@ xray: rabbitmq: connectionConfigFromEnvironment: false extraEnvVars: | - - name: XRAY_CHART_FULL_NAME - value: '{{ include "xray.fullname" . }}' - - name: XRAY_CHART_NAME - value: '{{ include "xray.name" . }}' - - name: XRAY_CHART_UNIFIED_SECRET_INSTALLATION - value: "{{ .Values.xray.unifiedSecretInstallation }}" - - name: XRAY_CHART_SYSTEM_YAML_OVERRIDE_EXISTING_SECRET - value: "{{ .Values.systemYamlOverride.existingSecret }}" - - name: XRAY_CHART_SYSTEM_YAML_OVERRIDE_DATA_KEY - value: "{{ .Values.systemYamlOverride.dataKey }}" - name: "JF_SHARED_RABBITMQ_VHOST" value: "xray" rabbitmq: @@ -233,7 +265,7 @@ xray: external: username: admin password: password - url: "amqp://{{ .Release.Name }}-rabbitmq:5672" + url: '{{ include "xray.rabbitmq.extRabbitmq.url" . }}' erlangCookie: secretcookie distribution: