From 30337074bf565c25ed35b12561b0ec66d6d98c3d Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres@bitnami.com>
Date: Mon, 20 May 2019 10:51:15 -0700
Subject: [PATCH 1/3] Bump chart version. Update apprepositories annotations

---
 chart/kubeapps/Chart.yaml                     | 2 +-
 chart/kubeapps/templates/apprepositories.yaml | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/chart/kubeapps/Chart.yaml b/chart/kubeapps/Chart.yaml
index 0a96855e0df..76f7baf016a 100644
--- a/chart/kubeapps/Chart.yaml
+++ b/chart/kubeapps/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kubeapps
-version: 1.6.2
+version: 1.7.0
 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/chart/kubeapps/templates/apprepositories.yaml b/chart/kubeapps/templates/apprepositories.yaml
index b681bb2a213..a0d17e51abe 100644
--- a/chart/kubeapps/templates/apprepositories.yaml
+++ b/chart/kubeapps/templates/apprepositories.yaml
@@ -4,11 +4,19 @@ kind: AppRepository
 metadata:
   name: {{ .name }}
   annotations:
+{{- if semverCompare ">=2.14.0" $.Capabilities.TillerVersion.SemVer }}
+    # Using the hook pre-install because since Helm v2.14 the crd-install
+    # hook should be used only for CRDs and the issues related to install
+    # Custom Resources have been already fixed
+    # https://github.com/helm/helm/issues/5756#issuecomment-493653454
+    "helm.sh/hook": pre-install
+{{- else }}
     # Using the hook crd-install to avoid issue w/Helm v1.11
     # https://github.com/kubeapps/kubeapps/pull/955#pullrequestreview-200764260
     "helm.sh/hook": crd-install
     # Make sure this runs after the AppRepository CRD install
     "helm.sh/hook-weight": "10"
+{{- end }}
   labels:
     app: {{ template "kubeapps.apprepository.fullname" $ }}
     chart: {{ template "kubeapps.chart" $ }}

From ad54487a29d8e133f8db50adcd641789b256dcdb Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres@bitnami.com>
Date: Mon, 20 May 2019 11:00:53 -0700
Subject: [PATCH 2/3] Use latest Helm version

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f623d8208a3..601b14c1a54 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -117,7 +117,7 @@ exports: &exports
     # history of the production tag
     echo "export IMG_MODIFIER=-ci" >> $BASH_ENV
     # Helm version (should be +2.10)
-    echo "export HELM_VERSION=v2.11.0" >> $BASH_ENV
+    echo "export HELM_VERSION=v2.14.0" >> $BASH_ENV
 build_images: &build_images
   steps:
     - setup_remote_docker

From d7b2f3d956ffefcd8059ac517ee442eafaf649e5 Mon Sep 17 00:00:00 2001
From: Andres Martinez Gotor <andres@bitnami.com>
Date: Mon, 20 May 2019 11:11:22 -0700
Subject: [PATCH 3/3] Specify a scoped namespace for AppRepositories

---
 chart/kubeapps/templates/apprepository-crd.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chart/kubeapps/templates/apprepository-crd.yaml b/chart/kubeapps/templates/apprepository-crd.yaml
index 8f41324812d..ba1f07a2cbb 100644
--- a/chart/kubeapps/templates/apprepository-crd.yaml
+++ b/chart/kubeapps/templates/apprepository-crd.yaml
@@ -14,6 +14,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   group: kubeapps.com
+  scope: Namespaced
   names:
     kind: AppRepository
     plural: apprepositories