Merge branch 'master' into configurable-protocols-and-ciphers

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.98.7] - Feb 20, 2024
+## [107.98.9] - Feb 20, 2024
 * Updated `artifactory.installerInfo` content
 
 ## [107.80.0] - Feb 1, 2024

stable/artifactory-cpp-ce/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.98.7
+  version: 107.98.9
 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.98.7
+version: 107.98.9

stable/artifactory-ha/CHANGELOG.md

@@ -1,12 +1,14 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.98.7] - Oct 02, 2024
+## [107.98.9] - Nov 06, 2024
 * Add support for `extraEnvironmentVariables` on filebeat Sidecar [GH-1377](https://github.com/jfrog/charts/pull/1377)
 * Support for SSL offload HTTPS proto override in Nginx service (ClusterIP, LoadBalancer) layer. Introduced `nginx.service.ssloffloadForceHttps` field with boolean type. [GH-1906](https://github.com/jfrog/charts/pull/1906)
 * Enable Access workers integration when artifactory.worker.enabled is true
 * Added `signedUrlExpirySeconds` option to artifactory.persistence.type of `google-storage`, `google-storage-v2`, and `google-storage-v2-direct` [GH-1858](https://github.com/jfrog/charts/pull/1858)
 * Added support to bootstrap jfconnect custom certs to jfconnect trusted directory
+* Added fix for database credentials secret in non-unified secret installations
+* Fixed the type of `.Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds` in binarystore.xml from boolean to integer
 
 ## [107.96.0] - Sep 18, 2024
 * Merged Artifactory sizing templates to a single file per size
@@ -29,7 +31,7 @@ All changes to this chart will be documented in this file
 ## [107.91.0] - July 18, 2024
 * Remove X-JFrog-Override-Base-Url port when using default `443/80` ports
 
-## [107.90.15] - July 18, 2024
+## [107.90.0] - 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

stable/artifactory-ha/Chart.yaml

@@ -1,9 +1,9 @@
 annotations:
-  artifactoryServiceVersion: 7.98.6
-  metadataVersion: 7.90.0
+  artifactoryServiceVersion: 7.98.10
+  metadataVersion: 7.90.4
   observabilityVersion: 1.31.5
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -25,4 +25,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.98.7
+version: 107.98.9

stable/artifactory-ha/files/binarystore.xml

@@ -199,9 +199,7 @@
         <path>{{ .Values.artifactory.persistence.googleStorage.path }}</path>
         <bucketExists>{{ .Values.artifactory.persistence.googleStorage.bucketExists }}</bucketExists>
         {{- if .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds }}
-        <signedUrlExpirySeconds>true</signedUrlExpirySeconds>
-        {{- else }}
-        <signedUrlExpirySeconds>false</signedUrlExpirySeconds>
+        <signedUrlExpirySeconds>{{ .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds | int64 }}</signedUrlExpirySeconds>
         {{- end }}
     </provider>
 </config>

stable/artifactory-ha/templates/artifactory-node-statefulset.yaml

@@ -542,7 +542,7 @@ spec:
               key: {{ tpl .Values.database.secrets.user.key . }}
         {{- else if .Values.database.user }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}
@@ -558,7 +558,7 @@ spec:
               key: {{ tpl .Values.database.secrets.password.key . }}
         {{- else if .Values.database.password }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}
@@ -577,7 +577,7 @@ spec:
               key: {{ tpl .Values.database.secrets.url.key . }}
         {{- else if .Values.database.url }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}

stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml

@@ -674,7 +674,7 @@ spec:
               key: {{ tpl .Values.database.secrets.user.key . }}
         {{- else if .Values.database.user }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}
@@ -690,7 +690,7 @@ spec:
               key: {{ tpl .Values.database.secrets.password.key . }}
         {{- else if .Values.database.password }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}
@@ -709,7 +709,7 @@ spec:
               key: {{ tpl .Values.database.secrets.url.key . }}
         {{- else if .Values.database.url }}
               {{- if not .Values.artifactory.unifiedSecretInstallation }}
-              name: {{ template "artifactory.fullname" . }}-database-creds
+              name: {{ template "artifactory-ha.fullname" . }}-database-creds
               {{- else }}
               name: "{{ template "artifactory.unifiedSecretPrependReleaseName" . }}-unified-secret"
               {{- end }}

stable/artifactory-ha/values.yaml

@@ -880,7 +880,7 @@ artifactory:
       bucketExists: false
       useInstanceCredentials: false
       enableSignedUrlRedirect: false
-      # signedUrlExpirySeconds: false
+      # signedUrlExpirySeconds: 30
     ## For artifactory.persistence.type aws-s3-v3, s3-storage-v3-direct, s3-storage-v3-archive
     awsS3V3:
       testConnection: false

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.98.7] - Feb 20, 2024
+## [107.98.9] - Feb 20, 2024
 * Updated `artifactory.installerInfo` content
 
 ## [107.80.0] - Feb 1, 2024

stable/artifactory-jcr/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.98.7
+  version: 107.98.9
 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.98.7
+version: 107.98.9

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.98.7] - Feb 20, 2024
+## [107.98.9] - Feb 20, 2024
 * Updated `artifactory.installerInfo` content
 
 ## [107.80.0] - Feb 1, 2024

stable/artifactory-oss/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.98.7
+  version: 107.98.9
 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.98.7
+version: 107.98.9

stable/artifactory/CHANGELOG.md

@@ -1,12 +1,13 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.98.7] - Oct 02, 2024
+## [107.98.9] - Nov 06, 2024
 * Add support for `extraEnvironmentVariables` on filebeat Sidecar [GH-1377](https://github.com/jfrog/charts/pull/1377)
 * Support for SSL offload HTTPS proto override in Nginx service (ClusterIP, LoadBalancer) layer. Introduced `nginx.service.ssloffloadForceHttps` field with boolean type. [GH-1906](https://github.com/jfrog/charts/pull/1906)
 * Enable Access workers integration when artifactory.worker.enabled is true
 * Added `signedUrlExpirySeconds` option to artifactory.persistence.type of `google-storage`, `google-storage-v2`, and `google-storage-v2-direct` [GH-1858](https://github.com/jfrog/charts/pull/1858)
 * Added support to bootstrap jfconnect custom certs to jfconnect trusted directory
+* Fixed the type of `.Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds` in binarystore.xml from boolean to integer
 
 ## [107.96.0] - Sep 10, 2024
 * Merged Artifactory sizing templates to a single file per size
@@ -25,7 +26,7 @@ All changes to this chart will be documented in this file.
 ## [107.91.0] - July 18, 2024
 * Remove X-JFrog-Override-Base-Url port when using default `443/80` ports
 
-## [107.90.15] - July 18, 2024
+## [107.90.0] - 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

stable/artifactory/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.98.7
+version: 107.98.9

stable/artifactory/files/binarystore.xml

@@ -180,9 +180,7 @@
         <path>{{ .Values.artifactory.persistence.googleStorage.path }}</path>
         <bucketExists>{{ .Values.artifactory.persistence.googleStorage.bucketExists }}</bucketExists>
         {{- if .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds }}
-        <signedUrlExpirySeconds>true</signedUrlExpirySeconds>
-        {{- else }}
-        <signedUrlExpirySeconds>false</signedUrlExpirySeconds>
+        <signedUrlExpirySeconds>{{ .Values.artifactory.persistence.googleStorage.signedUrlExpirySeconds | int64 }}</signedUrlExpirySeconds>
         {{- end }}
     </provider>
 </config>

stable/artifactory/values.yaml

@@ -867,7 +867,7 @@ artifactory:
       bucketExists: false
       useInstanceCredentials: false
       enableSignedUrlRedirect: false
-      # signedUrlExpirySeconds: false
+      # signedUrlExpirySeconds: 30
     ## For artifactory.persistence.type aws-s3-v3, s3-storage-v3-direct, cluster-s3-storage-v3, s3-storage-v3-archive
     awsS3V3:
       testConnection: false

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.20.1] - Nov 25, 2024
+* Fix jfrog url with duplicate artifactory string when release name has artifactory
+* Updated kubectl image to version `1.31.2`
+* Update dependency artifactory chart version to 107.98.9
+* Update dependency xray chart version to 103.107.11
+
 ## [10.20.0] - Oct 29, 2024
 * **IMPORTANT**
 * Added new dependency chart `worker` which is disabled by default and set `worker.enabled: true` to enable it. More info [here](https://jfrog.com/help/r/jfrog-installation-setup-documentation/installing-jfrog-worker)

stable/jfrog-platform/Chart.lock

@@ -7,10 +7,10 @@ dependencies:
   version: 11.9.3
 - name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.98.7
+  version: 107.98.9
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.104.18
+  version: 103.107.11
 - name: distribution
   repository: https://charts.jfrog.io/
   version: 102.27.2
@@ -23,5 +23,5 @@ dependencies:
 - name: worker
   repository: https://charts.jfrog.io/
   version: 101.95.1
-digest: sha256:2fb3be33472a516a0de2dc53a2cf93bd5d93a504f866c811749b7081780c7c6a
-generated: "2024-10-30T07:32:40.338187+05:30"
+digest: sha256:602c005909577fd36db25644f96b3895de318f1df5e4e3071e9a5cd777034c76
+generated: "2024-11-26T07:09:43.088388+05:30"

stable/jfrog-platform/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.98.7
+appVersion: 7.98.9
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -12,11 +12,11 @@ dependencies:
 - condition: artifactory.enabled
   name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.98.7
+  version: 107.98.9
 - condition: xray.enabled
   name: xray
   repository: https://charts.jfrog.io/
-  version: 103.104.18
+  version: 103.107.11
 - condition: distribution.enabled
   name: distribution
   repository: https://charts.jfrog.io/
@@ -55,4 +55,4 @@ name: jfrog-platform
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 10.20.0
+version: 10.20.1

stable/jfrog-platform/templates/_helpers.tpl

@@ -6,6 +6,19 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
+{{/*
+Handle uscases where the release name contains artifactory as part of it
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+*/}}
+{{- define "jfrog-platform.artifactory.fullname" -}}
+{{- $name := "artifactory" -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- 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).
@@ -269,7 +282,7 @@ Define database name
 Resolve jfrog url
 */}}
 {{- define "jfrog-platform.jfrogUrl" -}}
-{{- printf "http://%s-artifactory:8082" .Release.Name -}}
+{{- printf "http://%s:8082" (include "jfrog-platform.artifactory.fullname" .) -}}
 {{- end -}}
 
 {{/*

stable/jfrog-platform/templates/upgrade-hook.yaml

@@ -145,8 +145,8 @@ spec:
                 {{- end }}
 
                 {{- if not .Values.artifactory.mc.enabled }}
-                    systemYamlUnifiedSecret={{ .Release.Name }}-artifactory-unified-secret
-                    systemYamlSecret={{ .Release.Name }}-artifactory-systemyaml
+                    systemYamlUnifiedSecret={{ include "jfrog-platform.artifactory.fullname" . }}-unified-secret
+                    systemYamlSecret={{ include "jfrog-platform.artifactory.fullname" . }}-systemyaml
                     systemYamlEncoded=$(kubectl get secrets "$systemYamlUnifiedSecret" -o jsonpath="{.data.system\.yaml}")
                     if [ $? -ne 0 ]; then
                       systemYamlEncoded=$(kubectl get secrets "$systemYamlSecret" -o jsonpath="{.data.system\.yaml}")

stable/jfrog-platform/values.yaml

@@ -191,7 +191,7 @@ rabbitmq:
     image:
       registry: "{{ .Values.global.imageRegistry }}"
       repository: bitnami/kubectl
-      tag: 1.24.12
+      tag: 1.31.2
       pullPolicy: IfNotPresent
     resources:
       requests:
@@ -232,7 +232,7 @@ rabbitmq:
 artifactory:
   enabled: true
   unifiedUpgradeAllowed: true
-  installerInfo: '{"productId":"Helm_JFrogPlatform/{{ printf "10.20.0-%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.20.1-%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
@@ -361,7 +361,7 @@ preUpgradeHook:
   image:
     registry: "{{ .Values.global.imageRegistry }}"
     repository: bitnami/kubectl
-    tag: 1.24.12
+    tag: 1.31.2
     pullPolicy: IfNotPresent
   resources:
     requests:

stable/xray/CHANGELOG.md

@@ -1,7 +1,14 @@
 # JFrog Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [103.104.18] - July 17, 2024
+## [103.107.11] - September 26, 2024
+* Added support to read rabbitmq and database secrets from mounted secret files
+
+## [103.105.0] - August 22, 2024
+* Added support for `serviceAccount.annotations`to be passed to chart [GH-1841](https://github.com/jfrog/charts/pull/1841)
+* Updated rabbitmq multi-arch tag version to to `3.13.6-debian-12-r1`
+
+## [103.102.0] - 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)