Merge pull request #165 from kubefirst/feat-pkg-fix-import_export

feat: establish pkg folder and update types
konstructio · Sep 26, 2023 · 373cb53 · 373cb53
2 parents b94709f + 4a1304f
commit 373cb53
Show file tree

Hide file tree

Showing 76 changed files with 3,612 additions and 198 deletions.
diff --git a/extensions/aws/env.go b/extensions/aws/env.go
@@ -11,9 +11,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/kubefirst/kubefirst-api/internal/types"
+	"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
+	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	"github.com/kubefirst/runtime/pkg/k8s"
-	"github.com/kubefirst/runtime/pkg/providerConfigs"
 	"github.com/kubefirst/runtime/pkg/vault"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/kubernetes"
@@ -29,7 +29,7 @@ func readVaultTokenFromSecret(clientset *kubernetes.Clientset) string {
 	return existingKubernetesSecret["root-token"]
 }
 
-func GetAwsTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]string {
+func GetAwsTerraformEnvs(envs map[string]string, cl *pkgtypes.Cluster) map[string]string {
 	// needed for s3 api connectivity to object storage
 	envs["AWS_ACCESS_KEY_ID"] = cl.StateStoreCredentials.AccessKeyID
 	envs["AWS_SECRET_ACCESS_KEY"] = cl.StateStoreCredentials.SecretAccessKey
@@ -44,7 +44,7 @@ func GetAwsTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]s
 	return envs
 }
 
-func GetGithubTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]string {
+func GetGithubTerraformEnvs(envs map[string]string, cl *pkgtypes.Cluster) map[string]string {
 	envs["GITHUB_TOKEN"] = cl.GitAuth.Token
 	envs["GITHUB_OWNER"] = cl.GitAuth.Owner
 	envs["TF_VAR_atlantis_repo_webhook_secret"] = cl.AtlantisWebhookSecret
@@ -60,7 +60,7 @@ func GetGithubTerraformEnvs(envs map[string]string, cl *types.Cluster) map[strin
 	return envs
 }
 
-func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *types.Cluster) map[string]string {
+func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *pkgtypes.Cluster) map[string]string {
 	envs["GITLAB_TOKEN"] = cl.GitAuth.Token
 	envs["GITLAB_OWNER"] = cl.GitAuth.Owner
 	envs["TF_VAR_atlantis_repo_webhook_secret"] = cl.AtlantisWebhookSecret
@@ -78,7 +78,7 @@ func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *types.Cluster)
 	return envs
 }
 
-func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, envs map[string]string) map[string]string {
+func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, envs map[string]string) map[string]string {
 	envs["VAULT_TOKEN"] = readVaultTokenFromSecret(clientset)
 	envs["VAULT_ADDR"] = providerConfigs.VaultPortForwardURL
 	envs[fmt.Sprintf("%s_TOKEN", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Token
@@ -87,7 +87,7 @@ func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, e
 	return envs
 }
 
-func GetVaultTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, envs map[string]string) map[string]string {
+func GetVaultTerraformEnvs(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, envs map[string]string) map[string]string {
 	envs[fmt.Sprintf("%s_TOKEN", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Token
 	envs[fmt.Sprintf("%s_OWNER", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Owner
 	envs["TF_VAR_email_address"] = cl.AlertsEmail

diff --git a/extensions/aws/secrets.go b/extensions/aws/secrets.go
@@ -11,9 +11,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/kubefirst/kubefirst-api/internal/types"
+	providerConfig "github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
+	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	"github.com/kubefirst/runtime/pkg/aws"
-	providerConfig "github.com/kubefirst/runtime/pkg/providerConfigs"
 	"github.com/rs/zerolog/log"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -22,7 +22,7 @@ import (
 
 func BootstrapAWSMgmtCluster(
 	clientset *kubernetes.Clientset,
-	cl *types.Cluster,
+	cl *pkgtypes.Cluster,
 	destinationGitopsRepoURL string,
 	awsClient *aws.AWSConfiguration,
 ) error {

diff --git a/extensions/civo/env.go b/extensions/civo/env.go
@@ -11,9 +11,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/kubefirst/kubefirst-api/internal/types"
+	"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
+	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	"github.com/kubefirst/runtime/pkg/k8s"
-	"github.com/kubefirst/runtime/pkg/providerConfigs"
 	"github.com/kubefirst/runtime/pkg/vault"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/kubernetes"
@@ -29,7 +29,7 @@ func readVaultTokenFromSecret(clientset *kubernetes.Clientset) string {
 	return existingKubernetesSecret["root-token"]
 }
 
-func GetCivoTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]string {
+func GetCivoTerraformEnvs(envs map[string]string, cl *pkgtypes.Cluster) map[string]string {
 	envs["CIVO_TOKEN"] = cl.CivoAuth.Token
 	// needed for s3 api connectivity to object storage
 	envs["AWS_ACCESS_KEY_ID"] = cl.StateStoreCredentials.AccessKeyID
@@ -41,7 +41,7 @@ func GetCivoTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]
 	return envs
 }
 
-func GetGithubTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]string {
+func GetGithubTerraformEnvs(envs map[string]string, cl *pkgtypes.Cluster) map[string]string {
 	envs["GITHUB_TOKEN"] = cl.GitAuth.Token
 	envs["GITHUB_OWNER"] = cl.GitAuth.Owner
 	envs["TF_VAR_atlantis_repo_webhook_secret"] = cl.AtlantisWebhookSecret
@@ -54,7 +54,7 @@ func GetGithubTerraformEnvs(envs map[string]string, cl *types.Cluster) map[strin
 	return envs
 }
 
-func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *types.Cluster) map[string]string {
+func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *pkgtypes.Cluster) map[string]string {
 	envs["GITLAB_TOKEN"] = cl.GitAuth.Token
 	envs["GITLAB_OWNER"] = cl.GitAuth.Owner
 	envs["TF_VAR_atlantis_repo_webhook_secret"] = cl.AtlantisWebhookSecret
@@ -70,7 +70,7 @@ func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *types.Cluster)
 	return envs
 }
 
-func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, envs map[string]string) map[string]string {
+func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, envs map[string]string) map[string]string {
 	envs["VAULT_TOKEN"] = readVaultTokenFromSecret(clientset)
 	envs["VAULT_ADDR"] = providerConfigs.VaultPortForwardURL
 	envs[fmt.Sprintf("%s_TOKEN", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Token
@@ -79,7 +79,7 @@ func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, e
 	return envs
 }
 
-func GetVaultTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, envs map[string]string) map[string]string {
+func GetVaultTerraformEnvs(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, envs map[string]string) map[string]string {
 	envs[fmt.Sprintf("%s_TOKEN", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Token
 	envs[fmt.Sprintf("%s_OWNER", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Owner
 	envs["TF_VAR_email_address"] = cl.AlertsEmail

diff --git a/extensions/civo/secrets.go b/extensions/civo/secrets.go
@@ -10,16 +10,15 @@ import (
 	"context"
 	"strings"
 
-	"github.com/kubefirst/kubefirst-api/internal/types"
-	providerConfig "github.com/kubefirst/runtime/pkg/providerConfigs"
+	providerConfig "github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
+	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	"github.com/rs/zerolog/log"
-
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
 
-func BootstrapCivoMgmtCluster(clientset *kubernetes.Clientset, cl *types.Cluster, destinationGitopsRepoURL string) error {
+func BootstrapCivoMgmtCluster(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, destinationGitopsRepoURL string) error {
 
 	err := providerConfig.BootstrapMgmtCluster(
 		clientset,

diff --git a/extensions/digitalocean/env.go b/extensions/digitalocean/env.go
@@ -11,9 +11,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/kubefirst/kubefirst-api/internal/types"
+	"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
+	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	"github.com/kubefirst/runtime/pkg/k8s"
-	"github.com/kubefirst/runtime/pkg/providerConfigs"
 	"github.com/kubefirst/runtime/pkg/vault"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/kubernetes"
@@ -29,7 +29,7 @@ func readVaultTokenFromSecret(clientset *kubernetes.Clientset) string {
 	return existingKubernetesSecret["root-token"]
 }
 
-func GetDigitaloceanTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]string {
+func GetDigitaloceanTerraformEnvs(envs map[string]string, cl *pkgtypes.Cluster) map[string]string {
 	envs["DO_TOKEN"] = cl.DigitaloceanAuth.Token
 	envs["TF_VAR_do_token"] = cl.DigitaloceanAuth.Token
 	envs["AWS_ACCESS_KEY_ID"] = cl.StateStoreCredentials.AccessKeyID
@@ -41,7 +41,7 @@ func GetDigitaloceanTerraformEnvs(envs map[string]string, cl *types.Cluster) map
 	return envs
 }
 
-func GetGithubTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]string {
+func GetGithubTerraformEnvs(envs map[string]string, cl *pkgtypes.Cluster) map[string]string {
 	envs["GITHUB_TOKEN"] = cl.GitAuth.Token
 	envs["GITHUB_OWNER"] = cl.GitAuth.Owner
 	envs["TF_VAR_atlantis_repo_webhook_secret"] = cl.AtlantisWebhookSecret
@@ -56,7 +56,7 @@ func GetGithubTerraformEnvs(envs map[string]string, cl *types.Cluster) map[strin
 	return envs
 }
 
-func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *types.Cluster) map[string]string {
+func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *pkgtypes.Cluster) map[string]string {
 	envs["GITLAB_TOKEN"] = cl.GitAuth.Token
 	envs["GITLAB_OWNER"] = cl.GitAuth.Owner
 	envs["TF_VAR_atlantis_repo_webhook_secret"] = cl.AtlantisWebhookSecret
@@ -74,7 +74,7 @@ func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *types.Cluster)
 	return envs
 }
 
-func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, envs map[string]string) map[string]string {
+func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, envs map[string]string) map[string]string {
 	envs["VAULT_TOKEN"] = readVaultTokenFromSecret(clientset)
 	envs["VAULT_ADDR"] = providerConfigs.VaultPortForwardURL
 	envs[fmt.Sprintf("%s_TOKEN", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Token
@@ -89,7 +89,7 @@ func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, e
 	return envs
 }
 
-func GetVaultTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, envs map[string]string) map[string]string {
+func GetVaultTerraformEnvs(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, envs map[string]string) map[string]string {
 	envs[fmt.Sprintf("%s_TOKEN", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Token
 	envs[fmt.Sprintf("%s_OWNER", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Owner
 	envs["TF_VAR_email_address"] = cl.AlertsEmail

diff --git a/extensions/digitalocean/secrets.go b/extensions/digitalocean/secrets.go
@@ -10,16 +10,16 @@ import (
 	"context"
 	"strings"
 
-	"github.com/kubefirst/kubefirst-api/internal/types"
-	providerConfig "github.com/kubefirst/runtime/pkg/providerConfigs"
+	providerConfig "github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
+	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	"github.com/rs/zerolog/log"
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 )
 
-func BootstrapDigitaloceanMgmtCluster(clientset *kubernetes.Clientset, cl *types.Cluster, destinationGitopsRepoURL string) error {
+func BootstrapDigitaloceanMgmtCluster(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, destinationGitopsRepoURL string) error {
 
 
 	err := providerConfig.BootstrapMgmtCluster(

diff --git a/extensions/env.go b/extensions/env.go
@@ -11,9 +11,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/kubefirst/kubefirst-api/internal/types"
+	"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
+	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	"github.com/kubefirst/runtime/pkg/k8s"
-	"github.com/kubefirst/runtime/pkg/providerConfigs"
 	"github.com/kubefirst/runtime/pkg/vault"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/kubernetes"
@@ -25,11 +25,10 @@ func readVaultTokenFromSecret(clientset *kubernetes.Clientset) string {
 		log.Printf("Error reading existing Secret data: %s", err)
 		return ""
 	}
-
 	return existingKubernetesSecret["root-token"]
 }
 
-func GetCivoTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]string {
+func GetCivoTerraformEnvs(envs map[string]string, cl *pkgtypes.Cluster) map[string]string {
 	envs["CIVO_TOKEN"] = cl.CivoAuth.Token
 	// needed for s3 api connectivity to object storage
 	envs["AWS_ACCESS_KEY_ID"] = cl.StateStoreCredentials.AccessKeyID
@@ -41,7 +40,7 @@ func GetCivoTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]
 	return envs
 }
 
-func GetGithubTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]string {
+func GetGithubTerraformEnvs(envs map[string]string, cl *pkgtypes.Cluster) map[string]string {
 	envs["GITHUB_TOKEN"] = cl.GitAuth.Token
 	envs["GITHUB_OWNER"] = cl.GitAuth.Owner
 	envs["TF_VAR_atlantis_repo_webhook_secret"] = cl.AtlantisWebhookSecret
@@ -54,7 +53,7 @@ func GetGithubTerraformEnvs(envs map[string]string, cl *types.Cluster) map[strin
 	return envs
 }
 
-func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *types.Cluster) map[string]string {
+func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *pkgtypes.Cluster) map[string]string {
 	envs["GITLAB_TOKEN"] = cl.GitAuth.Token
 	envs["GITLAB_OWNER"] = cl.GitAuth.Owner
 	envs["TF_VAR_atlantis_repo_webhook_secret"] = cl.AtlantisWebhookSecret
@@ -70,7 +69,7 @@ func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *types.Cluster)
 
 	return envs
 }
-func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, envs map[string]string) map[string]string {
+func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, envs map[string]string) map[string]string {
 	envs["VAULT_TOKEN"] = readVaultTokenFromSecret(clientset)
 	envs["VAULT_ADDR"] = providerConfigs.VaultPortForwardURL
 	envs[fmt.Sprintf("%s_TOKEN", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Token
@@ -79,7 +78,7 @@ func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, e
 	return envs
 }
 
-func GetVaultTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, envs map[string]string) map[string]string {
+func GetVaultTerraformEnvs(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, envs map[string]string) map[string]string {
 	envs[fmt.Sprintf("%s_TOKEN", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Token
 	envs[fmt.Sprintf("%s_OWNER", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Owner
 	envs["TF_VAR_email_address"] = cl.AlertsEmail

diff --git a/extensions/google/env.go b/extensions/google/env.go
@@ -11,9 +11,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/kubefirst/kubefirst-api/internal/types"
+	"github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
+	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	"github.com/kubefirst/runtime/pkg/k8s"
-	"github.com/kubefirst/runtime/pkg/providerConfigs"
 	"github.com/kubefirst/runtime/pkg/vault"
 	log "github.com/sirupsen/logrus"
 	"k8s.io/client-go/kubernetes"
@@ -29,15 +29,15 @@ func readVaultTokenFromSecret(clientset *kubernetes.Clientset) string {
 	return existingKubernetesSecret["root-token"]
 }
 
-func GetGoogleTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]string {
+func GetGoogleTerraformEnvs(envs map[string]string, cl *pkgtypes.Cluster) map[string]string {
 	envs["GOOGLE_CLOUD_KEYFILE_JSON"] = cl.GoogleAuth.KeyFile
 	envs["TF_VAR_project"] = cl.GoogleAuth.ProjectId
 	//envs["TF_LOG"] = "debug"
 
 	return envs
 }
 
-func GetGithubTerraformEnvs(envs map[string]string, cl *types.Cluster) map[string]string {
+func GetGithubTerraformEnvs(envs map[string]string, cl *pkgtypes.Cluster) map[string]string {
 	envs["GITHUB_TOKEN"] = cl.GitAuth.Token
 	envs["GITHUB_OWNER"] = cl.GitAuth.Owner
 	envs["TF_VAR_atlantis_repo_webhook_secret"] = cl.AtlantisWebhookSecret
@@ -46,7 +46,7 @@ func GetGithubTerraformEnvs(envs map[string]string, cl *types.Cluster) map[strin
 	return envs
 }
 
-func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *types.Cluster) map[string]string {
+func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *pkgtypes.Cluster) map[string]string {
 	envs["GITLAB_TOKEN"] = cl.GitAuth.Token
 	envs["GITLAB_OWNER"] = cl.GitAuth.Owner
 	envs["TF_VAR_atlantis_repo_webhook_secret"] = cl.AtlantisWebhookSecret
@@ -58,7 +58,7 @@ func GetGitlabTerraformEnvs(envs map[string]string, gid int, cl *types.Cluster)
 	return envs
 }
 
-func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, envs map[string]string) map[string]string {
+func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, envs map[string]string) map[string]string {
 	envs["VAULT_TOKEN"] = readVaultTokenFromSecret(clientset)
 	envs["VAULT_ADDR"] = providerConfigs.VaultPortForwardURL
 	envs[fmt.Sprintf("%s_TOKEN", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Token
@@ -67,7 +67,7 @@ func GetUsersTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, e
 	return envs
 }
 
-func GetVaultTerraformEnvs(clientset *kubernetes.Clientset, cl *types.Cluster, envs map[string]string) map[string]string {
+func GetVaultTerraformEnvs(clientset *kubernetes.Clientset, cl *pkgtypes.Cluster, envs map[string]string) map[string]string {
 	envs[fmt.Sprintf("%s_TOKEN", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Token
 	envs[fmt.Sprintf("%s_OWNER", strings.ToUpper(cl.GitProvider))] = cl.GitAuth.Owner
 	envs["TF_VAR_email_address"] = cl.AlertsEmail

diff --git a/extensions/google/secrets.go b/extensions/google/secrets.go
@@ -10,8 +10,8 @@ import (
 	"context"
 	"strings"
 
-	"github.com/kubefirst/kubefirst-api/internal/types"
-	providerConfig "github.com/kubefirst/runtime/pkg/providerConfigs"
+	providerConfig "github.com/kubefirst/kubefirst-api/pkg/providerConfigs"
+	pkgtypes "github.com/kubefirst/kubefirst-api/pkg/types"
 	"github.com/rs/zerolog/log"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -20,7 +20,7 @@ import (
 
 func BootstrapGoogleMgmtCluster(
 	clientset *kubernetes.Clientset,
-	cl *types.Cluster,
+	cl *pkgtypes.Cluster,
 	destinationGitopsRepoURL string,
 ) error {