adds selfTracing property and tests

Signed-off-by: Adrian Cole <[email protected]>

charts/zipkin/Chart.yaml

@@ -10,11 +10,11 @@
 # or implied. See the License for the specific language governing permissions and limitations under
 # the License.
 apiVersion: v2
-appVersion: 3.0.3
+appVersion: 3.0.6
 name: zipkin
 description: A Zipkin helm chart for kubernetes
 type: application
-version: 0.1.2
+version: 0.2.0
 maintainers:
   - name: openzipkin
     email: [email protected]

charts/zipkin/ci/default-values.yaml

@@ -0,0 +1,3 @@
+---
+zipkin:
+  { }

charts/zipkin/ci/selfTracing-values.yaml

@@ -0,0 +1,4 @@
+---
+zipkin:
+  selfTracing:
+    enabled: true

charts/zipkin/templates/deployment.yaml

@@ -48,6 +48,8 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           env:
+            - name: SELF_TRACING_ENABLED
+              value: "{{ .Values.zipkin.selfTracing.enabled }}"
             - name: STORAGE_TYPE
               value: "{{ .Values.zipkin.storage.type }}"
             {{- if eq .Values.zipkin.storage.type "elasticsearch" }}

charts/zipkin/templates/tests/test-connection.yaml

@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: "{{ include "zipkin.fullname" . }}-test-connection"
+  labels:
+    {{- include "zipkin.labels" . | nindent 4 }}
+  annotations:
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: get-api-services
+      image: 'ghcr.io/openzipkin/alpine:3.19.1'
+      command: [ '/bin/sh', '-c' ]
+      # Get an arbitrary API endpoint using the ClusterIP and service port
+      args: [ 'wget -qO ---spider --header "b3: cafebabecafebabe-cafebabecafebabe-1" http://{{ include "zipkin.fullname" . }}:{{ .Values.service.port }}/api/v2/services' ]
+{{- if .Values.zipkin.selfTracing.enabled }}
+    - name: get-trace
+      image: 'ghcr.io/openzipkin/alpine:3.19.1'
+      command: [ '/bin/sh', '-c' ]
+      # If self-tracing, sleep for the trace to process, the get it by the constant ID passed above.
+      args: [ 'sleep 1 && wget -qO ---spider http://{{ include "zipkin.fullname" . }}:{{ .Values.service.port }}/api/v2/trace/cafebabecafebabe' ]
+{{- end }}
+  restartPolicy: Never

charts/zipkin/values.yaml

@@ -18,7 +18,7 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
-imagePullSecrets: []
+imagePullSecrets: [ ]
 nameOverride: ""
 fullnameOverride: ""
 namespaceOverride: ""
@@ -27,7 +27,7 @@ serviceAccount:
   # Specifies whether a service account should be created
   create: true
   # Annotations to add to the service account
-  annotations: {}
+  annotations: { }
   # The name of the service account to use.
   # If not set and create is true, a name is generated using the fullname template
   name: ""
@@ -38,8 +38,8 @@ podAnnotations:
   sidecar.istio.io/inject: "false"
 
 podSecurityContext:
-  {}
-  # fsGroup: 2000
+  { }
+# fsGroup: 2000
 
 securityContext:
   # capabilities:
@@ -56,13 +56,13 @@ service:
 ingress:
   enabled: false
   annotations:
-    {}
+    { }
     # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
+  # kubernetes.io/tls-acme: "true"
   # className: nginx
   host: chart-example.local
   path: /
-  tls: []
+  tls: [ ]
   #  - secretName: chart-example-tls
   #    hosts:
   #      - chart-example.local
@@ -92,20 +92,23 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
   # targetMemoryUtilizationPercentage: 80
 
-nodeSelector: {}
+nodeSelector: { }
 
-tolerations: []
+tolerations: [ ]
 
-affinity: {}
+affinity: { }
 
 priorityClassName: ""
 
 zipkin:
+  # selfTracing generates traces for HTTP paths under /api
+  selfTracing:
+    enabled: false
   storage:
     type: mem
-#   type: elasticsearch
-#   elasticsearch:
-#      hosts: hostA hostB
-#      index: fooIndex
-  extraEnv: {}
+  #   type: elasticsearch
+  #   elasticsearch:
+  #      hosts: hostA hostB
+  #      index: fooIndex
+  extraEnv: { }
 #    JAVA_OPTS: "-Xms128m -Xmx512m -XX:+ExitOnOutOfMemoryError"