diff --git a/jaeger/charts/linkerd-jaeger/templates/jaeger-injector.yaml b/jaeger/charts/linkerd-jaeger/templates/jaeger-injector.yaml index 6d6a9462b8413..2c0afe49bbc62 100644 --- 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 index ed0a475d4a5d7..e280c872b707c 100644 --- 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 index 6037c452afe35..a38f8a10c2ea2 100644 --- 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 index d8000e06dcf98..53566a2cc3898 100644 --- 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 index 661af96b015be..f3fcdb4000ff1 100644 --- a/jaeger/cmd/testdata/install_collector_disabled.golden +++ b/jaeger/cmd/testdata/install_collector_disabled.golden @@ -50,7 +50,6 @@ spec: - -linkerd-namespace=linkerd - -enable-pprof=false image: cr.l5d.io/linkerd/jaeger-webhook:dev-undefined - imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /ping @@ -293,7 +292,6 @@ spec: - args: - --query.base-path=/jaeger image: jaegertracing/all-in-one:1.31 - imagePullPolicy: Always name: jaeger ports: - containerPort: 14269 diff --git a/jaeger/cmd/testdata/install_default.golden b/jaeger/cmd/testdata/install_default.golden index f80d4d6f26477..50eba83d69f99 100644 --- a/jaeger/cmd/testdata/install_default.golden +++ b/jaeger/cmd/testdata/install_default.golden @@ -50,7 +50,6 @@ spec: - -linkerd-namespace=linkerd - -enable-pprof=false image: cr.l5d.io/linkerd/jaeger-webhook:dev-undefined - imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /ping @@ -368,13 +367,16 @@ spec: env: - name: GOGC value: "80" + - name: HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP - name: POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: otel/opentelemetry-collector:0.59.0 - imagePullPolicy: Always + image: otel/opentelemetry-collector:0.83.0 livenessProbe: httpGet: path: / @@ -476,7 +478,6 @@ spec: - args: - --query.base-path=/jaeger image: jaegertracing/all-in-one:1.31 - imagePullPolicy: Always name: jaeger ports: - containerPort: 14269 diff --git a/jaeger/cmd/testdata/install_jaeger_disabled.golden b/jaeger/cmd/testdata/install_jaeger_disabled.golden index 012eace9d80d7..687f302b430da 100644 --- a/jaeger/cmd/testdata/install_jaeger_disabled.golden +++ b/jaeger/cmd/testdata/install_jaeger_disabled.golden @@ -50,7 +50,6 @@ spec: - -linkerd-namespace=linkerd - -enable-pprof=false image: cr.l5d.io/linkerd/jaeger-webhook:dev-undefined - imagePullPolicy: IfNotPresent livenessProbe: httpGet: path: /ping @@ -357,13 +356,16 @@ spec: env: - name: GOGC value: "80" + - name: HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP - name: POD_NAMESPACE valueFrom: fieldRef: apiVersion: v1 fieldPath: metadata.namespace - image: otel/opentelemetry-collector:0.59.0 - imagePullPolicy: Always + image: otel/opentelemetry-collector:0.83.0 livenessProbe: httpGet: path: /