Merge branch 'master' into sr-add-annotations

jfrog · Mar 15, 2024 · 2d6cf09 · 2d6cf09
2 parents 874f4bc + 35a3032
commit 2d6cf09
Show file tree

Hide file tree

Showing 33 changed files with 78 additions and 74 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.77.6] - Nov 23, 2023
+## [107.77.7] - Nov 23, 2023
 * **IMPORTANT**
 * Added min kubeVersion ">= 1.19.0-0" in chart.yaml
 

diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.77.6
+appVersion: 7.77.7
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.77.6
+  version: 107.77.7
 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.77.6
+version: 107.77.7
diff --git 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.77.6] - Feb 20, 2024
+## [107.77.7] - Feb 20, 2024
 * Removed integration service
 * Added recommended postgresql sizing configurations under sizing directory
 * Updated artifactory-federation (probes, port, embedded mode)

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.77.6
+appVersion: 7.77.7
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.77.6
+version: 107.77.7
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.77.6] - Nov 23, 2023
+## [107.77.7] - Nov 23, 2023
 * **IMPORTANT**
 * Added min kubeVersion ">= 1.19.0-0" in chart.yaml
 

diff --git a/stable/artifactory-jcr/Chart.yaml b/stable/artifactory-jcr/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.77.6
+appVersion: 7.77.7
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.77.6
+  version: 107.77.7
 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.77.6
+version: 107.77.7
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.77.6] - Nov 23, 2023
+## [107.77.7] - Nov 23, 2023
 * **IMPORTANT**
 * Added min kubeVersion ">= 1.19.0-0" in chart.yaml
 

diff --git a/stable/artifactory-oss/Chart.yaml b/stable/artifactory-oss/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.77.6
+appVersion: 7.77.7
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.77.6
+  version: 107.77.7
 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.77.6
+version: 107.77.7
diff --git 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.77.6] - Feb 20, 2024
+## [107.77.7] - Feb 20, 2024
 * Removed integration service
 * Added recommended postgresql sizing configurations under sizing directory
 * Updated artifactory-federation (probes, port, embedded mode)

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.77.6
+appVersion: 7.77.7
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.77.6
+version: 107.77.7
diff --git a/stable/jfrog-platform/CHANGELOG.md b/stable/jfrog-platform/CHANGELOG.md
@@ -1,6 +1,11 @@
 # JFrog Platform Chart Changelog (GA releases only)
 All changes to this chart will be documented in this file.
 
+## [10.17.3] - Mar 14, 2024
+* Add missing IF statement in `NOTES.txt`
+* Update dependency artifactory chart version to 107.77.7
+* Update dependency xray chart version to 103.91.3
+
 ## [10.17.1] - Feb 29, 2024
 * Updated README.md to create a namespace using `--create-namespace` as part of helm install
 * Updated `artifactory.installerInfo` content

diff --git 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.77.6
+  version: 107.77.7
 - name: xray
   repository: https://charts.jfrog.io/
-  version: 103.90.1
+  version: 103.91.3
 - name: distribution
   repository: https://charts.jfrog.io/
   version: 102.22.2
@@ -20,5 +20,5 @@ dependencies:
 - name: pipelines
   repository: https://charts.jfrog.io/
   version: 101.55.6
-digest: sha256:7dab87296e623847160abc644f43556da5bb2d7083a357888e68a6db1e11f9e1
-generated: "2024-02-29T20:49:08.265023+05:30"
+digest: sha256:4bdf8d88c9d9b387a08a5a790e4c5393a4dc84fe34811cebe0f366bd7a9a0203
+generated: "2024-03-14T08:08:59.105896+05:30"
diff --git a/stable/jfrog-platform/Chart.yaml b/stable/jfrog-platform/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.77.6
+appVersion: 7.77.7
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -12,11 +12,11 @@ dependencies:
 - condition: artifactory.enabled
   name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.77.6
+  version: 107.77.7
 - condition: xray.enabled
   name: xray
   repository: https://charts.jfrog.io/
-  version: 103.90.1
+  version: 103.91.3
 - 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.17.1
+version: 10.17.3
diff --git a/stable/jfrog-platform/templates/NOTES.txt b/stable/jfrog-platform/templates/NOTES.txt
@@ -50,8 +50,9 @@ Instructions for accessing the JFrog Platform
    - Username: admin
    - Password: password
 {{- end }}
-
+{{- if .Values.postgresql.enabled }}
 ---------------------------------------------------------------------------------------------------------------------------------------------------
 ***WARNING*** You are using the bundled PostgreSQL database from the chart. This bundled database is not suitable for production use cases.
 Use an external PostgreSQL database for production deployments.
 ---------------------------------------------------------------------------------------------------------------------------------------------------
+{{- end }}
diff --git a/stable/jfrog-platform/values.yaml b/stable/jfrog-platform/values.yaml
@@ -213,7 +213,7 @@ rabbitmq:
 artifactory:
   enabled: true
   unifiedUpgradeAllowed: true
-  installerInfo: '{"productId":"Helm_JFrogPlatform/{{ printf "10.17.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.17.3-%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

diff --git a/stable/xray/CHANGELOG.md b/stable/xray/CHANGELOG.md
@@ -1,6 +1,16 @@
 # JFrog Xray Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [103.91.3] - Feb 21,2024
+* **IMPORTANT**
+* Added `unifiedSecretInstallation` flag which enables single unified secret holding all internal (chart) secrets to `true` by default
+* Renamed sizing yaml file names from `xray-sizing-<size>.yaml` to `xray-<size>.yaml`
+* **Important change:**
+* Update postgresql tag version to `15.2.0-debian-11-r23`
+* Renamed `common.xrayUserId` to `podSecurityContext.runAsUser`
+* Renamed `common.xrayGroupId` to `podSecurityContext.runAsGroup` and `podSecurityContext.fsGroup`
+* Renamed `common.fsGroupChangePolicy` to `podSecurityContext.fsGroupChangePolicy`
+
 ## [103.89.0] - Jan 18,2023
 * Remove fallback section from keda.
 

diff --git a/stable/xray/Chart.yaml b/stable/xray/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 3.90.1
+appVersion: 3.91.3
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -24,4 +24,4 @@ name: xray
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 103.90.1
+version: 103.91.3
diff --git a/stable/xray/ci/default-values.yaml b/stable/xray/ci/default-values.yaml
@@ -3,7 +3,7 @@
 unifiedUpgradeAllowed: true
 databaseUpgradeReady: true
 xray:
-  jfrogUrl: http://artifactory.rt:8082
+  jfrogUrl: http://rt-artifactory.rt:8082
 common:
   persistence:
     enabled: false

diff --git a/stable/xray/ci/global-section-values.yaml b/stable/xray/ci/global-section-values.yaml
@@ -65,7 +65,7 @@ common:
          cpu: "100m"
 
 global:
-  jfrogUrl: http://artifactory.rt:8082
+  jfrogUrl: http://rt-artifactory.rt:8082
   masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
   joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
   customInitContainersBegin: |

diff --git a/stable/xray/ci/test-rabbitmq-haQuorum-values.yaml b/stable/xray/ci/test-rabbitmq-haQuorum-values.yaml
@@ -3,7 +3,7 @@
 unifiedUpgradeAllowed: true
 databaseUpgradeReady: true
 xray:
-  jfrogUrl: http://artifactory.rt:8082
+  jfrogUrl: http://rt-artifactory.rt:8082
 common:
   persistence:
     enabled: false

diff --git a/stable/xray/ci/test-rabbitmq-replicaCount-values.yaml b/stable/xray/ci/test-rabbitmq-replicaCount-values.yaml
@@ -3,7 +3,7 @@
 unifiedUpgradeAllowed: true
 databaseUpgradeReady: true
 xray:
-  jfrogUrl: http://artifactory.rt:8082
+  jfrogUrl: http://rt-artifactory.rt:8082
 common:
   persistence:
     enabled: false

diff --git a/stable/xray/ci/test-values.yaml b/stable/xray/ci/test-values.yaml
@@ -3,7 +3,7 @@
 unifiedUpgradeAllowed: true
 databaseUpgradeReady: true
 xray:
-  jfrogUrl: http://artifactory.rt:8082
+  jfrogUrl: http://rt-artifactory.rt:8082
   unifiedSecretInstallation: true
   openMetrics:
     enabled: true

diff --git a/stable/xray/sizing/xray-sizing-2xlarge.yaml → stable/xray/sizing/xray-2xlarge.yaml b/stable/xray/sizing/xray-sizing-2xlarge.yaml → stable/xray/sizing/xray-2xlarge.yaml
diff --git a/stable/xray/sizing/xray-sizing-large.yaml → stable/xray/sizing/xray-large.yaml b/stable/xray/sizing/xray-sizing-large.yaml → stable/xray/sizing/xray-large.yaml
diff --git a/stable/xray/sizing/xray-sizing-medium.yaml → stable/xray/sizing/xray-medium.yaml b/stable/xray/sizing/xray-sizing-medium.yaml → stable/xray/sizing/xray-medium.yaml
diff --git a/stable/xray/sizing/xray-sizing-small.yaml → stable/xray/sizing/xray-small.yaml b/stable/xray/sizing/xray-sizing-small.yaml → stable/xray/sizing/xray-small.yaml
diff --git a/stable/xray/sizing/xray-sizing-xlarge.yaml → stable/xray/sizing/xray-xlarge.yaml b/stable/xray/sizing/xray-sizing-xlarge.yaml → stable/xray/sizing/xray-xlarge.yaml
diff --git a/stable/xray/sizing/xray-sizing-xsmall.yaml → stable/xray/sizing/xray-xsmall.yaml b/stable/xray/sizing/xray-sizing-xsmall.yaml → stable/xray/sizing/xray-xsmall.yaml
diff --git a/stable/xray/templates/xray-ipa-deployment.yaml b/stable/xray/templates/xray-ipa-deployment.yaml
@@ -17,7 +17,7 @@ metadata:
     unifiedUpgradeAllowed: {{ required "\n\n**************************************\nSTOP! UPGRADE from Xray 2.x (appVersion) currently not supported!\nIf this is an upgrade over an existing Xray 3.x, explicitly pass 'unifiedUpgradeAllowed=true' to upgrade.\n**************************************\n" .Values.unifiedUpgradeAllowed | quote }}
 {{- end }}
 {{- if and .Release.IsUpgrade .Values.postgresql.enabled }}
-    databaseUpgradeReady: {{ required "\n\n*********\nIMPORTANT: UPGRADE STOPPED to prevent data loss!\nReview CHANGELOG.md (https://github.com/jfrog/charts/blob/master/stable/xray/CHANGELOG.md), pass postgresql.image.tag '9.6.18-debian-10-r7' or '10.13.0-debian-10-r38' or '12.5.0-debian-10-r25' and databaseUpgradeReady=true if you are upgrading from chart version which has postgresql version 9.6.x or 10.13.x or 12.5.x" .Values.databaseUpgradeReady | quote }}
+    databaseUpgradeReady: {{ required "\n\n*********\nIMPORTANT: UPGRADE STOPPED to prevent data loss!\nReview CHANGELOG.md (https://github.com/jfrog/charts/blob/master/stable/xray/CHANGELOG.md), pass postgresql.image.tag '9.6.18-debian-10-r7' or '10.13.0-debian-10-r38' or '12.5.0-debian-10-r25' or 13.10.0-debian-11-r14 and databaseUpgradeReady=true if you are upgrading from chart version which has postgresql version 9.6.x or 10.13.x or 12.5.x or 13.x" .Values.databaseUpgradeReady | quote }}
 {{- end }}
 {{- with .Values.server.statefulset.annotations }}
   annotations:
@@ -91,12 +91,7 @@ spec:
     {{- end }}
       serviceAccountName: {{ template "xray.serviceAccountName" . }}
       {{- if .Values.podSecurityContext.enabled }}
-      securityContext:
-        runAsUser: {{ .Values.common.xrayUserId }}
-        fsGroup: {{ .Values.common.xrayGroupId }}
-        {{- if .Values.common.fsGroupChangePolicy }}
-        fsGroupChangePolicy: {{ .Values.common.fsGroupChangePolicy }}
-        {{- end }}
+      securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
       {{- end }}
       {{- if .Values.common.topologySpreadConstraints }}
       topologySpreadConstraints:
@@ -142,7 +137,7 @@ spec:
         - name: XRAY_JOIN_KEY
           valueFrom:
             secretKeyRef:
-              {{- if not .Values.xray.unifiedSecretInstallation }}
+              {{- if or (not .Values.xray.unifiedSecretInstallation) (or .Values.xray.joinKeySecretName .Values.global.joinKeySecretName) }}
               name: {{ include "xray.joinKeySecretName" . }}
               {{- else }}
               name: "{{ template "xray.name" . }}-unified-secret"
@@ -153,7 +148,7 @@ spec:
         - name: XRAY_MASTER_KEY
           valueFrom:
             secretKeyRef:
-              {{- if not .Values.xray.unifiedSecretInstallation }}
+              {{- if or (not .Values.xray.unifiedSecretInstallation) (or .Values.xray.masterKeySecretName .Values.global.masterKeySecretName) }}
               name: {{ include "xray.masterKeySecretName" . }}
               {{- else }}
               name: "{{ template "xray.name" . }}-unified-secret"
@@ -164,7 +159,7 @@ spec:
         - name: data-volume
           mountPath: {{ .Values.xray.persistence.mountPath | quote }}
       {{- if or .Values.systemYamlOverride.existingSecret .Values.xray.systemYaml }}
-        {{- if not .Values.xray.unifiedSecretInstallation }}
+        {{- if or (not .Values.xray.unifiedSecretInstallation) .Values.systemYamlOverride.existingSecret }}
         - name: systemyaml
         {{- else }}
         - name: {{ include "xray.unifiedCustomSecretVolumeName" . }}

diff --git a/stable/xray/templates/xray-server-deployment.yaml b/stable/xray/templates/xray-server-deployment.yaml
@@ -17,7 +17,7 @@ metadata:
     unifiedUpgradeAllowed: {{ required "\n\n**************************************\nSTOP! UPGRADE from Xray 2.x (appVersion) currently not supported!\nIf this is an upgrade over an existing Xray 3.x, explicitly pass 'unifiedUpgradeAllowed=true' to upgrade.\n**************************************\n" .Values.unifiedUpgradeAllowed | quote }}
 {{- end }}
 {{- if and .Release.IsUpgrade .Values.postgresql.enabled }}
-    databaseUpgradeReady: {{ required "\n\n*********\nIMPORTANT: UPGRADE STOPPED to prevent data loss!\nReview CHANGELOG.md (https://github.com/jfrog/charts/blob/master/stable/xray/CHANGELOG.md), pass postgresql.image.tag '9.6.18-debian-10-r7' or '10.13.0-debian-10-r38' or '12.5.0-debian-10-r25' and databaseUpgradeReady=true if you are upgrading from chart version which has postgresql version 9.6.x or 10.13.x or 12.5.x" .Values.databaseUpgradeReady | quote }}
+    databaseUpgradeReady: {{ required "\n\n*********\nIMPORTANT: UPGRADE STOPPED to prevent data loss!\nReview CHANGELOG.md (https://github.com/jfrog/charts/blob/master/stable/xray/CHANGELOG.md), pass postgresql.image.tag '9.6.18-debian-10-r7' or '10.13.0-debian-10-r38' or '12.5.0-debian-10-r25' or 13.10.0-debian-11-r14 and databaseUpgradeReady=true if you are upgrading from chart version which has postgresql version 9.6.x or 10.13.x or 12.5.x or 13.x" .Values.databaseUpgradeReady | quote }}
 {{- end }}
 {{- with .Values.server.statefulset.annotations }}
   annotations:
@@ -91,12 +91,7 @@ spec:
     {{- end }}
       serviceAccountName: {{ template "xray.serviceAccountName" . }}
       {{- if .Values.podSecurityContext.enabled }}
-      securityContext:
-        runAsUser: {{ .Values.common.xrayUserId }}
-        fsGroup: {{ .Values.common.xrayGroupId }}
-        {{- if .Values.common.fsGroupChangePolicy }}
-        fsGroupChangePolicy: {{ .Values.common.fsGroupChangePolicy }}
-        {{- end }}
+      securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }}
       {{- end }}
       {{- if .Values.common.topologySpreadConstraints }}
       topologySpreadConstraints:
@@ -142,7 +137,7 @@ spec:
         - name: XRAY_JOIN_KEY
           valueFrom:
             secretKeyRef:
-              {{- if not .Values.xray.unifiedSecretInstallation }}
+              {{- if or (not .Values.xray.unifiedSecretInstallation) (or .Values.xray.joinKeySecretName .Values.global.joinKeySecretName) }}
               name: {{ include "xray.joinKeySecretName" . }}
               {{- else }}
               name: "{{ template "xray.name" . }}-unified-secret"
@@ -153,7 +148,7 @@ spec:
         - name: XRAY_MASTER_KEY
           valueFrom:
             secretKeyRef:
-              {{- if not .Values.xray.unifiedSecretInstallation }}
+              {{- if or (not .Values.xray.unifiedSecretInstallation) (or .Values.xray.masterKeySecretName .Values.global.masterKeySecretName) }}
               name: {{ include "xray.masterKeySecretName" . }}
               {{- else }}
               name: "{{ template "xray.name" . }}-unified-secret"
@@ -164,7 +159,7 @@ spec:
         - name: data-volume
           mountPath: {{ .Values.xray.persistence.mountPath | quote }}
       {{- if or .Values.systemYamlOverride.existingSecret .Values.xray.systemYaml }}
-        {{- if not .Values.xray.unifiedSecretInstallation }}
+        {{- if or (not .Values.xray.unifiedSecretInstallation) .Values.systemYamlOverride.existingSecret }}
         - name: systemyaml
         {{- else }}
         - name: {{ include "xray.unifiedCustomSecretVolumeName" . }}