Merge branch 'jp-10.17.0' into nginx-custom-labels

rumstead · Jan 24, 2024 · c1ac106 · c1ac106
2 parents dce3804 + aff8937
commit c1ac106
Show file tree

Hide file tree

Showing 57 changed files with 695 additions and 268 deletions.
diff --git a/examples/xray/logging/README.md b/examples/xray/logging/README.md
@@ -0,0 +1,22 @@
+# Setting up a logging sidecar
+Due to the nature of Xray running with many services, each writing multiple logs to the file system, it's hard to collect them all in a Kubernetes based deployment.<br>
+The example in this directory has an example of using a [fluent-bit](https://fluentbit.io/) sidecar that collects all logs from Xray's `log/` directory and writes them to STDOUT in a nice json formatted way
+
+See the [values-logging-fluent-bit.yaml](values-logging-fluent-bit.yaml) for the configuration example
+
+## Deploy
+Install Xray with the following command
+```shell
+helm upgrade --install xray jfrog/xray -f values-logging-fluent-bit.yaml
+```
+
+## Fluent-bit STDOUT
+Once running, the `fluent-bit` sidecar tails the logs in the configured directories and outputs them to the container's STDOUT in a json format.<br>
+Each line had a `"file"` key that lists the source file, which later can be used to separate the sources.<br>
+The actual log line is in the `"log"` key.
+```json
+{"date":1700135001.943258,"file":"/var/opt/jfrog/xray/log/xray-server-service.log","log":"2023-11-16T11:43:21.942Z \u001b[33m[jfxr ]\u001b[0m \u001b[34m[INFO ]\u001b[0m [0e860ce4f1fd6552] [migrate:36                    ] [MainServer                      ] Data migration that should run always: starting for name V1_Update_Features_table"}
+```
+
+## Cluster log collector
+Once this is setup, you need to configure your cluster log collector (probably running as a DaemonSet) to collect logs from this container only.
diff --git a/examples/xray/logging/values-logging-fluent-bit.yaml b/examples/xray/logging/values-logging-fluent-bit.yaml
@@ -0,0 +1,68 @@
+common:
+
+  # Create extra config maps with the required fluent-bit configuration
+  configMaps: |
+    fluent-bit-input.conf: |-
+      [INPUT]
+          Name              tail
+          Path              /var/opt/jfrog/xray/log/*.log
+          DB                /var/opt/jfrog/fluentdb/fluentdb.db
+          Exclude_Path      *router-request.log,*console.log,*-metrics.log
+          Path_Key          file
+          Refresh_Interval  20
+          Multiline         On
+          Parser_Firstline  multiline_pattern
+          Skip_Long_Lines   On
+
+    fluent-bit-output.conf: |-
+      [OUTPUT]
+          Name   stdout
+          Match  *
+          Format json_lines
+
+    fluent-bit-service.conf: |-
+      [SERVICE]
+          Flush        1
+          Daemon       Off
+          Log_Level    info
+          Parsers_File parsers.conf
+
+    fluent-bit.conf: |-
+      @INCLUDE fluent-bit-service.conf
+      @INCLUDE fluent-bit-input.conf
+      @INCLUDE fluent-bit-output.conf
+
+    parsers.conf: |-
+      [PARSER]
+          Name      multiline_pattern
+          Format    regex
+          Regex     ^(?<log>\d{2,4}\-\d{2,4}\-\d{2,4}T\d{2,4}\:\d{2,4}\:\d{2,4}\.\d{1,6}?.*)
+
+  # Create the extra sidecar container
+  customSidecarContainers: |
+    - name: xray-fluent-bit
+      image: "fluent/fluent-bit:2.1.2"
+      volumeMounts:
+      - mountPath: /var/opt/jfrog/xray
+        name: data-volume
+      - mountPath: /var/opt/jfrog/fluentdb
+        name: fluentdb
+      - mountPath: /fluent-bit/etc/fluent-bit.conf
+        name: xray-configmaps
+        subPath: fluent-bit.conf
+      - mountPath: /fluent-bit/etc/fluent-bit-service.conf
+        name: xray-configmaps
+        subPath: fluent-bit-service.conf
+      - mountPath: /fluent-bit/etc/fluent-bit-input.conf
+        name: xray-configmaps
+        subPath: fluent-bit-input.conf
+      - mountPath: /fluent-bit/etc/fluent-bit-output.conf
+        name: xray-configmaps
+        subPath: fluent-bit-output.conf
+      - mountPath: /fluent-bit/etc/parsers.conf
+        name: xray-configmaps
+        subPath: parsers.conf
+
+  customVolumes: |
+    - name: fluentdb
+      emptyDir: {}
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.11] - 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.11
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.71.3
+  version: 107.71.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.71.3
+version: 107.71.11
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,10 +1,13 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.71.4] - Oct 27, 2023
+## [107.71.11] - Nov 15, 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
+* Fixed - Artifactory primary service condition
 * Added support for custom labels in the Nginx pods
 
-## [107.71.3] - Sep 18, 2023
+## [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.11
 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.11
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-service.yaml b/stable/artifactory-ha/templates/artifactory-primary-service.yaml
@@ -1,4 +1,4 @@
-{{- if gt (.Values.artifactory.node.replicaCount | int) 0  -}}
+{{- if gt (.Values.artifactory.primary.replicaCount | int) 0  -}}
 # Internal service for Artifactory primary node only!
 # Used by member nodes to check readiness of primary node before starting up
 apiVersion: v1

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.11] - 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.11
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.71.3
+  version: 107.71.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.71.3
+version: 107.71.11
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.11] - 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.11
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.71.3
+  version: 107.71.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.71.3
+version: 107.71.11
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,10 +1,12 @@
 # JFrog Artifactory Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [107.71.4] - Oct 27, 2023
+## [107.71.11] - 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
 * Added support for custom labels in the Nginx pods
 
-## [107.71.3] - Sep 18, 2023
+## [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.4
+appVersion: 7.71.11
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -21,4 +21,4 @@ name: artifactory
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.71.4
+version: 107.71.11
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/distribution/.helmignore b/stable/distribution/.helmignore
@@ -19,4 +19,6 @@
 .project
 .idea/
 *.tmproj
-OWNERS
+OWNERS
+
+tests/
diff --git a/stable/distribution/CHANGELOG.md b/stable/distribution/CHANGELOG.md
@@ -1,7 +1,15 @@
 # JFrog Distribution Chart Changelog
 All changes to this project chart be documented in this file.
 
-## [102.20.3] - Aug 29, 2023
+## [102.21.3] - Nov 22, 2023
+* Fixed - StatefulSet pod annotations changed from range to toYaml [GH-1828](https://github.com/jfrog/charts/issues/1828)
+* Removed default hardcoded javaOpts `-Xms2g -Xmx4g` from distribution.sh file
+
+## [102.20.1] - Sep 18, 2023
+* Reverted - Enabled `unifiedSecretInstallation` by default [GH-1819](https://github.com/jfrog/charts/issues/1819)
+* Added NewRelic APM agent integration
+
+## [102.20.0] - Aug 29, 2023
 * Updated redis version tag to `7.2.0-debian-11-r2`
 * Enabled `unifiedSecretInstallation` by default
 

diff --git a/stable/distribution/Chart.yaml b/stable/distribution/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 2.20.3
+appVersion: 2.21.3
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -19,4 +19,4 @@ name: distribution
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 102.20.3
+version: 102.21.3
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,4 +19,6 @@ @@
     .project
     .idea/
     *.tmproj
-    OWNERS
+    OWNERS
+    tests/