Merge pull request #1786 from jfrog/pdn-server-release-1.8.4

[pdn-server] 1.8.4 release
jfrog · Jul 10, 2023 · 9e2acba · 9e2acba
2 parents bbc9980 + 8abe9e6
commit 9e2acba
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 18 deletions.
diff --git a/stable/pdn-server/CHANGELOG.md b/stable/pdn-server/CHANGELOG.md
@@ -1,6 +1,12 @@
 # JFrog PDN Server Chart Changelog
 All changes to this chart will be documented in this file.
 
+## [101.8.4] - Jun 21, 2023
+* Request metrics via router
+* Aligned router port name
+* Aligned serviceMonitor scheme
+* Bump router version to 7.67.0
+
 ## [101.7.6] - May 25, 2023
 * Updated base image `ubi9/ubi-micro:9.2.5`
 * Updated initContainerImage `ubi9/ubi-minimal:9.2.484`

diff --git a/stable/pdn-server/Chart.yaml b/stable/pdn-server/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.7.6
+appVersion: 1.8.4
 dependencies:
 - name: jfrog-common
   repository: https://charts.jfrog.io/
@@ -24,4 +24,4 @@ name: pdn-server
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 101.7.6
+version: 101.8.4
diff --git a/stable/pdn-server/templates/deployment.yaml b/stable/pdn-server/templates/deployment.yaml
@@ -294,7 +294,7 @@ spec:
 {{ tpl (toYaml .) $ | indent 12 }}
 {{- end }}
           ports:
-            - name: http
+            - name: http-router
               containerPort: 8082
           volumeMounts:
             - name: data

diff --git a/stable/pdn-server/templates/servicemonitor.yaml b/stable/pdn-server/templates/servicemonitor.yaml
@@ -1,8 +1,8 @@
-{{- if and .Values.serviceMonitor.enabled }}
+{{- if .Values.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  name: {{ include "pdn-server.fullname" . }}
+  name: {{ include "pdn-server.name" . }}-metrics-service
   namespace: {{ .Values.serviceMonitor.kubePromFullName }}
   labels:
     app: {{ .Values.serviceMonitor.kubePromApp }}
@@ -12,24 +12,23 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: pdnserver-metrics
+  jobLabel: {{ .Values.serviceMonitor.jobLabel }}
   endpoints:
-    - path: /api/v1/metrics
+    - path: /pdnserver/api/v1/metrics
       bearerTokenSecret:
         key: token
         name: {{ .Values.serviceMonitor.tokenName }}
       honorLabels: true
       honorTimestamps: false
       interval: {{ .Values.serviceMonitor.interval }}
-      scheme: http
+      scheme: {{ include "pdn-server.scheme" . }}
       scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
-      port: {{ .Values.serviceMonitor.port | quote }}
-      targetPort: {{ .Values.serviceMonitor.targetPort | quote }}
+      port: {{ .Values.serviceMonitor.port }}
+      targetPort: {{ .Values.serviceMonitor.targetPort }}
       tlsConfig:
         insecureSkipVerify: true
   namespaceSelector:
 {{ toYaml .Values.serviceMonitor.namespaceSelector | indent 4 }}
   selector:
-    matchLabels:
-      application: pdnserver
+{{ toYaml .Values.serviceMonitor.selector | indent 4 }}
 {{- end }}
diff --git a/stable/pdn-server/templates/svc.yaml b/stable/pdn-server/templates/svc.yaml
@@ -22,12 +22,12 @@ spec:
     - name: http-router
       port: 8082
       targetPort: http-router
-    - name: secure-grpc
-      port: 8095
-      targetPort: secure-grpc
     - name: insecure-grpc
       port: 8093
       targetPort: insecure-grpc
+    - name: secure-grpc
+      port: 8095
+      targetPort: secure-grpc
     {{- if .Values.service.extraPorts }}
     {{- include "common.tplvalues.render" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }}
     {{- end }}

diff --git a/stable/pdn-server/values.yaml b/stable/pdn-server/values.yaml
@@ -66,6 +66,8 @@ joinKeySecretName: ""
 ## If not specified or empty value, a random join key will be generated
 ## upon PDN Server startup. You can copy the key from JFrog UI under
 # Admin -> User Management -> Settings -> PDN Access Token -> Join Key
+## You can generate one with the command: "openssl rand -hex 16"
+## The PDN join key must be 16 bytes in length (a 32 characters long hexadecimal value)
 pdnJoinKey: "aa34bd4dc7902a65f14900fc47ec6b5a"
 ## Alternatively, you can use a pre-existing secret with a key
 ## called "pdn-join-key" by specifying "pdnJoinKeySecretName"
@@ -478,7 +480,7 @@ router:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/router
-    tag: 7.56.0
+    tag: 7.67.0
     pullPolicy: IfNotPresent
   serviceRegistry:
     insecure: false
@@ -955,11 +957,15 @@ topologySpreadConstraints: []
 serviceMonitor:
   enabled: false
   interval: 30s
-  port: 8092
-  targetPort: 8092
+  jobLabel: pdnserver-metrics
+  port: http-router
+  targetPort: 8082
   scrapeTimeout: 15s
   tokenName: ""
   kubePromApp: ""
   kubePromFullName: ""
   namespaceSelector:
     any: true
+  selector:
+    matchLabels:
+      app: pdnserver