Merge pull request #28 from Financial-Times/fix/CPH-267-config-cleanup

Clean CoreOS setup
Financial-Times · Nov 2, 2020 · d09db61 · d09db61
2 parents f880d0e + cbaad5e
commit d09db61
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 22 deletions.
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
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
@@ -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
@@ -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
@@ -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