[pdn-node] 1.8.4 release

jfrog · Jul 6, 2023 · 44f20f0 · 44f20f0
1 parent ae5a56b
commit 44f20f0
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 36 deletions.
diff --git a/stable/pdn-node/CHANGELOG.md b/stable/pdn-node/CHANGELOG.md
@@ -1,6 +1,10 @@
 # JFrog PDN Node Chart Changelog
 All changes to this chart will be documented in this file
 
+## [101.8.4] - Jun 21, 2023
+* Bump PDN node version
+* 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-node/Chart.yaml b/stable/pdn-node/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-node
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 101.7.6
+version: 101.8.4
diff --git a/stable/pdn-node/templates/servicemonitor.yaml b/stable/pdn-node/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-node.fullname" . }}
+  name: {{ include "pdn-node.name" . }}-metrics-service
   namespace: {{ .Values.serviceMonitor.kubePromFullName }}
   labels:
     app: {{ .Values.serviceMonitor.kubePromApp }}
@@ -12,21 +12,20 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
-  jobLabel: pdnnode-metrics
+  jobLabel: {{ .Values.serviceMonitor.jobLabel }}
   endpoints:
     - path: /api/v1/metrics
       honorLabels: true
       honorTimestamps: false
       interval: {{ .Values.serviceMonitor.interval }}
       scheme: http
       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: pdnnode
+{{ toYaml .Values.serviceMonitor.selector | indent 4 }}
 {{- end }}
diff --git a/stable/pdn-node/templates/statefulset.yaml b/stable/pdn-node/templates/statefulset.yaml
@@ -174,8 +174,6 @@ spec:
               containerPort: 8088
             - name: http-server
               containerPort: 8089
-            - name: bouncer-server
-              containerPort: 8090
           volumeMounts:
             - name: data
               mountPath: {{ .Values.persistence.mountPath }}

diff --git a/stable/pdn-node/templates/svc.yaml b/stable/pdn-node/templates/svc.yaml
@@ -39,9 +39,6 @@ spec:
     - name: http-server
       port: 8089
       targetPort: http-server
-    - name: bouncer-server
-      port: 8090
-      targetPort: bouncer-server
     {{- if .Values.service.extraPorts }}
     {{- include "common.tplvalues.render" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }}
     {{- end }}

diff --git a/stable/pdn-node/values.yaml b/stable/pdn-node/values.yaml
@@ -70,7 +70,6 @@ diskSize: 64Gi
 ## Ref: https://www.jfrog.com/confluence/display/JFROG/Advanced+Private+Distribution+Network+%28PDN%29+Configurations
 systemYaml: |
   pdnNode:
-    disableBouncer: true
     disableBasicAuth: true
     http: true
     logLevel: info
@@ -557,26 +556,15 @@ nginx:
     tag: 1.23.2-debian-11-r2
   containerPorts:
     http: 8089
-  extraContainerPorts:
-    - name: bouncer-backend
-      containerPort: 8090
   service:
     loadBalancerSourceRanges: []
     ports:
       http: 8089
-    extraPorts:
-      - name: bouncer-backend
-        targetPort: 8090
-        port: 8090
   serverBlock: |-
     upstream backend {
         server pdn-node:8089;
     }
 
-    upstream bouncer-backend {
-        server pdn-node:8090;
-    }
-
     server {
         server_name _;
         listen 0.0.0.0:8089 default_server;
@@ -585,15 +573,6 @@ nginx:
             proxy_pass http://backend;
         }
     }
-
-    server {
-        server_name _;
-        listen 0.0.0.0:8090 default_server;
-
-        location / {
-            proxy_pass http://bouncer-backend;
-        }
-    }
 ## Allows to add additional kubernetes resources
 ## Use --- as a separator between multiple resources
 ## For an example, refer - https://github.com/jfrog/log-analytics-prometheus/blob/master/helm/artifactory-values.yaml
@@ -682,10 +661,14 @@ topologySpreadConstraints: []
 serviceMonitor:
   enabled: false
   interval: 30s
-  port: 8089
+  jobLabel: pdnnode-metrics
+  port: http-server
   targetPort: 8089
   scrapeTimeout: 15s
   kubePromApp: ""
   kubePromFullName: ""
   namespaceSelector:
     any: true
+  selector:
+    matchLabels:
+      app: pdnnode