Merge pull request #1760 from jfrog/pdn-server-release-1.7.3

[pdn-server] 1.7.3 release
jfrog · May 16, 2023 · ab6bdfb · ab6bdfb
2 parents 89a5a49 + 0637147
commit ab6bdfb
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 91 deletions.
diff --git a/stable/pdn-server/CHANGELOG.md b/stable/pdn-server/CHANGELOG.md
@@ -1,7 +1,16 @@
 # JFrog PDN Server Chart Changelog
 All changes to this chart will be documented in this file.
 
-## [101.6.2] - Mar 06, 2023
+## [101.7.3] - May 09, 2023
+* Added checksum annotation to pod to auto-restart upon change to system.yaml
+* Fixed HPA template issue
+
+## [101.7.2] - May 07, 2023
+* Upgraded common chart dependency up to 0.0.6
+* Updated initContainerImage `ubi9/ubi-minimal:9.1.0.1829`
+* Fixed network policy template issue
+
+## [101.6.4] - Mar 06, 2023
 * Updated initContainerImage `ubi9/ubi-minimal:9.1.0.1793`
 * Removed unused global values
 * Added `logLevel` option to systemYaml.pdnServer

diff --git a/stable/pdn-server/Chart.lock b/stable/pdn-server/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: jfrog-common
   repository: https://charts.jfrog.io/
-  version: 0.0.5
+  version: 0.0.6
 - name: nginx
   repository: https://charts.jfrog.io/
   version: 13.2.13
-digest: sha256:17f094c80e9db4be374377fca372e52cd84fa4d45d6c2474eed48e9a9a051bbe
-generated: "2023-02-09T18:19:29.166636+02:00"
+digest: sha256:e66497241d7d5eaefd6561077d1e18aaa82644184ab29d5a817a273ff04a97f0
+generated: "2023-05-06T22:58:29.56475+03:00"
diff --git a/stable/pdn-server/Chart.yaml b/stable/pdn-server/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 1.6.2
+appVersion: 1.7.3
 dependencies:
 - name: jfrog-common
   repository: https://charts.jfrog.io/
-  version: 0.0.5
+  version: 0.0.6
 - condition: nginx.enabled
   name: nginx
   repository: https://charts.jfrog.io/
@@ -24,4 +24,4 @@ name: pdn-server
 sources:
 - https://github.com/jfrog/charts
 type: application
-version: 101.6.2
+version: 101.7.3
diff --git a/stable/pdn-server/templates/deployment.yaml b/stable/pdn-server/templates/deployment.yaml
@@ -11,7 +11,9 @@ metadata:
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
+  {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
+  {{- end }}
   selector:
     matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
   template:
@@ -21,6 +23,7 @@ spec:
         {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }}
         {{- end }}
       annotations:
+        systemYaml/checksum: {{ include (print $.Template.BasePath "/system-yaml.yaml") . | sha256sum }}
         {{- if .Values.commonAnnotations }}
         {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }}
         {{- end }}
@@ -173,9 +176,7 @@ spec:
           command:
             - '/bin/bash'
             - '-c'
-            - |-
-              exec /opt/jfrog/pdnserver/app/pdnserver/bin/pdnserver.sh;
-              exec /opt/jfrog/router/app/bin/entrypoint-router.sh
+            - exec /opt/jfrog/pdnserver/app/pdnserver/bin/pdnserver.sh
           env:
             - name: JF_SHARED_NODE_ID
               valueFrom:

diff --git a/stable/pdn-server/templates/hpa.yaml b/stable/pdn-server/templates/hpa.yaml
@@ -15,7 +15,7 @@ metadata:
 spec:
   scaleTargetRef:
     apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }}
-    kind: StatefulSet
+    kind: Deployment
     name: {{ include "pdn-server.fullname" . }}
   minReplicas: {{ .Values.autoscaling.minReplicas }}
   maxReplicas: {{ .Values.autoscaling.maxReplicas }}

diff --git a/stable/pdn-server/templates/ingress.yaml b/stable/pdn-server/templates/ingress.yaml
@@ -2,26 +2,25 @@
 apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
-  name: {{ include "pdn-server.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  name: {{ template "common.names.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if or .Values.ingress.annotations .Values.commonAnnotations }}
   annotations:
-    {{- if .Values.ingress.certManager }}
-    kubernetes.io/tls-acme: "true"
+    {{- if .Values.ingress.annotations }}
+    {{- include "common.tplvalues.render" ( dict "value" .Values.ingress.annotations "context" $) | nindent 4 }}
     {{- end }}
     {{- if .Values.commonAnnotations }}
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
     {{- end }}
-    {{- if .Values.ingress.annotations }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.ingress.annotations "context" $) | nindent 4 }}
-    {{- end }}
+  {{- end }}
 spec:
   {{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
   {{- end }}
   rules:
     {{- if .Values.ingress.hostname }}
-    - host: {{ include "common.tplvalues.render" ( dict "value" .Values.ingress.hostname "context" $ ) }}
+    - host: {{ .Values.ingress.hostname }}
       http:
         paths:
           {{- if .Values.ingress.extraPaths }}
@@ -31,17 +30,17 @@ spec:
             {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
             pathType: {{ .Values.ingress.pathType }}
             {{- end }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" .Values.service.managerPortName "context" $)  | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "secure-grpc" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
-    - host: {{ include "common.tplvalues.render" ( dict "value" .name "context" $ ) }}
+    - host: {{ .name | quote }}
       http:
         paths:
           - path: {{ default "/" .path }}
             {{- if eq "true" (include "common.ingress.supportsPathType" $) }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
             {{- end }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" .Values.service.managerPortName "context" $) | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "secure-grpc" "context" $) | nindent 14 }}
     {{- end }}
     {{- if .Values.ingress.extraRules }}
     {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraRules "context" $) | nindent 4 }}

diff --git a/stable/pdn-server/templates/networkpolicy.yaml b/stable/pdn-server/templates/networkpolicy.yaml
@@ -1,33 +1,34 @@
-{{- range .Values.networkPolicy }}
-apiVersion: networking.k8s.io/v1
+{{- if .Values.networkPolicy.enabled }}
 kind: NetworkPolicy
+apiVersion: networking.k8s.io/v1
 metadata:
-  name: {{ template "pdn-server.fullname" $ }}
-  labels:
-    app: {{ template "pdn-server.name" $ }}
-    chart: {{ template "pdn-server.chart" $ }}
-    release: {{ $.Release.Name }}
-    heritage: {{ $.Release.Service }}
+  name: {{ include "pdn-server.fullname" . }}
+  namespace: {{ .Release.Namespace | quote }}
+  labels: {{- include "common.labels.standard" . | nindent 4 }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
+  {{- end }}
 spec:
-{{- if .podSelector }}
   podSelector:
-{{ .podSelector | toYaml | trimSuffix "\n" | indent 4 -}}
-{{ else }}
-  podSelector: {}
-{{- end }}
-  policyTypes:
-  {{- if .ingress }}
-  - Ingress
-  {{- end }}
-  {{- if .egress }}
-  - Egress
-  {{- end }}
-{{- if .ingress }}
+    matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
   ingress:
-{{ .ingress | toYaml | trimSuffix "\n" | indent 2 -}}
-{{- end }}
-{{- if .egress }}
-  egress:
-{{ .egress | toYaml | trimSuffix "\n" | indent 2 -}}
+    {{- if not .Values.networkPolicy.allowExternal }}
+    - ports:
+      - port: 8082
+        protocol: TCP
+      - port: 8093
+        protocol: TCP
+      - port: 8095
+        protocol: TCP
+      from:
+        - podSelector:
+            matchLabels:
+              {{ template "pdn-server.fullname" . }}-client: "true"
+        - podSelector:
+            matchLabels:
+              {{- include "common.labels.matchLabels" . | nindent 14 }}
+        {{- if .Values.networkPolicy.additionalRules }}
+        {{- include "common.tplvalues.render" (dict "value" .Values.networkPolicy.additionalRules "context" $) | nindent 8 }}
+        {{- end }}
+      {{- end }}
 {{- end }}
-{{- end -}}