Merge pull request #53 from Revolyssup/meshkitchanges

changes according to latest meshkit version
meshery · Oct 18, 2021 · cdd3dad · cdd3dad
2 parents 0ebcaf6 + 7955aca
commit cdd3dad
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ replace (
 
 require (
 	github.com/layer5io/meshery-adapter-library v0.1.24
-	github.com/layer5io/meshkit v0.2.30
+	github.com/layer5io/meshkit v0.2.31
 	github.com/layer5io/service-mesh-performance v0.3.3
 	k8s.io/apimachinery v0.21.0
 )
diff --git a/go.sum b/go.sum
@@ -606,6 +606,8 @@ github.com/layer5io/meshery-adapter-library v0.1.24/go.mod h1:SLknhKksSoUtKzG2tv
 github.com/layer5io/meshkit v0.2.24/go.mod h1:blHAWgbcsNJ3rjKr8YvYke8jQILV75vRaARXYwSh0YA=
 github.com/layer5io/meshkit v0.2.30 h1:ubhnZaMxz3jfW0QX1S9LeBagq2RVnXxsnEyLaOzza8s=
 github.com/layer5io/meshkit v0.2.30/go.mod h1:WyC18J2CRVwlphKjj0V/W36szAy0yJMNKu3PId19RPE=
+github.com/layer5io/meshkit v0.2.31 h1:YOQ+XQzI34BDXmV+pHISChO7y7xcRK2L9KqlrhYx0Jk=
+github.com/layer5io/meshkit v0.2.31/go.mod h1:WyC18J2CRVwlphKjj0V/W36szAy0yJMNKu3PId19RPE=
 github.com/layer5io/service-mesh-performance v0.3.2-0.20210122142912-a94e0658b021/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ=
 github.com/layer5io/service-mesh-performance v0.3.2/go.mod h1:W153amv8aHAeIWxO7b7d7Vibt9RhaEVh4Uh+RG+BumQ=
 github.com/layer5io/service-mesh-performance v0.3.3 h1:KtouYXg64y+G0soPJwDeB0sM6PXolBpkV6Ke15aqwmk=

diff --git a/nginx/install.go b/nginx/install.go
@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	repo = "https://helm.nginx.com/stable"
+	repo  = "https://helm.nginx.com/stable"
 	chart = "nginx-service-mesh"
 )
 
@@ -59,14 +59,20 @@ func (nginx *Nginx) applyHelmChart(del bool, version, namespace string) error {
 			return ErrApplyHelmChart(err)
 		}
 	}
+	var act mesherykube.HelmChartAction
+	if del {
+		act = mesherykube.UNINSTALL
+	} else {
+		act = mesherykube.INSTALL
+	}
 	err = kClient.ApplyHelmChart(mesherykube.ApplyHelmChartConfig{
 		ChartLocation: mesherykube.HelmChartLocation{
 			Repository: repo,
-			Chart: chart,
-			Version: chartVersion,
+			Chart:      chart,
+			Version:    chartVersion,
 		},
 		Namespace:       namespace,
-		Delete:          del,
+		Action:          act,
 		CreateNamespace: true,
 	})
 	if err != nil {