Consistent imagePullPolicy and fix test data

Signed-off-by: Cameron Boulton <[email protected]>
linkerd · Aug 22, 2023 · b8adf8f · b8adf8f
1 parent 8a86ecc
commit b8adf8f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 20 deletions.
diff --git a/jaeger/charts/linkerd-jaeger/templates/jaeger-injector.yaml b/jaeger/charts/linkerd-jaeger/templates/jaeger-injector.yaml
@@ -46,7 +46,9 @@ spec:
         - -linkerd-namespace={{.Values.linkerdNamespace}}
         - -enable-pprof={{.Values.enablePprof | default false}}
         image: {{.Values.webhook.image.name}}:{{default .Values.webhook.image.version .Values.linkerdVersion}}
-        imagePullPolicy: {{.Values.webhook.image.pullPolicy}}
+        {{- with .Values.webhook.image.pullPolicy }}
+        imagePullPolicy: {{.}}
+        {{- end }}
         livenessProbe:
           httpGet:
             path: /ping

diff --git a/jaeger/charts/linkerd-jaeger/templates/namespace-metadata.yaml b/jaeger/charts/linkerd-jaeger/templates/namespace-metadata.yaml
@@ -40,7 +40,9 @@ spec:
       containers:
       - name: namespace-metadata
         image: {{.Values.namespaceMetadata.image.registry}}/{{.Values.namespaceMetadata.image.name}}:{{.Values.namespaceMetadata.image.tag}}
-        imagePullPolicy: {{.Values.namespaceMetadata.image.pullPolicy | default .Values.imagePullPolicy}}
+        {{- with .Values.namespaceMetadata.image.pullPolicy }}
+        imagePullPolicy: {{.}}
+        {{- end }}
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

diff --git a/jaeger/charts/linkerd-jaeger/templates/tracing.yaml b/jaeger/charts/linkerd-jaeger/templates/tracing.yaml
@@ -113,7 +113,9 @@ spec:
           {{- toYaml $value | nindent 10 }}
         {{- end }}
         image: {{.Values.collector.image.name}}:{{.Values.collector.image.version}}
-        imagePullPolicy: {{.Values.collector.image.pullPolicy}}
+        {{- with .Values.collector.image.pullPolicy }}
+        imagePullPolicy: {{.}}
+        {{- end }}
         livenessProbe:
           httpGet:
             path: /
@@ -226,7 +228,9 @@ spec:
         - {{ . -}}
         {{ end }}
         image: {{.Values.jaeger.image.name}}:{{.Values.jaeger.image.version}}
-        imagePullPolicy: {{.Values.jaeger.image.pullPolicy}}
+        {{- with .Values.jaeger.image.pullPolicy }}
+        imagePullPolicy: {{.}}
+        {{- end }}
         name: jaeger
         ports:
         - containerPort: 14269

diff --git a/jaeger/charts/linkerd-jaeger/values.yaml b/jaeger/charts/linkerd-jaeger/values.yaml
@@ -7,9 +7,6 @@ podLabels: {}
 # -- Labels to apply to all resources
 commonLabels: {}
 
-# -- Docker imagePullPolicy for all jaeger components
-imagePullPolicy: IfNotPresent
-
 # -- Default nodeSelector section, See the
 # [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information
 nodeSelector: &default_node_selector
@@ -41,8 +38,8 @@ collector:
   enabled: true
   image:
     name: otel/opentelemetry-collector
-    version: 0.59.0
-    pullPolicy: Always
+    version: 0.83.0
+    pullPolicy: ""
 
   resources:
     cpu:
@@ -116,7 +113,7 @@ jaeger:
   image:
     name: jaegertracing/all-in-one
     version: 1.31
-    pullPolicy: Always
+    pullPolicy: ""
 
   # -- CLI arguments for Jaeger, See [Jaeger AIO Memory CLI reference](https://www.jaegertracing.io/docs/1.24/cli/#jaeger-all-in-one-memory)
   args:
@@ -218,7 +215,7 @@ webhook:
   image:
     name: cr.l5d.io/linkerd/jaeger-webhook
     version: *linkerd_version
-    pullPolicy: IfNotPresent
+    pullPolicy: ""
   logLevel: info
 
   namespaceSelector:

diff --git a/jaeger/cmd/testdata/install_collector_disabled.golden b/jaeger/cmd/testdata/install_collector_disabled.golden
diff --git a/jaeger/cmd/testdata/install_default.golden b/jaeger/cmd/testdata/install_default.golden
diff --git a/jaeger/cmd/testdata/install_jaeger_disabled.golden b/jaeger/cmd/testdata/install_jaeger_disabled.golden