From b88b0c424a0b258fc58cfaabee7dce389ea77480 Mon Sep 17 00:00:00 2001 From: Richard Case Date: Tue, 18 Jan 2022 10:48:24 +0000 Subject: [PATCH] fix: issues with tokens in the templates Signed-off-by: Richard Case --- templates/cluster-template-cilium.yaml | 3 +-- templates/cluster-template.yaml | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/templates/cluster-template-cilium.yaml b/templates/cluster-template-cilium.yaml index ac1e6c6..55549ef 100644 --- a/templates/cluster-template-cilium.yaml +++ b/templates/cluster-template-cilium.yaml @@ -32,7 +32,6 @@ spec: controlPlaneEndpoint: host: "${CONTROL_PLANE_VIP}" port: 6443 - sshPublicKey: "${USER_SSH_KEY:=}" placement: staticPool: hosts: @@ -702,7 +701,7 @@ data: # distros installed on the underlying host. Copy the binary to the # same directory where we install cilium cni plugin so that exec permissions # are available. - - 'cp /usr/bin/cilium-mount /hostbin/cilium-mount && nsenter --cgroup=/hostproc/1/ns/cgroup --mount=/hostproc/1/ns/mnt "${BIN_PATH}/cilium-mount" $CGROUP_ROOT; rm /hostbin/cilium-mount' + - 'cp /usr/bin/cilium-mount /hostbin/cilium-mount && nsenter --cgroup=/hostproc/1/ns/cgroup --mount=/hostproc/1/ns/mnt "/opt/cni/bin/cilium-mount" $CGROUP_ROOT; rm /hostbin/cilium-mount' image: "quay.io/cilium/cilium:v1.9.11@sha256:47f923325069a697d5baf5314c7fe936bdf34e7c8154666e6762a78be1ddc3ec" imagePullPolicy: IfNotPresent volumeMounts: diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml index fa5566d..86138ba 100644 --- a/templates/cluster-template.yaml +++ b/templates/cluster-template.yaml @@ -28,7 +28,6 @@ spec: controlPlaneEndpoint: host: "${CONTROL_PLANE_VIP}" port: 6443 - sshPublicKey: "${USER_SSH_KEY:=}" placement: staticPool: hosts: