From 19cfb283a7d41cdde263394af71388f23a24c629 Mon Sep 17 00:00:00 2001
From: Erik Osterman <erik@cloudposse.com>
Date: Wed, 2 May 2018 11:20:55 -0700
Subject: [PATCH] move kops helmfile (#130)

* move kops helmfile

* deprecate helm-diff because it keeps breaking build
---
 Dockerfile                                           | 2 --
 {conf => rootfs/conf}/kops/helmfile.yaml             | 0
 {conf => rootfs/conf}/kops/values/chart-repo.yaml    | 0
 {conf => rootfs/conf}/kops/values/chartmuseum.yaml   | 0
 {conf => rootfs/conf}/kops/values/nginx-ingress.yaml | 0
 5 files changed, 2 deletions(-)
 rename {conf => rootfs/conf}/kops/helmfile.yaml (100%)
 rename {conf => rootfs/conf}/kops/values/chart-repo.yaml (100%)
 rename {conf => rootfs/conf}/kops/values/chartmuseum.yaml (100%)
 rename {conf => rootfs/conf}/kops/values/nginx-ingress.yaml (100%)

diff --git a/Dockerfile b/Dockerfile
index 1a6e303e3..fd58429be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -156,14 +156,12 @@ RUN helm repo add cloudposse-incubator https://charts.cloudposse.com/incubator/
 # Install helm plugins
 # 
 ENV HELM_APPR_VERSION 0.7.0
-ENV HELM_DIFF_VERSION 2.8.0+1
 ENV HELM_EDIT_VERSION 0.2.0
 ENV HELM_GITHUB_VERSION 0.2.0
 ENV HELM_SECRETS_VERSION 1.2.9
 
 RUN helm plugin install https://github.com/app-registry/appr-helm-plugin --version v${HELM_APPR_VERSION} \
     && helm plugin install https://github.com/mstrzele/helm-edit --version v${HELM_EDIT_VERSION} \
-    && helm plugin install https://github.com/databus23/helm-diff --version v${HELM_DIFF_VERSION} \
     && helm plugin install https://github.com/futuresimple/helm-secrets --version ${HELM_SECRETS_VERSION} \
     && helm plugin install https://github.com/sagansystems/helm-github --version ${HELM_GITHUB_VERSION}
 
diff --git a/conf/kops/helmfile.yaml b/rootfs/conf/kops/helmfile.yaml
similarity index 100%
rename from conf/kops/helmfile.yaml
rename to rootfs/conf/kops/helmfile.yaml
diff --git a/conf/kops/values/chart-repo.yaml b/rootfs/conf/kops/values/chart-repo.yaml
similarity index 100%
rename from conf/kops/values/chart-repo.yaml
rename to rootfs/conf/kops/values/chart-repo.yaml
diff --git a/conf/kops/values/chartmuseum.yaml b/rootfs/conf/kops/values/chartmuseum.yaml
similarity index 100%
rename from conf/kops/values/chartmuseum.yaml
rename to rootfs/conf/kops/values/chartmuseum.yaml
diff --git a/conf/kops/values/nginx-ingress.yaml b/rootfs/conf/kops/values/nginx-ingress.yaml
similarity index 100%
rename from conf/kops/values/nginx-ingress.yaml
rename to rootfs/conf/kops/values/nginx-ingress.yaml