Merge pull request #165 from fluxcd/e2e/fix-valuesfile-test

.github/workflows/e2e.yaml

@@ -26,11 +26,11 @@ jobs:
       - name: Setup Kubernetes
         uses: engineerd/setup-kind@v0.3.0
       - name: Setup Kustomize
-        uses: fluxcd/pkg/actions/kustomize@master
+        uses: fluxcd/pkg/actions/kustomize@main
       - name: Setup Kubebuilder
-        uses: fluxcd/pkg/actions/kubebuilder@master
+        uses: fluxcd/pkg/actions/kubebuilder@main
       - name: Setup Helm
-        uses: fluxcd/pkg/actions/helm@master
+        uses: fluxcd/pkg/actions/helm@main
       - name: Run tests
         run: make test
         env:
@@ -63,8 +63,8 @@ jobs:
       - name: Run HelmChart values file tests
         run: |
           kubectl -n source-system apply -f ./config/testdata/helmchart-valuesfile
-          kubectl -n source-system wait helmchart/mariadb --for=condition=ready --timeout=5m
+          kubectl -n source-system wait helmchart/podinfo --for=condition=ready --timeout=5m
-          kubectl -n source-system wait helmchart/mariadb-git --for=condition=ready --timeout=5m
+          kubectl -n source-system wait helmchart/podinfo-git --for=condition=ready --timeout=5m
           kubectl -n source-system delete -f ./config/testdata/helmchart-valuesfile
       - name: Setup Minio
         env:

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup Kustomize
-        uses: fluxcd/pkg/actions/kustomize@master
+        uses: fluxcd/pkg/actions/kustomize@main
       - name: Prepare
         id: prep
         run: |

config/testdata/helmchart-valuesfile/gitrepository.yaml

@@ -1,12 +1,12 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: GitRepository
 metadata:
-  name: bitnami-charts
+  name: podinfo
 spec:
-  interval: 1m
+  interval: 5m
-  url: https://github.com/bitnami/charts
+  url: https://github.com/stefanprodan/podinfo
   ref:
-    branch: master
+    branch: v5.x
   ignore:
     /*
-    !/bitnami/
+    !/charts/

config/testdata/helmchart-valuesfile/helmchart_gitrepository.yaml

@@ -1,11 +1,11 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmChart
 metadata:
-  name: mariadb-git
+  name: podinfo-git
 spec:
-  chart: bitnami/mariadb
+  interval: 1m
-  valuesFile: values-production.yaml
   sourceRef:
     kind: GitRepository
-    name: bitnami-charts
+    name: podinfo
-  interval: 1m
+  chart: charts/podinfo
+  valuesFile: values-prod.yaml

config/testdata/helmchart-valuesfile/helmchart_helmrepository.yaml

@@ -1,11 +1,11 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmChart
 metadata:
-  name: mariadb
+  name: podinfo
 spec:
-  chart: mariadb
+  interval: 1m
-  valuesFile: values-production.yaml
   sourceRef:
     kind: HelmRepository
-    name: bitnami-charts
+    name: podinfo
-  interval: 1m
+  chart: podinfo
+  valuesFile: values-prod.yaml

config/testdata/helmchart-valuesfile/helmrepository.yaml

@@ -1,7 +1,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
-  name: bitnami-charts
+  name: podinfo
 spec:
-  interval: 1m
+  interval: 5m
-  url: https://charts.bitnami.com/bitnami
+  url: https://stefanprodan.github.io/podinfo