Merge branch 'main' into PLT-698

spectrocloud · Sep 25, 2023 · baec177 · baec177
2 parents 0b755cc + eacd334
commit baec177
Show file tree

Hide file tree

Showing 33 changed files with 121 additions and 1 deletion.
diff --git a/docs/data-sources/cluster.md b/docs/data-sources/cluster.md
@@ -24,6 +24,13 @@ resource "local_file" "kubeconfig" {
   file_permission      = "0644"
   directory_permission = "0755"
 }
+
+resource "local_file" "adminkubeconfig" {
+  content              = data.spectrocloud_cluster.cluster.admin_kube_config
+  filename             = "admin-client-101.kubeconfig"
+  file_permission      = "0644"
+  directory_permission = "0755"
+}
 ```
 
 <!-- schema generated by tfplugindocs -->
@@ -39,6 +46,7 @@ resource "local_file" "kubeconfig" {
 
 ### Read-Only
 
+- `admin_kube_config` (String)
 - `id` (String) The ID of this resource.
 - `kube_config` (String)
 

diff --git a/docs/resources/cluster_aks.md b/docs/resources/cluster_aks.md
@@ -120,6 +120,7 @@ resource "spectrocloud_cluster_aks" "cluster" {
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_aws.md b/docs/resources/cluster_aws.md
@@ -151,6 +151,7 @@ resource "spectrocloud_cluster_aws" "cluster" {
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_azure.md b/docs/resources/cluster_azure.md
@@ -114,6 +114,7 @@ resource "spectrocloud_cluster_azure" "cluster" {
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_coxedge.md b/docs/resources/cluster_coxedge.md
@@ -43,6 +43,7 @@ description: |-
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_edge_native.md b/docs/resources/cluster_edge_native.md
@@ -46,6 +46,7 @@ description: |-
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_edge_vsphere.md b/docs/resources/cluster_edge_vsphere.md
@@ -45,6 +45,7 @@ description: |-
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_eks.md b/docs/resources/cluster_eks.md
@@ -119,6 +119,7 @@ resource "spectrocloud_cluster_eks" "cluster" {
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_gcp.md b/docs/resources/cluster_gcp.md
@@ -111,6 +111,7 @@ resource "spectrocloud_cluster_gcp" "cluster" {
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_libvirt.md b/docs/resources/cluster_libvirt.md
@@ -46,6 +46,7 @@ description: |-
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_maas.md b/docs/resources/cluster_maas.md
@@ -121,6 +121,7 @@ resource "spectrocloud_cluster_maas" "cluster" {
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_openstack.md b/docs/resources/cluster_openstack.md
@@ -112,6 +112,7 @@ resource "spectrocloud_cluster_openstack" "cluster" {
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_tke.md b/docs/resources/cluster_tke.md
@@ -42,6 +42,7 @@ description: |-
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/cluster_vsphere.md b/docs/resources/cluster_vsphere.md
@@ -46,6 +46,7 @@ description: |-
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/docs/resources/virtual_cluster.md b/docs/resources/virtual_cluster.md
@@ -79,6 +79,7 @@ resource "spectrocloud_virtual_cluster" "cluster" {
 
 ### Read-Only
 
+- `admin_kube_config` (String) Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.
 - `cloud_config_id` (String, Deprecated) ID of the cloud config used for the cluster. This cloud config must be of type `azure`.
 - `id` (String) The ID of this resource.
 - `kubeconfig` (String) Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.

diff --git a/examples/data-sources/spectrocloud_cluster/data-source.tf b/examples/data-sources/spectrocloud_cluster/data-source.tf
@@ -8,4 +8,11 @@ resource "local_file" "kubeconfig" {
   filename             = "client-101.kubeconfig"
   file_permission      = "0644"
   directory_permission = "0755"
-}
+}
+
+resource "local_file" "adminkubeconfig" {
+  content              = data.spectrocloud_cluster.cluster.admin_kube_config
+  filename             = "admin-client-101.kubeconfig"
+  file_permission      = "0644"
+  directory_permission = "0755"
+}
diff --git a/spectrocloud/cluster_common_fields.go b/spectrocloud/cluster_common_fields.go
@@ -21,6 +21,14 @@ func readCommonFields(c *client.V1Client, d *schema.ResourceData, cluster *model
 		return diag.FromErr(err), true
 	}
 
+	adminKubeConfig, err := c.GetClusterAdminKubeConfig(d.Id(), ClusterContext)
+	if err != nil {
+		return diag.FromErr(err), true
+	}
+	if err := d.Set("admin_kube_config", adminKubeConfig); err != nil {
+		return diag.FromErr(err), true
+	}
+
 	if err := d.Set("tags", flattenTags(cluster.Metadata.Labels)); err != nil {
 		return diag.FromErr(err), true
 	}

diff --git a/spectrocloud/data_source_cluster.go b/spectrocloud/data_source_cluster.go
@@ -20,6 +20,10 @@ func dataSourceCluster() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
+			"admin_kube_config": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"kube_config": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -50,6 +54,12 @@ func dataSourceClusterRead(_ context.Context, d *schema.ResourceData, m interfac
 			if err := d.Set("kube_config", kubeConfig); err != nil {
 				return diag.FromErr(err)
 			}
+			adminKubeConfig, _ := c.GetClusterAdminKubeConfig(cluster.Metadata.UID, ClusterContext)
+			if adminKubeConfig != "" {
+				if err := d.Set("admin_kube_config", adminKubeConfig); err != nil {
+					return diag.FromErr(err)
+				}
+			}
 			d.SetId(cluster.Metadata.UID)
 			if err := d.Set("name", cluster.Metadata.Name); err != nil {
 				return diag.FromErr(err)

diff --git a/spectrocloud/resource_cluster_aks.go b/spectrocloud/resource_cluster_aks.go
@@ -98,6 +98,11 @@ func resourceClusterAks() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_aws.go b/spectrocloud/resource_cluster_aws.go
@@ -98,6 +98,11 @@ func resourceClusterAws() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_azure.go b/spectrocloud/resource_cluster_azure.go
@@ -99,6 +99,11 @@ func resourceClusterAzure() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_coxedge.go b/spectrocloud/resource_cluster_coxedge.go
@@ -97,6 +97,11 @@ func resourceClusterCoxEdge() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:        schema.TypeList,
 				ForceNew:    true,

diff --git a/spectrocloud/resource_cluster_edge_native.go b/spectrocloud/resource_cluster_edge_native.go
@@ -97,6 +97,11 @@ func resourceClusterEdgeNative() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_edge_vsphere.go b/spectrocloud/resource_cluster_edge_vsphere.go
@@ -86,6 +86,11 @@ func resourceClusterEdgeVsphere() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_eks.go b/spectrocloud/resource_cluster_eks.go
@@ -99,6 +99,11 @@ func resourceClusterEks() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:        schema.TypeList,
 				ForceNew:    true,

diff --git a/spectrocloud/resource_cluster_gcp.go b/spectrocloud/resource_cluster_gcp.go
@@ -97,6 +97,11 @@ func resourceClusterGcp() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_libvirt.go b/spectrocloud/resource_cluster_libvirt.go
@@ -99,6 +99,11 @@ func resourceClusterLibvirt() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_maas.go b/spectrocloud/resource_cluster_maas.go
@@ -97,6 +97,11 @@ func resourceClusterMaas() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_openstack.go b/spectrocloud/resource_cluster_openstack.go
@@ -97,6 +97,11 @@ func resourceClusterOpenStack() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_tke.go b/spectrocloud/resource_cluster_tke.go
@@ -78,6 +78,11 @@ func resourceClusterTke() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_virtual.go b/spectrocloud/resource_cluster_virtual.go
@@ -139,6 +139,11 @@ func resourceClusterVirtual() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_vsphere.go b/spectrocloud/resource_cluster_vsphere.go
@@ -101,6 +101,11 @@ func resourceClusterVsphere() *schema.Resource {
 				Computed:    true,
 				Description: "Kubeconfig for the cluster. This can be used to connect to the cluster using `kubectl`.",
 			},
+			"admin_kube_config": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "Admin Kube-config for the cluster. This can be used to connect to the cluster using `kubectl`, With admin privilege.",
+			},
 			"cloud_config": {
 				Type:     schema.TypeList,
 				ForceNew: true,

diff --git a/spectrocloud/resource_cluster_vsphere_test.go b/spectrocloud/resource_cluster_vsphere_test.go
@@ -338,6 +338,9 @@ func TestResourceClusterVsphereRead(t *testing.T) {
 		GetClusterKubeConfigFn: func(uid string) (string, error) {
 			return "testKubeConfig", nil
 		},
+		GetClusterAdminConfigFn: func(uid string) (string, error) {
+			return "testAdminKubeConfig", nil
+		},
 		GetClusterScanConfigFn: func(uid string) (*models.V1ClusterComplianceScan, error) {
 			clusterCom := &models.V1ClusterComplianceScan{
 				Metadata: &models.V1ObjectMeta{