Merge pull request #95 from weaveworks/template_fix

fix: issues with tokens in the templates
liquidmetal-dev · Jan 18, 2022 · e88aaf4 · e88aaf4
2 parents d267c2d + b88b0c4
commit e88aaf4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -28,7 +28,6 @@ spec:
   controlPlaneEndpoint:
     host: "${CONTROL_PLANE_VIP}"
     port: 6443
-  sshPublicKey: "${USER_SSH_KEY:=}"
   placement:
     staticPool:
       hosts: