diff --git a/changelog/v0.21.2/add-linkerd-helm-option.yaml b/changelog/v0.21.2/add-linkerd-helm-option.yaml new file mode 100644 index 00000000000..8f7a8cbde78 --- /dev/null +++ b/changelog/v0.21.2/add-linkerd-helm-option.yaml @@ -0,0 +1,4 @@ +changelog: + - type: HELM + description: Added Helm `settings.linkerd` chart value + issueLink: https://github.com/solo-io/gloo/issues/1651 diff --git a/install/helm/gloo/generate/values.go b/install/helm/gloo/generate/values.go index f7c90c319f7..cafd3442d19 100644 --- a/install/helm/gloo/generate/values.go +++ b/install/helm/gloo/generate/values.go @@ -104,6 +104,7 @@ type Settings struct { Create bool `json:"create" desc:"create a Settings CRD which provides bootstrap configuration to Gloo controllers"` Extensions interface{} `json:"extensions,omitempty"` SingleNamespace bool `json:"singleNamespace" desc:"Enable to use install namespace as WatchNamespace and WriteNamespace"` + Linkerd bool `json:"linkerd" desc:"Enable automatic Linkerd integration in Gloo."` } type Gloo struct { diff --git a/install/helm/gloo/templates/18-settings.yaml b/install/helm/gloo/templates/18-settings.yaml index 9299e43ec26..b06a2646288 100644 --- a/install/helm/gloo/templates/18-settings.yaml +++ b/install/helm/gloo/templates/18-settings.yaml @@ -23,6 +23,9 @@ spec: kubernetesConfigSource: {} kubernetesSecretSource: {} refreshRate: 60s +{{- if .Values.settings.linkerd }} + linkerd: true +{{- end }} {{- if .Values.settings.integrations.knative.enabled }} knative: {{- if (regexMatch "[0-9]+[.][0-7]+[.][0-9]+" .Values.settings.integrations.knative.version ) }} diff --git a/install/helm/gloo/values-gateway-template.yaml b/install/helm/gloo/values-gateway-template.yaml index 8793802baa2..f505814fde4 100644 --- a/install/helm/gloo/values-gateway-template.yaml +++ b/install/helm/gloo/values-gateway-template.yaml @@ -9,6 +9,7 @@ k8s: settings: # if this is set to false, default settings will be created by pods upon boot create: true + linkerd: false integrations: knative: enabled: false diff --git a/install/helm/gloo/values-knative-template.yaml b/install/helm/gloo/values-knative-template.yaml index 67b83ac27da..c888a389889 100644 --- a/install/helm/gloo/values-knative-template.yaml +++ b/install/helm/gloo/values-knative-template.yaml @@ -8,6 +8,7 @@ k8s: settings: create: true + linkerd: false integrations: knative: enabled: true