diff --git a/jaeger/charts/linkerd-jaeger/README.md b/jaeger/charts/linkerd-jaeger/README.md index 4ce219a33..4985c306a 100644 --- a/jaeger/charts/linkerd-jaeger/README.md +++ b/jaeger/charts/linkerd-jaeger/README.md @@ -89,6 +89,7 @@ Kubernetes: `>=1.21.0-0` | collector.tolerations | string | `nil` | Tolerations section, See the [K8S documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for more information | | defaultUID | int | `2103` | Default UID for all the jaeger components | | enablePSP | bool | `false` | Create Roles and RoleBindings to associate this extension's ServiceAccounts to the control plane PSP resource. This requires that `enabledPSP` is set to true on the control plane install. Note PSP has been deprecated since k8s v1.21 | +| imagePullPolicy | string | `"IfNotPresent"` | Docker imagePullPolicy for all jaeger components | | imagePullSecrets | list | `[]` | For Private docker registries, authentication is needed. Registry secrets are applied to the respective service accounts | | jaeger.UID | string | `nil` | UID for the jaeger resource | | jaeger.args | list | `["--query.base-path=/jaeger"]` | CLI arguments for Jaeger, See [Jaeger AIO Memory CLI reference](https://www.jaegertracing.io/docs/1.24/cli/#jaeger-all-in-one-memory) | @@ -106,6 +107,10 @@ Kubernetes: `>=1.21.0-0` | jaeger.tolerations | string | `nil` | Tolerations section, See the [K8S documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for more information | | linkerdNamespace | string | `"linkerd"` | Namespace of the Linkerd core control-plane install | | linkerdVersion | string | `"linkerdVersionValue"` | | +| namespaceMetadata.image.name | string | `"curl"` | Docker image name for the namespace-metadata instance | +| namespaceMetadata.image.pullPolicy | string | imagePullPolicy | Pull policy for the namespace-metadata instance | +| namespaceMetadata.image.registry | string | `"curlimages"` | Docker registry for the namespace-metadata instance | +| namespaceMetadata.image.tag | string | `"7.78.0"` | Docker image tag for the namespace-metadata instance | | nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Default nodeSelector section, See the [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information | | tolerations | string | `nil` | Default tolerations section, See the [K8S documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for more information | | webhook.UID | string | `nil` | UID for the webhook resource | diff --git a/jaeger/charts/linkerd-jaeger/templates/namespace-metadata.yaml b/jaeger/charts/linkerd-jaeger/templates/namespace-metadata.yaml index 1acad1f63..eef9c5c09 100644 --- a/jaeger/charts/linkerd-jaeger/templates/namespace-metadata.yaml +++ b/jaeger/charts/linkerd-jaeger/templates/namespace-metadata.yaml @@ -26,7 +26,8 @@ spec: serviceAccountName: namespace-metadata containers: - name: namespace-metadata - image: curlimages/curl:7.78.0 + image: {{.Values.namespaceMetadata.image.registry}}/{{.Values.namespaceMetadata.image.name}}:{{.Values.namespaceMetadata.image.tag}} + imagePullPolicy: {{.Values.namespaceMetadata.image.pullPolicy | default .Values.imagePullPolicy}} command: ["/bin/sh"] securityContext: runAsUser: {{.Values.defaultUID}} diff --git a/jaeger/charts/linkerd-jaeger/values.yaml b/jaeger/charts/linkerd-jaeger/values.yaml index 71b3612a6..0a0e5c8a9 100644 --- a/jaeger/charts/linkerd-jaeger/values.yaml +++ b/jaeger/charts/linkerd-jaeger/values.yaml @@ -1,6 +1,9 @@ # -- Namespace of the Linkerd core control-plane install linkerdNamespace: linkerd +# -- 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 @@ -140,6 +143,18 @@ jaeger: linkerdVersion: &linkerd_version linkerdVersionValue +namespaceMetadata: + image: + # -- Docker registry for the namespace-metadata instance + registry: curlimages + # -- Docker image name for the namespace-metadata instance + name: curl + # -- Docker image tag for the namespace-metadata instance + tag: 7.78.0 + # -- Pull policy for the namespace-metadata instance + # @default -- imagePullPolicy + pullPolicy: "" + webhook: # -- Do not create a secret resource for the webhook. # If this is set to `true`, the value `webhook.caBundle` must be set diff --git a/multicluster/charts/linkerd-multicluster/README.md b/multicluster/charts/linkerd-multicluster/README.md index d14182a6e..bd407f55f 100644 --- a/multicluster/charts/linkerd-multicluster/README.md +++ b/multicluster/charts/linkerd-multicluster/README.md @@ -85,8 +85,13 @@ Kubernetes: `>=1.21.0-0` | gateway.serviceAnnotations | object | `{}` | Annotations to add to the gateway service | | gateway.serviceType | string | `"LoadBalancer"` | Service Type of gateway Service | | identityTrustDomain | string | `"cluster.local"` | Identity Trust Domain of the certificate authority | +| imagePullPolicy | string | `"IfNotPresent"` | Docker imagePullPolicy for all multicluster components | | linkerdNamespace | string | `"linkerd"` | Namespace of linkerd installation | | linkerdVersion | string | `"linkerdVersionValue"` | Control plane version | +| namespaceMetadata.image.name | string | `"curl"` | Docker image name for the namespace-metadata instance | +| namespaceMetadata.image.pullPolicy | string | imagePullPolicy | Pull policy for the namespace-metadata instance | +| namespaceMetadata.image.registry | string | `"curlimages"` | Docker registry for the namespace-metadata instance | +| namespaceMetadata.image.tag | string | `"7.78.0"` | Docker image tag for the namespace-metadata instance | | proxyOutboundPort | int | `4140` | The port on which the proxy accepts outbound traffic | | remoteMirrorServiceAccount | bool | `true` | If the remote mirror service account should be installed | | remoteMirrorServiceAccountName | string | `"linkerd-service-mirror-remote-access-default"` | The name of the service account used to allow remote clusters to mirror local services | diff --git a/multicluster/charts/linkerd-multicluster/templates/namespace-metadata.yaml b/multicluster/charts/linkerd-multicluster/templates/namespace-metadata.yaml index 7e5823b85..13fbb3edd 100644 --- a/multicluster/charts/linkerd-multicluster/templates/namespace-metadata.yaml +++ b/multicluster/charts/linkerd-multicluster/templates/namespace-metadata.yaml @@ -26,7 +26,8 @@ spec: serviceAccountName: namespace-metadata containers: - name: namespace-metadata - image: curlimages/curl:7.78.0 + image: {{.Values.namespaceMetadata.image.registry}}/{{.Values.namespaceMetadata.image.name}}:{{.Values.namespaceMetadata.image.tag}} + imagePullPolicy: {{.Values.namespaceMetadata.image.pullPolicy | default .Values.imagePullPolicy}} command: ["/bin/sh"] securityContext: runAsUser: {{.Values.gateway.UID}} diff --git a/multicluster/charts/linkerd-multicluster/values.yaml b/multicluster/charts/linkerd-multicluster/values.yaml index 7e2b009c6..fefddf843 100644 --- a/multicluster/charts/linkerd-multicluster/values.yaml +++ b/multicluster/charts/linkerd-multicluster/values.yaml @@ -34,6 +34,8 @@ gateway: # -- Control plane version linkerdVersion: linkerdVersionValue +# -- Docker imagePullPolicy for all multicluster components +imagePullPolicy: IfNotPresent # -- The port on which the proxy accepts outbound traffic proxyOutboundPort: 4140 # -- If the remote mirror service account should be installed @@ -46,6 +48,18 @@ linkerdNamespace: linkerd # -- Identity Trust Domain of the certificate authority identityTrustDomain: cluster.local +namespaceMetadata: + image: + # -- Docker registry for the namespace-metadata instance + registry: curlimages + # -- Docker image name for the namespace-metadata instance + name: curl + # -- Docker image tag for the namespace-metadata instance + tag: 7.78.0 + # -- Pull policy for the namespace-metadata instance + # @default -- imagePullPolicy + pullPolicy: "" + # -- Create Roles and RoleBindings to associate this extension's # ServiceAccounts to the control plane PSP resource. This requires that # `enabledPSP` is set to true on the control plane install. Note PSP has been @@ -60,4 +74,4 @@ enablePodAntiAffinity: false # -- NodeAffinity section, See the # [K8S documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity) # for more information -# nodeAffinity: +# nodeAffinity: \ No newline at end of file diff --git a/viz/charts/linkerd-viz/README.md b/viz/charts/linkerd-viz/README.md index 77e37a313..381b2c65b 100644 --- a/viz/charts/linkerd-viz/README.md +++ b/viz/charts/linkerd-viz/README.md @@ -120,6 +120,10 @@ Kubernetes: `>=1.21.0-0` | metricsAPI.resources.memory.limit | string | `nil` | Maximum amount of memory that metrics-api container can use | | metricsAPI.resources.memory.request | string | `nil` | Amount of memory that the metrics-api container requests | | metricsAPI.tolerations | string | `nil` | Tolerations section, See the [K8S documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for more information | +| namespaceMetadata.image.name | string | `"curl"` | Docker image name for the namespace-metadata instance | +| namespaceMetadata.image.pullPolicy | string | defaultImagePullPolicy | Pull policy for the namespace-metadata instance | +| namespaceMetadata.image.registry | string | `"curlimages"` | Docker registry for the namespace-metadata instance | +| namespaceMetadata.image.tag | string | `"7.78.0"` | Docker image tag for the namespace-metadata instance | | nodeSelector | object | `{"kubernetes.io/os":"linux"}` | Default nodeSelector section, See the [K8S documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) for more information | | prometheus.alertRelabelConfigs | string | `nil` | Alert relabeling is applied to alerts before they are sent to the Alertmanager. | | prometheus.alertmanagers | string | `nil` | Alertmanager instances the Prometheus server sends alerts to configured via the static_configs parameter. | diff --git a/viz/charts/linkerd-viz/templates/namespace-metadata.yaml b/viz/charts/linkerd-viz/templates/namespace-metadata.yaml index 8abc781ff..9c56700a7 100644 --- a/viz/charts/linkerd-viz/templates/namespace-metadata.yaml +++ b/viz/charts/linkerd-viz/templates/namespace-metadata.yaml @@ -26,8 +26,8 @@ spec: serviceAccountName: namespace-metadata containers: - name: namespace-metadata - image: curlimages/curl:7.78.0 - imagePullPolicy: {{.Values.defaultImagePullPolicy}} + image: {{.Values.namespaceMetadata.image.registry}}/{{.Values.namespaceMetadata.image.name}}:{{.Values.namespaceMetadata.image.tag}} + imagePullPolicy: {{.Values.namespaceMetadata.image.pullPolicy | default .Values.defaultImagePullPolicy}} command: ["/bin/sh"] securityContext: runAsUser: {{.Values.defaultUID}} diff --git a/viz/charts/linkerd-viz/values.yaml b/viz/charts/linkerd-viz/values.yaml index 793d61326..9a7717099 100644 --- a/viz/charts/linkerd-viz/values.yaml +++ b/viz/charts/linkerd-viz/values.yaml @@ -348,6 +348,18 @@ dashboard: # into the dashboard component # resources: +namespaceMetadata: + image: + # -- Docker registry for the namespace-metadata instance + registry: curlimages + # -- Docker image name for the namespace-metadata instance + name: curl + # -- Docker image tag for the namespace-metadata instance + tag: 7.78.0 + # -- Pull policy for the namespace-metadata instance + # @default -- defaultImagePullPolicy + pullPolicy: "" + grafana: # -- url of an in-cluster Grafana instance with reverse proxy configured, used by the # Linkerd viz web dashboard to provide direct links to specific Grafana