[artifactory] 7.84.11 release

jfrog · May 17, 2024 · 2b0c4ba · 2b0c4ba
1 parent cef1e61
commit 2b0c4ba
Show file tree

Hide file tree

Showing 19 changed files with 175 additions and 84 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.84.10] - Feb 20, 2024
+## [107.84.11] - Feb 20, 2024
 * Updated `artifactory.installerInfo` content
 
 ## [107.80.0] - Feb 1, 2024

diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 7.84.10
+appVersion: 7.84.11
 dependencies:
 - name: artifactory
   repository: file://charts/artifactory
-  version: 107.84.10
+  version: 107.84.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.84.10
+version: 107.84.11
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.84.10] - May 2, 2024
+## [107.84.11] - May 16, 2024
 * Added image section for `initContainers` instead of `initContainerImage`
 * Renamed `router.image.imagePullPolicy` to `router.image.pullPolicy`
 * Removed loggers.image section
@@ -14,8 +14,11 @@ All changes to this chart will be documented in this file
 * 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`
+* Update postgresql tag version to `15.6.0-debian-11-r16`
 * 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)
 
 ## [107.83.0] - Mar 12, 2024
 * Added image section for `metadata` and `observability`

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,7 +1,7 @@
 annotations:
   artifactoryServiceVersion: 7.84.15
 apiVersion: v2
-appVersion: 7.84.10
+appVersion: 7.84.11
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -23,4 +23,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.84.10
+version: 107.84.11
diff --git a/stable/artifactory-ha/ci/loggers-values.yaml b/stable/artifactory-ha/ci/loggers-values.yaml
@@ -0,0 +1,43 @@
+# Leave this file empty to ensure that CI runs builds against the default configuration in values.yaml.
+databaseUpgradeReady: true
+
+# To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
+postgresql:
+  postgresqlPassword: password
+  persistence:
+    enabled: false
+artifactory:
+  persistence:
+    enabled: false
+  resources:
+    requests:
+      memory: "4Gi"
+      cpu: "2"
+    limits:
+      memory: "6Gi"
+      cpu: "4"
+  javaOpts:
+    xms: "4g"
+    xmx: "4g"
+
+  loggers:
+  - access-audit.log
+  - access-request.log
+  - access-security-audit.log
+  - access-service.log
+  - artifactory-access.log
+  - artifactory-event.log
+  - artifactory-import-export.log
+  - artifactory-request.log
+  - artifactory-service.log
+  - frontend-request.log
+  - frontend-service.log
+  - metadata-request.log
+  - metadata-service.log
+  - router-request.log
+  - router-service.log
+  - router-traefik.log
+
+  catalinaLoggers:
+  - tomcat-catalina.log
+  - tomcat-localhost.log
diff --git a/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml
@@ -83,7 +83,7 @@ spec:
       {{- if .Values.artifactory.persistence.fileSystem.existingSharedClaim.enabled }}
       - name: "create-artifactory-data-dir"
         image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
-        imagePullPolicy: {{ .Values.initContainers.image.imagePullPolicy }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
       {{- if .Values.containerSecurityContext.enabled }}
         securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
       {{- end }}
@@ -102,7 +102,7 @@ spec:
       {{- if .Values.artifactory.deleteDBPropertiesOnStartup }}
       - name: "delete-db-properties"
         image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
-        imagePullPolicy: {{ .Values.initContainers.image.imagePullPolicy }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
         command:
           - 'bash'
           - '-c'
@@ -117,7 +117,7 @@ spec:
       {{- if and .Values.artifactory.node.waitForPrimaryStartup.enabled }}
       - name: "wait-for-primary"
         image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
-        imagePullPolicy: {{ .Values.initContainers.image.imagePullPolicy }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
       {{- if .Values.containerSecurityContext.enabled }}
         securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
       {{- end }}
@@ -141,7 +141,7 @@ spec:
         {{- end }}
       - name: 'copy-system-configurations'
         image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
-        imagePullPolicy: {{ .Values.initContainers.image.imagePullPolicy }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
       {{- if .Values.containerSecurityContext.enabled }}
         securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
       {{- end }}
@@ -180,7 +180,7 @@ spec:
             {{- if or (not .Values.artifactory.unifiedSecretInstallation) (or .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName) }}
               name: {{ include "artifactory-ha.masterKeySecretName" . }}
             {{- else }}
-              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+              name: "{{ template "artifactory-ha.fullname" . }}-unified-secret"
             {{- end }}
               key: master-key
         {{- end }}
@@ -217,7 +217,7 @@ spec:
       {{- if or .Values.artifactory.customCertificates.enabled .Values.global.customCertificates.enabled }}
       - name: copy-custom-certificates
         image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
-        imagePullPolicy: {{ .Values.initContainers.image.imagePullPolicy }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
       {{- if .Values.containerSecurityContext.enabled }}
         securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
       {{- end }}
@@ -239,7 +239,7 @@ spec:
       {{- if .Values.artifactory.circleOfTrustCertificatesSecret }}
       - name: copy-circle-of-trust-certificates
         image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
-        imagePullPolicy: {{ .Values.initContainers.image.imagePullPolicy }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
       {{- if .Values.containerSecurityContext.enabled }}
         securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
       {{- end }}
@@ -261,7 +261,7 @@ spec:
       {{- if or .Values.postgresql.enabled }}
       - name: "wait-for-db"
         image: {{ include "artifactory-ha.getImageInfoByValue" (list . "initContainers") }}
-        imagePullPolicy: {{ .Values.initContainers.image.imagePullPolicy }}
+        imagePullPolicy: {{ .Values.initContainers.image.pullPolicy }}
         command:
         - /bin/bash
         - -c
@@ -320,7 +320,7 @@ spec:
             {{- if not .Values.artifactory.unifiedSecretInstallation }}
               name: {{ template "artifactory-ha.fullname" . }}-database-creds
             {{- else }}
-              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+              name: "{{ template "artifactory-ha.fullname" . }}-unified-secret"
             {{- end }}
               key: db-user
         {{- end }}
@@ -336,7 +336,7 @@ spec:
             {{- if not .Values.artifactory.unifiedSecretInstallation }}
               name: {{ template "artifactory-ha.fullname" . }}-database-creds
             {{- else }}
-              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+              name: "{{ template "artifactory-ha.fullname" . }}-unified-secret"
             {{- end }}
               key: db-password
         {{- else if .Values.postgresql.enabled }}
@@ -355,7 +355,7 @@ spec:
             {{- if not .Values.artifactory.unifiedSecretInstallation }}
               name: {{ template "artifactory-ha.fullname" . }}-database-creds
             {{- else }}
-              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+              name: "{{ template "artifactory-ha.fullname" . }}-unified-secret"
             {{- end }}
               key: db-url
         {{- end }}
@@ -544,7 +544,7 @@ spec:
             {{- if not .Values.artifactory.unifiedSecretInstallation }}
               name: {{ template "artifactory-ha.fullname" . }}-database-creds
             {{- else }}
-              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+              name: "{{ template "artifactory-ha.fullname" . }}-unified-secret"
             {{- end }}
               key: db-user
         {{- end }}
@@ -560,7 +560,7 @@ spec:
             {{- if not .Values.artifactory.unifiedSecretInstallation }}
               name: {{ template "artifactory-ha.fullname" . }}-database-creds
             {{- else }}
-              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+              name: "{{ template "artifactory-ha.fullname" . }}-unified-secret"
             {{- end }}
               key: db-password
         {{- else if .Values.postgresql.enabled }}
@@ -579,7 +579,7 @@ spec:
             {{- if not .Values.artifactory.unifiedSecretInstallation }}
               name: {{ template "artifactory-ha.fullname" . }}-database-creds
             {{- else }}
-              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+              name: "{{ template "artifactory-ha.fullname" . }}-unified-secret"
             {{- end }}
               key: db-url
         {{- end }}
@@ -712,7 +712,7 @@ spec:
             {{- if not .Values.artifactory.unifiedSecretInstallation }}
               name: {{ template "artifactory-ha.fullname" . }}-database-creds
             {{- else }}
-              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+              name: "{{ template "artifactory-ha.fullname" . }}-unified-secret"
             {{- end }}
               key: db-password
         {{- else if .Values.postgresql.enabled }}
@@ -858,7 +858,7 @@ spec:
             {{- if not .Values.artifactory.unifiedSecretInstallation }}
               name: {{ template "artifactory-ha.fullname" . }}-database-creds
             {{- else }}
-              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+              name: "{{ template "artifactory-ha.fullname" . }}-unified-secret"
             {{- end }}
               key: db-user
         {{- end }}
@@ -874,7 +874,7 @@ spec:
             {{- if not .Values.artifactory.unifiedSecretInstallation }}
               name: {{ template "artifactory-ha.fullname" . }}-database-creds
             {{- else }}
-              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+              name: "{{ template "artifactory-ha.fullname" . }}-unified-secret"
             {{- end }}
               key: db-password
         {{- else if .Values.postgresql.enabled }}
@@ -893,7 +893,7 @@ spec:
             {{- if not .Values.artifactory.unifiedSecretInstallation }}
               name: {{ template "artifactory-ha.fullname" . }}-database-creds
             {{- else }}
-              name: "{{ template "artifactory-ha.name" . }}-unified-secret"
+              name: "{{ template "artifactory-ha.fullname" . }}-unified-secret"
             {{- end }}
               key: db-url
         {{- end }}
@@ -1021,7 +1021,7 @@ spec:
       {{- range .Values.artifactory.loggers }}
       - name: {{ . | replace "_" "-" | replace "." "-" }}
         image: {{ include "artifactory-ha.getImageInfoByValue" (list $ "initContainers") }}
-        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+        imagePullPolicy: {{ $.Values.initContainers.image.pullPolicy }}
       {{- if $.Values.containerSecurityContext.enabled }}
         securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
       {{- end }}
@@ -1042,7 +1042,7 @@ spec:
       {{- range .Values.artifactory.catalinaLoggers }}
       - name: {{ . | replace "_" "-" | replace "." "-" }}
         image: {{ include "artifactory-ha.getImageInfoByValue" (list $ "initContainers") }}
-        imagePullPolicy: {{ .Values.artifactory.image.pullPolicy }}
+        imagePullPolicy: {{ $.Values.initContainers.image.pullPolicy }}
       {{- if $.Values.containerSecurityContext.enabled }}
         securityContext: {{- omit $.Values.containerSecurityContext "enabled" | toYaml | nindent 10 }}
       {{- end }}
@@ -1239,7 +1239,7 @@ spec:
     {{- if and .Values.artifactory.unifiedSecretInstallation (eq (include "artifactory-ha.checkDuplicateUnifiedCustomVolume" .) "false" ) }}
       - name: {{ include "artifactory-ha.unifiedCustomSecretVolumeName" . }}
         secret:
-          secretName: {{ template "artifactory-ha.name" . }}-unified-secret
+          secretName: {{ template "artifactory-ha.fullname" . }}-unified-secret
     {{- else if not .Values.artifactory.unifiedSecretInstallation }}
 
       ############ If single secret installation flag is disable ############