Remove cluster provider from schema (#746)

pulumi · Jul 25, 2022 · e11995e · e11995e
1 parent 077b0a6
commit e11995e
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Unreleased
-(None)
+- Remove cluster provider from schema
+  [#746](https://github.com/pulumi/pulumi-eks/pull/746)
 
 ## 0.41.2 (Released Jul 12, 2022)
 - Allow removal of default Kubernetes addons

diff --git a/dotnet/Cluster.cs b/dotnet/Cluster.cs
@@ -69,12 +69,6 @@ public partial class Cluster : Pulumi.ComponentResource
         [Output("nodeSecurityGroup")]
         public Output<Pulumi.Aws.Ec2.SecurityGroup> NodeSecurityGroup { get; private set; } = null!;
 
-        /// <summary>
-        /// A Kubernetes resource provider that can be used to deploy into this cluster.
-        /// </summary>
-        [Output("provider")]
-        public Output<Pulumi.Kubernetes.Provider> Provider { get; private set; } = null!;
-
 
         /// <summary>
         /// Create a Cluster resource with the given unique name, arguments, and options.

diff --git a/java/src/main/java/com/pulumi/eks/Cluster.java b/java/src/main/java/com/pulumi/eks/Cluster.java
@@ -152,20 +152,6 @@ public Output<Object> kubeconfig() {
     public Output<SecurityGroup> nodeSecurityGroup() {
         return this.nodeSecurityGroup;
     }
-    /**
-     * A Kubernetes resource provider that can be used to deploy into this cluster.
-     * 
-     */
-    @Export(name="provider", type=com.pulumi.kubernetes.Provider.class, parameters={})
-    private Output<com.pulumi.kubernetes.Provider> provider;
-
-    /**
-     * @return A Kubernetes resource provider that can be used to deploy into this cluster.
-     * 
-     */
-    public Output<com.pulumi.kubernetes.Provider> provider() {
-        return this.provider;
-    }
 
     /**
      *

diff --git a/provider/cmd/pulumi-gen-eks/main.go b/provider/cmd/pulumi-gen-eks/main.go
@@ -161,10 +161,10 @@ func generateSchema() schema.PackageSpec {
 							TypeSpec:    schema.TypeSpec{Ref: awsRef("#/provider")},
 							Description: "The AWS resource provider.",
 						},
-						"provider": {
-							TypeSpec:    schema.TypeSpec{Ref: k8sRef("#/provider")},
-							Description: "A Kubernetes resource provider that can be used to deploy into this cluster.",
-						},
+						// "provider": {
+						// 	TypeSpec:    schema.TypeSpec{Ref: k8sRef("#/provider")},
+						// 	Description: "A Kubernetes resource provider that can be used to deploy into this cluster.",
+						// },
 						"clusterSecurityGroup": {
 							TypeSpec:    schema.TypeSpec{Ref: awsRef("#/resources/aws:ec2%2FsecurityGroup:SecurityGroup")},
 							Description: "The security group for the EKS cluster.",
@@ -201,7 +201,7 @@ func generateSchema() schema.PackageSpec {
 					Required: []string{
 						"kubeconfig",
 						"awsProvider",
-						"provider",
+						// "provider",
 						"clusterSecurityGroup",
 						"instanceRoles",
 						"nodeSecurityGroup",

diff --git a/provider/cmd/pulumi-resource-eks/schema.json b/provider/cmd/pulumi-resource-eks/schema.json
@@ -593,16 +593,11 @@
                 "nodeSecurityGroup": {
                     "$ref": "/aws/v5.4.0/schema.json#/resources/aws:ec2%2FsecurityGroup:SecurityGroup",
                     "description": "The security group for the cluster's nodes."
-                },
-                "provider": {
-                    "$ref": "/kubernetes/v3.0.0/schema.json#/provider",
-                    "description": "A Kubernetes resource provider that can be used to deploy into this cluster."
                 }
             },
             "required": [
                 "kubeconfig",
                 "awsProvider",
-                "provider",
                 "clusterSecurityGroup",
                 "instanceRoles",
                 "nodeSecurityGroup",

diff --git a/python/pulumi_eks/cluster.py b/python/pulumi_eks/cluster.py
@@ -1446,7 +1446,6 @@ def _internal_init(__self__,
             __props__.__dict__["eks_cluster_ingress_rule"] = None
             __props__.__dict__["kubeconfig"] = None
             __props__.__dict__["node_security_group"] = None
-            __props__.__dict__["provider"] = None
         super(Cluster, __self__).__init__(
             'eks:index:Cluster',
             resource_name,
@@ -1526,14 +1525,6 @@ def node_security_group(self) -> pulumi.Output['pulumi_aws.ec2.SecurityGroup']:
         """
         return pulumi.get(self, "node_security_group")
 
-    @property
-    @pulumi.getter
-    def provider(self) -> pulumi.Output['pulumi_kubernetes.Provider']:
-        """
-        A Kubernetes resource provider that can be used to deploy into this cluster.
-        """
-        return pulumi.get(self, "provider")
-
     @pulumi.output_type
     class GetKubeconfigResult:
         def __init__(__self__, result=None):

diff --git a/sdk/go/eks/cluster.go b/sdk/go/eks/cluster.go