pulumi-oci 2.4.0a1721890421__py3-none-any.whl → 2.5.0__py3-none-any.whl

pulumi_oci/bigdataservice/bds_instance.py

@@ -33,6 +33,7 @@ class BdsInstanceArgs:
                  defined_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
                  edge_node: Optional[pulumi.Input['BdsInstanceEdgeNodeArgs']] = None,
                  freeform_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
+                 ignore_existing_nodes_shapes: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  is_cloud_sql_configured: Optional[pulumi.Input[bool]] = None,
                  is_force_stop_jobs: Optional[pulumi.Input[bool]] = None,
                  is_kafka_configured: Optional[pulumi.Input[bool]] = None,
@@ -58,6 +59,7 @@ class BdsInstanceArgs:
         :param pulumi.Input[str] cluster_profile: Profile of the Big Data Service cluster.
         :param pulumi.Input[Mapping[str, Any]] defined_tags: (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"foo-namespace.bar-key": "value"}`
         :param pulumi.Input[Mapping[str, Any]] freeform_tags: (Updatable) Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}`
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] ignore_existing_nodes_shapes: Tag to ignore changing the shape of existing worker, master, utility, compute_only_worker, edge, kafka_broker nodes, in a list format, when new nodes are added with a different shape.
         :param pulumi.Input[bool] is_cloud_sql_configured: (Updatable) Boolean flag specifying whether we configure Cloud SQL or not
         :param pulumi.Input[bool] is_force_stop_jobs: (Updatable) When setting state as `INACTIVE` for stopping a cluster, setting this flag to true forcefully stops the bds instance.
         :param pulumi.Input[bool] is_kafka_configured: Boolean flag specifying whether or not Kafka should be configured.
@@ -92,6 +94,8 @@ class BdsInstanceArgs:
             pulumi.set(__self__, "edge_node", edge_node)
         if freeform_tags is not None:
             pulumi.set(__self__, "freeform_tags", freeform_tags)
+        if ignore_existing_nodes_shapes is not None:
+            pulumi.set(__self__, "ignore_existing_nodes_shapes", ignore_existing_nodes_shapes)
         if is_cloud_sql_configured is not None:
             pulumi.set(__self__, "is_cloud_sql_configured", is_cloud_sql_configured)
         if is_force_stop_jobs is not None:
@@ -306,6 +310,18 @@ class BdsInstanceArgs:
     def freeform_tags(self, value: Optional[pulumi.Input[Mapping[str, Any]]]):
         pulumi.set(self, "freeform_tags", value)
 
+    @property
+    @pulumi.getter(name="ignoreExistingNodesShapes")
+    def ignore_existing_nodes_shapes(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
+        """
+        Tag to ignore changing the shape of existing worker, master, utility, compute_only_worker, edge, kafka_broker nodes, in a list format, when new nodes are added with a different shape.
+        """
+        return pulumi.get(self, "ignore_existing_nodes_shapes")
+
+    @ignore_existing_nodes_shapes.setter
+    def ignore_existing_nodes_shapes(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]):
+        pulumi.set(self, "ignore_existing_nodes_shapes", value)
+
     @property
     @pulumi.getter(name="isCloudSqlConfigured")
     def is_cloud_sql_configured(self) -> Optional[pulumi.Input[bool]]:
@@ -432,6 +448,7 @@ class _BdsInstanceState:
                  display_name: Optional[pulumi.Input[str]] = None,
                  edge_node: Optional[pulumi.Input['BdsInstanceEdgeNodeArgs']] = None,
                  freeform_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
+                 ignore_existing_nodes_shapes: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  is_cloud_sql_configured: Optional[pulumi.Input[bool]] = None,
                  is_force_stop_jobs: Optional[pulumi.Input[bool]] = None,
                  is_high_availability: Optional[pulumi.Input[bool]] = None,
@@ -465,6 +482,7 @@ class _BdsInstanceState:
         :param pulumi.Input[Mapping[str, Any]] defined_tags: (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"foo-namespace.bar-key": "value"}`
         :param pulumi.Input[str] display_name: (Updatable) Name of the BDS instance
         :param pulumi.Input[Mapping[str, Any]] freeform_tags: (Updatable) Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}`
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] ignore_existing_nodes_shapes: Tag to ignore changing the shape of existing worker, master, utility, compute_only_worker, edge, kafka_broker nodes, in a list format, when new nodes are added with a different shape.
         :param pulumi.Input[bool] is_cloud_sql_configured: (Updatable) Boolean flag specifying whether we configure Cloud SQL or not
         :param pulumi.Input[bool] is_force_stop_jobs: (Updatable) When setting state as `INACTIVE` for stopping a cluster, setting this flag to true forcefully stops the bds instance.
         :param pulumi.Input[bool] is_high_availability: Boolean flag specifying whether or not the cluster is HA
@@ -512,6 +530,8 @@ class _BdsInstanceState:
             pulumi.set(__self__, "edge_node", edge_node)
         if freeform_tags is not None:
             pulumi.set(__self__, "freeform_tags", freeform_tags)
+        if ignore_existing_nodes_shapes is not None:
+            pulumi.set(__self__, "ignore_existing_nodes_shapes", ignore_existing_nodes_shapes)
         if is_cloud_sql_configured is not None:
             pulumi.set(__self__, "is_cloud_sql_configured", is_cloud_sql_configured)
         if is_force_stop_jobs is not None:
@@ -713,6 +733,18 @@ class _BdsInstanceState:
     def freeform_tags(self, value: Optional[pulumi.Input[Mapping[str, Any]]]):
         pulumi.set(self, "freeform_tags", value)
 
+    @property
+    @pulumi.getter(name="ignoreExistingNodesShapes")
+    def ignore_existing_nodes_shapes(self) -> Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]:
+        """
+        Tag to ignore changing the shape of existing worker, master, utility, compute_only_worker, edge, kafka_broker nodes, in a list format, when new nodes are added with a different shape.
+        """
+        return pulumi.get(self, "ignore_existing_nodes_shapes")
+
+    @ignore_existing_nodes_shapes.setter
+    def ignore_existing_nodes_shapes(self, value: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]]):
+        pulumi.set(self, "ignore_existing_nodes_shapes", value)
+
     @property
     @pulumi.getter(name="isCloudSqlConfigured")
     def is_cloud_sql_configured(self) -> Optional[pulumi.Input[bool]]:
@@ -956,6 +988,7 @@ class BdsInstance(pulumi.CustomResource):
                  display_name: Optional[pulumi.Input[str]] = None,
                  edge_node: Optional[pulumi.Input[pulumi.InputType['BdsInstanceEdgeNodeArgs']]] = None,
                  freeform_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
+                 ignore_existing_nodes_shapes: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  is_cloud_sql_configured: Optional[pulumi.Input[bool]] = None,
                  is_force_stop_jobs: Optional[pulumi.Input[bool]] = None,
                  is_high_availability: Optional[pulumi.Input[bool]] = None,
@@ -996,6 +1029,7 @@ class BdsInstance(pulumi.CustomResource):
         :param pulumi.Input[Mapping[str, Any]] defined_tags: (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"foo-namespace.bar-key": "value"}`
         :param pulumi.Input[str] display_name: (Updatable) Name of the BDS instance
         :param pulumi.Input[Mapping[str, Any]] freeform_tags: (Updatable) Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}`
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] ignore_existing_nodes_shapes: Tag to ignore changing the shape of existing worker, master, utility, compute_only_worker, edge, kafka_broker nodes, in a list format, when new nodes are added with a different shape.
         :param pulumi.Input[bool] is_cloud_sql_configured: (Updatable) Boolean flag specifying whether we configure Cloud SQL or not
         :param pulumi.Input[bool] is_force_stop_jobs: (Updatable) When setting state as `INACTIVE` for stopping a cluster, setting this flag to true forcefully stops the bds instance.
         :param pulumi.Input[bool] is_high_availability: Boolean flag specifying whether or not the cluster is HA
@@ -1056,6 +1090,7 @@ class BdsInstance(pulumi.CustomResource):
                  display_name: Optional[pulumi.Input[str]] = None,
                  edge_node: Optional[pulumi.Input[pulumi.InputType['BdsInstanceEdgeNodeArgs']]] = None,
                  freeform_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
+                 ignore_existing_nodes_shapes: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
                  is_cloud_sql_configured: Optional[pulumi.Input[bool]] = None,
                  is_force_stop_jobs: Optional[pulumi.Input[bool]] = None,
                  is_high_availability: Optional[pulumi.Input[bool]] = None,
@@ -1101,6 +1136,7 @@ class BdsInstance(pulumi.CustomResource):
             __props__.__dict__["display_name"] = display_name
             __props__.__dict__["edge_node"] = edge_node
             __props__.__dict__["freeform_tags"] = freeform_tags
+            __props__.__dict__["ignore_existing_nodes_shapes"] = ignore_existing_nodes_shapes
             __props__.__dict__["is_cloud_sql_configured"] = is_cloud_sql_configured
             __props__.__dict__["is_force_stop_jobs"] = is_force_stop_jobs
             if is_high_availability is None and not opts.urn:
@@ -1158,6 +1194,7 @@ class BdsInstance(pulumi.CustomResource):
             display_name: Optional[pulumi.Input[str]] = None,
             edge_node: Optional[pulumi.Input[pulumi.InputType['BdsInstanceEdgeNodeArgs']]] = None,
             freeform_tags: Optional[pulumi.Input[Mapping[str, Any]]] = None,
+            ignore_existing_nodes_shapes: Optional[pulumi.Input[Sequence[pulumi.Input[str]]]] = None,
             is_cloud_sql_configured: Optional[pulumi.Input[bool]] = None,
             is_force_stop_jobs: Optional[pulumi.Input[bool]] = None,
             is_high_availability: Optional[pulumi.Input[bool]] = None,
@@ -1196,6 +1233,7 @@ class BdsInstance(pulumi.CustomResource):
         :param pulumi.Input[Mapping[str, Any]] defined_tags: (Updatable) Defined tags for this resource. Each key is predefined and scoped to a namespace. Example: `{"foo-namespace.bar-key": "value"}`
         :param pulumi.Input[str] display_name: (Updatable) Name of the BDS instance
         :param pulumi.Input[Mapping[str, Any]] freeform_tags: (Updatable) Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only. Example: `{"bar-key": "value"}`
+        :param pulumi.Input[Sequence[pulumi.Input[str]]] ignore_existing_nodes_shapes: Tag to ignore changing the shape of existing worker, master, utility, compute_only_worker, edge, kafka_broker nodes, in a list format, when new nodes are added with a different shape.
         :param pulumi.Input[bool] is_cloud_sql_configured: (Updatable) Boolean flag specifying whether we configure Cloud SQL or not
         :param pulumi.Input[bool] is_force_stop_jobs: (Updatable) When setting state as `INACTIVE` for stopping a cluster, setting this flag to true forcefully stops the bds instance.
         :param pulumi.Input[bool] is_high_availability: Boolean flag specifying whether or not the cluster is HA
@@ -1233,6 +1271,7 @@ class BdsInstance(pulumi.CustomResource):
         __props__.__dict__["display_name"] = display_name
         __props__.__dict__["edge_node"] = edge_node
         __props__.__dict__["freeform_tags"] = freeform_tags
+        __props__.__dict__["ignore_existing_nodes_shapes"] = ignore_existing_nodes_shapes
         __props__.__dict__["is_cloud_sql_configured"] = is_cloud_sql_configured
         __props__.__dict__["is_force_stop_jobs"] = is_force_stop_jobs
         __props__.__dict__["is_high_availability"] = is_high_availability
@@ -1360,6 +1399,14 @@ class BdsInstance(pulumi.CustomResource):
         """
         return pulumi.get(self, "freeform_tags")
 
+    @property
+    @pulumi.getter(name="ignoreExistingNodesShapes")
+    def ignore_existing_nodes_shapes(self) -> pulumi.Output[Optional[Sequence[str]]]:
+        """
+        Tag to ignore changing the shape of existing worker, master, utility, compute_only_worker, edge, kafka_broker nodes, in a list format, when new nodes are added with a different shape.
+        """
+        return pulumi.get(self, "ignore_existing_nodes_shapes")
+
     @property
     @pulumi.getter(name="isCloudSqlConfigured")
     def is_cloud_sql_configured(self) -> pulumi.Output[bool]:

pulumi_oci/bigdataservice/get_bds_instance.py

@@ -22,7 +22,7 @@ class GetBdsInstanceResult:
     """
     A collection of values returned by getBdsInstance.
     """
-    def __init__(__self__, bds_instance_id=None, bootstrap_script_url=None, cloud_sql_details=None, cluster_admin_password=None, cluster_details=None, cluster_profile=None, cluster_public_key=None, cluster_version=None, compartment_id=None, compute_only_worker_nodes=None, created_by=None, defined_tags=None, display_name=None, edge_nodes=None, freeform_tags=None, id=None, is_cloud_sql_configured=None, is_force_stop_jobs=None, is_high_availability=None, is_kafka_configured=None, is_secure=None, kafka_broker_nodes=None, kerberos_realm_name=None, kms_key_id=None, master_nodes=None, network_configs=None, nodes=None, number_of_nodes=None, number_of_nodes_requiring_maintenance_reboot=None, os_patch_version=None, state=None, time_created=None, time_updated=None, util_nodes=None, worker_nodes=None):
+    def __init__(__self__, bds_instance_id=None, bootstrap_script_url=None, cloud_sql_details=None, cluster_admin_password=None, cluster_details=None, cluster_profile=None, cluster_public_key=None, cluster_version=None, compartment_id=None, compute_only_worker_nodes=None, created_by=None, defined_tags=None, display_name=None, edge_nodes=None, freeform_tags=None, id=None, ignore_existing_nodes_shapes=None, is_cloud_sql_configured=None, is_force_stop_jobs=None, is_high_availability=None, is_kafka_configured=None, is_secure=None, kafka_broker_nodes=None, kerberos_realm_name=None, kms_key_id=None, master_nodes=None, network_configs=None, nodes=None, number_of_nodes=None, number_of_nodes_requiring_maintenance_reboot=None, os_patch_version=None, state=None, time_created=None, time_updated=None, util_nodes=None, worker_nodes=None):
         if bds_instance_id and not isinstance(bds_instance_id, str):
             raise TypeError("Expected argument 'bds_instance_id' to be a str")
         pulumi.set(__self__, "bds_instance_id", bds_instance_id)
@@ -71,6 +71,9 @@ class GetBdsInstanceResult:
         if id and not isinstance(id, str):
             raise TypeError("Expected argument 'id' to be a str")
         pulumi.set(__self__, "id", id)
+        if ignore_existing_nodes_shapes and not isinstance(ignore_existing_nodes_shapes, list):
+            raise TypeError("Expected argument 'ignore_existing_nodes_shapes' to be a list")
+        pulumi.set(__self__, "ignore_existing_nodes_shapes", ignore_existing_nodes_shapes)
         if is_cloud_sql_configured and not isinstance(is_cloud_sql_configured, bool):
             raise TypeError("Expected argument 'is_cloud_sql_configured' to be a bool")
         pulumi.set(__self__, "is_cloud_sql_configured", is_cloud_sql_configured)
@@ -242,6 +245,11 @@ class GetBdsInstanceResult:
         """
         return pulumi.get(self, "id")
 
+    @property
+    @pulumi.getter(name="ignoreExistingNodesShapes")
+    def ignore_existing_nodes_shapes(self) -> Sequence[str]:
+        return pulumi.get(self, "ignore_existing_nodes_shapes")
+
     @property
     @pulumi.getter(name="isCloudSqlConfigured")
     def is_cloud_sql_configured(self) -> bool:
@@ -396,6 +404,7 @@ class AwaitableGetBdsInstanceResult(GetBdsInstanceResult):
             edge_nodes=self.edge_nodes,
             freeform_tags=self.freeform_tags,
             id=self.id,
+            ignore_existing_nodes_shapes=self.ignore_existing_nodes_shapes,
             is_cloud_sql_configured=self.is_cloud_sql_configured,
             is_force_stop_jobs=self.is_force_stop_jobs,
             is_high_availability=self.is_high_availability,
@@ -458,6 +467,7 @@ def get_bds_instance(bds_instance_id: Optional[str] = None,
         edge_nodes=pulumi.get(__ret__, 'edge_nodes'),
         freeform_tags=pulumi.get(__ret__, 'freeform_tags'),
         id=pulumi.get(__ret__, 'id'),
+        ignore_existing_nodes_shapes=pulumi.get(__ret__, 'ignore_existing_nodes_shapes'),
         is_cloud_sql_configured=pulumi.get(__ret__, 'is_cloud_sql_configured'),
         is_force_stop_jobs=pulumi.get(__ret__, 'is_force_stop_jobs'),
         is_high_availability=pulumi.get(__ret__, 'is_high_availability'),

pulumi_oci/bigdataservice/outputs.py

@@ -6467,6 +6467,7 @@ class GetBdsInstancesBdsInstanceResult(dict):
                  edge_nodes: Sequence['outputs.GetBdsInstancesBdsInstanceEdgeNodeResult'],
                  freeform_tags: Mapping[str, Any],
                  id: str,
+                 ignore_existing_nodes_shapes: Sequence[str],
                  is_cloud_sql_configured: bool,
                  is_force_stop_jobs: bool,
                  is_high_availability: bool,
@@ -6526,6 +6527,7 @@ class GetBdsInstancesBdsInstanceResult(dict):
         pulumi.set(__self__, "edge_nodes", edge_nodes)
         pulumi.set(__self__, "freeform_tags", freeform_tags)
         pulumi.set(__self__, "id", id)
+        pulumi.set(__self__, "ignore_existing_nodes_shapes", ignore_existing_nodes_shapes)
         pulumi.set(__self__, "is_cloud_sql_configured", is_cloud_sql_configured)
         pulumi.set(__self__, "is_force_stop_jobs", is_force_stop_jobs)
         pulumi.set(__self__, "is_high_availability", is_high_availability)
@@ -6654,6 +6656,11 @@ class GetBdsInstancesBdsInstanceResult(dict):
         """
         return pulumi.get(self, "id")
 
+    @property
+    @pulumi.getter(name="ignoreExistingNodesShapes")
+    def ignore_existing_nodes_shapes(self) -> Sequence[str]:
+        return pulumi.get(self, "ignore_existing_nodes_shapes")
+
     @property
     @pulumi.getter(name="isCloudSqlConfigured")
     def is_cloud_sql_configured(self) -> bool:

pulumi_oci/core/__init__.py

@@ -112,6 +112,8 @@ from .get_instance_configurations import *
 from .get_instance_console_connections import *
 from .get_instance_credentials import *
 from .get_instance_devices import *
+from .get_instance_maintenance_event import *
+from .get_instance_maintenance_events import *
 from .get_instance_maintenance_reboot import *
 from .get_instance_measured_boot_report import *
 from .get_instance_pool import *
@@ -188,6 +190,7 @@ from .image import *
 from .instance import *
 from .instance_configuration import *
 from .instance_console_connection import *
+from .instance_maintenance_event import *
 from .instance_pool import *
 from .instance_pool_instance import *
 from .internet_gateway import *

pulumi_oci/core/_inputs.py

@@ -235,6 +235,7 @@ __all__ = [
     'GetInstanceConfigurationsFilterArgs',
     'GetInstanceConsoleConnectionsFilterArgs',
     'GetInstanceDevicesFilterArgs',
+    'GetInstanceMaintenanceEventsFilterArgs',
     'GetInstancePoolInstancesFilterArgs',
     'GetInstancePoolsFilterArgs',
     'GetInstancesFilterArgs',
@@ -2386,8 +2387,8 @@ class ComputeCapacityReservationInstanceReservationConfigArgs:
         :param pulumi.Input[str] reserved_count: (Updatable) The total number of instances that can be launched from the capacity configuration.
         :param pulumi.Input['ComputeCapacityReservationInstanceReservationConfigClusterConfigArgs'] cluster_config: (Updatable) The HPC cluster configuration requested when launching instances in a compute capacity reservation.
                
-               <<<<<<< HEAD
                If the parameter is provided, the reservation is created with the HPC island and a list of HPC blocks that you specify. If a list of HPC blocks are missing or not provided, the reservation is created with any HPC blocks in the HPC island that you specify. If the values of HPC island or HPC block that you provide are not valid, an error is returned.
+        :param pulumi.Input[str] cluster_placement_group_id: (Updatable) The OCID of the cluster placement group for this instance reservation capacity configuration.
         :param pulumi.Input[str] fault_domain: (Updatable) The fault domain to use for instances created using this capacity configuration. For more information, see [Fault Domains](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/regions.htm#fault). If you do not specify the fault domain, the capacity is available for an instance that does not specify a fault domain. To change the fault domain for a reservation, delete the reservation and create a new one in the preferred fault domain.
                
                To retrieve a list of fault domains, use the `ListFaultDomains` operation in the [Identity and Access Management Service API](https://www.terraform.io/iaas/api/#/en/identity/20160918/).
@@ -2445,7 +2446,6 @@ class ComputeCapacityReservationInstanceReservationConfigArgs:
         """
         (Updatable) The HPC cluster configuration requested when launching instances in a compute capacity reservation.
 
-        <<<<<<< HEAD
         If the parameter is provided, the reservation is created with the HPC island and a list of HPC blocks that you specify. If a list of HPC blocks are missing or not provided, the reservation is created with any HPC blocks in the HPC island that you specify. If the values of HPC island or HPC block that you provide are not valid, an error is returned.
         """
         return pulumi.get(self, "cluster_config")
@@ -2457,6 +2457,9 @@ class ComputeCapacityReservationInstanceReservationConfigArgs:
     @property
     @pulumi.getter(name="clusterPlacementGroupId")
     def cluster_placement_group_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        (Updatable) The OCID of the cluster placement group for this instance reservation capacity configuration.
+        """
         return pulumi.get(self, "cluster_placement_group_id")
 
     @cluster_placement_group_id.setter
@@ -10404,8 +10407,8 @@ class InstancePoolPlacementConfigurationArgs:
                
                To get a list of fault domains, use the [ListFaultDomains](https://docs.cloud.oracle.com/iaas/api/#/en/identity/20160918/FaultDomain/ListFaultDomains) operation in the Identity and Access Management Service API.
                
-               <<<<<<< HEAD
                Example: `[FAULT-DOMAIN-1, FAULT-DOMAIN-2, FAULT-DOMAIN-3]`
+        :param pulumi.Input[str] primary_subnet_id: (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. This field is deprecated. Use `primaryVnicSubnets` instead to set VNIC data for instances in the pool.
         :param pulumi.Input['InstancePoolPlacementConfigurationPrimaryVnicSubnetsArgs'] primary_vnic_subnets: (Updatable) Details about the IPv6 primary subnet.
         :param pulumi.Input[Sequence[pulumi.Input['InstancePoolPlacementConfigurationSecondaryVnicSubnetArgs']]] secondary_vnic_subnets: (Updatable) The set of secondary VNIC data for instances in the pool.
         """
@@ -10443,7 +10446,6 @@ class InstancePoolPlacementConfigurationArgs:
 
         To get a list of fault domains, use the [ListFaultDomains](https://docs.cloud.oracle.com/iaas/api/#/en/identity/20160918/FaultDomain/ListFaultDomains) operation in the Identity and Access Management Service API.
 
-        <<<<<<< HEAD
         Example: `[FAULT-DOMAIN-1, FAULT-DOMAIN-2, FAULT-DOMAIN-3]`
         """
         return pulumi.get(self, "fault_domains")
@@ -10455,6 +10457,9 @@ class InstancePoolPlacementConfigurationArgs:
     @property
     @pulumi.getter(name="primarySubnetId")
     def primary_subnet_id(self) -> Optional[pulumi.Input[str]]:
+        """
+        (Updatable) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the primary subnet to place instances. This field is deprecated. Use `primaryVnicSubnets` instead to set VNIC data for instances in the pool.
+        """
         return pulumi.get(self, "primary_subnet_id")
 
     @primary_subnet_id.setter
@@ -10494,8 +10499,6 @@ class InstancePoolPlacementConfigurationPrimaryVnicSubnetsArgs:
                  is_assign_ipv6ip: Optional[pulumi.Input[bool]] = None):
         """
         :param pulumi.Input[str] subnet_id: (Updatable) The subnet [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) for the secondary VNIC.
-               =======
-               Example: `[FAULT-DOMAIN-1, FAULT-DOMAIN-2, FAULT-DOMAIN-3]`
         :param pulumi.Input[Sequence[pulumi.Input['InstancePoolPlacementConfigurationPrimaryVnicSubnetsIpv6addressIpv6subnetCidrPairDetailArgs']]] ipv6address_ipv6subnet_cidr_pair_details: (Updatable) A list of IPv6 prefix ranges from which the VNIC should be assigned an IPv6 address. You can provide only the prefix ranges and Oracle Cloud Infrastructure will select an available address from the range. You can optionally choose to leave the prefix range empty and instead provide the specific IPv6 address that should be used from within that range.
         :param pulumi.Input[bool] is_assign_ipv6ip: (Updatable) Whether to allocate an IPv6 address at instance and VNIC creation from an IPv6 enabled subnet. Default: False. When provided you may optionally provide an IPv6 prefix (`ipv6SubnetCidr`) of your choice to assign the IPv6 address from. If `ipv6SubnetCidr` is not provided then an IPv6 prefix is chosen for you.
         """
@@ -10510,8 +10513,6 @@ class InstancePoolPlacementConfigurationPrimaryVnicSubnetsArgs:
     def subnet_id(self) -> pulumi.Input[str]:
         """
         (Updatable) The subnet [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) for the secondary VNIC.
-        =======
-        Example: `[FAULT-DOMAIN-1, FAULT-DOMAIN-2, FAULT-DOMAIN-3]`
         """
         return pulumi.get(self, "subnet_id")
 
@@ -16137,6 +16138,45 @@ class GetInstanceDevicesFilterArgs:
         pulumi.set(self, "regex", value)
 
 
+@pulumi.input_type
+class GetInstanceMaintenanceEventsFilterArgs:
+    def __init__(__self__, *,
+                 name: str,
+                 values: Sequence[str],
+                 regex: Optional[bool] = None):
+        pulumi.set(__self__, "name", name)
+        pulumi.set(__self__, "values", values)
+        if regex is not None:
+            pulumi.set(__self__, "regex", regex)
+
+    @property
+    @pulumi.getter
+    def name(self) -> str:
+        return pulumi.get(self, "name")
+
+    @name.setter
+    def name(self, value: str):
+        pulumi.set(self, "name", value)
+
+    @property
+    @pulumi.getter
+    def values(self) -> Sequence[str]:
+        return pulumi.get(self, "values")
+
+    @values.setter
+    def values(self, value: Sequence[str]):
+        pulumi.set(self, "values", value)
+
+    @property
+    @pulumi.getter
+    def regex(self) -> Optional[bool]:
+        return pulumi.get(self, "regex")
+
+    @regex.setter
+    def regex(self, value: Optional[bool]):
+        pulumi.set(self, "regex", value)
+
+
 @pulumi.input_type
 class GetInstancePoolInstancesFilterArgs:
     def __init__(__self__, *,