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

Cleanup CoreOS setup
Financial-Times · Nov 3, 2020 · 7ddf28e · 7ddf28e
2 parents 84430da + 33126f4
commit 7ddf28e
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 20 deletions.
diff --git a/helm/notifications-push/app-configs/notifications-push_delivery.yaml b/helm/notifications-push/app-configs/notifications-push_delivery.yaml
diff --git a/helm/notifications-push/app-configs/notifications-push_eks_delivery.yaml b/helm/notifications-push/app-configs/notifications-push_eks_delivery.yaml
@@ -2,7 +2,6 @@
 replicaCount: 2
 service:
   name: notifications-push
-eksCluster: true
 env:
   TOPIC: "PostPublicationEvents"
   METADATA_TOPIC: "PostConceptAnnotations"

diff --git a/helm/notifications-push/templates/deployment.yaml b/helm/notifications-push/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/notifications-push/values.yaml b/helm/notifications-push/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/notifications-push