pulumi-alicloud 3.62.0__py3-none-any.whl → 3.62.0a1724476801__py3-none-any.whl

pulumi_alicloud/cs/_inputs.py

@@ -47,7 +47,6 @@ __all__ = [
     'NodePoolTaintArgs',
     'NodePoolTeeConfigArgs',
     'ServerlessKubernetesAddonArgs',
-    'ServerlessKubernetesDeleteOptionArgs',
     'ServerlessKubernetesRrsaMetadataArgs',
     'SwarmNodeArgs',
 ]
@@ -980,7 +979,7 @@ class KubernetesDeleteOptionArgs:
         """
         :param pulumi.Input[str] delete_mode: The deletion mode of the cluster. Different resources may have different default behavior, see `resource_type` for details. Valid values:
         :param pulumi.Input[str] resource_type: The type of resources that are created by cluster. Valid values:
-               - `SLB`: SLB resources created by the Nginx Ingress Service, default behavior is to delete, option to retain is available.
+               - `SLB`: SLB resources created through the service, default behavior is to delete, option to retain is available.
                - `ALB`: ALB resources created by the ALB Ingress Controller, default behavior is to retain, option to delete is available.
                - `SLS_Data`: SLS Project used by the cluster logging feature, default behavior is to retain, option to delete is available.
                - `SLS_ControlPlane`: SLS Project used for the managed cluster control plane logs, default behavior is to retain, option to delete is available.
@@ -988,7 +987,7 @@ class KubernetesDeleteOptionArgs:
                ```
                ...
                // Specify delete_options as below when deleting cluster
-               // delete SLB resources created by the Nginx Ingress Service
+               // delete SLB resources created by the cluster
                delete_options {
                delete_mode = "delete"
                resource_type = "SLB"
@@ -1032,7 +1031,7 @@ class KubernetesDeleteOptionArgs:
     def resource_type(self) -> Optional[pulumi.Input[str]]:
         """
         The type of resources that are created by cluster. Valid values:
-        - `SLB`: SLB resources created by the Nginx Ingress Service, default behavior is to delete, option to retain is available.
+        - `SLB`: SLB resources created through the service, default behavior is to delete, option to retain is available.
         - `ALB`: ALB resources created by the ALB Ingress Controller, default behavior is to retain, option to delete is available.
         - `SLS_Data`: SLS Project used by the cluster logging feature, default behavior is to retain, option to delete is available.
         - `SLS_ControlPlane`: SLS Project used for the managed cluster control plane logs, default behavior is to retain, option to delete is available.
@@ -1040,7 +1039,7 @@ class KubernetesDeleteOptionArgs:
         ```
         ...
         // Specify delete_options as below when deleting cluster
-        // delete SLB resources created by the Nginx Ingress Service
+        // delete SLB resources created by the cluster
         delete_options {
         delete_mode = "delete"
         resource_type = "SLB"
@@ -1379,8 +1378,8 @@ class ManagedKubernetesCertificateAuthorityArgs:
                  client_key: Optional[pulumi.Input[str]] = None,
                  cluster_cert: Optional[pulumi.Input[str]] = None):
         """
-        :param pulumi.Input[str] client_cert: The path of client certificate, like `~/.kube/client-cert.pem`.
-        :param pulumi.Input[str] client_key: The path of client key, like `~/.kube/client-key.pem`.
+        :param pulumi.Input[str] client_cert: The base64 encoded client certificate data required to communicate with your cluster. Add this to the client-certificate-data section of the kubeconfig file for your cluster.
+        :param pulumi.Input[str] client_key: The base64 encoded client key data required to communicate with your cluster. Add this to the client-key-data section of the kubeconfig file for your cluster.
         :param pulumi.Input[str] cluster_cert: The base64 encoded cluster certificate data required to communicate with your cluster. Add this to the certificate-authority-data section of the kubeconfig file for your cluster.
         """
         if client_cert is not None:
@@ -1394,7 +1393,7 @@ class ManagedKubernetesCertificateAuthorityArgs:
     @pulumi.getter(name="clientCert")
     def client_cert(self) -> Optional[pulumi.Input[str]]:
         """
-        The path of client certificate, like `~/.kube/client-cert.pem`.
+        The base64 encoded client certificate data required to communicate with your cluster. Add this to the client-certificate-data section of the kubeconfig file for your cluster.
         """
         return pulumi.get(self, "client_cert")
 
@@ -1406,7 +1405,7 @@ class ManagedKubernetesCertificateAuthorityArgs:
     @pulumi.getter(name="clientKey")
     def client_key(self) -> Optional[pulumi.Input[str]]:
         """
-        The path of client key, like `~/.kube/client-key.pem`.
+        The base64 encoded client key data required to communicate with your cluster. Add this to the client-key-data section of the kubeconfig file for your cluster.
         """
         return pulumi.get(self, "client_key")
 
@@ -1506,7 +1505,7 @@ class ManagedKubernetesDeleteOptionArgs:
         """
         :param pulumi.Input[str] delete_mode: The deletion mode of the cluster. Different resources may have different default behavior, see `resource_type` for details. Valid values:
         :param pulumi.Input[str] resource_type: The type of resources that are created by cluster. Valid values:
-               - `SLB`: SLB resources created by the Nginx Ingress Service, default behavior is to delete, option to retain is available.
+               - `SLB`: SLB resources created through the service, default behavior is to delete, option to retain is available.
                - `ALB`: ALB resources created by the ALB Ingress Controller, default behavior is to retain, option to delete is available.
                - `SLS_Data`: SLS Project used by the cluster logging feature, default behavior is to retain, option to delete is available.
                - `SLS_ControlPlane`: SLS Project used for the managed cluster control plane logs, default behavior is to retain, option to delete is available.
@@ -1514,7 +1513,7 @@ class ManagedKubernetesDeleteOptionArgs:
                ```
                ...
                // Specify delete_options as below when deleting cluster
-               // delete SLB resources created by the Nginx Ingress Service
+               // delete SLB resources created by the cluster
                delete_options {
                delete_mode = "delete"
                resource_type = "SLB"
@@ -1558,7 +1557,7 @@ class ManagedKubernetesDeleteOptionArgs:
     def resource_type(self) -> Optional[pulumi.Input[str]]:
         """
         The type of resources that are created by cluster. Valid values:
-        - `SLB`: SLB resources created by the Nginx Ingress Service, default behavior is to delete, option to retain is available.
+        - `SLB`: SLB resources created through the service, default behavior is to delete, option to retain is available.
         - `ALB`: ALB resources created by the ALB Ingress Controller, default behavior is to retain, option to delete is available.
         - `SLS_Data`: SLS Project used by the cluster logging feature, default behavior is to retain, option to delete is available.
         - `SLS_ControlPlane`: SLS Project used for the managed cluster control plane logs, default behavior is to retain, option to delete is available.
@@ -1566,7 +1565,7 @@ class ManagedKubernetesDeleteOptionArgs:
         ```
         ...
         // Specify delete_options as below when deleting cluster
-        // delete SLB resources created by the Nginx Ingress Service
+        // delete SLB resources created by the cluster
         delete_options {
         delete_mode = "delete"
         resource_type = "SLB"
@@ -2895,8 +2894,7 @@ class ServerlessKubernetesAddonArgs:
     def __init__(__self__, *,
                  config: Optional[pulumi.Input[str]] = None,
                  disabled: Optional[pulumi.Input[bool]] = None,
-                 name: Optional[pulumi.Input[str]] = None,
-                 version: Optional[pulumi.Input[str]] = None):
+                 name: Optional[pulumi.Input[str]] = None):
         """
         :param pulumi.Input[str] config: The ACK add-on configurations. For more config information, see cs_kubernetes_addon_metadata.
         :param pulumi.Input[bool] disabled: Disables the automatic installation of a component. Default is `false`.
@@ -2904,7 +2902,7 @@ class ServerlessKubernetesAddonArgs:
                The following example is the definition of addons block, The type of this field is list:
                
                ```
-               # install nginx ingress, conflict with ALB ingress
+               # install nginx ingress, conflict with SLB ingress
                addons {
                name = "nginx-ingress-controller"
                # use internet
@@ -2912,7 +2910,7 @@ class ServerlessKubernetesAddonArgs:
                # if use intranet, detail below.
                # config = "{\\"IngressSlbNetworkType\\":\\"intranet",\\"IngressSlbSpec\\":\\"slb.s2.small\\"}"
                }
-               # install ALB ingress, conflict with nginx ingress
+               # install SLB ingress, conflict with nginx ingress
                addons {
                name = "alb-ingress-controller"
                }
@@ -2927,10 +2925,11 @@ class ServerlessKubernetesAddonArgs:
                # install prometheus
                addons {
                name = "arms-prometheus"
+               # prometheus also provides managed version, specify with name `managed-arms-prometheus` for professional serverless clusters
+               # name = "managed-arms-prometheus"
                }
                ```
         :param pulumi.Input[str] name: Name of the ACK add-on. The name must match one of the names returned by [DescribeAddons](https://help.aliyun.com/document_detail/171524.html).
-        :param pulumi.Input[str] version: It specifies the version of the component.
         """
         if config is not None:
             pulumi.set(__self__, "config", config)
@@ -2938,8 +2937,6 @@ class ServerlessKubernetesAddonArgs:
             pulumi.set(__self__, "disabled", disabled)
         if name is not None:
             pulumi.set(__self__, "name", name)
-        if version is not None:
-            pulumi.set(__self__, "version", version)
 
     @property
     @pulumi.getter
@@ -2962,7 +2959,7 @@ class ServerlessKubernetesAddonArgs:
         The following example is the definition of addons block, The type of this field is list:
 
         ```
-        # install nginx ingress, conflict with ALB ingress
+        # install nginx ingress, conflict with SLB ingress
         addons {
         name = "nginx-ingress-controller"
         # use internet
@@ -2970,7 +2967,7 @@ class ServerlessKubernetesAddonArgs:
         # if use intranet, detail below.
         # config = "{\\"IngressSlbNetworkType\\":\\"intranet",\\"IngressSlbSpec\\":\\"slb.s2.small\\"}"
         }
-        # install ALB ingress, conflict with nginx ingress
+        # install SLB ingress, conflict with nginx ingress
         addons {
         name = "alb-ingress-controller"
         }
@@ -2985,6 +2982,8 @@ class ServerlessKubernetesAddonArgs:
         # install prometheus
         addons {
         name = "arms-prometheus"
+        # prometheus also provides managed version, specify with name `managed-arms-prometheus` for professional serverless clusters
+        # name = "managed-arms-prometheus"
         }
         ```
         """
@@ -3006,125 +3005,6 @@ class ServerlessKubernetesAddonArgs:
     def name(self, value: Optional[pulumi.Input[str]]):
         pulumi.set(self, "name", value)
 
-    @property
-    @pulumi.getter
-    def version(self) -> Optional[pulumi.Input[str]]:
-        """
-        It specifies the version of the component.
-        """
-        return pulumi.get(self, "version")
-
-    @version.setter
-    def version(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "version", value)
-
-
-@pulumi.input_type
-class ServerlessKubernetesDeleteOptionArgs:
-    def __init__(__self__, *,
-                 delete_mode: Optional[pulumi.Input[str]] = None,
-                 resource_type: Optional[pulumi.Input[str]] = None):
-        """
-        :param pulumi.Input[str] delete_mode: The deletion mode of the cluster. Different resources may have different default behavior, see `resource_type` for details. Valid values:
-        :param pulumi.Input[str] resource_type: The type of resources that are created by cluster. Valid values:
-               - `SLB`: SLB resources created by the Nginx Ingress Service, default behavior is to delete, option to retain is available.
-               - `ALB`: ALB resources created by the ALB Ingress Controller, default behavior is to retain, option to delete is available.
-               - `SLS_Data`: SLS Project used by the cluster logging feature, default behavior is to retain, option to delete is available.
-               - `SLS_ControlPlane`: SLS Project used for the managed cluster control plane logs, default behavior is to retain, option to delete is available.
-               - `PrivateZone`: PrivateZone resources created by the cluster, default behavior is to retain, option to delete is available.
-               ```
-               ...
-               // Specify delete_options as below when deleting cluster
-               // delete SLB resources created by the Nginx Ingress Service
-               delete_options {
-               delete_mode = "delete"
-               resource_type = "SLB"
-               }
-               // delete ALB resources created by the ALB Ingress Controller
-               delete_options {
-               delete_mode = "delete"
-               resource_type = "ALB"
-               }
-               // delete SLS Project used by the cluster logging feature
-               delete_options {
-               delete_mode = "delete"
-               resource_type = "SLS_Data"
-               }
-               // delete SLS Project used for the managed cluster control plane logs
-               delete_options {
-               delete_mode = "delete"
-               resource_type = "SLS_ControlPlane"
-               }
-               // delete PrivateZone resources created by the cluster
-               delete_options {
-               delete_mode = "delete"
-               resource_type = "PrivateZone"
-               }
-               ```
-        """
-        if delete_mode is not None:
-            pulumi.set(__self__, "delete_mode", delete_mode)
-        if resource_type is not None:
-            pulumi.set(__self__, "resource_type", resource_type)
-
-    @property
-    @pulumi.getter(name="deleteMode")
-    def delete_mode(self) -> Optional[pulumi.Input[str]]:
-        """
-        The deletion mode of the cluster. Different resources may have different default behavior, see `resource_type` for details. Valid values:
-        """
-        return pulumi.get(self, "delete_mode")
-
-    @delete_mode.setter
-    def delete_mode(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "delete_mode", value)
-
-    @property
-    @pulumi.getter(name="resourceType")
-    def resource_type(self) -> Optional[pulumi.Input[str]]:
-        """
-        The type of resources that are created by cluster. Valid values:
-        - `SLB`: SLB resources created by the Nginx Ingress Service, default behavior is to delete, option to retain is available.
-        - `ALB`: ALB resources created by the ALB Ingress Controller, default behavior is to retain, option to delete is available.
-        - `SLS_Data`: SLS Project used by the cluster logging feature, default behavior is to retain, option to delete is available.
-        - `SLS_ControlPlane`: SLS Project used for the managed cluster control plane logs, default behavior is to retain, option to delete is available.
-        - `PrivateZone`: PrivateZone resources created by the cluster, default behavior is to retain, option to delete is available.
-        ```
-        ...
-        // Specify delete_options as below when deleting cluster
-        // delete SLB resources created by the Nginx Ingress Service
-        delete_options {
-        delete_mode = "delete"
-        resource_type = "SLB"
-        }
-        // delete ALB resources created by the ALB Ingress Controller
-        delete_options {
-        delete_mode = "delete"
-        resource_type = "ALB"
-        }
-        // delete SLS Project used by the cluster logging feature
-        delete_options {
-        delete_mode = "delete"
-        resource_type = "SLS_Data"
-        }
-        // delete SLS Project used for the managed cluster control plane logs
-        delete_options {
-        delete_mode = "delete"
-        resource_type = "SLS_ControlPlane"
-        }
-        // delete PrivateZone resources created by the cluster
-        delete_options {
-        delete_mode = "delete"
-        resource_type = "PrivateZone"
-        }
-        ```
-        """
-        return pulumi.get(self, "resource_type")
-
-    @resource_type.setter
-    def resource_type(self, value: Optional[pulumi.Input[str]]):
-        pulumi.set(self, "resource_type", value)
-
 
 @pulumi.input_type
 class ServerlessKubernetesRrsaMetadataArgs:

pulumi_alicloud/cs/kubernetes.py

@@ -71,7 +71,7 @@ class KubernetesArgs:
         The set of arguments for constructing a Kubernetes resource.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] master_instance_types: The instance type of master node. Specify one type for single AZ Cluster, three types for MultiAZ Cluster.
         :param pulumi.Input[Sequence[pulumi.Input[str]]] master_vswitch_ids: The vswitches used by master, you can specific 3 or 5 vswitches because of the amount of masters. Detailed below.
-        :param pulumi.Input[Sequence[pulumi.Input['KubernetesAddonArgs']]] addons: The addon you want to install in cluster. See `addons` below. Only works for **Create** Operation, use resource cs_kubernetes_addon to manage addons if cluster is created.
+        :param pulumi.Input[Sequence[pulumi.Input['KubernetesAddonArgs']]] addons: The addon you want to install in cluster. See `addons` below.
                
                *Network params*
         :param pulumi.Input[Sequence[pulumi.Input[str]]] api_audiences: A list of API audiences for [Service Account Token Volume Projection](https://www.alibabacloud.com/help/doc-detail/160384.htm). Set this to `["https://kubernetes.default.svc"]` if you want to enable the Token Volume Projection feature requires specifying `service_account_issuer` as well. From cluster version 1.22+, Service Account Token Volume Projection will be enabled by default.
@@ -262,7 +262,7 @@ class KubernetesArgs:
     @pulumi.getter
     def addons(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['KubernetesAddonArgs']]]]:
         """
-        The addon you want to install in cluster. See `addons` below. Only works for **Create** Operation, use resource cs_kubernetes_addon to manage addons if cluster is created.
+        The addon you want to install in cluster. See `addons` below.
 
         *Network params*
         """
@@ -918,7 +918,7 @@ class _KubernetesState:
                  worker_ram_role_name: Optional[pulumi.Input[str]] = None):
         """
         Input properties used for looking up and filtering Kubernetes resources.
-        :param pulumi.Input[Sequence[pulumi.Input['KubernetesAddonArgs']]] addons: The addon you want to install in cluster. See `addons` below. Only works for **Create** Operation, use resource cs_kubernetes_addon to manage addons if cluster is created.
+        :param pulumi.Input[Sequence[pulumi.Input['KubernetesAddonArgs']]] addons: The addon you want to install in cluster. See `addons` below.
                
                *Network params*
         :param pulumi.Input[Sequence[pulumi.Input[str]]] api_audiences: A list of API audiences for [Service Account Token Volume Projection](https://www.alibabacloud.com/help/doc-detail/160384.htm). Set this to `["https://kubernetes.default.svc"]` if you want to enable the Token Volume Projection feature requires specifying `service_account_issuer` as well. From cluster version 1.22+, Service Account Token Volume Projection will be enabled by default.
@@ -1116,7 +1116,7 @@ class _KubernetesState:
     @pulumi.getter
     def addons(self) -> Optional[pulumi.Input[Sequence[pulumi.Input['KubernetesAddonArgs']]]]:
         """
-        The addon you want to install in cluster. See `addons` below. Only works for **Create** Operation, use resource cs_kubernetes_addon to manage addons if cluster is created.
+        The addon you want to install in cluster. See `addons` below.
 
         *Network params*
         """
@@ -1941,7 +1941,7 @@ class Kubernetes(pulumi.CustomResource):
 
         :param str resource_name: The name of the resource.
         :param pulumi.ResourceOptions opts: Options for the resource.
-        :param pulumi.Input[Sequence[pulumi.Input[Union['KubernetesAddonArgs', 'KubernetesAddonArgsDict']]]] addons: The addon you want to install in cluster. See `addons` below. Only works for **Create** Operation, use resource cs_kubernetes_addon to manage addons if cluster is created.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['KubernetesAddonArgs', 'KubernetesAddonArgsDict']]]] addons: The addon you want to install in cluster. See `addons` below.
                
                *Network params*
         :param pulumi.Input[Sequence[pulumi.Input[str]]] api_audiences: A list of API audiences for [Service Account Token Volume Projection](https://www.alibabacloud.com/help/doc-detail/160384.htm). Set this to `["https://kubernetes.default.svc"]` if you want to enable the Token Volume Projection feature requires specifying `service_account_issuer` as well. From cluster version 1.22+, Service Account Token Volume Projection will be enabled by default.
@@ -2269,7 +2269,7 @@ class Kubernetes(pulumi.CustomResource):
         :param str resource_name: The unique name of the resulting resource.
         :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
         :param pulumi.ResourceOptions opts: Options for the resource.
-        :param pulumi.Input[Sequence[pulumi.Input[Union['KubernetesAddonArgs', 'KubernetesAddonArgsDict']]]] addons: The addon you want to install in cluster. See `addons` below. Only works for **Create** Operation, use resource cs_kubernetes_addon to manage addons if cluster is created.
+        :param pulumi.Input[Sequence[pulumi.Input[Union['KubernetesAddonArgs', 'KubernetesAddonArgsDict']]]] addons: The addon you want to install in cluster. See `addons` below.
                
                *Network params*
         :param pulumi.Input[Sequence[pulumi.Input[str]]] api_audiences: A list of API audiences for [Service Account Token Volume Projection](https://www.alibabacloud.com/help/doc-detail/160384.htm). Set this to `["https://kubernetes.default.svc"]` if you want to enable the Token Volume Projection feature requires specifying `service_account_issuer` as well. From cluster version 1.22+, Service Account Token Volume Projection will be enabled by default.
@@ -2409,7 +2409,7 @@ class Kubernetes(pulumi.CustomResource):
     @pulumi.getter
     def addons(self) -> pulumi.Output[Optional[Sequence['outputs.KubernetesAddon']]]:
         """
-        The addon you want to install in cluster. See `addons` below. Only works for **Create** Operation, use resource cs_kubernetes_addon to manage addons if cluster is created.
+        The addon you want to install in cluster. See `addons` below.
 
         *Network params*
         """

pulumi_alicloud/cs/kubernetes_addon.py

@@ -246,9 +246,11 @@ class KubernetesAddon(pulumi.CustomResource):
                  version: Optional[pulumi.Input[str]] = None,
                  __props__=None):
         """
-        ## Example Usage
+        This resource will help you to manage addon in Kubernetes Cluster, see What is kubernetes addon.
 
-        Basic Usage
+        > **NOTE:** Available since v1.150.0.
+
+        > **NOTE:** From version 1.166.0, support specifying addon customizable configuration.
 
         ## Import
 
@@ -273,9 +275,11 @@ class KubernetesAddon(pulumi.CustomResource):
                  args: KubernetesAddonInitArgs,
                  opts: Optional[pulumi.ResourceOptions] = None):
         """
-        ## Example Usage
+        This resource will help you to manage addon in Kubernetes Cluster, see What is kubernetes addon.
+
+        > **NOTE:** Available since v1.150.0.
 
-        Basic Usage
+        > **NOTE:** From version 1.166.0, support specifying addon customizable configuration.
 
         ## Import