[artifactory] 7.23.3 release (jfrog#1489)

ohaviv · Aug 5, 2021 · f43f88b · f43f88b
1 parent 2120611
commit f43f88b
Show file tree

Hide file tree

Showing 40 changed files with 245 additions and 50 deletions.
diff --git a/stable/artifactory-cpp-ce/CHANGELOG.md b/stable/artifactory-cpp-ce/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Artifactory CE for C++ Chart Changelog
 All changes to this chart will be documented in this file
 
+## [107.23.3] - Aug 5, 2021
+* Bumping chart version to align with app version
+
 ## [107.21.12] - July 28, 2021
 * Bumping chart version to align with app version
 

diff --git a/stable/artifactory-cpp-ce/Chart.lock b/stable/artifactory-cpp-ce/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.21.12
-digest: sha256:0c59f0117227fe02013f08e424d92a94afbb0261c8cf54539a6f5f4c17ff5d9e
-generated: "2021-07-28T15:18:15.228632+05:30"
+  version: 107.23.3
+digest: sha256:f9434bf2d43933f5a7faba2cf89bcfa51d01396d09ac9ccbd440abc7b42ae4cd
+generated: "2021-08-05T19:36:58.012045+05:30"
diff --git a/stable/artifactory-cpp-ce/Chart.yaml b/stable/artifactory-cpp-ce/Chart.yaml
@@ -2,11 +2,11 @@ apiVersion: v2
 type: application
 name: artifactory-cpp-ce
 home: https://www.jfrog.com/artifactory/
-version: 107.21.12
-appVersion: 7.21.12
+version: 107.23.3
+appVersion: 7.23.3
 dependencies:
   - name: artifactory
-    version: 107.21.12
+    version: 107.23.3
     repository: https://charts.jfrog.io/
 description: JFrog Artifactory CE for C++
 sources:

diff --git a/stable/artifactory-ha/CHANGELOG.md b/stable/artifactory-ha/CHANGELOG.md
@@ -1,6 +1,14 @@
 # JFrog Artifactory-ha Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [107.23.3] - Aug 5, 2021
+* Bug fix - logger sideCar picks up Wrong File in helm
+* Allow filebeat metrics configuration in values.yaml
+* Update alpine tag version to `3.14.0`
+* Added `nodePort` support to artifactory-service and nginx-service templates
+* Removed redundant `terminationGracePeriodSeconds` in statefulset
+* Increased `startupProbe.failureThreshold` time
+
 ## [107.21.12] - July 28, 2021
 * Updated Artifactory version to 7.21.12
 

diff --git a/stable/artifactory-ha/Chart.yaml b/stable/artifactory-ha/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 7.21.12
+appVersion: 7.23.3
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -20,4 +20,4 @@ name: artifactory-ha
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 107.21.12
+version: 107.23.3
diff --git a/stable/artifactory-ha/ci/access-tls-values.yaml b/stable/artifactory-ha/ci/access-tls-values.yaml
@@ -1,9 +1,13 @@
 databaseUpgradeReady: true
 artifactory:
   masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
 # To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
 postgresql:
   postgresqlPassword: password
+  persistence:
+    enabled: false
 access:
   accessConfig:
     security:

diff --git a/stable/artifactory-ha/ci/default-values.yaml b/stable/artifactory-ha/ci/default-values.yaml
@@ -4,6 +4,10 @@ databaseUpgradeReady: true
 ## Please refer https://github.com/jfrog/charts/blob/master/stable/artifactory-ha/README.md#special-upgrade-notes-1
 artifactory:
   masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+  persistence:
+    enabled: false
 # To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
 postgresql:
   postgresqlPassword: password
+  persistence:
+    enabled: false
diff --git a/stable/artifactory-ha/ci/global-values.yaml b/stable/artifactory-ha/ci/global-values.yaml
@@ -1,10 +1,13 @@
 databaseUpgradeReady: true
+artifactory:
+  persistence:
+    enabled: false
 # To Fix ct tool --reuse-values - PASSWORDS ERROR: you must provide your current passwords when upgrade the release
 postgresql:
   postgresqlPassword: password
+  persistence:
+    enabled: false
 global:
-  versions:
-    artifactory: 7.12.8
   masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
   joinKey: EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
   customInitContainers: |

diff --git a/stable/artifactory-ha/ci/migration-disabled-values.yaml b/stable/artifactory-ha/ci/migration-disabled-values.yaml
@@ -2,7 +2,11 @@ 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:
   masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
   migration:
     enabled: false
+  persistence:
+    enabled: false
diff --git a/stable/artifactory-ha/ci/test-values.yaml b/stable/artifactory-ha/ci/test-values.yaml
@@ -2,11 +2,11 @@ databaseUpgradeReady: true
 artifactory:
   masterKey: FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
   persistence:
-    enabled: true
+    enabled: false
 
 postgresql:
   postgresqlPassword: "password"
   postgresqlExtendedConf:
     maxConnections: "102"
   persistence:
-    enabled: true
+    enabled: false
diff --git a/stable/artifactory-ha/files/migrationStatus.sh b/stable/artifactory-ha/files/migrationStatus.sh
@@ -20,7 +20,7 @@ do
 done
 
 sleep 20
-echo "Artifactory started sucessfully...in Init Container"
+echo "Artifactory started successfully...in Init Container"
 echo "Stopping artifactory in Init Container..."
 ${scriptsPath}/artifactory.sh stop
 echo "Exiting Init Container..."

diff --git a/stable/artifactory-ha/templates/_helpers.tpl b/stable/artifactory-ha/templates/_helpers.tpl
@@ -150,6 +150,13 @@ Resolve joinKey value
 {{- end -}}
 {{- end -}}
 
+{{/*
+Resolve jfConnectToken value
+*/}}
+{{- define "artifactory-ha.jfConnectToken" -}}
+{{- .Values.artifactory.jfConnectToken -}}
+{{- end -}}
+
 {{/*
 Resolve masterKey value
 */}}
@@ -174,6 +181,17 @@ Resolve joinKeySecretName value
 {{- end -}}
 {{- end -}}
 
+{{/*
+Resolve jfConnectTokenSecretName value
+*/}}
+{{- define "artifactory-ha.jfConnectTokenSecretName" -}}
+{{- if .Values.artifactory.jfConnectTokenSecretName -}}
+{{- .Values.artifactory.jfConnectTokenSecretName -}}
+{{- else -}}
+{{ include "artifactory-ha.fullname" . }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Resolve masterKeySecretName value
 */}}

diff --git a/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-node-statefulset.yaml
@@ -593,7 +593,6 @@ spec:
 {{ toYaml .Values.filebeat.readinessProbe | indent 10 }}
         resources:
 {{ toYaml .Values.filebeat.resources | indent 10 }}
-        terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
       {{- end }}
     {{- if or .Values.artifactory.customSidecarContainers .Values.global.customSidecarContainers }}
 {{ tpl (include "artifactory-ha.customSidecarContainers" .) . | indent 6 }}

diff --git a/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml b/stable/artifactory-ha/templates/artifactory-primary-statefulset.yaml
@@ -196,6 +196,11 @@ spec:
           mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/access/etc/security;
           echo -n ${ARTIFACTORY_JOIN_KEY} > {{ .Values.artifactory.persistence.mountPath }}/bootstrap/access/etc/security/join.key;
         {{- end }}
+        {{- if or .Values.artifactory.jfConnectToken .Values.artifactory.jfConnectTokenSecretName }}
+          echo "Copy jfConnectToken to {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/registration_token";
+          mkdir -p {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/;
+          echo -n ${ARTIFACTORY_JFCONNECT_TOKEN} > {{ .Values.artifactory.persistence.mountPath }}/bootstrap/jfconnect/registration_token;
+        {{- end }}        
         {{- if or .Values.artifactory.masterKey .Values.global.masterKey .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName }}
           echo "Copy masterKey to {{ .Values.artifactory.persistence.mountPath }}/etc/security";
           mkdir -p {{ .Values.artifactory.persistence.mountPath }}/etc/security;
@@ -209,6 +214,13 @@ spec:
               name: {{ include "artifactory-ha.joinKeySecretName" . }}
               key: join-key
         {{- end }}
+        {{- if or .Values.artifactory.jfConnectToken .Values.artifactory.jfConnectTokenSecretName }}
+        - name: ARTIFACTORY_JFCONNECT_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: {{ include "artifactory-ha.jfConnectTokenSecretName" . }}
+              key: jfconnect-token
+        {{- end }}        
         {{- if or .Values.artifactory.masterKey .Values.global.masterKey .Values.artifactory.masterKeySecretName .Values.global.masterKeySecretName }}
         - name: ARTIFACTORY_MASTER_KEY
           valueFrom:
@@ -689,7 +701,6 @@ spec:
 {{ toYaml .Values.filebeat.readinessProbe | indent 10 }}
         resources:
 {{ toYaml .Values.filebeat.resources | indent 10 }}
-        terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
       {{- end }}
     {{- if or .Values.artifactory.customSidecarContainers .Values.global.customSidecarContainers }}
 {{ tpl (include "artifactory-ha.customSidecarContainers" .) . | indent 6 }}

diff --git a/stable/artifactory-ha/templates/artifactory-secrets.yaml b/stable/artifactory-ha/templates/artifactory-secrets.yaml
@@ -19,3 +19,8 @@ data:
   join-key: {{ include "artifactory-ha.joinKey" . | b64enc | quote }}
   {{- end }}
   {{- end }}
+  {{- if .Values.artifactory.jfConnectToken  }}
+  {{- if not (.Values.artifactory.jfConnectTokenSecretName) }}
+  jfconnect-token: {{ include "artifactory-ha.jfConnectToken" . | b64enc | quote }}
+  {{- end }}
+  {{- end }}
diff --git a/stable/artifactory-ha/templates/artifactory-service.yaml b/stable/artifactory-ha/templates/artifactory-service.yaml
@@ -44,6 +44,9 @@ spec:
   {{- if .enabled }}
   - port: {{ .port }}
     targetPort: {{ .port }}
+  {{- if .Values.artifactory.service.nodePort }}
+    nodePort: {{ .Values.artifactory.service.nodePort }}
+  {{- end }}
     protocol: TCP
     name: tcp-jmx
   {{- end }}

diff --git a/stable/artifactory-ha/templates/logger-configmap.yaml b/stable/artifactory-ha/templates/logger-configmap.yaml
@@ -26,12 +26,12 @@ data:
     LOG_PREFIX=$(echo ${LOG_NAME} | sed 's/.log$//g')
 
     # Find the log to tail
-    LOG_FILE=$(ls -1t ./${LOG_PREFIX}*.log 2>/dev/null | head -1)
+    LOG_FILE=$(ls -1t ./${LOG_PREFIX}.log 2>/dev/null)
 
     # Wait for the log file
     while [ -z "${LOG_FILE}" ]; do
       sleep 1
-      LOG_FILE=$(ls -1t ./${LOG_PREFIX}*.log 2>/dev/null | head -1)
+      LOG_FILE=$(ls -1t ./${LOG_PREFIX}.log 2>/dev/null)
     done
 
     echo "Log file ${LOG_FILE} is ready!"

diff --git a/stable/artifactory-ha/templates/nginx-service.yaml b/stable/artifactory-ha/templates/nginx-service.yaml
@@ -40,6 +40,9 @@ spec:
   {{- if .Values.nginx.http.enabled }}
   - port: {{ .Values.nginx.http.externalPort }}
     targetPort: {{ .Values.nginx.http.internalPort }}
+    {{- if .Values.nginx.service.nodePort }}
+    nodePort: {{ .Values.nginx.service.nodePort }}
+    {{- end }}
     protocol: TCP
     name: http
   {{- end }}
@@ -57,6 +60,9 @@ spec:
     {{- else }}
     targetPort: {{ .Values.nginx.https.internalPort}}
     {{- end }}
+    {{- if .Values.nginx.service.nodePort }}
+    nodePort: {{ .Values.nginx.service.nodePort }}
+    {{- end }}
     protocol: TCP
     name: https
   {{- end }}

diff --git a/stable/artifactory-ha/values.yaml b/stable/artifactory-ha/values.yaml
@@ -39,7 +39,7 @@ global:
 ##
 # fullnameOverride:
 
-initContainerImage: releases-docker.jfrog.io/alpine:3.13.5
+initContainerImage: releases-docker.jfrog.io/alpine:3.14.0
 
 installer:
   type:
@@ -253,6 +253,18 @@ artifactory:
   # Refer - https://www.jfrog.com/confluence/display/JFROG/Open+Metrics
   openMetrics:
     enabled: false
+    ## Settings for pushing metrics to Insight - enable filebeat to true
+    filebeat:
+      enabled: false
+      log:
+        enabled: false
+        ## Log level for filebeat. Possible values: debug, info, warning, or error.
+        level: "info"
+      ## Elasticsearch details for filebeat to connect
+      elasticsearch:
+        url: "Elasticsearch url where JFrog Mission Control is installed For example, http://<ip_address>:8082"
+        username: ""
+        password: ""
 
   # This directory is intended for use with NFS eventual configuration for HA
   haDataDir:
@@ -432,6 +444,11 @@ artifactory:
   ## Alternatively, you can use a pre-existing secret with a key called join-key by specifying joinKeySecretName
   # joinKeySecretName:
 
+  ## Registration Token for JFConnect
+  # jfConnectToken:
+  ## Alternatively, you can use a pre-existing secret with a key called jfconnect-token by specifying jfConnectTokenSecretName
+  # jfConnectTokenSecretName:
+
   # Add custom secrets - secret per file
   customSecrets:
   #  - name: custom-secret
@@ -521,6 +538,13 @@ artifactory:
   # TODO: Fix javaOpts for member nodes (currently uses primary settings for all nodes)
   systemYaml: |
     shared:
+    {{- if  .Values.artifactory.openMetrics.enabled }}
+      metrics:
+        enabled: true
+      {{- if .Values.artifactory.openMetrics.filebeat.enabled }}
+        filebeat: {{ toYaml .Values.artifactory.openMetrics.filebeat | nindent 6 }}
+      {{- end }}
+    {{- end }}
       logging:
         consoleLog:
           enabled: {{ .Values.artifactory.consoleLog }}
@@ -568,10 +592,6 @@ artifactory:
         driver: "{{ .Values.database.driver }}"
       {{- end }}
     artifactory:
-    {{- if .Values.artifactory.openMetrics }}
-      metrics:
-        enabled: {{ .Values.artifactory.openMetrics.enabled }}
-    {{- end }}
     {{- if or .Values.artifactory.haDataDir.enabled .Values.artifactory.haBackupDir.enabled }}
       node:
       {{- if .Values.artifactory.haDataDir.path }}
@@ -651,7 +671,7 @@ artifactory:
     enabled: true
     path: /router/api/v1/system/health
     initialDelaySeconds: 30
-    failureThreshold: 60
+    failureThreshold: 90
     periodSeconds: 5
     timeoutSeconds: 5
 
@@ -1165,6 +1185,8 @@ artifactory:
     ## members
     ## all
     pool: members
+    ## If the type is NodePort you can set a fixed port
+    # nodePort: 32082
 
   ## The following Java options are passed to the java process running Artifactory.
   ## This will be passed to all cluster members. Primary and member nodes.
@@ -1561,6 +1583,8 @@ nginx:
     externalTrafficPolicy: Cluster
     labels: {}
     #  label-key: label-value
+    ## If the type is NodePort you can set a fixed port
+    # nodePort: 32082
   http:
     enabled: true
     externalPort: 80
@@ -1602,7 +1626,7 @@ nginx:
     enabled: true
     path: /router/api/v1/system/health
     initialDelaySeconds: 30
-    failureThreshold: 60
+    failureThreshold: 90
     periodSeconds: 5
     timeoutSeconds: 5
 

diff --git a/stable/artifactory-jcr/CHANGELOG.md b/stable/artifactory-jcr/CHANGELOG.md
@@ -1,6 +1,9 @@
 # JFrog Container Registry Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [107.23.3] - Aug 5, 2021
+* Bumping chart version to align with app version
+
 ## [107.21.12] - July 28, 2021
 * Bumping chart version to align with app version
 

diff --git a/stable/artifactory-jcr/Chart.lock b/stable/artifactory-jcr/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: artifactory
   repository: https://charts.jfrog.io/
-  version: 107.21.12
-digest: sha256:0c59f0117227fe02013f08e424d92a94afbb0261c8cf54539a6f5f4c17ff5d9e
-generated: "2021-07-28T15:20:06.959852+05:30"
+  version: 107.23.3
+digest: sha256:f9434bf2d43933f5a7faba2cf89bcfa51d01396d09ac9ccbd440abc7b42ae4cd
+generated: "2021-08-05T19:36:58.842618+05:30"