Merge branch 'master' into testing/argo-workflows_also_test_with_defaults

charts/argo-rollouts/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: "v1.0.2"
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 2.1.0
+version: 2.1.1
 icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
 home: https://github.com/argoproj/argo-helm
 maintainers:
@@ -11,4 +11,4 @@ maintainers:
   - name: jessesuen
 annotations:
   artifacthub.io/changes: |
-    - "[Added]: Keep CRDs on Helm uninstall by default, add corresponding option"
+    - "[Added]: Two separate tests. One for default values and one for dashboard enabled."

charts/argo-rollouts/ci/default-values.yaml

@@ -0,0 +1 @@
+# Test with default values

charts/argo-rollouts/ci/enable-dashboard-values.yaml

@@ -0,0 +1,6 @@
+# Test with dashboard enabled
+# Do not deploy the CRDs as they are already present from the previous test
+installCRDs: false
+
+dashboard:
+  enabled: true

charts/argo-rollouts/ci/test-values.yaml

@@ -1,2 +0,0 @@
-dashboard:
-  enabled: true