Mount known_hosts properly

fluxcd · Nov 7, 2019 · a5e8f43 · a5e8f43
1 parent 4214b3d
commit a5e8f43
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/test/e2e/fixtures/kustom/base/flux/e2e_patch.yaml b/test/e2e/fixtures/kustom/base/flux/e2e_patch.yaml
@@ -7,3 +7,15 @@
 - op: add
   path: /spec/template/spec/containers/0/args/-
   value: --registry-exclude-image=*
+- op: add
+  path: /spec/template/spec/containers/0/volumeMounts/-
+  value:
+    name: known-hosts
+    mountPath: /root/.ssh/known_hosts
+    subPath: known_hosts
+- op: add
+  path: /spec/template/spec/volumes/-
+  value:
+    name: known-hosts
+    configMap:
+      name: flux-known-hosts
diff --git a/test/e2e/fixtures/kustom/base/flux/kustomization.yaml b/test/e2e/fixtures/kustom/base/flux/kustomization.yaml
@@ -5,8 +5,6 @@ resources:
 - memcache-dep.yaml
 - memcache-svc.yaml
 patchesJson6902:
-# use a poll interval of 10s (to make tests quicker) and disable
-# registry polling (to avoid overloading kind)
 - target:
     group: apps
     version: v1

diff --git a/test/e2e/lib/install.bash b/test/e2e/lib/install.bash
@@ -52,6 +52,7 @@ fluxctl_install_cmd="fluxctl install --git-url=ssh://git@gitsrv/git-server/repos
 
 function install_flux_with_fluxctl() {
   kustomization_dir=${1:-base/flux}
+  kubectl -n "${FLUX_NAMESPACE}" create configmap flux-known-hosts --from-file="${E2E_DIR}/fixtures/known_hosts"
   local kustomtmp
   kustomtmp="$(mktemp -d)"
   defer "rm -rf \"${kustomtmp}\""
@@ -64,14 +65,11 @@ function install_flux_with_fluxctl() {
   cp -R "${E2E_DIR}"/fixtures/kustom/* "${kustomtmp}/"
   kubectl apply -k "${kustomtmp}/${kustomization_dir}" >&3
   kubectl -n "${FLUX_NAMESPACE}" rollout status -w --timeout=30s deployment/flux
-  # Add the known hosts file manually (it's much easier than editing the manifests to add a volume)
-  local flux_podname
-  flux_podname=$(kubectl get pod -n "${FLUX_NAMESPACE}" -l name=flux -o jsonpath="{['items'][0].metadata.name}")
-  kubectl exec -n "${FLUX_NAMESPACE}" "${flux_podname}" -- sh -c "mkdir -p /root/.ssh; echo '${KNOWN_HOSTS}' > /root/.ssh/known_hosts" >&3
 }
 
 function uninstall_flux_with_fluxctl() {
-  $fluxctl_install_cmd --namespace "${FLUX_NAMESPACE}" | kubectl delete -f -
+  kubectl delete -n "${FLUX_NAMESPACE}" configmap flux-known-hosts
+  $fluxctl_install_cmd -n "${FLUX_NAMESPACE}" | kubectl delete -f -
 }
 
 flux_gpg_helm_template="helm template --name flux-gpg