diff --git a/stable/artifactory-ha/files/nginx-artifactory-conf.yaml b/stable/artifactory-ha/files/nginx-artifactory-conf.yaml index 9f9f06dbb..609994075 100644 --- a/stable/artifactory-ha/files/nginx-artifactory-conf.yaml +++ b/stable/artifactory-ha/files/nginx-artifactory-conf.yaml @@ -146,4 +146,7 @@ location / { {{- end }} } } +{{- if .Values.nginx.customServerSnippet }} +{{ tpl .Values.nginx.customServerSnippet . }} +{{- end }} } \ No newline at end of file diff --git a/stable/artifactory-ha/templates/nginx-artifactory-conf.yaml b/stable/artifactory-ha/templates/nginx-artifactory-conf.yaml index 97ae5f27b..efb95df32 100644 --- a/stable/artifactory-ha/templates/nginx-artifactory-conf.yaml +++ b/stable/artifactory-ha/templates/nginx-artifactory-conf.yaml @@ -15,4 +15,7 @@ data: {{- else }} {{ tpl ( .Files.Get "files/nginx-artifactory-conf.yaml" ) . | indent 4 }} {{- end }} +{{- if .Values.nginx.customConfFile }} +{{ tpl .Values.nginx.customConfFile . | indent 2 }} +{{- end }} {{- end }} \ No newline at end of file diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml index d9b5d511e..9d9128113 100644 --- a/stable/artifactory-ha/values.yaml +++ b/stable/artifactory-ha/values.yaml @@ -2038,6 +2038,12 @@ nginx: ## allows overwriting the command for the nginx container. ## defaults to [ 'nginx', '-g', 'daemon off;' ] + customConfFile: "" + # custom.conf: | + # log_format nginxartifactory '$proxy_protocol_addr - $remote_user [$time_local] "$request"'; + customServerSnippet: "" + # access_log /dev/stdout nginxartifactory; + service: ## For minikube, set this to NodePort, elsewhere use LoadBalancer type: LoadBalancer diff --git a/stable/artifactory/CHANGELOG.md b/stable/artifactory/CHANGELOG.md index b791794b3..2481d34cf 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.161.16] - Aug 04, 2026 +## [107.161.17] - Aug 04, 2026 * **BREAKING CHANGE — mandatory keys:** Both `masterKey` and `joinKey` are now mandatory at install time (centralizes key management across the JFrog Platform). * **On fresh install** — both keys must be provided before running `helm install`. * **On upgrade** — reuse the existing keys from the running cluster; do **not** generate new ones. @@ -27,6 +27,7 @@ All changes to this chart will be documented in this file. * Aligned the default `replicaCount` of the `frontend`, `rtfs`, `jfbus`, `jfmelt`, `apptrust`, `unifiedpolicy`, `evaluation` and `platformfederation` Deployments with `artifactory.replicaCount`, in `values.yaml` and in all sizing files. * Raised `autoscaling.maxReplicas` to the profile `replicaCount` in the xlarge (4) and 2xlarge (6) sizing files, for Artifactory and for the above services, so enabling autoscaling no longer caps these workloads below the size of the profile. Each of these services keeps its own `replicaCount`, so changing `artifactory.replicaCount` does not change theirs; they must be updated separately. A warning is printed when they are out of sync. +* Added `nginx.customConfFile` and `nginx.customServerSnippet` to extend the nginx configuration without replacing it [GH-2290](https://github.com/jfrog/charts/pull/2290) ## [107.158.0] - Jun 25, 2026 diff --git a/stable/artifactory/Chart.yaml b/stable/artifactory/Chart.yaml index d09df8ac5..0e6794a55 100644 --- a/stable/artifactory/Chart.yaml +++ b/stable/artifactory/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 7.161.16 +appVersion: 7.161.17 dependencies: - condition: postgresql.enabled name: postgresql @@ -21,4 +21,4 @@ name: artifactory sources: - https://github.com/jfrog/charts type: application -version: 107.161.16 +version: 107.161.17 diff --git a/stable/artifactory/files/nginx-artifactory-conf.yaml b/stable/artifactory/files/nginx-artifactory-conf.yaml index a353be57b..c406a4efe 100644 --- a/stable/artifactory/files/nginx-artifactory-conf.yaml +++ b/stable/artifactory/files/nginx-artifactory-conf.yaml @@ -146,4 +146,7 @@ location / { {{- end }} } } +{{- if .Values.nginx.customServerSnippet }} +{{ tpl .Values.nginx.customServerSnippet . }} +{{- end }} } \ No newline at end of file diff --git a/stable/artifactory/templates/nginx-artifactory-conf.yaml b/stable/artifactory/templates/nginx-artifactory-conf.yaml index 343448994..1c8d7c760 100644 --- a/stable/artifactory/templates/nginx-artifactory-conf.yaml +++ b/stable/artifactory/templates/nginx-artifactory-conf.yaml @@ -15,4 +15,7 @@ data: {{- else }} {{ tpl ( .Files.Get "files/nginx-artifactory-conf.yaml" ) . | indent 4 }} {{- end }} +{{- if .Values.nginx.customConfFile }} +{{ tpl .Values.nginx.customConfFile . | indent 2 }} +{{- end }} {{- end }} \ No newline at end of file diff --git a/stable/artifactory/values.yaml b/stable/artifactory/values.yaml index 3c14a9492..1139592fa 100644 --- a/stable/artifactory/values.yaml +++ b/stable/artifactory/values.yaml @@ -355,7 +355,7 @@ router: image: registry: releases-docker.jfrog.io repository: jfrog/router - tag: 7.729.23 + tag: 7.729.40 # digest: pullPolicy: IfNotPresent serviceRegistry: @@ -1134,7 +1134,7 @@ frontend: image: registry: releases-docker.jfrog.io repository: jfrog/frontend - tag: 1.652.21 + tag: 1.652.41 pullPolicy: IfNotPresent # digest: apiContext: frontend @@ -1761,7 +1761,7 @@ observability: image: registry: releases-docker.jfrog.io repository: jfrog/observability - tag: 2.47.5 + tag: 2.47.9 # digest: pullPolicy: IfNotPresent persistence: @@ -1941,6 +1941,16 @@ nginx: ## allows overwriting the command for the nginx container. ## defaults to [ 'nginx', '-g', 'daemon off;' ] + ## Additional conf files to add to the nginx conf.d directory, alongside the generated artifactory.conf. + ## Each entry is a `.conf: |` block and is included by the http block of the nginx main conf. + customConfFile: "" + # custom.conf: | + # log_format nginxartifactory '$proxy_protocol_addr - $remote_user [$time_local] "$request"'; + + ## Additional directives to add to the artifactory server block of the nginx artifactory conf. + customServerSnippet: "" + # access_log /dev/stdout nginxartifactory; + service: ## For minikube, set this to NodePort, elsewhere use LoadBalancer type: LoadBalancer @@ -2242,7 +2252,7 @@ rtfs: registry: releases-docker.jfrog.io repository: jfrog/artifactory-federation pullPolicy: IfNotPresent - tag: 2.126.10 + tag: 2.126.17 # digest: jfrogUrl: "" ## Aligned with artifactory.replicaCount. Update it separately to scale rtfs independently. @@ -2423,7 +2433,7 @@ apptrust: registry: releases-docker.jfrog.io repository: jfrog/apptrust pullPolicy: IfNotPresent - tag: 1.86.5 + tag: 1.86.8 # digest: jfrogUrl: "" ## Aligned with artifactory.replicaCount. Update it separately to scale apptrust independently. @@ -2547,7 +2557,7 @@ jfbus: registry: releases-docker.jfrog.io repository: jfrog/jfbus-service pullPolicy: IfNotPresent - tag: 1.386.2 + tag: 1.386.17 # digest: ## Aligned with artifactory.replicaCount. Update it separately to scale jfbus independently. replicaCount: 1 @@ -2679,7 +2689,7 @@ jfmelt: registry: releases-docker.jfrog.io repository: jfrog/jfmelt pullPolicy: IfNotPresent - tag: 1.12.4 + tag: 1.12.6 # digest: ## Aligned with artifactory.replicaCount. Update it separately to scale jfmelt independently. replicaCount: 1 @@ -2926,7 +2936,7 @@ evaluation: registry: releases-docker.jfrog.io repository: jfrog/evaluation pullPolicy: IfNotPresent - tag: 1.27.9 + tag: 1.27.13 # digest: jfrogUrl: "" ## Aligned with artifactory.replicaCount. Update it separately to scale evaluation independently. @@ -3052,7 +3062,7 @@ platformfederation: registry: releases-docker.jfrog.io repository: jfrog/platformfederation pullPolicy: IfNotPresent - tag: 1.1328.9 + tag: 1.1328.11 # digest: port: 8017 grpcPort: 8018