From 433f2cd40cf713f50a683a6d67775a2c4bd0360b Mon Sep 17 00:00:00 2001 From: Clayton Dittman Date: Fri, 22 Sep 2023 21:38:47 -0500 Subject: [PATCH 1/2] fix: add arguments for bootstrap --- extensions/aws/secrets.go | 2 ++ extensions/civo/secrets.go | 2 ++ extensions/digitalocean/secrets.go | 2 ++ extensions/google/secrets.go | 2 ++ extensions/vultr/secrets.go | 2 ++ go.mod | 2 +- go.sum | 4 ++-- 7 files changed, 13 insertions(+), 3 deletions(-) diff --git a/extensions/aws/secrets.go b/extensions/aws/secrets.go index 0535dbc8..7d5ad9f2 100644 --- a/extensions/aws/secrets.go +++ b/extensions/aws/secrets.go @@ -37,6 +37,8 @@ func BootstrapAWSMgmtCluster( "", cl.DnsProvider, cl.CloudProvider, + cl.GitAuth.Token, + cl.GitAuth.PrivateKey, ) if err != nil { log.Fatal().Msgf("error in central function to create secrets: %s", err) diff --git a/extensions/civo/secrets.go b/extensions/civo/secrets.go index 149421dd..0cb409ef 100644 --- a/extensions/civo/secrets.go +++ b/extensions/civo/secrets.go @@ -31,6 +31,8 @@ func BootstrapCivoMgmtCluster(clientset *kubernetes.Clientset, cl *types.Cluster cl.CivoAuth.Token, cl.DnsProvider, cl.CloudProvider, + cl.GitAuth.Token, + cl.GitAuth.PrivateKey, ) if err != nil { log.Fatal().Msgf("error in central function to create secrets: %s", err) diff --git a/extensions/digitalocean/secrets.go b/extensions/digitalocean/secrets.go index 64993bdb..516b619d 100644 --- a/extensions/digitalocean/secrets.go +++ b/extensions/digitalocean/secrets.go @@ -31,6 +31,8 @@ func BootstrapDigitaloceanMgmtCluster(clientset *kubernetes.Clientset, cl *types cl.DigitaloceanAuth.Token, cl.DnsProvider, cl.CloudProvider, + cl.GitAuth.Token, + cl.GitAuth.PrivateKey, ) if err != nil { log.Fatal().Msgf("error in central function to create secrets: %s", err) diff --git a/extensions/google/secrets.go b/extensions/google/secrets.go index e6460218..ad43052f 100644 --- a/extensions/google/secrets.go +++ b/extensions/google/secrets.go @@ -34,6 +34,8 @@ func BootstrapGoogleMgmtCluster( cl.GoogleAuth.KeyFile, //Google has no authentication method because we use roles cl.DnsProvider, cl.CloudProvider, + cl.GitAuth.Token, + cl.GitAuth.PrivateKey, ) if err != nil { log.Fatal().Msgf("error in central function to create secrets: %s", err) diff --git a/extensions/vultr/secrets.go b/extensions/vultr/secrets.go index a07e00f6..e95a89ae 100644 --- a/extensions/vultr/secrets.go +++ b/extensions/vultr/secrets.go @@ -31,6 +31,8 @@ func BootstrapVultrMgmtCluster(clientset *kubernetes.Clientset, cl *types.Cluste cl.VultrAuth.Token, cl.DnsProvider, cl.CloudProvider, + cl.GitAuth.Token, + cl.GitAuth.PrivateKey, ) if err != nil { log.Fatal().Msgf("error in central function to create secrets: %s", err) diff --git a/go.mod b/go.mod index 224ab9e2..cf5eea03 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/google/go-github/v52 v52.0.0 github.com/hashicorp/vault/api v1.9.0 github.com/joho/godotenv v1.5.1 - github.com/kubefirst/runtime v0.3.19 + github.com/kubefirst/runtime v0.3.21 github.com/minio/minio-go/v7 v7.0.49 github.com/rs/zerolog v1.29.0 github.com/sirupsen/logrus v1.9.0 diff --git a/go.sum b/go.sum index 91065e3f..adee5250 100644 --- a/go.sum +++ b/go.sum @@ -735,8 +735,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubefirst/runtime v0.3.19 h1:M0GrJSDwMU6yZNBebMm4Y9hkDFE8GxmgtnNp0h3uCvo= -github.com/kubefirst/runtime v0.3.19/go.mod h1:q9GkYqn/QPR7daUqhEuk50/IeFybTAYftuJVcBW2StI= +github.com/kubefirst/runtime v0.3.21 h1:sjZY3Mb2D5Lw4namDymGYUZ3AspSnCKORsh7Ha6KiqU= +github.com/kubefirst/runtime v0.3.21/go.mod h1:q9GkYqn/QPR7daUqhEuk50/IeFybTAYftuJVcBW2StI= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= From 7816a6d293be270118b97a9473853d9304b762a6 Mon Sep 17 00:00:00 2001 From: Clayton Dittman Date: Fri, 22 Sep 2023 21:49:53 -0500 Subject: [PATCH 2/2] fix: update runtime --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index cf5eea03..2bfe8595 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/google/go-github/v52 v52.0.0 github.com/hashicorp/vault/api v1.9.0 github.com/joho/godotenv v1.5.1 - github.com/kubefirst/runtime v0.3.21 + github.com/kubefirst/runtime v0.3.22 github.com/minio/minio-go/v7 v7.0.49 github.com/rs/zerolog v1.29.0 github.com/sirupsen/logrus v1.9.0 diff --git a/go.sum b/go.sum index adee5250..771d202d 100644 --- a/go.sum +++ b/go.sum @@ -735,8 +735,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kubefirst/runtime v0.3.21 h1:sjZY3Mb2D5Lw4namDymGYUZ3AspSnCKORsh7Ha6KiqU= -github.com/kubefirst/runtime v0.3.21/go.mod h1:q9GkYqn/QPR7daUqhEuk50/IeFybTAYftuJVcBW2StI= +github.com/kubefirst/runtime v0.3.22 h1:CK3CxoE16RIGvYr+0pwd+BI0bPXlx8RnnFWsHzsNxVo= +github.com/kubefirst/runtime v0.3.22/go.mod h1:q9GkYqn/QPR7daUqhEuk50/IeFybTAYftuJVcBW2StI= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=