Merge branch 'xray-3.105.x' into master

stable/artifactory-cpp-ce/CHANGELOG.md

@@ -1,7 +1,17 @@
 # JFrog Artifactory CE for C++ Chart Changelog
 All changes to this chart will be documented in this file
 
-## [107.71.4] - Jul 20, 2023
+## [107.90.10] - Feb 20, 2024
+* Updated `artifactory.installerInfo` content
+
+## [107.80.0] - Feb 1, 2024
+* Updated README.md to create a namespace using `--create-namespace` as part of helm install
+
+## [107.74.0] - Nov 23, 2023
+* **IMPORTANT**
+* Added min kubeVersion ">= 1.19.0-0" in chart.yaml
+
+## [107.66.0] - Jul 20, 2023
 * Disabled federation services when splitServicesToContainers=true
 
 ## [107.45.0] - Aug 25, 2022

stable/artifactory-cpp-ce/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.71.4
+appVersion: 7.90.10
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.71.4
+  version: 107.90.10
 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
@@ -13,12 +13,12 @@ keywords:
 - container
 - registry
 - devops
-kubeVersion: '>= 1.14.0-0'
+kubeVersion: '>= 1.19.0-0'
 maintainers:
 - email: [email protected]
   name: Chart Maintainers at JFrog
 name: artifactory-cpp-ce
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.71.4
+version: 107.90.10

stable/artifactory-cpp-ce/README.md

@@ -6,7 +6,7 @@ JFrog Artifactory CE for C++ is a free Artifactory edition to host C/C++ package
 
 ## Prerequisites Details
 
-* Kubernetes 1.14+
+* Kubernetes 1.19+
 
 ## Chart Details
 This chart will do the following:
@@ -30,7 +30,7 @@ helm repo update
 ### Install Chart
 To install the chart with the release name `artifactory-cpp-ce`:
 ```bash
-helm upgrade --install artifactory-cpp-ce --set artifactory.postgresql.postgresqlPassword=<postgres_password> --namespace artifactory-cpp-ce jfrog/artifactory-cpp-ce
+helm upgrade --install artifactory-cpp-ce --set artifactory.postgresql.postgresqlPassword=<postgres_password> jfrog/artifactory-cpp-ce --namespace artifactory-cpp-ce --create-namespace
 ```
 
 ### Accessing Artifactory CE for C++
@@ -39,7 +39,7 @@ helm upgrade --install artifactory-cpp-ce --set artifactory.postgresql.postgresq
 ### Updating Artifactory CE for C++
 Once you have a new chart version, you can upgrade your deployment with
 ```bash
-helm upgrade artifactory-cpp-ce --namespace artifactory-cpp-ce jfrog/artifactory-cpp-ce
+helm upgrade artifactory-cpp-ce jfrog/artifactory-cpp-ce --namespace artifactory-cpp-ce --create-namespace
 ```
 
 ### Special Upgrade Notes
@@ -85,7 +85,7 @@ helm upgrade --install artifactory-cpp-ce \
   --set artifactory.ingress.enabled=true \
   --set artifactory.ingress.hosts[0]="artifactory.company.com" \
   --set artifactory.artifactory.service.type=NodePort \
-  --namespace artifactory-cpp-ce jfrog/artifactory-cpp-ce
+  jfrog/artifactory-cpp-ce --namespace artifactory-cpp-ce --create-namespace
 ```
 
 To manually configure TLS, first create/retrieve a key & certificate pair for the address(es) you wish to protect. Then create a TLS secret in the namespace:

stable/artifactory-cpp-ce/values.yaml

@@ -35,7 +35,7 @@ artifactory:
     # other: ""
   installer:
     platform: art-cpp-ce-helm
-  installerInfo: '{"productId": "Helm_artifactory-cpp/{{ .Chart.Version }}", "features": [ { "featureId": "Platform/{{ default "kubernetes" .Values.installer.platform }}"}]}'
+  installerInfo: '{"productId":"Helm_artifactory-cpp/{{ .Chart.Version }}","features":[{"featureId":"Platform/{{ printf "%s-%s" "kubernetes" .Capabilities.KubeVersion.Version }}"},{"featureId":"Database/{{ .Values.database.type }}"},{"featureId":"PostgreSQL_Enabled/{{ .Values.postgresql.enabled }}"},{"featureId":"Nginx_Enabled/{{ .Values.nginx.enabled }}"},{"featureId":"ArtifactoryPersistence_Type/{{ .Values.artifactory.persistence.type }}"},{"featureId":"SplitServicesToContainers_Enabled/{{ .Values.splitServicesToContainers }}"},{"featureId":"UnifiedSecretInstallation_Enabled/{{ .Values.artifactory.unifiedSecretInstallation }}"},{"featureId":"Filebeat_Enabled/{{ .Values.filebeat.enabled }}"},{"featureId":"ReplicaCount/{{ .Values.artifactory.replicaCount }}"}]}'
   ## Nginx
   ## See full list of supported Nginx options and documentation in artifactory chart: https://github.com/jfrog/charts/tree/master/stable/artifactory
   nginx:
@@ -69,8 +69,7 @@ postgresql:
   enabled: true
 router:
   image:
-    tag: 7.81.0
-logger:
+    tag: 7.118.2
+initContainers:
   image:
-    tag: 9.2.750.1697534106
-initContainerImage: releases-docker.jfrog.io/ubi9/ubi-minimal:9.2.750.1697534106
+    tag: 9.4.949.1716471857

stable/artifactory-ha/.helmignore

@@ -19,4 +19,6 @@
 .project
 .idea/
 *.tmproj
-OWNERS
+OWNERS
+
+tests/

stable/artifactory-ha/CHANGELOG.md

@@ -1,9 +1,118 @@
 # JFrog Artifactory-ha Chart Changelog
-All changes to this chart will be documented in this file
+All changes to this chart will be documented in this file.
+
+## [107.90.10] - July 18, 2024
+* Fixed #adding colon in image registry which breaks deployment [GH-1892](https://github.com/jfrog/charts/pull/1892)
+* Added new `nginx.hosts` to use Nginx server_name directive instead of `ingress.hosts`
+* Added a deprecation notice of ingress.hosts when `ngnix.enabled` is true
+* Added new evidence service
+* Corrected database connection values based on sizing 
+* **IMPORTANT**
+* Separate access from artifactory tomcat to run on its own dedicated tomcat
+  * With this change access will be running in its own dedicated container
+  * This will give the ability to control resources and java options specific to access
+    Can be done by passing the following,
+    `access.javaOpts.other`
+    `access.resources`
+    `access.extraEnvironmentVariables`
+* Updating the example link for downloading the DB driver
+* Added Binary Provider recommendations
+
+## [107.89.0] - May 30, 2024
+* Fix the indentation of the commented-out sections in the values.yaml file
+
+## [107.88.0] - May 29, 2024
+* **IMPORTANT**
+* Refactored `nginx.artifactoryConf` and `nginx.mainConf` configuration (moved to files/nginx-artifactory-conf.yaml  and files/nginx-main-conf.yaml instead of keys in values.yaml)
+
+## [107.87.0] - May 29, 2024
+* Renamed `.Values.artifactory.openMetrics` to `.Values.artifactory.metrics`
+* Align all liveness and readiness probes (Removed hard-coded values)
+
+## [107.85.0] - May 29, 2024
+* Changed `migration.enabled` to false by default. For 6.x to 7.x migration, this flag needs to be set to `true`
+
+## [107.84.0] - May 29, 2024
+* Added image section for `initContainers` instead of `initContainerImage`
+* Renamed `router.image.imagePullPolicy` to `router.image.pullPolicy`
+* Removed loggers.image section
+* Added support for `global.verisons.initContainers` to override `initContainers.image.tag`
+* Fixed an issue with extraSystemYaml merge
+* **IMPORTANT**
+* Renamed `artifactory.setSecurityContext` to `artifactory.podSecurityContext` 
+* Renamed `artifactory.uid` to `artifactory.podSecurityContext.runAsUser`
+* Renamed `artifactory.gid` to `artifactory.podSecurityContext.runAsGroup` and `artifactory.podSecurityContext.fsGroup`
+* Renamed `artifactory.fsGroupChangePolicy` to `artifactory.podSecurityContext.fsGroupChangePolicy`
+* Renamed `artifactory.seLinuxOptions` to `artifactory.podSecurityContext.seLinuxOptions`
+* Added flag `allowNonPostgresql` defaults to false
+* Update postgresql tag version to `15.6.0-debian-12-r5`
+* Added a check if `initContainerImage` exists
+* Fixed a wrong imagePullPolicy configuration
+* Fixed an issue to generate unified secret to support artifactory fullname [GH-1882](https://github.com/jfrog/charts/issues/1882)
+* Fixed an issue template render on loggers [GH-1883](https://github.com/jfrog/charts/issues/1883)
+* Override metadata and observability image tag with `global.verisons.artifactory` value
+* Fixed resource constraints for "setup" initContainer of nginx deployment [GH-962] (https://github.com/jfrog/charts/issues/962)
+* Added .Values.artifactory.unifiedSecretsPrependReleaseName` for unified secret to prepend release name
+* Fixed maxCacheSize and cacheProviderDir mix up under azure-blob-storage-v2-direct template in binarystore.xml
+
+## [107.83.0] - Mar 12, 2024
+* Added image section for `metadata` and `observability`
+
+## [107.82.0] - Mar 04, 2024
+* Added `disableRouterBypass` flag as experimental feature, to disable the artifactoryPath /artifactory/ and route all traffic through the Router.
+* Removed Replicator Service
+
+## [107.81.0] - Feb 20, 2024
+* **IMPORTANT**
+* Refactored systemYaml configuration (moved to files/system.yaml instead of key in values.yaml)
+* Added ability to provide `extraSystemYaml` configuration in values.yaml which will merge with the existing system yaml when `systemYamlOverride` is not given [GH-1848](https://github.com/jfrog/charts/pull/1848)
+* Added option to modify the new cache configs, maxFileSizeLimit and skipDuringUpload
+* Added IPV4/IPV6 Dualstack flag support for Artifactory and nginx service
+* Added `singleStackIPv6Cluster` flag, which manages the Nginx configuration to enable listening on IPv6 and proxying
+* Fixing broken link for creating additional kubernetes resources. Refer [here](https://github.com/jfrog/log-analytics-prometheus/blob/master/helm/artifactory-ha-values.yaml)
+* Refactored installerInfo configuration (moved to files/installer-info.json instead of key in values.yaml)
+
+## [107.80.0] - Feb 20, 2024
+* Updated README.md to create a namespace using `--create-namespace` as part of helm install
+
+## [107.79.0] - Feb 20, 2024
+* **IMPORTANT**
+* Added `unifiedSecretInstallation` flag which enables single unified secret holding all internal (chart) secrets to `true` by default
+* Added support for azure-blob-storage-v2-direct config
+* Added option to set Nginx to write access_log to container STDOUT
+* **Important change:**
+* Update postgresql tag version to `15.2.0-debian-11-r23`
+* If this is a new deployment or you already use an external database (`postgresql.enabled=false`), these changes **do not affect you**!
+* If this is an upgrade and you are using the default bundles PostgreSQL (`postgresql.enabled=true`), you need to pass previous 9.x/10.x/12.x/13.x's postgresql.image.tag, previous postgresql.persistence.size and databaseUpgradeReady=true
+
+## [107.77.0] - April 22, 2024
+* Removed integration service
+* Added recommended postgresql sizing configurations under sizing directory
+* Updated artifactory-federation (probes, port, embedded mode)
+* **IMPORTANT**
+* setSecurityContext has been renamed to podSecurityContext. 
+* Moved podSecurityContext to values.yaml
+* Fixing broken nginx port [GH-1860](https://github.com/jfrog/charts/issues/1860)
+* Added nginx.customCommand to use custom commands for the nginx container
+
+## [107.76.0] - Dec 13, 2023
+* Added connectionTimeout and socketTimeout paramaters under AWSS3 binarystore section
+* Reduced nginx startupProbe initialDelaySeconds
+
+## [107.74.0] - Nov 30, 2023
+* Added recommended sizing configurations under sizing directory, please refer [here](README.md/#apply-sizing-configurations-to-the-chart)
+* **IMPORTANT**
+* Added min kubeVersion ">= 1.19.0-0" in chart.yaml
 
-## [107.71.4] - Oct 31, 2023
+## [107.70.0] - Nov 30, 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 - Invalid format for awsS3V3 `multiPartLimit,multipartElementSize` in binarystore.xml
+* Fixed - Artifactory primary service condition
+* Fixed - SecurityContext with runAsGroup in artifactory-ha [GH-1838](https://github.com/jfrog/charts/issues/1838)
+* Added support for custom labels in the Nginx pods [GH-1836](https://github.com/jfrog/charts/pull/1836)
+* Added podSecurityContext and containerSecurityContext for nginx
+* Added support for nginx on openshift, set `podSecurityContext` and `containerSecurityContext` to false
+* Renamed nginx internalPort 80,443 to 8080,8443 to support openshift
 
 ## [107.69.0] - Sep 18, 2023
 * Adjust rtfs context

stable/artifactory-ha/Chart.yaml

@@ -1,5 +1,7 @@
+annotations:
+  artifactoryServiceVersion: 7.90.13
 apiVersion: v2
-appVersion: 7.71.4
+appVersion: 7.90.10
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -13,12 +15,12 @@ keywords:
 - artifactory
 - jfrog
 - devops
-kubeVersion: '>= 1.14.0-0'
+kubeVersion: '>= 1.19.0-0'
 maintainers:
 - email: [email protected]
   name: Chart Maintainers at JFrog
 name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.71.4
+version: 107.90.10

stable/artifactory-ha/README.md

@@ -8,7 +8,7 @@ Below you will find the basic instructions for installing, uninstalling, and del
 
 ## Prerequisites Details
 
-* Kubernetes 1.14+
+* Kubernetes 1.19+
 * Artifactory HA license
 
 ## Chart Details
@@ -37,7 +37,14 @@ helm repo update
 ### Install Chart
 To install the chart with the release name `artifactory`:
 ```bash
-helm upgrade --install artifactory-ha --namespace artifactory-ha jfrog/artifactory-ha
+helm upgrade --install artifactory-ha jfrog/artifactory-ha --namespace artifactory-ha --create-namespace
+```
+
+### Apply Sizing configurations to the Chart
+To apply the chart with recommended sizing configurations :
+For small configurations :
+```bash
+helm upgrade --install artifactory-ha jfrog/artifactory-ha -f sizing/artifactory-small-extra-config.yaml -f sizing/artifactory-small.yaml --namespace artifactory-ha --create-namespace
 ```
 
 ## Uninstalling Artifactory

stable/artifactory-ha/ci/global-values.yaml

@@ -23,8 +23,8 @@ artifactory:
         cpu: "4"
   customInitContainersBegin: |
    - name: "custom-init-begin-local"
-     image: "{{ .Values.initContainerImage }}"
-     imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
      command:
        - 'sh'
        - '-c'
@@ -34,8 +34,8 @@ artifactory:
          name: volume
   customInitContainers: |
    - name: "custom-init-local"
-     image: "{{ .Values.initContainerImage }}"
-     imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
      command:
        - 'sh'
        - '-c'
@@ -55,8 +55,8 @@ artifactory:
   # Add custom sidecar containers
   customSidecarContainers: |
    - name: "sidecar-list-local"
-     image: "{{ .Values.initContainerImage }}"
-     imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
      securityContext:
        allowPrivilegeEscalation: false
        capabilities:
@@ -84,8 +84,8 @@ global:
   joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
   customInitContainersBegin: |
    - name: "custom-init-begin-global"
-     image: "{{ .Values.initContainerImage }}"
-     imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
      command:
        - 'sh'
        - '-c'
@@ -95,8 +95,8 @@ global:
          name: volume
   customInitContainers: |
    - name: "custom-init-global"
-     image: "{{ .Values.initContainerImage }}"
-     imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
      command:
        - 'sh'
        - '-c'
@@ -116,8 +116,8 @@ global:
   # Add custom sidecar containers
   customSidecarContainers: |
    - name: "sidecar-list-global"
-     image: "{{ .Values.initContainerImage }}"
-     imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
      securityContext:
        allowPrivilegeEscalation: false
        capabilities:
@@ -138,8 +138,8 @@ global:
 nginx:
   customInitContainers: |
    - name: "custom-init-begin-nginx"
-     image: "{{ .Values.initContainerImage }}"
-     imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
      command:
        - 'sh'
        - '-c'
@@ -149,8 +149,8 @@ nginx:
          name: custom-script-local
   customSidecarContainers: |
    - name: "sidecar-list-nginx"
-     image: "{{ .Values.initContainerImage }}"
-     imagePullPolicy: "{{ .Values.artifactory.image.pullPolicy }}"
+     image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
+     imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
      securityContext:
        allowPrivilegeEscalation: false
        capabilities:

stable/artifactory-ha/ci/large-values.yaml

@@ -75,14 +75,6 @@ jfconnect:
     limits:
       memory: "1Gi"
       cpu: "1"
-integration:
-  resources:
-    requests:
-      memory: "200Mi"
-      cpu: "200m"
-    limits:
-      memory: "1Gi"
-      cpu: "1"
 observability:
   resources:
     requests: