mirror of https://github.com/linkerd/linkerd2.git
Linkerd viz have hardcoded image value in namespace metadata.yml template (#9481)
* linkerd-viz have hardcoded image value in namespace-metadata.yml template bug correction Signed-off-by: BOSSER, Bastien <bastien.bosser@atos.net>
This commit is contained in:
bastienbosser
GitHub
parent
4fa4244ed6
commit
fa1a80f9f5
|
|
@ -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 |
|
||||
|
|
|
|||
|
|
@ -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}}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 |
|
||||
|
|
|
|||
|
|
@ -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}}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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. |
|
||||
|
|
|
|||
|
|
@ -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}}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue