From cbaad5e4c40f16949d2bfe28bbbb46a124e3e09e Mon Sep 17 00:00:00 2001
From: Donislav Belev <donislav.belev@ft.com>
Date: Thu, 29 Oct 2020 16:23:15 +0200
Subject: [PATCH] Clean CoreOS setup

---
 .../content-collection-unfolder_delivery.yaml     | 15 ---------------
 .../content-collection-unfolder_eks_delivery.yaml |  2 --
 .../templates/deployment.yaml                     |  4 ----
 helm/content-collection-unfolder/values.yaml      |  1 -
 4 files changed, 22 deletions(-)
 delete mode 100644 helm/content-collection-unfolder/app-configs/content-collection-unfolder_delivery.yaml

diff --git a/helm/content-collection-unfolder/app-configs/content-collection-unfolder_delivery.yaml b/helm/content-collection-unfolder/app-configs/content-collection-unfolder_delivery.yaml
deleted file mode 100644
index a98fa65..0000000
--- a/helm/content-collection-unfolder/app-configs/content-collection-unfolder_delivery.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Values used for the deployed application.
-replicaCount: 2
-service:
-  name: content-collection-unfolder
-env:
-  UNFOLDING_WHITELIST: content-package
-  WRITER_URI: http://content-collection-rw-neo4j:8080/content-collection/
-  WRITER_HEALTH_URI: http://content-collection-rw-neo4j:8080/__health
-  CONTENT_RESOLVER_URI: http://document-store-api:8080/content/
-  CONTENT_RESOLVER_HEALTH_URI: http://document-store-api:8080/__health
-  RELATIONS_RESOLVER_URI: http://relations-api:8080/contentcollection/{uuid}/relations
-  RELATIONS_RESOLVER_HEALTH_URI: http://relations-api:8080/__health
-  Q_WRITE_TOPIC: PostPublicationEvents
-  REQUEST_TIMEOUT: '"2"'
-  
\ No newline at end of file
diff --git a/helm/content-collection-unfolder/app-configs/content-collection-unfolder_eks_delivery.yaml b/helm/content-collection-unfolder/app-configs/content-collection-unfolder_eks_delivery.yaml
index 4d6e2a8..d185d39 100644
--- a/helm/content-collection-unfolder/app-configs/content-collection-unfolder_eks_delivery.yaml
+++ b/helm/content-collection-unfolder/app-configs/content-collection-unfolder_eks_delivery.yaml
@@ -2,7 +2,6 @@
 replicaCount: 2
 service:
   name: content-collection-unfolder
-eksCluster: true
 env:
   UNFOLDING_WHITELIST: content-package
   WRITER_URI: http://content-collection-rw-neo4j:8080/content-collection/
@@ -13,4 +12,3 @@ env:
   RELATIONS_RESOLVER_HEALTH_URI: http://relations-api:8080/__health
   Q_WRITE_TOPIC: PostPublicationEvents
   REQUEST_TIMEOUT: '"2"'
-  
diff --git a/helm/content-collection-unfolder/templates/deployment.yaml b/helm/content-collection-unfolder/templates/deployment.yaml
index 0a2d434..d90ca0a 100644
--- a/helm/content-collection-unfolder/templates/deployment.yaml
+++ b/helm/content-collection-unfolder/templates/deployment.yaml
@@ -1,8 +1,4 @@
-{{- if .Values.eksCluster }}
 apiVersion: apps/v1
-{{- else }}
-apiVersion: extensions/v1beta1
-{{- end }}
 kind: Deployment
 metadata:
   name: {{ .Values.service.name }}
diff --git a/helm/content-collection-unfolder/values.yaml b/helm/content-collection-unfolder/values.yaml
index 81a5084..447f37c 100644
--- a/helm/content-collection-unfolder/values.yaml
+++ b/helm/content-collection-unfolder/values.yaml
@@ -5,7 +5,6 @@ service:
   name: "" # The name of the service, should be defined in the specific app-configs folder.
   hasHealthcheck: "true"
   isResilient: "false"
-eksCluster: false
 replicaCount: 2
 image:
   repository: coco/content-collection-unfolder