From e4fc8355b8ed96fd2b5ebea9d0a660f00fa7edb7 Mon Sep 17 00:00:00 2001 From: bodymindarts Date: Tue, 18 Jan 2022 10:51:56 +0100 Subject: [PATCH 1/2] feat: add k9s to bastion --- modules/inception/gcp/bastion-startup.tmpl | 6 ++++++ modules/inception/gcp/bastion.tf | 2 ++ 2 files changed, 8 insertions(+) diff --git a/modules/inception/gcp/bastion-startup.tmpl b/modules/inception/gcp/bastion-startup.tmpl index 46a9ebc4..a1a77356 100644 --- a/modules/inception/gcp/bastion-startup.tmpl +++ b/modules/inception/gcp/bastion-startup.tmpl @@ -57,3 +57,9 @@ wget https://github.com/lightningnetwork/lnd/releases/download/v${lnd_version}-b && tar -xvf lnd-linux-amd64-v${lnd_version}-beta.tar.gz \ && mv lnd-linux-amd64-v${lnd_version}-beta/lncli /usr/local/bin \ && rm -rf lnd-linux-amd64-v${lnd_version}-* + +mkdir k9s && cd k9s \ + && wget https://github.com/derailed/k9s/releases/download/v${k9s_version}/k9s_Linux_x86_64.tar.gz \ + && tar -xvf k9s_Linux_x86_64.tar.gz \ + && mv k9s /usr/local/bin \ + && cd .. && rm -rf k9s* diff --git a/modules/inception/gcp/bastion.tf b/modules/inception/gcp/bastion.tf index 6a439e54..74541e95 100644 --- a/modules/inception/gcp/bastion.tf +++ b/modules/inception/gcp/bastion.tf @@ -5,6 +5,7 @@ locals { cepler_version = "0.7.5" lnd_version = "0.13.3" kubectl_version = "1.21.3" + k9s_version = "0.25.18" } resource "google_service_account" "bastion" { @@ -61,6 +62,7 @@ resource "google_compute_instance" "bastion" { bitcoin_version : local.bitcoin_version cepler_version : local.cepler_version kubectl_version : local.kubectl_version + k9s_version : local.k9s_version lnd_version : local.lnd_version }) } From 165aac9e48153984624fd7b3b4e6521013eeae89 Mon Sep 17 00:00:00 2001 From: bodymindarts Date: Tue, 18 Jan 2022 10:52:13 +0100 Subject: [PATCH 2/2] fix: fmt --- modules/inception/gcp/bastion.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/inception/gcp/bastion.tf b/modules/inception/gcp/bastion.tf index 74541e95..37f0de09 100644 --- a/modules/inception/gcp/bastion.tf +++ b/modules/inception/gcp/bastion.tf @@ -57,7 +57,7 @@ resource "google_compute_instance" "bastion" { cluster_name : "${local.name_prefix}-cluster", zone : local.region, project : local.project, - bastion_revoke_on_exit: local.bastion_revoke_on_exit + bastion_revoke_on_exit : local.bastion_revoke_on_exit cfssl_version : local.cfssl_version, bitcoin_version : local.bitcoin_version cepler_version : local.cepler_version