diff --git a/iipod-metal/cloud-config.yaml b/iipod-metal/cloud-config.yaml index 1153ff2..788ea2c 100644 --- a/iipod-metal/cloud-config.yaml +++ b/iipod-metal/cloud-config.yaml @@ -68,6 +68,10 @@ write_files: content: ${coder_init_service} permissions: "0644" encoding: b64 + - path: /etc/kubernetes/manifests/ips.yaml + content: ${ip_manifest} + permissions: "0644" + encoding: b64 - path: /etc/kubernetes/manifests/iipod.yaml content: ${iipod_manifest} permissions: "0644" @@ -153,9 +157,8 @@ packages: - aria2 - apt-fast runcmd: - - ip addr add ${elastic_ip} dev lo:0 + # - ip addr add ${elastic_ip} dev lo:0 - su - ii -c "ssh-import-id gh:${username} gh:hh gh:heyste gh:zachmandeville" - - su - git -c "ssh-import-id gh:${username} gh:hh gh:heyste gh:zachmandeville" - DEBIAN_FRONTENT=noninteractive apt-fast -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install -y ttyd tmux kitty-terminfo # emacs-gtk kitty novnc websockify postgresql-client tigervnc-standalone-server asciinema silversearcher-ag direnv jq - systemctl stop ttyd diff --git a/iipod-metal/cluster/flux-system/gotk-sync.yaml b/iipod-metal/cluster/flux-system/gotk-sync.yaml index 8f7dca0..e204a5f 100644 --- a/iipod-metal/cluster/flux-system/gotk-sync.yaml +++ b/iipod-metal/cluster/flux-system/gotk-sync.yaml @@ -8,10 +8,10 @@ metadata: spec: interval: 1m0s ref: - branch: mon423-hh + branch: tue0807-heyste secretRef: name: flux-system - url: ssh://ii@mon423-hh.ii.nz/home/ii/space-templates + url: ssh://git@tue0807-heyste.ii.nz:22/home/git/space-templates --- apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization diff --git a/iipod-metal/etc/cloud/install-flux b/iipod-metal/etc/cloud/install-flux index b77c534..285652a 100644 --- a/iipod-metal/etc/cloud/install-flux +++ b/iipod-metal/etc/cloud/install-flux @@ -16,3 +16,6 @@ sudo su - ii -c \ cd space-templates git remote add upstream git@github.com:cloudnative-coop/space-templates " +sleep 15 +export KUBECONFIG=/etc/kubernetes/admin.conf +kubectl apply -f /etc/kubernetes/ips.yaml \ No newline at end of file diff --git a/iipod-metal/etc/kubernetes/manifests/apisnoop.yaml b/iipod-metal/etc/kubernetes/manifests/apisnoop.yaml deleted file mode 100644 index e69de29..0000000 diff --git a/iipod-metal/etc/kubernetes/manifests/ips.yaml b/iipod-metal/etc/kubernetes/manifests/ips.yaml new file mode 100644 index 0000000..78762e2 --- /dev/null +++ b/iipod-metal/etc/kubernetes/manifests/ips.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: metallb.io/v1beta1 +kind: IPAddressPool +metadata: + name: default + namespace: metallb-system +spec: + addresses: + - ${ip} +--- +apiVersion: metallb.io/v1beta1 +kind: L2Advertisement +metadata: + name: default + namespace: metallb-system diff --git a/iipod-metal/metal.tf b/iipod-metal/metal.tf index bb5846f..17469c4 100644 --- a/iipod-metal/metal.tf +++ b/iipod-metal/metal.tf @@ -37,6 +37,10 @@ resource "equinix_metal_device" "machine" { username = "ii" coder_agent_token = coder_agent.ii.token })) + ip_manifest = base64encode( + templatefile("./etc/kubernetes/manifests/ips.yaml", { + ip = local.elastic_ip + })) iipod_manifest = base64encode( templatefile("./etc/kubernetes/manifests/iipod.yaml", { coder_agent_token = coder_agent.iipod.token