jfrog · chukka · Aug 10, 2023 · Aug 10, 2023 · Aug 10, 2023 · Aug 10, 2023
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.63.10] - Aug 25, 2022
+## [107.63.11] - Aug 25, 2022
 * Included event service as mandatory and remove the flag from values.yaml
 
 ## [107.41.0] - Jul 22, 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.63.10
+appVersion: 7.63.11
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.63.10
+  version: 107.63.11
 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.63.10
+version: 107.63.11
diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,13 +1,16 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.63.10] - Jul 20, 2023
+## [107.63.11] - Aug 7, 2023
 * Added support for Openshift by adding the securityContext in container level.
 * **IMPORTANT**
-* Nginx deployment is disabled on openshift.
 * Disable securityContext in container and pod level to deploy postgres on openshift.
-* Fixed support for fsGroup in non openshift environemnt and runAsGroup in openshift environment.
+* Fixed support for fsGroup in non openshift environment and runAsGroup in openshift environment.
 * Fixed - Helm Template Error when using artifactory.loggers [GH-1791](https://github.com/jfrog/charts/issues/1791)
+* Removed the nginx disable condition for openshift
+* Added support to configure event.webhooks within generated system.yaml
+* Fixed an issue to generate ssl certificate should support artifactory-ha fullname
+* Added 'multiPartLimit' and 'multipartElementSize' parameters to awsS3V3 binary providers.
 
 ## [107.62.0] - Jun 5, 2023
 * Added support for 'port' and 'useHttp' parameters for s3-storage-v3 binary provider [GH-1767](https://github.com/jfrog/charts/issues/1767)

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.63.10
+appVersion: 7.63.11
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.63.10
+version: 107.63.11
diff --git a/stable/artifactory-ha/files/binarystore.xml b/stable/artifactory-ha/files/binarystore.xml
@@ -293,6 +293,12 @@
         {{- with .enablePathStyleAccess }}
         <enablePathStyleAccess>{{ . }}</enablePathStyleAccess>
         {{- end }}
+        {{- with .multiPartLimit }}
+        <multiPartLimit>{{ . }}</multiPartLimit>
+        {{- end }}
+        {{- with .multipartElementSize }}
+        <multipartElementSize>{{ . }}</multipartElementSize>
+        {{- end }}
     </provider>
     {{- end }}
 </config>

diff --git a/stable/artifactory-ha/templates/_helpers.tpl b/stable/artifactory-ha/templates/_helpers.tpl
@@ -121,9 +121,9 @@ Create chart name and version as used by the chart label.
 Generate SSL certificates
 */}}
 {{- define "artifactory-ha.gen-certs" -}}
-{{- $altNames := list ( printf "%s.%s" (include "artifactory-ha.name" .) .Release.Namespace ) ( printf "%s.%s.svc" (include "artifactory-ha.name" .) .Release.Namespace ) -}}
+{{- $altNames := list ( printf "%s.%s" (include "artifactory-ha.fullname" .) .Release.Namespace ) ( printf "%s.%s.svc" (include "artifactory-ha.fullname" .) .Release.Namespace ) -}}
 {{- $ca := genCA "artifactory-ca" 365 -}}
-{{- $cert := genSignedCert ( include "artifactory-ha.name" . ) nil $altNames 365 $ca -}}
+{{- $cert := genSignedCert ( include "artifactory-ha.fullname" . ) nil $altNames 365 $ca -}}
 tls.crt: {{ $cert.Cert | b64enc }}
 tls.key: {{ $cert.Key | b64enc }}
 {{- end -}}

diff --git a/stable/artifactory-ha/templates/nginx-artifactory-conf.yaml b/stable/artifactory-ha/templates/nginx-artifactory-conf.yaml
@@ -1,4 +1,3 @@
-{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") -}}
 {{- if and (not .Values.nginx.customArtifactoryConfigMap) .Values.nginx.enabled }}
 apiVersion: v1
 kind: ConfigMap
@@ -12,5 +11,4 @@ metadata:
 data:
   artifactory.conf: |
 {{ tpl .Values.nginx.artifactoryConf . | indent 4 }}
-{{- end }}
 {{- end }}
diff --git a/stable/artifactory-ha/templates/nginx-certificate-secret.yaml b/stable/artifactory-ha/templates/nginx-certificate-secret.yaml
@@ -1,4 +1,3 @@
-{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") -}}
 {{- if and (not .Values.nginx.tlsSecretName) .Values.nginx.enabled .Values.nginx.https.enabled }}
 apiVersion: v1
 kind: Secret
@@ -13,4 +12,3 @@ metadata:
 data:
 {{ ( include "artifactory-ha.gen-certs" . ) | indent 2 }}
 {{- end }}
-{{- end }}
diff --git a/stable/artifactory-ha/templates/nginx-conf.yaml b/stable/artifactory-ha/templates/nginx-conf.yaml
@@ -1,4 +1,3 @@
-{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") -}}
 {{- if and (not .Values.nginx.customConfigMap) .Values.nginx.enabled }}
 apiVersion: v1
 kind: ConfigMap
@@ -13,4 +12,3 @@ data:
   nginx.conf: |
 {{ tpl .Values.nginx.mainConf . | indent 4 }}
 {{- end }}
-{{- end }}
diff --git a/stable/artifactory-ha/templates/nginx-deployment.yaml b/stable/artifactory-ha/templates/nginx-deployment.yaml
@@ -1,4 +1,3 @@
-{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") -}}
 {{- if .Values.nginx.enabled -}}
 {{- $serviceName := include "artifactory-ha.fullname" . -}}
 {{- $servicePort := .Values.artifactory.externalPort -}}
@@ -213,4 +212,3 @@ spec:
       {{- end }}
       {{- end }}
 {{- end }}
-{{- end }}
diff --git a/stable/artifactory-ha/templates/nginx-pdb.yaml b/stable/artifactory-ha/templates/nginx-pdb.yaml
@@ -1,4 +1,3 @@
-{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") -}}
 {{- if .Values.nginx.enabled -}}
 {{- if semverCompare "<v1.21.0-0" .Capabilities.KubeVersion.Version }}
 apiVersion: policy/v1beta1
@@ -22,4 +21,3 @@ spec:
       release: {{ .Release.Name }}
   minAvailable: {{ .Values.nginx.minAvailable }}
 {{- end }}
-{{- end }}
diff --git a/stable/artifactory-ha/templates/nginx-pvc.yaml b/stable/artifactory-ha/templates/nginx-pvc.yaml
@@ -1,4 +1,3 @@
-{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") -}}
 {{- if and .Values.nginx.persistence.enabled (.Values.nginx.enabled) (eq (int .Values.nginx.replicaCount) 1) }}
 {{- if (not .Values.nginx.persistence.existingClaim) }}
 kind: PersistentVolumeClaim
@@ -25,4 +24,3 @@ spec:
 {{- end }}
 {{- end }}
 {{- end }}
-{{- end }}
diff --git a/stable/artifactory-ha/templates/nginx-service.yaml b/stable/artifactory-ha/templates/nginx-service.yaml
@@ -1,4 +1,3 @@
-{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") -}}
 {{- if .Values.nginx.enabled -}}
 apiVersion: v1
 kind: Service
@@ -86,5 +85,4 @@ spec:
     app: {{ template "artifactory-ha.name" . }}
     component: {{ .Values.nginx.name }}
     release: {{ .Release.Name }}
-{{- end }}
 {{- end }}
diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml
@@ -780,6 +780,10 @@ artifactory:
     jfconnect:
       enabled: false
     {{- end }}
+    {{- if .Values.event.webhooks }}
+    event:
+      webhooks: {{ toYaml .Values.event.webhooks | nindent 6 }}
+    {{- end }}
   ## IMPORTANT: If overriding artifactory.internalPort:
   ## DO NOT use port lower than 1024 as Artifactory runs as non-root and cannot bind to ports lower than 1024!
   externalPort: 8082
@@ -903,7 +907,7 @@ artifactory:
       backupDir: "/var/opt/jfrog/artifactory-backup"
       capacity: 200Gi
       mountOptions: []
-    ## For artifactory.persistence.type google-storage
+    ## For artifactory.persistence.type google-storage, google-storage-v2, google-storage-v2-direct
     googleStorage:
       ## When using GCP buckets as your binary store (Available with enterprise license only)
       gcpServiceAccount:
@@ -935,7 +939,7 @@ artifactory:
       bucketExists: false
       useInstanceCredentials: false
       enableSignedUrlRedirect: false
-    ## For artifactory.persistence.type aws-s3-v3
+    ## For artifactory.persistence.type aws-s3-v3, s3-storage-v3-direct, s3-storage-v3-archive
     awsS3V3:
       testConnection: false
       identity:
@@ -959,7 +963,9 @@ artifactory:
       cloudFrontPrivateKey:
       enableSignedUrlRedirect: false
       enablePathStyleAccess: false
-    ## For artifactory.persistence.type azure-blob
+      multiPartLimit:
+      multipartElementSize:
+    ## For artifactory.persistence.type azure-blob, azure-blob-storage-direct
     azureBlob:
       accountName:
       accountKey:
@@ -1304,6 +1310,10 @@ event:
   name: event
   enabled: true
   internalPort: 8061
+  ## WebHook handlers settings for event
+  webhooks: {}
+  # urlStrictPolicy: false
+
   ## Extra environment variables that can be used to tune event to your needs.
   ## Uncomment and set value as needed
   extraEnvironmentVariables:

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.63.10] - Aug 25, 2022
+## [107.63.11] - Aug 25, 2022
 * Included event service as mandatory and remove the flag from values.yaml
 
 ## [107.41.0] - Jul 22, 2022

diff --git a/stable/artifactory-jcr/Chart.yaml b/stable/artifactory-jcr/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.63.10
+appVersion: 7.63.11
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.63.10
+  version: 107.63.11
 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.63.10
+version: 107.63.11
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.63.10] - Aug 25, 2022
+## [107.63.11] - Aug 25, 2022
 * Included event service as mandatory and remove the flag from values.yaml
 
 ## [107.41.0] - Jul 22, 2022

diff --git a/stable/artifactory-oss/Chart.yaml b/stable/artifactory-oss/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.63.10
+appVersion: 7.63.11
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.63.10
+  version: 107.63.11
 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.63.10
+version: 107.63.11
diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md
@@ -1,13 +1,17 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.63.10] - Jul 20, 2023
+## [107.63.11] - Aug 7, 2023
 * Added support for Openshift by adding the securityContext in container level.
 * **IMPORTANT**
-* Nginx deployment is disabled on openshift.
 * Disable securityContext in container and pod level to deploy postgres on openshift.
-* Fixed support for fsGroup in non openshift environemnt and runAsGroup in openshift environment.
+* Fixed support for fsGroup in non openshift environment and runAsGroup in openshift environment.
 * Fixed - Helm Template Error when using artifactory.loggers [GH-1791](https://github.com/jfrog/charts/issues/1791)
+* Removed the nginx disable condition for openshift
+* Added support to configure event.webhooks within generated system.yaml
+* Fixed an issue to generate ssl certificate should support artifactory fullname
+* Added binarystore.xml template to persistence storage type `nfs`. The default Filestore location configured according to artifactory.persistence.nfs.dataDir.
+* Added 'multiPartLimit' and 'multipartElementSize' parameters to awsS3V3 binary providers.
 
 ## [107.62.0] - Jun 5, 2023
 * Upgraded to autoscaling/v2

diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.63.10
+appVersion: 7.63.11
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.63.10
+version: 107.63.11
diff --git a/stable/artifactory/files/binarystore.xml b/stable/artifactory/files/binarystore.xml
@@ -1,3 +1,29 @@
+{{- if eq .Values.artifactory.persistence.type "nfs" -}}
+<config version="2">
+    {{- if  (.Values.artifactory.persistence.maxCacheSize) }}
+    <chain> <!--template="file-system"-->
+        <provider id="cache-fs" type="cache-fs">
+            <provider id="file-system" type="file-system"/>
+        </provider>
+    </chain>
+    {{- else }}
+    <chain> <!--template="file-system"-->
+        <provider id="file-system" type="file-system"/>
+    </chain>
+    {{- end }}
+
+    {{- if .Values.artifactory.persistence.maxCacheSize }}
+    <provider id="cache-fs" type="cache-fs">
+        <maxCacheSize>{{ .Values.artifactory.persistence.maxCacheSize | int64 }}</maxCacheSize>
+        <cacheProviderDir>{{ .Values.artifactory.persistence.cacheProviderDir }}</cacheProviderDir>
+    </provider>
+    {{- end }}
+
+    <provider id="file-system" type="file-system">
+        <fileStoreDir>{{ .Values.artifactory.persistence.nfs.dataDir }}/filestore</fileStoreDir>
+    </provider>
+</config>
+{{- end }}
 {{- if eq .Values.artifactory.persistence.type "file-system" -}}
 <!-- File system filestore -->
 <config version="v1">
@@ -253,6 +279,12 @@
         {{- with .enablePathStyleAccess }}
         <enablePathStyleAccess>{{ . }}</enablePathStyleAccess>
         {{- end }}
+        {{- with .multiPartLimit }}
+        <multiPartLimit>{{ . }}</multiPartLimit>
+        {{- end }}
+        {{- with .multipartElementSize }}
+        <multipartElementSize>{{ . }}</multipartElementSize>
+        {{- end }}
     </provider>
     {{- end }}
 </config>

diff --git a/stable/artifactory/templates/_helpers.tpl b/stable/artifactory/templates/_helpers.tpl
@@ -88,9 +88,9 @@ Create chart name and version as used by the chart label.
 Generate SSL certificates
 */}}
 {{- define "artifactory.gen-certs" -}}
-{{- $altNames := list ( printf "%s.%s" (include "artifactory.name" .) .Release.Namespace ) ( printf "%s.%s.svc" (include "artifactory.name" .) .Release.Namespace ) -}}
+{{- $altNames := list ( printf "%s.%s" (include "artifactory.fullname" .) .Release.Namespace ) ( printf "%s.%s.svc" (include "artifactory.fullname" .) .Release.Namespace ) -}}
 {{- $ca := genCA "artifactory-ca" 365 -}}
-{{- $cert := genSignedCert ( include "artifactory.name" . ) nil $altNames 365 $ca -}}
+{{- $cert := genSignedCert ( include "artifactory.fullname" . ) nil $altNames 365 $ca -}}
 tls.crt: {{ $cert.Cert | b64enc }}
 tls.key: {{ $cert.Key | b64enc }}
 {{- end -}}

diff --git a/stable/artifactory/templates/nginx-artifactory-conf.yaml b/stable/artifactory/templates/nginx-artifactory-conf.yaml
@@ -1,4 +1,3 @@
-{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") -}}
 {{- if and (not .Values.nginx.customArtifactoryConfigMap) .Values.nginx.enabled }}
 apiVersion: v1
 kind: ConfigMap
@@ -12,5 +11,4 @@ metadata:
 data:
   artifactory.conf: |
 {{ tpl .Values.nginx.artifactoryConf . | indent 4 }}
-{{- end }}
 {{- end }}
diff --git a/stable/artifactory/templates/nginx-certificate-secret.yaml b/stable/artifactory/templates/nginx-certificate-secret.yaml
@@ -1,4 +1,3 @@
-{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") -}}
 {{- if and (not .Values.nginx.tlsSecretName) .Values.nginx.enabled .Values.nginx.https.enabled }}
 apiVersion: v1
 kind: Secret
@@ -13,4 +12,3 @@ metadata:
 data:
 {{ ( include "artifactory.gen-certs" . ) | indent 2 }}
 {{- end }}
-{{- end }}
diff --git a/stable/artifactory/templates/nginx-conf.yaml b/stable/artifactory/templates/nginx-conf.yaml
@@ -1,4 +1,3 @@
-{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") -}}
 {{- if and (not .Values.nginx.customConfigMap) .Values.nginx.enabled }}
 apiVersion: v1
 kind: ConfigMap
@@ -13,4 +12,3 @@ data:
   nginx.conf: |
 {{ tpl .Values.nginx.mainConf . | indent 4 }}
 {{- end }}
-{{- end }}
diff --git a/stable/artifactory/templates/nginx-deployment.yaml b/stable/artifactory/templates/nginx-deployment.yaml
@@ -1,4 +1,3 @@
-{{- if not (.Capabilities.APIVersions.Has "security.openshift.io/v1/SecurityContextConstraints") -}}
 {{- if .Values.nginx.enabled -}}
 {{- $serviceName := include "artifactory.fullname" . -}}
 {{- $servicePort := .Values.artifactory.externalPort -}}
@@ -214,5 +213,4 @@ spec:
           secretName: {{ template "artifactory.fullname" . }}-nginx-certificate
       {{- end }}
       {{- end }}
-{{- end }}
 {{- end }}