Allow to disable linkerd-viz namespace installation with Helm (linker…

…d#5509) If namespace is manage by an external tool , it fails on install. Add a feature to not manage namespace by Helm. Signed-off-by: Nicolas Lamirault <[email protected]>
Teamwork · Jan 11, 2021 · 8eab38d · 8eab38d
1 parent b5dddf5
commit 8eab38d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/viz/charts/linkerd-viz/README.md b/viz/charts/linkerd-viz/README.md
@@ -99,6 +99,7 @@ Kubernetes: `>=1.13.0-0`
 | grafana.resources.memory.request | string | `nil` | Amount of memory that the grafana container requests |
 | identityTrustDomain | string | `"cluster.local"` | Trust domain used for identity  |
 | imagePullSecrets | list | `[]` | For Private docker registries, authentication is needed.  Registry secrets are applied to the respective service accounts |
+| installNamespace | bool | `true` | Set to false when installing in a custom namespace. |
 | linkerdNamespace | string | `"linkerd"` | Namespace of the Linkerd core control-plane install |
 | linkerdVersion | string | `"linkerdVersionValue"` | control plane version. See Proxy section for proxy version |
 | namespace | string | `"linkerd-viz"` | Namespace in which the Linkerd Viz extension has to be installed |

diff --git a/viz/charts/linkerd-viz/templates/namespace.yaml b/viz/charts/linkerd-viz/templates/namespace.yaml
@@ -1,3 +1,4 @@
+{{- if (.Values.installNamespace) -}}
 ---
 ###
 ### Linkerd Viz Extension Namespace
@@ -11,3 +12,4 @@ metadata:
     {{.Values.extensionAnnotation}}: linkerd-viz
   annotations:
     {{.Values.proxyInjectAnnotation}}: enabled
+{{ end -}}
diff --git a/viz/charts/linkerd-viz/values.yaml b/viz/charts/linkerd-viz/values.yaml
@@ -30,6 +30,8 @@ createdByAnnotation: linkerd.io/created-by
 proxyInjectAnnotation: linkerd.io/inject
 extensionAnnotation: linkerd.io/extension
 
+# -- Set to false when installing in a custom namespace.
+installNamespace: true
 # -- Namespace in which the Linkerd Viz extension has to be installed
 namespace: linkerd-viz