Use Rancher Cloud Credential ID for GKE

Signed-off-by: Sverre Boschman <[email protected]>
crossplane-contrib · Jul 12, 2022 · 5846ebd · 5846ebd
1 parent 0fecd3d
commit 5846ebd
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 22 deletions.
diff --git a/apis/rancher2/v1alpha1/zz_cluster_types.go b/apis/rancher2/v1alpha1/zz_cluster_types.go
diff --git a/apis/rancher2/v1alpha1/zz_generated.deepcopy.go b/apis/rancher2/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/rancher2/v1alpha1/zz_generated_terraformed.go b/apis/rancher2/v1alpha1/zz_generated_terraformed.go
diff --git a/config/cluster/config.go b/config/cluster/config.go
@@ -0,0 +1,18 @@
+package cluster
+
+import (
+	tjconfig "github.com/crossplane/terrajet/pkg/config"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+)
+
+func Configure(p *tjconfig.Provider) {
+	p.AddResourceConfigurator("rancher2_cluster", func(r *tjconfig.Resource) {
+		if block, ok := r.TerraformResource.Schema["gke_config_v2"]; ok {
+			if attr, ok := block.Elem.(*schema.Resource).Schema["google_credential_secret"]; ok {
+				attr.Description = "The GKE Cloud Credential ID to use"
+				attr.Sensitive = false
+			}
+		}
+	})
+}
diff --git a/config/provider.go b/config/provider.go
@@ -19,6 +19,8 @@ import (
 
 	tjconfig "github.com/crossplane/terrajet/pkg/config"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	"github.com/crossplane-contrib/provider-jet-rancher/config/cluster"
 )
 
 const (
@@ -46,6 +48,7 @@ func GetProvider() *tjconfig.Provider {
 
 	for _, configure := range []func(provider *tjconfig.Provider){
 		// add custom config functions
+		cluster.Configure,
 	} {
 		configure(pc)
 	}

diff --git a/package/crds/rancher2.rancher.jet.crossplane.io_clusters.yaml b/package/crds/rancher2.rancher.jet.crossplane.io_clusters.yaml
@@ -1117,23 +1117,9 @@ spec:
                         enableKubernetesAlpha:
                           description: Enable Kubernetes alpha
                           type: boolean
-                        googleCredentialSecretSecretRef:
-                          description: Google credential secret
-                          properties:
-                            key:
-                              description: The key to select.
-                              type: string
-                            name:
-                              description: Name of the secret.
-                              type: string
-                            namespace:
-                              description: Namespace of the secret.
-                              type: string
-                          required:
-                          - key
-                          - name
-                          - namespace
-                          type: object
+                        googleCredentialSecret:
+                          description: The GKE Cloud Credential ID to use
+                          type: string
                         imported:
                           description: Is GKE cluster imported?
                           type: boolean
@@ -1374,7 +1360,7 @@ spec:
                             is empty
                           type: string
                       required:
-                      - googleCredentialSecretSecretRef
+                      - googleCredentialSecret
                       - name
                       - projectId
                       type: object