Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Skip linkerd checks for Kubernetes >=1.17.0 #1

Merged
merged 1 commit into from Feb 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Chart.yaml
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: Wrapper helm chart for MetaKube LinkerD addon
name: linkerd-helm
version: 0.1.5
version: 0.1.6
4 changes: 4 additions & 0 deletions templates/scripts.yaml
Expand Up @@ -22,15 +22,19 @@ data:

if kubectl get namespace linkerd > /dev/null 2>&1;then
echo "linkerd namespace already exists . . ."
{{ if and (eq .Capabilities.KubeVersion.Major 1) (lt .Capabilities.KubeVersion.Minor 17) }}
linkerd check
{{ end }}
{{ if .Values.highAvailability }}
linkerd upgrade --ha | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f -
{{ else }}
linkerd upgrade | kubectl apply --prune -l linkerd.io/control-plane-ns=linkerd -f -
{{ end }}
else
{{ if and (eq .Capabilities.KubeVersion.Major 1) (lt .Capabilities.KubeVersion.Minor 17) }}
# linkerd preflight checks
linkerd check --pre
{{ end }}
# Install linkerd
{{ if .Values.highAvailability }}
linkerd install --ha | kubectl apply -f -
Expand Down