rekor: refactor service wait init containers (#39)

The goal of this change is to upgrade curl to the current stable release. However, since the current stable release of curl behaves differently with respect to non-HTTP servers, a different solution was necessary for determining availability of the database (MySQL and MariaDB do not use HTTP). This resulted in three changes: 1. Change the curl image to docker.io/curlimages/curl:7.79.1 2. Modify the test for database server availability to use netcat instead of curl 3. Refactor the initContainerImage section of the values.yaml to support multiple init containers Signed-off-by: Gregory Moyer <[email protected]>
sigstore · Nov 17, 2021 · be8374f · be8374f
1 parent 04003b8
commit be8374f
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 19 deletions.
diff --git a/charts/rekor/Chart.yaml b/charts/rekor/Chart.yaml
@@ -4,7 +4,7 @@ description: Part of the sigstore project, Rekor is a timestamping server and tr
 
 type: application
 
-version: 0.2.5
+version: 0.2.6
 appVersion: 0.3.0
 
 keywords:
@@ -30,5 +30,7 @@ annotations:
       image: gcr.io/trillian-opensource-ci/db_server@sha256:e21b597eedb84063c7d958b6548e62ff1531a2ce7c024f366ccb4fb43163218c
     - name: redis
       image: docker.io/redis@sha256:0a0d563fd6fe5361316dd53f7f0a244656675054302567230e85eb114f683db4
-    - name: appropriate/curl
-      image: docker.io/appropriate/curl@sha256:c8bf5bbec6397465a247c2bb3e589bb77e4f62ff88a027175ecb2d9e4f12c9d7
+    - name: curlimages/curl
+      image: docker.io/curlimages/curl@sha256:1a2209a10a11295c3ab6952d1278a9ea2ce0d20e33fdeaeb24d7a4586767c825
+    - name: toolbelt/netcat
+      image: docker.io/toolbelt/netcat@sha256:a88ddd1f371229e7ea40a200a02145ddd48af602a028e0657e0ba6a18c58dbaf
diff --git a/charts/rekor/templates/server/deployment.yaml b/charts/rekor/templates/server/deployment.yaml
@@ -37,8 +37,8 @@ spec:
       serviceAccountName: {{ template "rekor.serviceAccountName.server" . }}
       initContainers:
         - name: "wait-for-trillian-log-server"
-          image: "{{ template "rekor.image" .Values.initContainerImage }}"
-          imagePullPolicy: {{ .Values.initContainerImage.imagePullPolicy }}
+          image: "{{ template "rekor.image" .Values.initContainerImage.curl }}"
+          imagePullPolicy: {{ .Values.initContainerImage.curl.imagePullPolicy }}
           command: ["sh", "-c", "until curl --max-time 10 http://{{ template "rekor.trillianLogServer.fullname" . }}:{{ .Values.trillianLogServer.portHTTP}}; do echo waiting for {{ template "rekor.trillianLogServer.fullname" . }}; sleep 5; done;"]
       {{- if .Values.server.extraInitContainers }}
 {{ toYaml .Values.server.extraInitContainers | indent 8 }}
@@ -107,4 +107,4 @@ spec:
           persistentVolumeClaim:
             claimName: {{ template "rekor.server.fullname" . }}
   {{- end }}
-{{- end }}
+{{- end }}
diff --git a/charts/rekor/templates/trillian-log-server/deployment.yaml b/charts/rekor/templates/trillian-log-server/deployment.yaml
@@ -37,9 +37,9 @@ spec:
       serviceAccountName: {{ template "rekor.serviceAccountName.trillianLogServer" . }}
       initContainers:
         - name: "wait-for-trillian-db"
-          image: "{{ template "rekor.image" .Values.initContainerImage }}"
-          imagePullPolicy: {{ .Values.initContainerImage.imagePullPolicy }}
-          command: ["sh", "-c", "until curl --max-time 10 http://{{ template "mysql.hostname" . }}:{{ .Values.mysql.port }}; do echo waiting for {{ template "mysql.hostname" . }}; sleep 5; done;"]
+          image: "{{ template "rekor.image" .Values.initContainerImage.netcat }}"
+          imagePullPolicy: {{ .Values.initContainerImage.netcat.imagePullPolicy }}
+          command: ["sh", "-c", "until nc -z -w 10 {{ template "mysql.hostname" . }} {{ .Values.mysql.port }}; do echo waiting for {{ template "mysql.hostname" . }}; sleep 5; done;"]
       {{- if .Values.trillianLogServer.extraInitContainers }}
 {{ toYaml .Values.trillianLogServer.extraInitContainers | indent 8 }}
       {{- end }}
@@ -101,4 +101,4 @@ spec:
     {{- if .Values.trillianLogServer.affinity }}
       affinity:
 {{ toYaml .Values.trillianLogServer.affinity | indent 8 }}
-    {{- end }}
+    {{- end }}
diff --git a/charts/rekor/templates/trillian-log-signer/deployment.yaml b/charts/rekor/templates/trillian-log-signer/deployment.yaml
@@ -37,9 +37,9 @@ spec:
       serviceAccountName: {{ template "rekor.serviceAccountName.trillianLogSigner" . }}
       initContainers:
         - name: "wait-for-trillian-db"
-          image: "{{ template "rekor.image" .Values.initContainerImage }}"
-          imagePullPolicy: {{ .Values.initContainerImage.imagePullPolicy }}
-          command: ["sh", "-c", "until curl --max-time 10 http://{{ template "mysql.hostname" . }}:{{ .Values.mysql.port }}; do echo waiting for {{ template "mysql.hostname" . }}; sleep 5; done;"]
+          image: "{{ template "rekor.image" .Values.initContainerImage.netcat }}"
+          imagePullPolicy: {{ .Values.initContainerImage.netcat.imagePullPolicy }}
+          command: ["sh", "-c", "until nc -z -w 10 {{ template "mysql.hostname" . }} {{ .Values.mysql.port }}; do echo waiting for {{ template "mysql.hostname" . }}; sleep 5; done;"]
       {{- if .Values.trillianLogSigner.extraInitContainers }}
 {{ toYaml .Values.trillianLogSigner.extraInitContainers | indent 8 }}
       {{- end }}
@@ -101,4 +101,4 @@ spec:
     {{- if .Values.trillianLogSigner.affinity }}
       affinity:
 {{ toYaml .Values.trillianLogSigner.affinity | indent 8 }}
-    {{- end }}
+    {{- end }}
diff --git a/charts/rekor/values.yaml b/charts/rekor/values.yaml
@@ -1,11 +1,18 @@
 imagePullSecrets:
 
 initContainerImage:
-  registry: docker.io
-  repository: appropriate/curl
-  # latest from 2021-10-28
-  version: sha256:c8bf5bbec6397465a247c2bb3e589bb77e4f62ff88a027175ecb2d9e4f12c9d7
-  imagePullPolicy: IfNotPresent
+  curl:
+    registry: docker.io
+    repository: curlimages/curl
+    # 7.79.1
+    version: sha256:1a2209a10a11295c3ab6952d1278a9ea2ce0d20e33fdeaeb24d7a4586767c825
+    imagePullPolicy: IfNotPresent
+  netcat:
+    registry: docker.io
+    repository: toolbelt/netcat
+    # 2021-10-23
+    version: sha256:a88ddd1f371229e7ea40a200a02145ddd48af602a028e0657e0ba6a18c58dbaf
+    imagePullPolicy: IfNotPresent
 
 redis:
   enabled: true