From f4dd370dab46eefae1e027acb69f6748c397d6da Mon Sep 17 00:00:00 2001 From: Ram <1331672+chukka@users.noreply.github.com> Date: Tue, 8 Oct 2024 19:47:50 +0530 Subject: [PATCH 1/3] [artifactory] 7.90.14 release --- stable/artifactory-cpp-ce/CHANGELOG.md | 2 +- stable/artifactory-cpp-ce/Chart.yaml | 6 +++--- stable/artifactory-cpp-ce/values.yaml | 2 +- stable/artifactory-ha/CHANGELOG.md | 2 +- stable/artifactory-ha/Chart.yaml | 6 +++--- stable/artifactory-ha/values.yaml | 2 +- stable/artifactory-jcr/CHANGELOG.md | 2 +- stable/artifactory-jcr/Chart.yaml | 6 +++--- stable/artifactory-jcr/values.yaml | 2 +- stable/artifactory-oss/CHANGELOG.md | 2 +- stable/artifactory-oss/Chart.yaml | 6 +++--- stable/artifactory-oss/values.yaml | 2 +- stable/artifactory/CHANGELOG.md | 2 +- stable/artifactory/Chart.yaml | 4 ++-- stable/artifactory/values.yaml | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/stable/artifactory-cpp-ce/CHANGELOG.md b/stable/artifactory-cpp-ce/CHANGELOG.md index 41ec88fee..0ee8af051 100644 --- a/stable/artifactory-cpp-ce/CHANGELOG.md +++ b/stable/artifactory-cpp-ce/CHANGELOG.md @@ -1,7 +1,7 @@ # JFrog Artifactory CE for C++ Chart Changelog All changes to this chart will be documented in this file -## [107.90.10] - Feb 20, 2024 +## [107.90.14] - Feb 20, 2024 * Updated `artifactory.installerInfo` content ## [107.80.0] - Feb 1, 2024 diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml index aec5c0f38..b31b79502 100644 --- a/stable/artifactory-cpp-ce/Chart.yaml +++ b/stable/artifactory-cpp-ce/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 7.90.10 +appVersion: 7.90.14 dependencies: - name: artifactory repository: file://charts/artifactory - version: 107.90.10 + version: 107.90.14 description: JFrog Artifactory CE for C++ home: https://www.jfrog.com/artifactory/ icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-cpp-ce/logo/conan.png @@ -21,4 +21,4 @@ name: artifactory-cpp-ce sources: - https://github.com/jfrog/charts type: application -version: 107.90.10 +version: 107.90.14 diff --git a/stable/artifactory-cpp-ce/values.yaml b/stable/artifactory-cpp-ce/values.yaml index 10f1b08e2..20d9ee86a 100644 --- a/stable/artifactory-cpp-ce/values.yaml +++ b/stable/artifactory-cpp-ce/values.yaml @@ -69,7 +69,7 @@ postgresql: enabled: true router: image: - tag: 7.118.2 + tag: 7.118.3 initContainers: image: tag: 9.4.949.1716471857 diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md index 28f5dd520..5edb3eebb 100644 --- a/stable/artifactory-ha/CHANGELOG.md +++ b/stable/artifactory-ha/CHANGELOG.md @@ -1,7 +1,7 @@ # JFrog Artifactory-ha Chart Changelog All changes to this chart will be documented in this file. -## [107.90.10] - July 18, 2024 +## [107.90.14] - July 18, 2024 * Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892) * Added new `nginx.hosts` to use Nginx server_name directive instead of `ingress.hosts` * Added a deprecation notice of ingress.hosts when `ngnix.enabled` is true diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml index 94f34cae1..11d7e9f51 100644 --- a/stable/artifactory-ha/Chart.yaml +++ b/stable/artifactory-ha/Chart.yaml @@ -1,7 +1,7 @@ annotations: - artifactoryServiceVersion: 7.90.13 + artifactoryServiceVersion: 7.90.20 apiVersion: v2 -appVersion: 7.90.10 +appVersion: 7.90.14 dependencies: - condition: postgresql.enabled name: postgresql @@ -23,4 +23,4 @@ name: artifactory-ha sources: - https://github.com/jfrog/charts type: application -version: 107.90.10 +version: 107.90.14 diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml index 0affa3d69..3d1a325af 100644 --- a/stable/artifactory-ha/values.yaml +++ b/stable/artifactory-ha/values.yaml @@ -255,7 +255,7 @@ router: image: registry: releases-docker.jfrog.io repository: jfrog/router - tag: 7.118.2 + tag: 7.118.3 pullPolicy: IfNotPresent serviceRegistry: ## Service registry (Access) TLS verification skipped if enabled diff --git a/stable/artifactory-jcr/CHANGELOG.md b/stable/artifactory-jcr/CHANGELOG.md index d05e2a520..3a984d30f 100644 --- a/stable/artifactory-jcr/CHANGELOG.md +++ b/stable/artifactory-jcr/CHANGELOG.md @@ -1,7 +1,7 @@ # JFrog Container Registry Chart Changelog All changes to this chart will be documented in this file. -## [107.90.10] - Feb 20, 2024 +## [107.90.14] - Feb 20, 2024 * Updated `artifactory.installerInfo` content ## [107.80.0] - Feb 1, 2024 diff --git a/stable/artifactory-jcr/Chart.yaml b/stable/artifactory-jcr/Chart.yaml index 3334fb734..4c389f432 100644 --- a/stable/artifactory-jcr/Chart.yaml +++ b/stable/artifactory-jcr/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 7.90.10 +appVersion: 7.90.14 dependencies: - name: artifactory repository: file://charts/artifactory - version: 107.90.10 + version: 107.90.14 description: JFrog Container Registry home: https://jfrog.com/container-registry/ icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory-jcr/logo/jcr-logo.png @@ -22,4 +22,4 @@ name: artifactory-jcr sources: - https://github.com/jfrog/charts type: application -version: 107.90.10 +version: 107.90.14 diff --git a/stable/artifactory-jcr/values.yaml b/stable/artifactory-jcr/values.yaml index 6892aa866..a96b4f7d2 100644 --- a/stable/artifactory-jcr/values.yaml +++ b/stable/artifactory-jcr/values.yaml @@ -69,7 +69,7 @@ postgresql: enabled: true router: image: - tag: 7.118.2 + tag: 7.118.3 initContainers: image: tag: 9.4.949.1716471857 diff --git a/stable/artifactory-oss/CHANGELOG.md b/stable/artifactory-oss/CHANGELOG.md index e5179a058..f79342ced 100644 --- a/stable/artifactory-oss/CHANGELOG.md +++ b/stable/artifactory-oss/CHANGELOG.md @@ -1,7 +1,7 @@ # JFrog Artifactory OSS Chart Changelog All changes to this chart will be documented in this file -## [107.90.10] - Feb 20, 2024 +## [107.90.14] - Feb 20, 2024 * Updated `artifactory.installerInfo` content ## [107.80.0] - Feb 1, 2024 diff --git a/stable/artifactory-oss/Chart.yaml b/stable/artifactory-oss/Chart.yaml index 38cd23544..c91051baf 100644 --- a/stable/artifactory-oss/Chart.yaml +++ b/stable/artifactory-oss/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 7.90.10 +appVersion: 7.90.14 dependencies: - name: artifactory repository: file://charts/artifactory - version: 107.90.10 + version: 107.90.14 description: JFrog Artifactory OSS home: https://www.jfrog.com/artifactory/ icon: https://raw.githubusercontent.com/jfrog/charts/master/stable/artifactory/logo/artifactory-logo.png @@ -20,4 +20,4 @@ name: artifactory-oss sources: - https://github.com/jfrog/charts type: application -version: 107.90.10 +version: 107.90.14 diff --git a/stable/artifactory-oss/values.yaml b/stable/artifactory-oss/values.yaml index 9ec458817..986dbc5b5 100644 --- a/stable/artifactory-oss/values.yaml +++ b/stable/artifactory-oss/values.yaml @@ -69,7 +69,7 @@ postgresql: enabled: true router: image: - tag: 7.118.2 + tag: 7.118.3 initContainers: image: tag: 9.4.949.1716471857 diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md index c86d0e438..61f0d3d9a 100644 --- a/stable/artifactory/CHANGELOG.md +++ b/stable/artifactory/CHANGELOG.md @@ -1,7 +1,7 @@ # JFrog Artifactory Chart Changelog All changes to this chart will be documented in this file. -## [107.90.10] - July 18, 2024 +## [107.90.14] - July 18, 2024 * Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892) * Added new `nginx.hosts` to use Nginx server_name directive instead of `ingress.hosts` * Added a deprecation notice of ingress.hosts when `ngnix.enabled` is true diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml index 223843784..58bbbab3f 100644 --- a/stable/artifactory/Chart.yaml +++ b/stable/artifactory/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 7.90.10 +appVersion: 7.90.14 dependencies: - condition: postgresql.enabled name: postgresql @@ -21,4 +21,4 @@ name: artifactory sources: - https://github.com/jfrog/charts type: application -version: 107.90.10 +version: 107.90.14 diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml index ff9a6b33f..15f5de112 100644 --- a/stable/artifactory/values.yaml +++ b/stable/artifactory/values.yaml @@ -198,7 +198,7 @@ router: image: registry: releases-docker.jfrog.io repository: jfrog/router - tag: 7.118.2 + tag: 7.118.3 pullPolicy: IfNotPresent serviceRegistry: ## Service registry (Access) TLS verification skipped if enabled From 42027794725eae92afab8adee2c70c61d619e10c Mon Sep 17 00:00:00 2001 From: Ram <1331672+chukka@users.noreply.github.com> Date: Tue, 8 Oct 2024 19:48:14 +0530 Subject: [PATCH 2/3] [xray] 3.104.17 release --- stable/xray/CHANGELOG.md | 2 +- stable/xray/Chart.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md index 78a4ab283..d74830dfa 100644 --- a/stable/xray/CHANGELOG.md +++ b/stable/xray/CHANGELOG.md @@ -1,7 +1,7 @@ # JFrog Xray Chart Changelog All changes to this chart will be documented in this file. -## [103.104.8] - July 17, 2024 +## [103.104.17] - July 17, 2024 * Added support of specifying resources constraints for RabbitMQ's pre-upgrade-hook job * Fixed formatting error associated to the `volumeMounts` for the `panoramic` microservice [GH-1895](https://github.com/jfrog/charts/issues/1895) diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml index e54688bf1..768bc8198 100644 --- a/stable/xray/Chart.yaml +++ b/stable/xray/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 3.104.8 +appVersion: 3.104.17 dependencies: - condition: postgresql.enabled name: postgresql @@ -24,4 +24,4 @@ name: xray sources: - https://github.com/jfrog/charts type: application -version: 103.104.8 +version: 103.104.17 From 18c141ed518c51bc1e37a4087002c62fcd4fd1bc Mon Sep 17 00:00:00 2001 From: Ram <1331672+chukka@users.noreply.github.com> Date: Tue, 8 Oct 2024 19:48:48 +0530 Subject: [PATCH 3/3] [jfrog-platform] 10.19.6 release --- stable/jfrog-platform/CHANGELOG.md | 6 ++++++ stable/jfrog-platform/Chart.lock | 8 ++++---- stable/jfrog-platform/Chart.yaml | 8 ++++---- stable/jfrog-platform/files/setupPostgres.sh | 2 +- stable/jfrog-platform/templates/upgrade-hook.yaml | 4 ++++ stable/jfrog-platform/values.yaml | 3 ++- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md index 317a4fcea..3abcac574 100644 --- a/stable/jfrog-platform/CHANGELOG.md +++ b/stable/jfrog-platform/CHANGELOG.md @@ -1,6 +1,12 @@ # JFrog Platform Chart Changelog (GA releases only) All changes to this chart will be documented in this file. +## [10.19.6] - Oct 8, 2024 +* Fixed typo to get fourth parameter for setupPostgres.sh [GH-1992](https://github.com/jfrog/charts/pull/1992) +* Added `preUpgradeHook.tolerations` +* Update dependency artifactory chart version to 107.90.14 +* Update dependency xray chart version to 103.104.17 + ## [10.19.5] - Sep 11, 2024 * Update dependency artifactory chart version to 107.90.10 * Update dependency xray chart version to 103.104.8 diff --git a/stable/jfrog-platform/Chart.lock b/stable/jfrog-platform/Chart.lock index 9d8718838..c4ff85600 100644 --- a/stable/jfrog-platform/Chart.lock +++ b/stable/jfrog-platform/Chart.lock @@ -7,10 +7,10 @@ dependencies: version: 11.9.3 - name: artifactory repository: https://charts.jfrog.io/ - version: 107.90.10 + version: 107.90.14 - name: xray repository: https://charts.jfrog.io/ - version: 103.104.8 + version: 103.104.17 - name: distribution repository: https://charts.jfrog.io/ version: 102.26.1 @@ -20,5 +20,5 @@ dependencies: - name: pipelines repository: https://charts.jfrog.io/ version: 101.59.7 -digest: sha256:fb50efce66803cefab39d3efc0a32c0842b97703a8bec572453b2217a56d8934 -generated: "2024-09-11T16:49:29.381655+02:00" +digest: sha256:a6071a02ef3029d1aba4ed221e61566dc2a098e2b4c6b85108b839d5fdf5d89a +generated: "2024-10-08T17:20:56.179314+05:30" diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml index 2ff280b6f..15a0b0a5c 100644 --- a/stable/jfrog-platform/Chart.yaml +++ b/stable/jfrog-platform/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 7.90.10 +appVersion: 7.90.14 dependencies: - condition: postgresql.enabled name: postgresql @@ -12,11 +12,11 @@ dependencies: - condition: artifactory.enabled name: artifactory repository: https://charts.jfrog.io/ - version: 107.90.10 + version: 107.90.14 - condition: xray.enabled name: xray repository: https://charts.jfrog.io/ - version: 103.104.8 + version: 103.104.17 - condition: distribution.enabled name: distribution repository: https://charts.jfrog.io/ @@ -50,4 +50,4 @@ name: jfrog-platform sources: - https://github.com/jfrog/charts type: application -version: 10.19.5 +version: 10.19.6 diff --git a/stable/jfrog-platform/files/setupPostgres.sh b/stable/jfrog-platform/files/setupPostgres.sh index 69cd53661..e766104ce 100644 --- a/stable/jfrog-platform/files/setupPostgres.sh +++ b/stable/jfrog-platform/files/setupPostgres.sh @@ -104,7 +104,7 @@ setupDB(){ : ${DB_NAME:=$1} : ${DB_USERNAME:=$2} : ${DB_PASSWORD:=$3} -: ${CHART_NAME:=4} +: ${CHART_NAME:=$4} ### Following are the postgres details being setup for each service. ## Common details diff --git a/stable/jfrog-platform/templates/upgrade-hook.yaml b/stable/jfrog-platform/templates/upgrade-hook.yaml index f146e8137..18873021d 100644 --- a/stable/jfrog-platform/templates/upgrade-hook.yaml +++ b/stable/jfrog-platform/templates/upgrade-hook.yaml @@ -165,5 +165,9 @@ spec: {{- end }} restartPolicy: Never terminationGracePeriodSeconds: 10 +{{- with .Values.preUpgradeHook.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} {{- end }} {{- end }} \ No newline at end of file diff --git a/stable/jfrog-platform/values.yaml b/stable/jfrog-platform/values.yaml index 51d18dd2f..aac6495f6 100644 --- a/stable/jfrog-platform/values.yaml +++ b/stable/jfrog-platform/values.yaml @@ -232,7 +232,7 @@ rabbitmq: artifactory: enabled: true unifiedUpgradeAllowed: true - installerInfo: '{"productId":"Helm_JFrogPlatform/{{ printf "10.19.5-%s" .Chart.AppVersion }}","features":[{"featureId":"Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"},{"featureId":"Database/{{ .Values.database.type }}"},{"featureId":"Nginx_Enabled/{{ .Values.nginx.enabled }}"},{"featureId":"ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"},{"featureId":"SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"},{"featureId":"Filebeat_Enabled/{{ .Values.filebeat.enabled }}"},{"featureId":"ReplicaCount/{{ .Values.artifactory.replicaCount }}"}]}' + installerInfo: '{"productId":"Helm_JFrogPlatform/{{ printf "10.19.6-%s" .Chart.AppVersion }}","features":[{"featureId":"Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"},{"featureId":"Database/{{ .Values.database.type }}"},{"featureId":"Nginx_Enabled/{{ .Values.nginx.enabled }}"},{"featureId":"ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"},{"featureId":"SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"},{"featureId":"Filebeat_Enabled/{{ .Values.filebeat.enabled }}"},{"featureId":"ReplicaCount/{{ .Values.artifactory.replicaCount }}"}]}' postgresql: enabled: false waitForDatabase: false @@ -366,3 +366,4 @@ preUpgradeHook: limits: cpu: 1 memory: 1Gi + tolerations: []