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

Cleanup CoreOS setup
Financial-Times · Nov 12, 2020 · e034486 · e034486
2 parents 6cde846 + 6a8a1d2
commit e034486
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 21 deletions.
diff --git a/helm/splunk-event-reader/app-configs/splunk-event-reader_delivery.yaml b/helm/splunk-event-reader/app-configs/splunk-event-reader_delivery.yaml
diff --git a/helm/splunk-event-reader/app-configs/splunk-event-reader_eks_delivery_dev.yaml b/helm/splunk-event-reader/app-configs/splunk-event-reader_eks_delivery_dev.yaml
@@ -2,7 +2,6 @@
 replicaCount: 2
 service:
   name: splunk-event-reader
-eksCluster: true
 encryptedsecrets:
   splunk.rest-api.password: "AgB+6iCW3RZjidRGY49/xeIslGc3cEb20H6K6JhvDdyChwY8Ad1v5AlJGl7ak1kEpwW3Kttm7b9BwY/h/S9xnayhZTDC6rA1WHq2Lipvp7K38fNS4Mv4qZJlFiuQc9UN6fulpf7I2R2YiskPdwgsx35HLO5JGEpfHSb93vZJVYhL9SxI1TaRvx5W4U3nFkyKAD3+huVeSttakJJ9eT/ofTNF4ayqqskhS7syiUezuoTkL000bkkCZ6/HmzjU8BYFzD05FlnplFq4SqB56guC1AnPDQLnXAlnxRHPqQNFHoVp7t3Iga9ZoPUtSkBHHdwqkN4YP0msyJz0R+BFeBPRXkndDuueHqxrBi4nPSw7M1KmIckQzA9fUVXh0GgLlcPFgtxAijizDoIeuYxw/J7sO4J287CkGHDSPaz12g5yMmNuTloo7RUHKyJgmAGASqnhBljetdSfDd326f3bIodMQUyRRyd9ObGGioA6S655wR6MXx/hsLoCqpLWmUJ6ffV8C9rOqVYA91MugnKpZGcXYqzWweBBRnT2MfHZ62eXFTY+eeoeWO6nez3bGcxRuIjYb882Dj8ibGZuPZ1qe0Ip6Bwtjogw7EgpK46JPXw5tfIteU//gCbPSpF21PIJAvVMISUiZnwwUUMvcjj5JTZlJzkq5J/sKFQst8W93PlfTl/+zf/3iICl68rvyJmNzY9rtM2bb5o9OTCIon7wDsE="
   splunk.rest-api.user: "AgBQgaD5DfPjUwOa9i6UwtdfUnMDteCwj6Ns9ST2I/NJsquFuXvqQHILmKzjkBYxYOv8pILaFnr7e2/hQr2S43Iit9s/ORbRBvkyG5LDS8lRa+ub3zgBt7jHTzUeRdLU8TqQeaB8Pl0KhQV5gdpzQp6MsGGECaT9pU5gbOVP4jtNXWIQNq3UnRIsRPBV/FrQHfNUyw02q8w0xVv2Ob1BhzfCfsXfuczfLv9SMMZ3mVzJgykbHNqHen5A6IVypj5V8qS+x08C1aiyi0EXOrbqvC2cbX2Kj6OVK9vwdRkmOIdXFC+uq4OQeUnctYgAVBNTqjMYE2tBM4NskInbsIUB304yxZfFKVeDjHk8xRtlWXWo0obkt3wNzTOG3sswQOBvVxM3PjcenA//1iOfjgvdKYwiZVDgvLY5E7AjV/OEYoX5Comyi3OA9bhKUUfUlsiaR0eB21vwHA8uWYm29YhYZ3FKySrJJNpU0vMUFtcIBpMytvsb/whhPegP4b/uQ6jsCmLlNCavhJjc11+lmDF7tmjVW1a0amxh+ROBPPXQeBVK/8mzoV1c7p+L9OnDe/vsyhqJgK1a36rshuh1VvIMsSLSJRzzlfxGyHkcbVUa0eDwdw/rReqaWqVgnfFnhUnW3xgQ2AynNOk9/UZ93SQQoyWdtH31QoJPYlLaIceb75l0BzZRzuIR3OSJ//1ROTvzM1/eFrIGCV28"
diff --git a/helm/splunk-event-reader/app-configs/splunk-event-reader_eks_delivery_prod.yaml b/helm/splunk-event-reader/app-configs/splunk-event-reader_eks_delivery_prod.yaml
@@ -2,7 +2,6 @@
 replicaCount: 2
 service:
   name: splunk-event-reader
-eksCluster: true
 encryptedsecrets:
   splunk.rest-api.password: "AgA0Z1IYzU7jvgJZyVwe9oRRuPnvKRAtcXzkFOlUl4CjlhurYneLAWlQmPYnz3E3PbZjLZgrqIF1uSijlVAt+yHgQWx2LAPiXw1vGTK0Eiu3RS3UOf2LtS0lK+K/+aKDAoA1yBWxPdQXVr85QgC4+6Ed8V1AyJtZ/JAJG91qh8ZhJWPj7cuPiHs2fjGn3M08WdljrihGNwJ3pIua1NkPmRjp9PvPtuzxOhrxkqwzw0CQ9Q8REs3sVQuyijY4s6mqFbI9Rgd72Y9M5uLiVym5CPr9LuoxMnd4QoUS1pjwgGvuu7WGSA7iZ8+paSJNXuKu5rUzPtj1wrSUcHBlpoCwZdazaJC2vglPcVldPe0vaTp+nvRSagpc7jK3lN67S+v65Oc4qfB/9cC3ZOW0y/zRbkLRDNBfkMS+xCQqBnW8cRCSUOv1/MDjjEXWLICZZpX/PMVBjcFuiK6YPnEyNShGwwMFIcCbX6WeW4Z/FcgkMQKY97UtgtLmA519tdXn66uluH7hl/EWB+XxXo73l1/UvTvkAo5JA50lVmEecOAnzn1qkIqMdbOYc3AfSPxbsqegLX2LVgwn27aeLFcD0hwRa3EkUzoSMLMpxiLH7wo+evAtrCIEL8LNuTccWKmJ/k2Bl3yfeEb6RUHH3aG+9oXZGrgL0j9WGY6QVbP2j41hEitzwuUMftaDnFfn95L5G34aGojGv5OgHSahu0Irj/A="
   splunk.rest-api.user: "AgA4/NFv5XAbaUEJSLeolEOdfP4jkSzLbQVJj2aykGp2Xt4C89mzSmavZlgHjfRCi1KxX/qjoetwKdWuM4IF/UWK2SNg2vM2JcxX2xWOKo9c+frMi3FIH1zG/dzBRHH+xRDGTZEUCYFpRmN7c7l97ATnG+aLvlyr4bxgRNQQTnidGS9MtUSUpy6c6dFOllLxWzAaHIBfVzmifMGfnLYk0kg7jxh6TH34gLKZTu49LMSzrS0i1uc/g54daICe/PVFw5buGei1r63rpKiAp7Y2VJan9DwvDVEECq4RQSjzg75vTfSNruetO3LwpIbVAcnwI7wDXzA13mjnJGk0imZm0ehD9WEtuD8eTB/rHowBN8Eq9vk9Wdn4gg3sy5sbhiUveXKur0DMvVsfl5aNV7j2p66N6wqE2HG5PVrgxG7VAXirwBXuH7FXmDTEq2lt3cRP8uEoxyTGP/BCBCOaFk+HuFKNqcMjZfbu6KTxd6swyAgv/nsenaO2JypFG3cri/M4wlo6hsyNHSvc6VG3TXM/0qp251MLIDVJogmraYmoYBRxwdZtn/JRg1Y4SpD9o5/nR8e8PwGPX6l62Prb5NZqCTFBDewZ0c1oZWhifWLJfQNOePmmP0UXytx2b4xqWQRymVvR44Yx1MFFt7f1MnLchC/UIbaPtWMiZOkaQ4lBd5tZWY37NYXvhRJ3t7XwZXHArkoEQXcRuLMTRL/V9rY="
diff --git a/helm/splunk-event-reader/app-configs/splunk-event-reader_eks_delivery_staging.yaml b/helm/splunk-event-reader/app-configs/splunk-event-reader_eks_delivery_staging.yaml
@@ -2,7 +2,6 @@
 replicaCount: 2
 service:
   name: splunk-event-reader
-eksCluster: true
 encryptedsecrets:
   splunk.rest-api.password: "AgANig8jZSs7qDqKiRvh96Zg3YC3F+L8Ras8NuYJhRv3KyyfSYHXZ2vzCOc+Sc+XIE4UeiXHkAIEmT34YTdXbRDeTSDTIGhgggDlpZx3gFFqWMhUmXGLBDklVk0EbcyxM4DCFAV7duqqldK+5uDHfO7ReoSyp0NAbiTrVhJJOJEure9zvcNLkvAufLW+NGB7mdX7dMUZNV3Ei7FUUObnahSXO1D71GlDQQR9bcF8ZgPVnZQe/I60BvO+x8ZsJy+snCGFGHHCI9VBOM+wsxvPLjLcTNnnEQuSEXBCttuZGpaXdaf1pOpKngHTEWfAWFO0CKRt/Tm6yYNMQOSjeFcaiigvPt2jx0DM37iy/dBnuSvJcAhig+/AlwE2jCYwJ6yEVUneC2qZ0oPRNkzsoqLLv3FVtaD2+/0sRpPjnbl1gZxQ7MAK1cwveSFwQQhu1BYGB0Om9QnsqGsh+PVDd50z/o7XPNC7OO3rBOm/Fe5ZdF9oMYDph9kX+0Yp/kdu1EcC7crIFWFzjbmGC/jnCgFKpWgGdBa+MiHtErKMfiubc02pThphceswwt0PZRuy9PmSHKyA8P9FTR+m02WjCqZrkKCzSS/JwSmGJlIlJtLMKVJ+NOsfXxRD2E8NsreyV8fTyjsCEoiJEDNNVHIY6bQqZRio+0yY5nMJ2rmwbIzq7bxaLwOGpixj2qVGoZw/16TZMWUDGOOIw2SNlqqxWIc="
   splunk.rest-api.user: "AgAIuKYXhz6qwQRRR3+LSjA8UbDaFXedQBkALzJu5TTQOFJvWHgfkli/OJexzWb/kcjtol5fn1zBvmWrUnqF0Rrp/G0exV1A23AAVwjCiM7YM1FA6DI+CKdIxbEg6sJsJyKrfhKG5CAQGT2esLtQuW/CWhIE6MYW/cN3jFgZR2dEwuzVeQ3xAhUDM7lNtuv+dLQ9tjzCiatpsQJeCDbKLi47KebUXaq9q74Yy1xVg7bJxjt7UfTeFO08O6anUxWdAxIjIfN/IWiaBg8X/CnS07mNh/cwvB80BtZHtiNc/+tOzI7TDXBp6Rp6DswlwjJ7r4rgyFtlw+MLNijn78MFkN/GecWeFUzGbVfrYkymdA77qO+VPApOXn1u4AghDrmifv8t9q4YLciJ91HObLwSxL9AfeKLdWyGK7LcGCNZwjFU6WIdGmnsAykXmubNx2bQetIE5/bfrXNkHqjGsRc+r8EcopYYIv/Tfev5Fwud0sIskTul3myOTJbsTFtfSuWp3UkrM7CECuhirmE3/nbldeQwPe8M+LR8XqCvc1cDWUKPv+5PFl2xeaIoZzsZrUwPJ4pdUhRrCl5Rkm+LFmLLrT70ZLlOLvWUtXrsPEs2A8N3q/tF3U6eH4+LLGSZHi3A1eEpw9qRDkPPl2sY3tCMpJUp7+MUMy7Dlf9x+j6xkX4DF7HH5RbXDq6slJbyTpm/mK6OTSPdibYT"
diff --git a/helm/splunk-event-reader/templates/deployment.yaml b/helm/splunk-event-reader/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/splunk-event-reader/templates/service.yaml b/helm/splunk-event-reader/templates/service.yaml
@@ -1,15 +1,15 @@
 kind: Service
 apiVersion: v1
 metadata:
-  name: {{.Values.service.name}} 
+  name: {{.Values.service.name}}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     app: {{.Values.service.name}}
-    visualize: "true" 
-    hasHealthcheck: "{{ .Values.service.hasHealthcheck }}" 
+    visualize: "true"
+    hasHealthcheck: "{{ .Values.service.hasHealthcheck }}"
 spec:
-  ports: 
-    - port: 8080 
+  ports:
+    - port: 8080
       targetPort: 8080
-  selector: 
-    app: {{ .Values.service.name }} 
+  selector:
+    app: {{ .Values.service.name }}
diff --git a/helm/splunk-event-reader/templates/splunk-event-reader-sealed-secrets.yaml b/helm/splunk-event-reader/templates/splunk-event-reader-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/splunk-event-reader/values.yaml b/helm/splunk-event-reader/values.yaml
@@ -3,7 +3,6 @@
 service:
   name: "" # The name of the service, should be defined in the specific app-configs folder.
   hasHealthcheck: "true"
-eksCluster: false
 replicaCount: 2
 image:
   repository: coco/splunk-event-reader