From c05697e6122e66084c0759807ee01100a9251872 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres@bitnami.com>
Date: Mon, 25 Feb 2019 11:56:38 +0100
Subject: [PATCH 1/3] Use bitnami images before updating bitnami chart

---
 chart/kubeapps/Chart.yaml  | 2 +-
 script/chart_sync_utils.sh | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/chart/kubeapps/Chart.yaml b/chart/kubeapps/Chart.yaml
index 4d4dd39d166..c11ccb8d14f 100644
--- a/chart/kubeapps/Chart.yaml
+++ b/chart/kubeapps/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kubeapps
-version: 1.5.0
+version: 1.5.1
 appVersion: DEVEL
 description: Kubeapps is a dashboard for your Kubernetes cluster that makes it easy to deploy and manage applications in your cluster using Helm
 icon: https://raw.githubusercontent.com/kubeapps/kubeapps/master/docs/img/logo.png
diff --git a/script/chart_sync_utils.sh b/script/chart_sync_utils.sh
index 7ce78f67010..14fabaccd8c 100755
--- a/script/chart_sync_utils.sh
+++ b/script/chart_sync_utils.sh
@@ -58,6 +58,13 @@ updateRepo() {
     rm "${targetChartPath}/Chart.yaml.bk"
     # DANGER: This replaces any tag marked as latest in the values.yaml
     sed -i.bk 's/tag: latest/tag: '"${targetTag}"'/g' "${targetChartPath}/values.yaml"
+    # Replace quay.io images for docker.io
+    sed -i.bk 's/registry: quay.io/registry: docker.io/g' "${targetChartPath}/values.yaml"
+    # Remove v prefix from tags
+    sed -i.bk 's/tag: v\(.*\)/tag: \1/g' "${targetChartPath}/values.yaml"
+    # Use bitnami images
+    sed -i.bk 's/repository: helmpack\/\(.*\)/repository: bitnami\/kubeapps-\1/g' "${targetChartPath}/values.yaml"
+    sed -i.bk 's/repository: kubeapps\/\(.*\)/repository: bitnami\/kubeapps-\1/g' "${targetChartPath}/values.yaml"
     rm "${targetChartPath}/values.yaml.bk"
 }
 

From 8ba63892a081dfb6653334ebb3705d319e83ba62 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres@bitnami.com>
Date: Tue, 26 Feb 2019 10:07:32 +0100
Subject: [PATCH 2/3] Use bitnami repository instead of helmpack

---
 chart/kubeapps/values.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/chart/kubeapps/values.yaml b/chart/kubeapps/values.yaml
index 0031e8cbbee..485d6b7a382 100644
--- a/chart/kubeapps/values.yaml
+++ b/chart/kubeapps/values.yaml
@@ -98,9 +98,9 @@ apprepository:
     tag: latest
   # Image used to perform chart repository syncs
   syncImage:
-    registry: quay.io
-    repository: helmpack/chart-repo
-    tag: v1.4.0
+    registry: docker.io
+    repository: bitnami/kubeapps-chart-repo
+    tag: 1.4.0
   initialRepos:
   - name: stable
     url: https://kubernetes-charts.storage.googleapis.com
@@ -175,9 +175,9 @@ tillerProxy:
 chartsvc:
   replicaCount: 2
   image:
-    registry: quay.io
-    repository: helmpack/chartsvc
-    tag: v1.4.0
+    registry: docker.io
+    repository: bitnami/kubeapps-chartsvc
+    tag: 1.4.0
   service:
     port: 8080
   # https://github.com/kubeapps/kubeapps/issues/478#issuecomment-422979262

From 6e10064dfef9c69d3e4a75153754dfe009082942 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres@bitnami.com>
Date: Tue, 26 Feb 2019 10:12:42 +0100
Subject: [PATCH 3/3] Simplify regex

---
 script/chart_sync_utils.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/script/chart_sync_utils.sh b/script/chart_sync_utils.sh
index 14fabaccd8c..a80a7d35386 100755
--- a/script/chart_sync_utils.sh
+++ b/script/chart_sync_utils.sh
@@ -57,13 +57,9 @@ updateRepo() {
     sed -i.bk 's/appVersion: DEVEL/appVersion: '"${targetTag}"'/g' "${chartYaml}"
     rm "${targetChartPath}/Chart.yaml.bk"
     # DANGER: This replaces any tag marked as latest in the values.yaml
-    sed -i.bk 's/tag: latest/tag: '"${targetTag}"'/g' "${targetChartPath}/values.yaml"
-    # Replace quay.io images for docker.io
-    sed -i.bk 's/registry: quay.io/registry: docker.io/g' "${targetChartPath}/values.yaml"
-    # Remove v prefix from tags
-    sed -i.bk 's/tag: v\(.*\)/tag: \1/g' "${targetChartPath}/values.yaml"
+    local tagWithoutV=$(echo $targetTag | tr -d v)
+    sed -i.bk 's/tag: latest/tag: '"${tagWithoutV}"'/g' "${targetChartPath}/values.yaml"
     # Use bitnami images
-    sed -i.bk 's/repository: helmpack\/\(.*\)/repository: bitnami\/kubeapps-\1/g' "${targetChartPath}/values.yaml"
     sed -i.bk 's/repository: kubeapps\/\(.*\)/repository: bitnami\/kubeapps-\1/g' "${targetChartPath}/values.yaml"
     rm "${targetChartPath}/values.yaml.bk"
 }