chore(mrs): update mrs config

FlexibleEngineCloud · Jan 19, 2023 · edad185 · edad185
1 parent 11cbdf0
commit edad185
Show file tree

Hide file tree

Showing 10 changed files with 473 additions and 40 deletions.
diff --git a/apis/mrs/v1beta1/zz_cluster_types.go b/apis/mrs/v1beta1/zz_cluster_types.go
diff --git a/apis/mrs/v1beta1/zz_generated.deepcopy.go b/apis/mrs/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/mrs/v1beta1/zz_generated.resolvers.go b/apis/mrs/v1beta1/zz_generated.resolvers.go
diff --git a/apis/mrs/v1beta1/zz_generated_terraformed.go b/apis/mrs/v1beta1/zz_generated_terraformed.go
diff --git a/apis/mrs/v1beta1/zz_job_types.go b/apis/mrs/v1beta1/zz_job_types.go
diff --git a/config/mrs/config.go b/config/mrs/config.go
@@ -12,15 +12,6 @@ func Configure(p *config.Provider) {
 	// flexibleengine_mrs_cluster_v2
 	// https://registry.terraform.io/providers/FlexibleEngineCloud/flexibleengine/latest/docs/resources/mrs_cluster_v2
 	p.AddResourceConfigurator("flexibleengine_mrs_cluster_v2", func(r *config.Resource) {
-		r.UseAsync = true
-		// vpc_id
-		r.References["vpc_id"] = config.Reference{
-			Type: tools.GenerateType("vpc", "VPC"),
-		}
-		// subnet_id
-		r.References["subnet_id"] = config.Reference{
-			Type: tools.GenerateType("vpc", "Subnet"),
-		}
 		// eip_id
 		r.References["eip_id"] = config.Reference{
 			Type: tools.GenerateType("eip", "EIP"),
@@ -32,11 +23,11 @@ func Configure(p *config.Provider) {
 		}
 		// node_key_pair
 		r.References["node_key_pair"] = config.Reference{
-			Type: tools.GenerateType("compute", "KeyPair"),
+			Type: tools.GenerateType("ecs", "KeyPair"),
 		}
 		// security_group_ids
 		r.References["security_group_ids"] = config.Reference{
-			Type:              tools.GenerateType("networking", "SecGroup"),
+			Type:              tools.GenerateType("vpc", "SecurityGroup"),
 			Extractor:         tools.GenerateExtractor(true, "id"),
 			SelectorFieldName: "SecurityGroupSelector",
 			RefFieldName:      "SecurityGroupRefs",
@@ -50,7 +41,6 @@ func Configure(p *config.Provider) {
 		r.References["cluster_id"] = config.Reference{
 			Type: tools.GenerateType("mrs", "Cluster"),
 		}
-		r.UseAsync = true
 	})
 
 }
diff --git a/examples-generated/mrs/cluster.yaml b/examples-generated/mrs/cluster.yaml
@@ -35,10 +35,9 @@ spec:
       rootVolumeSize: 300
       rootVolumeType: SAS
     name: ${var.cluster_name}
-    nodeKeyPairSecretRef:
-      key: example-key
-      name: example-secret
-      namespace: upbound-system
+    nodeKeyPairSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example
     subnetIdSelector:
       matchLabels:
         testing.upbound.io/example-name: example_subnet

diff --git a/examples-generated/mrs/job.yaml b/examples-generated/mrs/job.yaml
@@ -8,7 +8,9 @@ metadata:
   name: test
 spec:
   forProvider:
-    clusterId: ${var.cluster_id}
+    clusterIdSelector:
+      matchLabels:
+        testing.upbound.io/example-name: example
     name: ${var.job_name}
     parameters: ${var.access_key} ${var.secret_key} 1 s3a://obs-demo-analysis/input
       s3a://obs-demo-analysis/output