Clarification for collectorSvcAccount and collectorSvcAddr in jaeger's values.yaml (#5366)

Moved the `collectorSvcAccount` and `collectorSvcAddr` values in
`values.yaml` under the `webhook` section, given it's the injector that
will make use of that, and to not confuse with the SA and address for
the collector that is provided by default (the injector could point to a
different collector than that one).

jaeger/charts/jaeger/README.md

@@ -19,14 +19,14 @@ A Helm chart for the jaeger add-on in Linkerd
 | collector.image.name | string | `"omnition/opencensus-collector"` |  |
 | collector.image.pullPolicy | string | `"Always"` |  |
 | collector.image.version | string | `"0.1.11"` |  |
-| collectorSvcAccount | string | `"collector"` |  |
-| collectorSvcAddr | string | `"collector.linkerd-jaeger:55678"` |  |
 | jaeger.image.name | string | `"jaegertracing/all-in-one"` |  |
 | jaeger.image.pullPolicy | string | `"Always"` |  |
 | jaeger.image.version | string | `"1.19.2"` |  |
 | linkerdVersion | string | `"linkerdVersionValue"` |  |
 | namespace | string | `"linkerd-jaeger"` |  |
 | webhook.caBundle | string | `""` | if empty, Helm will auto-generate this field, unless externalSecret is set to true. |
+| webhook.collectorSvcAccount | string | `"collector"` | service account associated with the collector instance |
+| webhook.collectorSvcAddr | string | `"collector.linkerd-jaeger:55678"` | collector service address for the proxies to send trace data. Points by default to the the linkerd-jaeger collector |
 | webhook.crtPEM | string | `""` | if empty, Helm will auto-generate these fields |
 | webhook.externalSecret | bool | `false` |  |
 | webhook.failurePolicy | string | `"Ignore"` |  |

jaeger/charts/jaeger/templates/proxy-mutator.yaml

@@ -26,8 +26,8 @@ spec:
     spec:
       containers:
       - args:
-        - -collector-svc-addr={{.Values.collectorSvcAddr}}
-        - -collector-svc-account={{.Values.collectorSvcAccount}}
+        - -collector-svc-addr={{.Values.webhook.collectorSvcAddr}}
+        - -collector-svc-account={{.Values.webhook.collectorSvcAccount}}
         - -log-level={{.Values.webhook.logLevel}}
         image: {{.Values.webhook.image.name}}:{{default .Values.webhook.image.version .Values.cliVersion}}
         imagePullPolicy: {{.Values.webhook.image.pullPolicy}}

jaeger/charts/jaeger/values.yaml

@@ -9,9 +9,6 @@ collector:
     pullPolicy: Always
   # resources:
 
-collectorSvcAddr: collector.linkerd-jaeger:55678
-collectorSvcAccount: collector
-
 jaeger:
   image: 
     name: jaegertracing/all-in-one
@@ -30,6 +27,12 @@ webhook:
   # -- if empty, Helm will auto-generate this field, unless externalSecret is set to true.
   caBundle: |
 
+  # -- collector service address for the proxies to send trace data.
+  # Points by default to the the linkerd-jaeger collector
+  collectorSvcAddr: collector.linkerd-jaeger:55678
+  # -- service account associated with the collector instance
+  collectorSvcAccount: collector
+
   failurePolicy: Ignore
   image: 
     name: ghcr.io/linkerd/jaeger-webhook

jaeger/values/values.go

@@ -15,14 +15,12 @@ import (
 
 // Values represents the values of jaeger template
 type Values struct {
-	Namespace           string    `json:"namespace"`
-	CliVersion          string    `json:"cliVersion"`
-	Collector           collector `json:"collector"`
-	CollectorSvcAddr    string    `json:"collectorSvcAddr"`
-	CollectorSvcAccount string    `json:"collectorSvcAccount"`
-	Jaeger              jaeger    `json:"jaeger"`
-	LinkerdVersion      string    `json:"linkerdVersion"`
-	Webhook             webhook   `json:"webhook"`
+	Namespace      string    `json:"namespace"`
+	CliVersion     string    `json:"cliVersion"`
+	Collector      collector `json:"collector"`
+	Jaeger         jaeger    `json:"jaeger"`
+	LinkerdVersion string    `json:"linkerdVersion"`
+	Webhook        webhook   `json:"webhook"`
 }
 
 type collector struct {
@@ -36,15 +34,17 @@ type jaeger struct {
 }
 
 type webhook struct {
-	ExternalSecret    bool                  `json:"externalSecret"`
-	CrtPEM            string                `json:"crtPEM"`
-	KeyPEM            string                `json:"keyPEM"`
-	CaBundle          string                `json:"caBundle"`
-	FailurePolicy     string                `json:"failurePolicy"`
-	Image             l5dcharts.Image       `json:"image"`
-	LogLevel          string                `json:"logLevel"`
-	NamespaceSelector *metav1.LabelSelector `json:"namespaceSelector"`
-	ObjectSelector    *metav1.LabelSelector `json:"objectSelector"`
+	ExternalSecret      bool                  `json:"externalSecret"`
+	CrtPEM              string                `json:"crtPEM"`
+	KeyPEM              string                `json:"keyPEM"`
+	CaBundle            string                `json:"caBundle"`
+	CollectorSvcAddr    string                `json:"collectorSvcAddr"`
+	CollectorSvcAccount string                `json:"collectorSvcAccount"`
+	FailurePolicy       string                `json:"failurePolicy"`
+	Image               l5dcharts.Image       `json:"image"`
+	LogLevel            string                `json:"logLevel"`
+	NamespaceSelector   *metav1.LabelSelector `json:"namespaceSelector"`
+	ObjectSelector      *metav1.LabelSelector `json:"objectSelector"`
 }
 
 // NewValues returns a new instance of the Values type.