Merge pull request #1839 from jfrog/jp-10.16.2

[jfrog-platform] 10.16.2 release
jfrog · Nov 10, 2023 · b15e989 · b15e989
2 parents 7a7916b + 3b8dfbf
commit b15e989
Show file tree

Hide file tree

Showing 27 changed files with 64 additions and 52 deletions.
diff --git 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.71.3] - Jul 20, 2023
+## [107.71.4] - Jul 20, 2023
 * Disabled federation services when splitServicesToContainers=true
 
 ## [107.45.0] - Aug 25, 2022

diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.71.3
+appVersion: 7.71.4
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.71.3
+  version: 107.71.4
 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.71.3
+version: 107.71.4
diff --git a/stable/artifactory-cpp-ce/values.yaml b/stable/artifactory-cpp-ce/values.yaml
@@ -72,5 +72,5 @@ router:
     tag: 7.81.0
 logger:
   image:
-    tag: 9.2.717
-initContainerImage: releases-docker.jfrog.io/ubi9/ubi-minimal:9.2.717
+    tag: 9.2.750.1697534106
+initContainerImage: releases-docker.jfrog.io/ubi9/ubi-minimal:9.2.750.1697534106
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,7 +1,11 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.71.3] - Sep 18, 2023
+## [107.71.4] - Oct 31, 2023
+* Fixed - StatefulSet pod annotations changed from range to toYaml [GH-1828](https://github.com/jfrog/charts/issues/1828)
+* Fixed - Invalid format for awsS3V3 `multiPartLimit,multipartElementSize` in binarystore.xml.
+
+## [107.69.0] - Sep 18, 2023
 * Adjust rtfs context
 * Fixed - Metadata service does not respect customVolumeMounts for DB CAs [GH-1815](https://github.com/jfrog/charts/issues/1815)
 

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.71.3
+appVersion: 7.71.4
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.71.3
+version: 107.71.4
diff --git a/stable/artifactory-ha/files/binarystore.xml b/stable/artifactory-ha/files/binarystore.xml
@@ -294,10 +294,10 @@
         <enablePathStyleAccess>{{ . }}</enablePathStyleAccess>
         {{- end }}
         {{- with .multiPartLimit }}
-        <multiPartLimit>{{ . }}</multiPartLimit>
+        <multiPartLimit>{{ . | int64 }}</multiPartLimit>
         {{- end }}
         {{- with .multipartElementSize }}
-        <multipartElementSize>{{ . }}</multipartElementSize>
+        <multipartElementSize>{{ . | int64 }}</multipartElementSize>
         {{- end }}
     </provider>
     {{- end }}

diff --git a/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml
@@ -48,8 +48,8 @@ spec:
       {{- else }}
         checksum/artifactory-unified-secret: {{ include (print $.Template.BasePath "/artifactory-unified-secret.yaml") . | sha256sum }}
       {{- end }}
-      {{- range $key, $value := .Values.artifactory.annotations }}
-        {{ $key }}: {{ tpl $value $ | quote }}
+      {{- with .Values.artifactory.annotations }}
+{{ toYaml . | indent 8 }}
       {{- end }}
     spec:
     {{- if .Values.artifactory.schedulerName }}

diff --git a/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml
@@ -66,8 +66,8 @@ spec:
       {{- else }}
         checksum/artifactory-unified-secret: {{ include (print $.Template.BasePath "/artifactory-unified-secret.yaml") . | sha256sum }}
       {{- end }}
-      {{- range $key, $value := .Values.artifactory.annotations }}
-        {{ $key }}: {{ tpl $value $ | quote }}
+      {{- with .Values.artifactory.annotations }}
+{{ toYaml . | indent 8 }}
       {{- end }}
     spec:
     {{- if .Values.artifactory.schedulerName }}

diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml
@@ -41,7 +41,7 @@ global:
 ## String to fully override artifactory-ha.fullname template
 ##
 # fullnameOverride:
-initContainerImage: releases-docker.jfrog.io/ubi9/ubi-minimal:9.2.717
+initContainerImage: releases-docker.jfrog.io/ubi9/ubi-minimal:9.2.750.1697534106
 installer:
   type:
   platform:
@@ -214,7 +214,7 @@ logger:
   image:
     registry: releases-docker.jfrog.io
     repository: ubi9/ubi-minimal
-    tag: 9.2.717
+    tag: 9.2.750.1697534106
 ## You can use a pre-existing secret with keys license_token and iam_role by specifying licenseConfigSecretName
 ## Example : Create a generic secret using `kubectl create secret generic <secret-name> --from-literal=license_token=${TOKEN} --from-literal=iam_role=${ROLE_ARN}`
 aws:

diff --git 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.71.3] - Jul 20, 2023
+## [107.71.4] - Jul 20, 2023
 * Disabled federation services when splitServicesToContainers=true
 
 ## [107.45.0] - Aug 25, 2022

diff --git a/stable/artifactory-jcr/Chart.yaml b/stable/artifactory-jcr/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.71.3
+appVersion: 7.71.4
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.71.3
+  version: 107.71.4
 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.71.3
+version: 107.71.4
diff --git a/stable/artifactory-jcr/values.yaml b/stable/artifactory-jcr/values.yaml
@@ -72,5 +72,5 @@ router:
     tag: 7.81.0
 logger:
   image:
-    tag: 9.2.717
-initContainerImage: releases-docker.jfrog.io/ubi9/ubi-minimal:9.2.717
+    tag: 9.2.750.1697534106
+initContainerImage: releases-docker.jfrog.io/ubi9/ubi-minimal:9.2.750.1697534106
diff --git 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.71.3] - Jul 20, 2023
+## [107.71.4] - Jul 20, 2023
 * Disabled federation services when splitServicesToContainers=true
 
 ## [107.45.0] - Aug 25, 2022

diff --git a/stable/artifactory-oss/Chart.yaml b/stable/artifactory-oss/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.71.3
+appVersion: 7.71.4
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.71.3
+  version: 107.71.4
 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.71.3
+version: 107.71.4
diff --git a/stable/artifactory-oss/values.yaml b/stable/artifactory-oss/values.yaml
@@ -72,5 +72,5 @@ router:
     tag: 7.81.0
 logger:
   image:
-    tag: 9.2.717
-initContainerImage: releases-docker.jfrog.io/ubi9/ubi-minimal:9.2.717
+    tag: 9.2.750.1697534106
+initContainerImage: releases-docker.jfrog.io/ubi9/ubi-minimal:9.2.750.1697534106
diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
@@ -1,7 +1,11 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.71.3] - Sep 18, 2023
+## [107.71.4] - Oct 31, 2023
+* Fixed - StatefulSet pod annotations changed from range to toYaml [GH-1828](https://github.com/jfrog/charts/issues/1828)
+* Fixed - Invalid format for awsS3V3 `multiPartLimit,multipartElementSize` in binarystore.xml.
+
+## [107.69.0] - Sep 18, 2023
 * Adjust rtfs context
 * Fixed - Metadata service does not respect customVolumeMounts for DB CAs [GH-1815](https://github.com/jfrog/charts/issues/1815)
 

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.71.3
+appVersion: 7.71.4
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.71.3
+version: 107.71.4
diff --git a/stable/artifactory/files/binarystore.xml b/stable/artifactory/files/binarystore.xml
@@ -280,10 +280,10 @@
         <enablePathStyleAccess>{{ . }}</enablePathStyleAccess>
         {{- end }}
         {{- with .multiPartLimit }}
-        <multiPartLimit>{{ . }}</multiPartLimit>
+        <multiPartLimit>{{ . | int64 }}</multiPartLimit>
         {{- end }}
         {{- with .multipartElementSize }}
-        <multipartElementSize>{{ . }}</multipartElementSize>
+        <multipartElementSize>{{ . | int64 }}</multipartElementSize>
         {{- end }}
     </provider>
     {{- end }}

diff --git a/stable/artifactory/templates/artifactory-statefulset.yaml b/stable/artifactory/templates/artifactory-statefulset.yaml
@@ -68,8 +68,8 @@ spec:
       {{- else }}
         checksum/artifactory-unified-secret: {{ include (print $.Template.BasePath "/artifactory-unified-secret.yaml") . | sha256sum }}
       {{- end }}
-      {{- range $key, $value := .Values.artifactory.annotations }}
-        {{ $key }}: {{ tpl $value $ | quote }}
+      {{- with .Values.artifactory.annotations }}
+{{ toYaml . | indent 8 }}
       {{- end }}
     spec:
     {{- if .Values.artifactory.schedulerName }}

diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml
@@ -42,7 +42,7 @@ global:
 ## String to fully override artifactory.fullname template
 ##
 # fullnameOverride:
-initContainerImage: releases-docker.jfrog.io/ubi9/ubi-minimal:9.2.717
+initContainerImage: releases-docker.jfrog.io/ubi9/ubi-minimal:9.2.750.1697534106
 # Init containers
 initContainers:
   resources:
@@ -162,7 +162,7 @@ logger:
   image:
     registry: releases-docker.jfrog.io
     repository: ubi9/ubi-minimal
-    tag: 9.2.717
+    tag: 9.2.750.1697534106
 ## You can use a pre-existing secret with keys license_token and iam_role by specifying licenseConfigSecretName
 ## Example : Create a generic secret using `kubectl create secret generic <secret-name> --from-literal=license_token=${TOKEN} --from-literal=iam_role=${ROLE_ARN}`
 aws:

diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md
@@ -1,6 +1,10 @@
 # JFrog Platform Chart Changelog (GA releases only)
 All changes to this chart will be documented in this file.
 
+## [10.16.2] - Nov 10, 2023
+* Update dependency artifactory chart version to 107.71.4
+* Update dependency xray chart version to 103.85.5
+
 ## [10.16.0] - Oct 26, 2023
 * Update dependency artifactory chart version to 107.71.3
 * Update dependency xray chart version to 103.83.10

diff --git a/stable/jfrog-platform/Chart.lock b/stable/jfrog-platform/Chart.lock
@@ -10,10 +10,10 @@ dependencies:
   version: 12.10.1
 - name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.71.3
+  version: 107.71.4
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.83.10
+  version: 103.85.5
 - name: distribution
   repository: https://charts.jfrog.io/
   version: 102.20.3
@@ -23,5 +23,5 @@ dependencies:
 - name: pipelines
   repository: https://charts.jfrog.io/
   version: 101.44.5
-digest: sha256:9be06f4c96b581205f37d4f9403c19d9df5eb919a1a91a08d27c1f535a011a87
-generated: "2023-10-26T11:55:31.32258+05:30"
+digest: sha256:15d219e1983ce1ab5c8d759f2814c645ab359c4e779a9e0c79b3caa529945d31
+generated: "2023-11-09T11:25:20.649655+05:30"
diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.71.3
+appVersion: 7.71.4
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -16,11 +16,11 @@ dependencies:
 - condition: artifactory.enabled
   name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.71.3
+  version: 107.71.4
 - condition: xray.enabled
   name: xray
   repository: https://charts.jfrog.io/
-  version: 103.83.10
+  version: 103.85.5
 - 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.16.0
+version: 10.16.2
diff --git a/stable/jfrog-platform/values.yaml b/stable/jfrog-platform/values.yaml
@@ -224,7 +224,7 @@ redis:
 artifactory:
   enabled: true
   unifiedUpgradeAllowed: true
-  installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.16.0-%s" .Chart.AppVersion  }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}'
+  installerInfo: '{"productId": "Helm_JFrogPlatform/{{ printf "10.16.2-%s" .Chart.AppVersion  }}", "features": [ { "featureId": "Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"}]}'
   postgresql:
     enabled: false
   waitForDatabase: false

diff --git 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.83.10] - Sep 15,2023
+## [103.85.5] - Sep 15,2023
 * Fixed - Support to configure privateRegistry for pre-upgrade-hook
 
 ## [103.80.0] - Jul 16, 2023

diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 3.83.10
+appVersion: 3.85.5
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -24,4 +24,4 @@ name: xray
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 103.83.10
+version: 103.85.5
diff --git a/stable/xray/values.yaml b/stable/xray/values.yaml
@@ -1186,7 +1186,7 @@ router:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/router
-    tag: 7.79.0
+    tag: 7.81.0
     imagePullPolicy: IfNotPresent
   serviceRegistry:
     ## Service registry (Access) TLS verification skipped if enabled.
@@ -1272,7 +1272,7 @@ observability:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/observability
-    tag: 1.14.0
+    tag: 1.17.0
     imagePullPolicy: IfNotPresent
   internalPort: 8036
   resources: {}