Merge pull request #40 from galal-hussein/more_tests

More helm tests and upgrade klipper
k3s-io · Apr 14, 2020 · e7f3c6b · e7f3c6b
2 parents 809a41e + 474a032
commit e7f3c6b
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 3 deletions.
diff --git a/pkg/helm/controller.go b/pkg/helm/controller.go
@@ -39,7 +39,7 @@ type Controller struct {
 }
 
 const (
-	image   = "rancher/klipper-helm:v0.2.4"
+	image   = "rancher/klipper-helm:v0.2.5"
 	Label   = "helmcharts.helm.cattle.io/chart"
 	CRDName = "helmcharts.helm.cattle.io"
 	Name    = "helm-controller"

diff --git a/test/framework/framework.go b/test/framework/framework.go
@@ -185,8 +185,8 @@ func (f *Framework) ListHelmCharts(labelSelector, namespace string) (*helmapiv1.
 // WaitForChartApp will check the for pods created by the chart
 func (f *Framework) WaitForChartApp(chart *helmapiv1.HelmChart, appName string, timeout time.Duration, count int) (pods []corev1.Pod, err error) {
 	labelSelector := labels.SelectorFromSet(labels.Set{
-		"app":      appName,
-		"heritage": "Helm",
+		"app":     appName,
+		"release": chart.Name,
 	})
 
 	return pods, wait.Poll(5*time.Second, timeout, func() (bool, error) {

diff --git a/test/suite/helm_test.go b/test/suite/helm_test.go
@@ -118,6 +118,51 @@ var _ = Describe("Helm Tests", func() {
 		})
 	})
 
+	Context("When a helm V3 chart version is updated with values", func() {
+		var (
+			err     error
+			chart   *helmapiv1.HelmChart
+			secrets []corev1.Secret
+			pods    []corev1.Pod
+		)
+		BeforeEach(func() {
+			chart = framework.NewHelmChart("traefik-update-example-values",
+				"stable/traefik",
+				"1.86.1",
+				"v3",
+				map[string]intstr.IntOrString{
+					"rbac.enabled": {
+						Type:   intstr.String,
+						StrVal: "true",
+					},
+					"ssl.enabled": {
+						Type:   intstr.String,
+						StrVal: "true",
+					},
+				})
+			chart, err = framework.CreateHelmChart(chart, framework.Namespace)
+			Expect(err).ToNot(HaveOccurred())
+
+			labelSelector := labels.SelectorFromSet(labels.Set{
+				"owner": "helm",
+				"name":  chart.Name,
+			})
+			secrets, err = framework.WaitForRelease(chart, labelSelector, 120*time.Second, 1)
+			Expect(err).ToNot(HaveOccurred())
+			Expect(secrets).To(HaveLen(1))
+
+			chart, err = framework.GetHelmChart("traefik-update-example-values", framework.Namespace)
+			chart.Spec.Set["replicas"] = intstr.FromString("3")
+			chart, err = framework.UpdateHelmChart(chart, framework.Namespace)
+			Expect(err).ToNot(HaveOccurred())
+			pods, err = framework.WaitForChartApp(chart, "traefik", 120*time.Second, 3)
+			Expect(err).ToNot(HaveOccurred())
+		})
+		It("Should upgrade the release successfully", func() {
+			Expect(len(pods)).To(BeEquivalentTo(3))
+		})
+	})
+
 	Context("When a helm V2 chart is created", func() {
 		var (
 			err     error