From f7ceac644d5b93b6e1da6d175c17dadad0caa6de Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Tue, 6 Oct 2020 00:12:53 +0200
Subject: [PATCH 1/2] e2e: use podinfo chart for valuesfile tests

---
 .github/workflows/e2e.yaml                             |  4 ++--
 .../testdata/helmchart-valuesfile/gitrepository.yaml   | 10 +++++-----
 .../helmchart-valuesfile/helmchart_gitrepository.yaml  | 10 +++++-----
 .../helmchart-valuesfile/helmchart_helmrepository.yaml | 10 +++++-----
 .../testdata/helmchart-valuesfile/helmrepository.yaml  |  6 +++---
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 2e9d3fed..8546c95d 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -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/mariadb-git --for=condition=ready --timeout=5m
+          kubectl -n source-system wait helmchart/podinfo --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:
diff --git a/config/testdata/helmchart-valuesfile/gitrepository.yaml b/config/testdata/helmchart-valuesfile/gitrepository.yaml
index b9324f6b..b620c856 100644
--- a/config/testdata/helmchart-valuesfile/gitrepository.yaml
+++ b/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
-  url: https://github.com/bitnami/charts
+  interval: 5m
+  url: https://github.com/stefanprodan/podinfo
   ref:
-    branch: master
+    branch: v5.x
   ignore:
     /*
-    !/bitnami/
+    !/charts/
diff --git a/config/testdata/helmchart-valuesfile/helmchart_gitrepository.yaml b/config/testdata/helmchart-valuesfile/helmchart_gitrepository.yaml
index 25163995..eab8c5b7 100644
--- a/config/testdata/helmchart-valuesfile/helmchart_gitrepository.yaml
+++ b/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
-  valuesFile: values-production.yaml
+  interval: 1m
   sourceRef:
     kind: GitRepository
-    name: bitnami-charts
-  interval: 1m
+    name: podinfo
+  chart: charts/podinfo
+  valuesFile: values-prod.yaml
diff --git a/config/testdata/helmchart-valuesfile/helmchart_helmrepository.yaml b/config/testdata/helmchart-valuesfile/helmchart_helmrepository.yaml
index e0c03517..4674622b 100644
--- a/config/testdata/helmchart-valuesfile/helmchart_helmrepository.yaml
+++ b/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
-  valuesFile: values-production.yaml
+  interval: 1m
   sourceRef:
     kind: HelmRepository
-    name: bitnami-charts
-  interval: 1m
+    name: podinfo
+  chart: podinfo
+  valuesFile: values-prod.yaml
diff --git a/config/testdata/helmchart-valuesfile/helmrepository.yaml b/config/testdata/helmchart-valuesfile/helmrepository.yaml
index adb1cf54..ab568384 100644
--- a/config/testdata/helmchart-valuesfile/helmrepository.yaml
+++ b/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
-  url: https://charts.bitnami.com/bitnami
+  interval: 5m
+  url: https://stefanprodan.github.io/podinfo

From 335a091f60e6db719588d79121ef3b2976be2df5 Mon Sep 17 00:00:00 2001
From: Hidde Beydals <hello@hidde.co>
Date: Tue, 6 Oct 2020 09:31:49 +0200
Subject: [PATCH 2/2] Use GitHub actions from fluxcd/pkg@main

As `master` was replaced with `main`.
---
 .github/workflows/e2e.yaml    | 6 +++---
 .github/workflows/release.yml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 8546c95d..c673de3a 100644
--- a/.github/workflows/e2e.yaml
+++ b/.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:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0bee6589..3f10a2b0 100644
--- a/.github/workflows/release.yml
+++ b/.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: |