Add EKS configs

Financial-Times · Jun 11, 2020 · 9e866aa · 9e866aa
1 parent 0e9e07a
commit 9e866aa
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 23 deletions.
diff --git a/...ntent-placeholder-mapper/app-configs/methode-content-placeholder-mapper_eks_delivery.yaml b/...ntent-placeholder-mapper/app-configs/methode-content-placeholder-mapper_eks_delivery.yaml
@@ -0,0 +1,5 @@
+# Values used for the deployed application.
+replicaCount: 2
+service:
+  name: methode-content-placeholder-mapper
+eksCluster: true
diff --git a/helm/methode-content-placeholder-mapper/templates/deployment.yaml b/helm/methode-content-placeholder-mapper/templates/deployment.yaml
@@ -1,24 +1,27 @@
 ##this is an example deployment.yaml that should be customized in order to meet the configuration for app k8s deployment
-
+{{- if .Values.eksCluster }}
+apiVersion: apps/v1
+{{- else }}
 apiVersion: extensions/v1beta1
+{{- end }}
 kind: Deployment
 metadata:
-  name: {{ .Values.service.name }} 
+  name: {{ .Values.service.name }}
   labels:
     chart: "{{ .Chart.Name | trunc 63 }}"
-    chartVersion: "{{ .Chart.Version | trunc 63 }}" 
-    visualize: "true" 
-    app: {{ .Values.service.name }} 
+    chartVersion: "{{ .Chart.Version | trunc 63 }}"
+    visualize: "true"
+    app: {{ .Values.service.name }}
 spec:
-  replicas: {{ .Values.replicaCount }} 
-  selector: 
+  replicas: {{ .Values.replicaCount }}
+  selector:
     matchLabels:
       app: {{ .Values.service.name }}
   template:
     metadata:
       labels:
         app: {{ .Values.service.name }}
-        visualize: "true" 
+        visualize: "true"
     spec:
       affinity:
         podAntiAffinity:
@@ -30,8 +33,8 @@ spec:
                 values:
                 - {{ .Values.service.name }}
             topologyKey: "kubernetes.io/hostname"
-      containers: 
-      - name: {{ .Values.service.name }} 
+      containers:
+      - name: {{ .Values.service.name }}
         image: "{{ .Values.image.repository }}:{{ .Chart.Version }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
@@ -53,17 +56,17 @@ spec:
           value: {{ .Values.service.QueueWriteTopic }}
         - name: DOCUMENT_STORE_API_ADDRESS
           value: {{ .Values.service.DocumentStoreAPIUrl }}
-        ports: 
-        - containerPort: 8080 
-        livenessProbe: 
-          tcpSocket: 
-            port: 8080 
-          initialDelaySeconds: 10 
-        readinessProbe: 
-          httpGet: 
-            path: "/__gtg" 
-            port: 8080 
-          initialDelaySeconds: 15 
-          periodSeconds: 30 
-        resources: 
+        ports:
+        - containerPort: 8080
+        livenessProbe:
+          tcpSocket:
+            port: 8080
+          initialDelaySeconds: 10
+        readinessProbe:
+          httpGet:
+            path: "/__gtg"
+            port: 8080
+          initialDelaySeconds: 15
+          periodSeconds: 30
+        resources:
 {{ toYaml .Values.resources | indent 12 }}
diff --git a/helm/methode-content-placeholder-mapper/values.yaml b/helm/methode-content-placeholder-mapper/values.yaml
@@ -9,6 +9,7 @@ service:
   QueueWriteTopic: "CmsPublicationEvents"
   DocumentStoreAPIUrl: "http://document-store-api:8080"
   isResilient: "false"
+eksCluster: false
 replicaCount: 2
 image:
   repository: coco/methode-content-placeholder-mapper