From 97298c2fc891fcb85bf1402cd477e0ee36ce6a99 Mon Sep 17 00:00:00 2001
From: Gerrit <Gerrit91@users.noreply.github.com>
Date: Fri, 5 Feb 2021 11:59:35 +0100
Subject: [PATCH] Don't init data store with metal-api instances. (#10)

---
 .../templates/metal-api.yaml                   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/charts/metal-control-plane/templates/metal-api.yaml b/charts/metal-control-plane/templates/metal-api.yaml
index d11b545..2824c39 100644
--- a/charts/metal-control-plane/templates/metal-api.yaml
+++ b/charts/metal-control-plane/templates/metal-api.yaml
@@ -74,6 +74,8 @@ spec:
           value: {{ .Values.zap_encoding }}
         - name: ZAP_LEVEL
           value: {{ .Values.zap_level }}
+        - name: METAL_API_INIT_DATA_STORE
+          value: "false"
         - name: METAL_API_DB_ADDR
           value: {{ .Values.metal_api.db_address }}
         - name: METAL_API_DB_PASSWORD
@@ -310,16 +312,22 @@ spec:
           mountPath: /masterdata
       initContainers:
       - name: wait-for-api
-        image: gempesaw/curl-jq
+        image: {{ .Values.images.metalctl.image }}:{{ .Values.images.metalctl.tag }}
+        imagePullPolicy: {{ .Values.images.metalctl.imagePullPolicy }}
         env:
-        - name: API_BASE_URL
-          value: metal-api:{{ .Values.ports.metal_api }}{{ .Values.metal_api.base_path }}
+        - name: METALCTL_URL
+          value: http://metal-api:{{ .Values.ports.metal_api }}{{ .Values.metal_api.base_path }}
+        - name: METALCTL_HMAC
+          valueFrom:
+            secretKeyRef:
+              name: metal-api
+              key: admin_key
         command:
           - sh
           - -c
           - |
-              set -eu
-              until curl --output /dev/null --fail -s $API_BASE_URL/v1/health; do echo waiting for $API_BASE_URL; sleep 2; done
+              set -exu
+              until /metalctl health; do echo "." && sleep 2; done
       volumes:
         - name: masterdata
           configMap: