[worker] 1.133.0 release

Author: vitaliil-jfrog

stable/worker/CHANGELOG.md

@@ -1,6 +1,13 @@
 # JFrog Worker Chart Changelog
 All changes to this chart will be documented in this file
 
+## [101.133.0] - Feb 24, 2025
+* Update required services in router configuration
+* Use shared.jfrogUrl instead of deprecated router.serviceRegistryUrl and router.serviceRegistry.grpcAddress
+
+## [101.126.0] - Feb 14, 2025
+* Change scheme in default router probes
+
 ## [101.118.0] - Nov 12, 2024
 * Add startup probe for worker container
 

stable/worker/Chart.yaml

@@ -1,10 +1,10 @@
 apiVersion: v2
-appVersion: 1.118.0
+appVersion: 1.133.0
 dependencies:
 - name: jfrog-common
   repository: https://charts.jfrog.io/
   version: 0.0.8
 description: A Helm chart for Kubernetes
 name: worker
 type: application
-version: 101.118.0
+version: 101.133.0

stable/worker/ci/test-values.yaml

@@ -197,8 +197,6 @@ router:
   serviceRegistry:
     ## Service registry (Access) TLS verification skipped if enabled
     insecure: true
-    url: http://tenant1-artifactory:8082
-    grpcUrl: tenant1-artifactory:8082
   internalPort: 8046
   externalPort: 8082
   tlsEnabled: false
@@ -230,7 +228,7 @@ router:
         command:
           - sh
           - -c
-          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "worker.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/liveness
+          - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/liveness
       initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}90{{ else }}0{{ end }}
       periodSeconds: 5
       timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
@@ -243,7 +241,7 @@ router:
   #       command:
   #         - sh
   #         - -c
-  #         - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "worker.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
+  #         - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
   #     initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}60{{ else }}0{{ end }}
   #     periodSeconds: 5
   #     timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
@@ -256,7 +254,7 @@ router:
   #       command:
   #         - sh
   #         - -c
-  #         - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "worker.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
+  #         - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
   #     initialDelaySeconds: 0
   #     failureThreshold: 60
   #     periodSeconds: 5

stable/worker/templates/_helpers.tpl

@@ -236,3 +236,14 @@ Calculate the systemYaml from the unstructured text input
 {{- define "worker.systemYaml" -}}
 {{ include (print $.Template.BasePath "/_system-yaml-render.tpl") . }}
 {{- end -}}
+
+{{/*
+Resolve worker requiredServiceTypes value
+*/}}
+{{- define "worker.router.requiredServiceTypes" -}}
+{{- $requiredTypes := "jfwks" -}}
+{{- if .Values.observability.enabled -}}
+  {{- $requiredTypes = printf "%s,%s" $requiredTypes "jfob" -}}
+{{- end -}}
+{{- $requiredTypes -}}
+{{- end -}}

stable/worker/templates/deployment.yaml

@@ -204,11 +204,9 @@ spec:
           {{- end }}
           env:
             - name: JF_ROUTER_TOPOLOGY_LOCAL_REQUIREDSERVICETYPES
-              value: ""
-            - name: JF_ROUTER_SERVICEREGISTRY_URL
-              value: "{{ default (tpl (required "\n\njfrogUrl or global.jfrogUrl is required! This allows to connect to Artifactory.\nYou can copy the JFrog URL from Administration > User Management > Settings > Connection details" (include "worker.jfrogUrl" .)) .) .Values.router.serviceRegistry.url }}/access"
-            - name: JF_ROUTER_SERVICEREGISTRY_GRPCADDRESS
-              value: "{{ default (include "worker.jfrogUrlHost" .) .Values.router.serviceRegistry.grpcUrl }}"
+              value: {{ include "worker.router.requiredServiceTypes" . }}
+            - name: JF_SHARED_JFROGURL
+              value: "{{ tpl (required "\n\njfrogUrl or global.jfrogUrl is required! This allows to connect to Artifactory.\nYou can copy the JFrog URL from Administration > User Management > Settings > Connection details" (include "worker.jfrogUrl" .)) . }}"
             - name: JF_SHARED_NODE_ID
               valueFrom:
                 fieldRef:
@@ -247,7 +245,7 @@ spec:
               command:
                 - sh
                 - -c
-                - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "worker.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
+                - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
           {{- end }}
           {{- if .Values.router.customReadinessProbe }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.router.customReadinessProbe "context" $) | nindent 12 }}
@@ -259,7 +257,7 @@ spec:
               command:
                 - sh
                 - -c
-                - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "worker.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
+                - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/readiness
           {{- end }}
           {{- if .Values.router.customLivenessProbe }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.router.customLivenessProbe "context" $) | nindent 12 }}
@@ -269,7 +267,7 @@ spec:
               command:
                 - sh
                 - -c
-                - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} {{ include "worker.scheme" . }}://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/liveness
+                - curl -s -k --fail --max-time {{ .Values.probes.timeoutSeconds }} http://localhost:{{ .Values.router.internalPort }}/router/api/v1/system/liveness
             initialDelaySeconds: {{ if semverCompare "<v1.20.0-0" .Capabilities.KubeVersion.Version }}90{{ else }}0{{ end }}
             timeoutSeconds: {{ .Values.probes.timeoutSeconds }}
           {{- end }}

stable/worker/values.yaml

@@ -190,14 +190,11 @@ router:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/router
-    tag: 7.149.0
+    tag: 7.155.0
     imagePullPolicy: IfNotPresent
   serviceRegistry:
     ## Service registry (Access) TLS verification skipped if enabled
     insecure: false
-    ## Service registry URL and gRPC URL use jfrogUrl by default. Override if needed
-    # url: https://workersvc-artifactory:8082
-    # grpcUrl: workersvc-artifactory:8082
   internalPort: 8046
   externalPort: 8082
   tlsEnabled: false
@@ -562,7 +559,7 @@ filebeat:
   name: worker-filebeat
   image:
     repository: docker.elastic.co/beats/filebeat
-    version: 7.17.26
+    version: 7.17.28
     pullPolicy: IfNotPresent
   logstashUrl: "logstash:5044"
 
@@ -628,7 +625,7 @@ observability:
   image:
     registry: releases-docker.jfrog.io
     repository: jfrog/observability
-    tag: 1.31.11
+    tag: 1.31.13
     pullPolicy: IfNotPresent
   internalPort: 8036
   resources: {}