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

Fix/cph 267 config cleanup
Financial-Times · Aug 19, 2020 · 94d5a08 · 94d5a08
2 parents 5463557 + 50a5b7a
commit 94d5a08
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 18 deletions.
diff --git a/helm/draft-annotations-api/app-configs/draft-annotations-api_eks_pac_prod.yaml b/helm/draft-annotations-api/app-configs/draft-annotations-api_eks_pac_prod.yaml
@@ -1,8 +1,6 @@
 # Values used for the deployed application.
 replicaCount: 2
 
-eksCluster: true
-
 service:
   name: draft-annotations-api
 

diff --git a/helm/draft-annotations-api/app-configs/draft-annotations-api_eks_pac_staging.yaml b/helm/draft-annotations-api/app-configs/draft-annotations-api_eks_pac_staging.yaml
@@ -1,8 +1,6 @@
 # Values used for the deployed application.
 replicaCount: 2
 
-eksCluster: true
-
 service:
   name: draft-annotations-api
 

diff --git a/helm/draft-annotations-api/app-configs/draft-annotations-api_eks_pac_test.yaml b/helm/draft-annotations-api/app-configs/draft-annotations-api_eks_pac_test.yaml
@@ -1,8 +1,6 @@
 # Values used for the deployed application.
 replicaCount: 2
 
-eksCluster: true
-
 service:
   name: draft-annotations-api
 

diff --git a/helm/draft-annotations-api/app-configs/draft-annotations-api_pac.yaml b/helm/draft-annotations-api/app-configs/draft-annotations-api_pac.yaml
diff --git a/helm/draft-annotations-api/templates/deployment.yaml b/helm/draft-annotations-api/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/draft-annotations-api/templates/draft-annotations-api-sealed-secrets.yaml b/helm/draft-annotations-api/templates/draft-annotations-api-sealed-secrets.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.eksCluster }}
 apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret
 metadata:
@@ -8,4 +7,3 @@ metadata:
 spec:
   encryptedData:
 {{ if .Values.encryptedSecrets }}{{ toYaml .Values.encryptedSecrets | indent 4 }}{{ end }}
-{{- end }}
diff --git a/helm/draft-annotations-api/values.yaml b/helm/draft-annotations-api/values.yaml
@@ -13,5 +13,3 @@ resources:
     memory: 10Mi
   limits:
     memory: 128Mi
-
-eksCluster: false