[insight] 1.12.0 release

stable/insight/CHANGELOG.md

@@ -1,11 +1,20 @@
 # JFrog Insights Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [101.11.5] - May 30, 2022
+## [101.12.0] - Aug 25, 2022
+* Use an alternate command for `find` to copy custom certificates
+* Updated router version to `7.45.0`
+* Added `.Values.insightServer.openMetrics.enabled` flag to enable metrics (defaults to `false`)
+* Added flag `insightServer.schedulerName` to set for the pods the value of schedulerName field [GH-1606](https://github.com/jfrog/charts/issues/1606)
+* Added support for lifecycle hooks for all containers
+* Updated initContainerImage and logger Image to `ubi8/ubi-minimal:8.6-902`
+
+## [101.11.0] - Aug 25, 2022
 * Added new flag `unifiedSecretInstallation` to enables single unified secret holding all the insight secrets
 * Updated router version to `7.38.0`
 * Fixed duplicate entry of `initialDelaySeconds` [GH-1622](https://github.com/jfrog/charts/issues/1622)
 * Update elasticsearch version to `7.17.1`
+* Added support to truncate (> 63 chars) for unifiedCustomSecretVolumeName
 
 ## [101.9.0] - Apr 14, 2022
 * Updated router version to `7.36.1`

stable/insight/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.11.5
+appVersion: 1.12.0
 dependencies:
 - condition: postgresql.enabled
   name: postgresql
@@ -19,4 +19,4 @@ name: insight
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 101.11.5
+version: 101.12.0

stable/insight/README.md

@@ -19,7 +19,7 @@ This chart will do the following:
 - Default StorageClass set to allow services using the default StorageClass for persistent storage
 - A running Artifactory Enterprise
 - [Kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) installed and setup to use the cluster
-- [Helm](https://helm.sh/) installed and setup to use the cluster (helm init)
+- [Helm](https://helm.sh/) v3 installed
 
 ### Install Chart
 

stable/insight/ci/test-values.yaml

@@ -5,6 +5,8 @@ unifiedUpgradeAllowed: true
 databaseUpgradeReady: true
 insightServer:
   jfrogUrl: http://artifactory.rt:8082
+  openMetrics:
+    enabled: true
   extraEnvironmentVariables:
   - name: JF_INSIGHT_SERVER_EXTRAJAVAOPTS
     value: '-Xms2g -Xmx3g -server -XX:+UseG1GC -Dfile.encoding=UTF8'
@@ -20,6 +22,14 @@ insightServer:
     limits:
       memory: "2Gi"
       cpu: "1"
+  # Add lifecycle hooks for insightServer container
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the insightServer postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the insightServer postStart handler >> /tmp/message"]
   javaOpts:
     xms: "512m"
     xmx: "2g"
@@ -37,6 +47,14 @@ insightScheduler:
     limits:
       memory: "2Gi"
       cpu: "1"
+  # Add lifecycle hooks for insightScheduler container
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the insightScheduler postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the insightScheduler postStart handler >> /tmp/message"]
   javaOpts:
     xms: "512m"
     xmx: "2g"
@@ -49,6 +67,14 @@ router:
     limits:
       memory: "1Gi"
       cpu: "1"
+  # Add lifecycle hooks for router container
+  lifecycle:
+    postStart:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the router postStart handler >> /tmp/message"]
+    preStop:
+      exec:
+        command: ["/bin/sh", "-c", "echo Hello from the router postStart handler >> /tmp/message"]
 
 postgresql:
   image:

stable/insight/templates/_helpers.tpl

@@ -245,8 +245,8 @@ Custom certificate copy command
 {{- define "insight-server.copyCustomCerts" -}}
 echo "Copy custom certificates to {{ .Values.insightServer.persistence.mountPath }}/etc/security/keys/trusted";
 mkdir -p {{ .Values.insightServer.persistence.mountPath }}/etc/security/keys/trusted;
-find /tmp/certs -type f -not -name "*.key" -exec cp -v {} {{ .Values.insightServer.persistence.mountPath }}/etc/security/keys/trusted \;;
-find {{ .Values.insightServer.persistence.mountPath }}/etc/security/keys/trusted/ -type f -name "tls.crt" -exec mv -v {} {{ .Values.insightServer.persistence.mountPath }}/etc/security/keys/trusted/ca.crt \;;
+for file in $(ls -1 /tmp/certs/* | grep -v .key | grep -v ":" | grep -v grep); do if [ -f "${file}" ]; then cp -v ${file} {{ .Values.insightServer.persistence.mountPath }}/etc/security/keys/trusted; fi done;
+if [ -f {{ .Values.insightServer.persistence.mountPath }}/etc/security/keys/trusted/tls.crt ]; then mv -v {{ .Values.insightServer.persistence.mountPath }}/etc/security/keys/trusted/tls.crt {{ .Values.insightServer.persistence.mountPath }}/etc/security/keys/trusted/ca.crt; fi;
 {{- end -}}
 
 {{/*
@@ -320,7 +320,7 @@ nodeSelector:
 Resolve unifiedCustomSecretVolumeName value
 */}}
 {{- define "insight.unifiedCustomSecretVolumeName" -}}
-{{- printf "%s-%s" (include "insight.name" .) ("unified-secret-volume") -}}
+{{- printf "%s-%s" (include "insight.name" .) ("unified-secret-volume") | trunc 63 -}}
 {{- end -}}
 
 {{/*

stable/insight/templates/insight-statefulset.yaml

@@ -47,6 +47,9 @@ spec:
         {{ $key }}: {{ $value | quote }}
       {{- end }}
     spec:
+    {{- if .Values.insightServer.schedulerName }}
+      schedulerName: {{ .Values.insightServer.schedulerName | quote }}
+    {{- end }}
     {{- if .Values.insightServer.priorityClass.existingPriorityClass }}
       priorityClassName: {{ .Values.insightServer.priorityClass.existingPriorityClass }}
     {{- else -}}
@@ -361,6 +364,10 @@ spec:
         - '-c'
         - >
           exec /opt/jfrog/router/app/bin/entrypoint-router.sh;
+        {{- with .Values.router.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
         env:
         - name: JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES
           value: {{ include "insight.router.requiredServiceTypes" . }}
@@ -396,6 +403,10 @@ spec:
           capabilities:
             drop:
               - NET_RAW
+        {{- with .Values.insightServer.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
         command:
         - '/bin/bash'
         - '-c'
@@ -518,6 +529,10 @@ spec:
           capabilities:
             drop:
               - NET_RAW
+        {{- with .Values.insightScheduler.lifecycle }}
+        lifecycle:
+{{ toYaml . | indent 10 }}
+        {{- end }}
         env:
         {{- if or .Values.database.secrets.user .Values.database.user }}
         - name: JF_SHARED_DATABASE_USERNAME

stable/insight/values.yaml

@@ -43,7 +43,7 @@ global:
 ## Fully override insight.fullname template
 # fullnameOverride:
 
-initContainerImage: releases-docker.jfrog.io/jfrog/ubi-minimal:8.5-204
+initContainerImage: releases-docker.jfrog.io/ubi8/ubi-minimal:8.6-902
 
 # For supporting pulling from private registries
 imagePullSecrets:
@@ -408,8 +408,8 @@ podRestartTime:
 logger:
   image:
     registry: releases-docker.jfrog.io
-    repository: jfrog/ubi-minimal
-    tag: 8.5-204
+    repository: ubi8/ubi-minimal
+    tag: 8.6-902
 
 insightServer:
   name: insight-server
@@ -422,6 +422,9 @@ insightServer:
   # unifiedSecretInstallation flag enables single unified secret holding all the insight-server secrets
   unifiedSecretInstallation: false
 
+  ## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
+  schedulerName:
+
   # Create a priority class for the Insight pod or use an existing one
   # NOTE - Maximum allowed value of a user defined priority is 1000000000
   priorityClass:
@@ -444,6 +447,15 @@ insightServer:
   labels: {}
   annotations: {}
 
+  # Add lifecycle hooks for the insight pods
+  lifecycle: {}
+    # postStart:
+    #   exec:
+    #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"]
+    # preStop:
+    #   exec:
+    #     command: ["/bin/sh", "-c", "echo Hello from the preStart handler > /usr/share/message"]
+
   # env:
 
   # Set this to true if you want to override credentials in insight-server.properties on startup
@@ -496,6 +508,23 @@ insightServer:
   osType: "NA"
   osDist: "NA"
 
+  # To enable set `.Values.insightServer.openMetrics.enabled` to `true`
+  # 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 Insight is installed For example, http://<ip_address>:8082"
+        username: ""
+        password: ""
+
   systemYaml: |
     router:
       serviceRegistry:
@@ -506,6 +535,13 @@ insightServer:
         version: {{ .Values.elasticsearch.image.tag }}
     {{- end}}
     shared:
+    {{- if .Values.insightServer.openMetrics.enabled }}
+      metrics:
+        enabled: true
+      {{- if .Values.insightServer.openMetrics.filebeat.enabled }}
+        filebeat: {{ toYaml .Values.insightServer.openMetrics.filebeat | nindent 6 }}
+      {{- end }}
+    {{- end }}
       logging:
         consoleLog:
           enabled: {{ .Values.insightServer.consoleLog }}
@@ -645,6 +681,15 @@ insightScheduler:
   #    memory: "1.5Gi"
   #    cpu: "1"
 
+  # Add lifecycle hooks for the insightScheduler pod
+  lifecycle: {}
+    # postStart:
+    #   exec:
+    #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"]
+    # preStop:
+    #   exec:
+    #     command: ["/bin/sh", "-c", "echo Hello from the preStart handler > /usr/share/message"]
+
   # Persistence for the logs
   persistence:
     enabled: false
@@ -717,7 +762,7 @@ router:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/router
-    tag: 7.38.0
+    tag: 7.45.0
     imagePullPolicy: IfNotPresent
   serviceRegistry:
     ## Service registry (Access) TLS verification skipped if enabled
@@ -733,6 +778,15 @@ router:
   #    memory: "1Gi"
   #    cpu: "1"
 
+  # Add lifecycle hooks for the router pod
+  lifecycle: {}
+    # postStart:
+    #   exec:
+    #     command: ["/bin/sh", "-c", "echo Hello from the postStart handler > /usr/share/message"]
+    # preStop:
+    #   exec:
+    #     command: ["/bin/sh", "-c", "echo Hello from the preStart handler > /usr/share/message"]
+
   livenessProbe:
     enabled: true
     config: |