Skip to content

Commit

Permalink
Linkerd Helm Chart Value (#1652) (#1715)
Browse files Browse the repository at this point in the history
* Linkerd Helm Chart Value (#1652)

* Added linkerd option to settings helm template.
* Added documentation for the linkerd option.
* Added to changelog entry.
  • Loading branch information
kdelorey authored and soloio-bulldozer[bot] committed Nov 15, 2019
1 parent f2b7a78 commit 44ced73
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 0 deletions.
4 changes: 4 additions & 0 deletions changelog/v0.21.2/add-linkerd-helm-option.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
changelog:
- type: HELM
description: Added Helm `settings.linkerd` chart value
issueLink: https://github.com/solo-io/gloo/issues/1651
1 change: 1 addition & 0 deletions install/helm/gloo/generate/values.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions install/helm/gloo/templates/18-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) }}
Expand Down
1 change: 1 addition & 0 deletions install/helm/gloo/values-gateway-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions install/helm/gloo/values-knative-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ k8s:

settings:
create: true
linkerd: false
integrations:
knative:
enabled: true
Expand Down

0 comments on commit 44ced73

Please sign in to comment.