oci 2.17.0 → 2.18.0

data/lib/oci/cloud_guard/models/update_security_zone_details.rb

@@ -0,0 +1,212 @@
+# Copyright (c) 2016, 2022, Oracle and/or its affiliates.  All rights reserved.
+# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
+
+require 'date'
+
+# rubocop:disable Lint/UnneededCopDisableDirective, Metrics/LineLength
+module OCI
+  # Information to update in an existing security zone
+  class CloudGuard::Models::UpdateSecurityZoneDetails
+    # **[Required]** The security zone's name
+    # @return [String]
+    attr_accessor :display_name
+
+    # The security zone's description
+    # @return [String]
+    attr_accessor :description
+
+    # The OCID of the recipe (`SecurityRecipe`) for the security zone
+    # @return [String]
+    attr_accessor :security_zone_recipe_id
+
+    # Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only.
+    # Example: `{\"bar-key\": \"value\"}`
+    #
+    # Avoid entering confidential information.
+    #
+    # @return [Hash<String, String>]
+    attr_accessor :freeform_tags
+
+    # Defined tags for this resource. Each key is predefined and scoped to a namespace.
+    # Example: `{\"foo-namespace\": {\"bar-key\": \"value\"}}`
+    #
+    # @return [Hash<String, Hash<String, Object>>]
+    attr_accessor :defined_tags
+
+    # Attribute mapping from ruby-style variable name to JSON key.
+    def self.attribute_map
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'display_name': :'displayName',
+        'description': :'description',
+        'security_zone_recipe_id': :'securityZoneRecipeId',
+        'freeform_tags': :'freeformTags',
+        'defined_tags': :'definedTags'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # Attribute type mapping.
+    def self.swagger_types
+      {
+        # rubocop:disable Style/SymbolLiteral
+        'display_name': :'String',
+        'description': :'String',
+        'security_zone_recipe_id': :'String',
+        'freeform_tags': :'Hash<String, String>',
+        'defined_tags': :'Hash<String, Hash<String, Object>>'
+        # rubocop:enable Style/SymbolLiteral
+      }
+    end
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+
+    # Initializes the object
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :display_name The value to assign to the {#display_name} property
+    # @option attributes [String] :description The value to assign to the {#description} property
+    # @option attributes [String] :security_zone_recipe_id The value to assign to the {#security_zone_recipe_id} property
+    # @option attributes [Hash<String, String>] :freeform_tags The value to assign to the {#freeform_tags} property
+    # @option attributes [Hash<String, Hash<String, Object>>] :defined_tags The value to assign to the {#defined_tags} property
+    def initialize(attributes = {})
+      return unless attributes.is_a?(Hash)
+
+      # convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+
+      self.display_name = attributes[:'displayName'] if attributes[:'displayName']
+
+      raise 'You cannot provide both :displayName and :display_name' if attributes.key?(:'displayName') && attributes.key?(:'display_name')
+
+      self.display_name = attributes[:'display_name'] if attributes[:'display_name']
+
+      self.description = attributes[:'description'] if attributes[:'description']
+
+      self.security_zone_recipe_id = attributes[:'securityZoneRecipeId'] if attributes[:'securityZoneRecipeId']
+
+      raise 'You cannot provide both :securityZoneRecipeId and :security_zone_recipe_id' if attributes.key?(:'securityZoneRecipeId') && attributes.key?(:'security_zone_recipe_id')
+
+      self.security_zone_recipe_id = attributes[:'security_zone_recipe_id'] if attributes[:'security_zone_recipe_id']
+
+      self.freeform_tags = attributes[:'freeformTags'] if attributes[:'freeformTags']
+
+      raise 'You cannot provide both :freeformTags and :freeform_tags' if attributes.key?(:'freeformTags') && attributes.key?(:'freeform_tags')
+
+      self.freeform_tags = attributes[:'freeform_tags'] if attributes[:'freeform_tags']
+
+      self.defined_tags = attributes[:'definedTags'] if attributes[:'definedTags']
+
+      raise 'You cannot provide both :definedTags and :defined_tags' if attributes.key?(:'definedTags') && attributes.key?(:'defined_tags')
+
+      self.defined_tags = attributes[:'defined_tags'] if attributes[:'defined_tags']
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
+
+
+    # Checks equality by comparing each attribute.
+    # @param [Object] other the other object to be compared
+    def ==(other)
+      return true if equal?(other)
+
+      self.class == other.class &&
+        display_name == other.display_name &&
+        description == other.description &&
+        security_zone_recipe_id == other.security_zone_recipe_id &&
+        freeform_tags == other.freeform_tags &&
+        defined_tags == other.defined_tags
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
+
+    # @see the `==` method
+    # @param [Object] other the other object to be compared
+    def eql?(other)
+      self == other
+    end
+
+    # rubocop:disable Metrics/AbcSize, Layout/EmptyLines
+
+
+    # Calculates hash code according to all attributes.
+    # @return [Fixnum] Hash code
+    def hash
+      [display_name, description, security_zone_recipe_id, freeform_tags, defined_tags].hash
+    end
+    # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
+
+    # rubocop:disable Metrics/AbcSize, Layout/EmptyLines
+
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def build_from_hash(attributes)
+      return nil unless attributes.is_a?(Hash)
+
+      self.class.swagger_types.each_pair do |key, type|
+        if type =~ /^Array<(.*)>/i
+          # check to ensure the input is an array given that the the attribute
+          # is documented as an array but the input is not
+          if attributes[self.class.attribute_map[key]].is_a?(Array)
+            public_method("#{key}=").call(
+              attributes[self.class.attribute_map[key]]
+                .map { |v| OCI::Internal::Util.convert_to_type(Regexp.last_match(1), v) }
+            )
+          end
+        elsif !attributes[self.class.attribute_map[key]].nil?
+          public_method("#{key}=").call(
+            OCI::Internal::Util.convert_to_type(type, attributes[self.class.attribute_map[key]])
+          )
+        end
+        # or else data not found in attributes(hash), not an issue as the data can be optional
+      end
+
+      self
+    end
+    # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
+
+    # Returns the string representation of the object
+    # @return [String] String presentation of the object
+    def to_s
+      to_hash.to_s
+    end
+
+    # Returns the object in the form of hash
+    # @return [Hash] Returns the object in the form of hash
+    def to_hash
+      hash = {}
+      self.class.attribute_map.each_pair do |attr, param|
+        value = public_method(attr).call
+        next if value.nil? && !instance_variable_defined?("@#{attr}")
+
+        hash[param] = _to_hash(value)
+      end
+      hash
+    end
+
+    private
+
+    # Outputs non-array value in the form of hash
+    # For object, use to_hash. Otherwise, just return the value
+    # @param [Object] value Any valid value
+    # @return [Hash] Returns the value in the form of hash
+    def _to_hash(value)
+      if value.is_a?(Array)
+        value.compact.map { |v| _to_hash(v) }
+      elsif value.is_a?(Hash)
+        {}.tap do |hash|
+          value.each { |k, v| hash[k] = _to_hash(v) }
+        end
+      elsif value.respond_to? :to_hash
+        value.to_hash
+      else
+        value
+      end
+    end
+  end
+end
+# rubocop:enable Lint/UnneededCopDisableDirective, Metrics/LineLength

data/lib/oci/cloud_guard/models/update_target_details.rb

@@ -17,7 +17,10 @@ module OCI
       LIFECYCLE_STATE_FAILED = 'FAILED'.freeze
     ].freeze
 
-    # DetectorTemplate Identifier
+    # DetectorTemplate identifier.
+    #
+    # Avoid entering confidential information.
+    #
     # @return [String]
     attr_accessor :display_name
 
@@ -36,6 +39,8 @@ module OCI
     # Simple key-value pair that is applied without any predefined name, type or scope. Exists for cross-compatibility only.
     # Example: `{\"bar-key\": \"value\"}`
     #
+    # Avoid entering confidential information.
+    #
     # @return [Hash<String, String>]
     attr_accessor :freeform_tags
 

data/lib/oci/cloud_guard/models/update_target_detector_recipe_details.rb

@@ -7,7 +7,15 @@ require 'date'
 module OCI
   # The information to be updated in DetectorRecipe
   class CloudGuard::Models::UpdateTargetDetectorRecipeDetails
-    # **[Required]** Update detector rules associated with detector recipe in a target.
+    # Detector recipe identifier associated with the target
+    # @return [String]
+    attr_accessor :detector_recipe_id
+
+    # When enabled, validation is performed for attaching the detector recipe.
+    # @return [BOOLEAN]
+    attr_accessor :is_validation_only_query
+
+    # Update detector rules associated with detector recipe in a target.
     # @return [Array<OCI::CloudGuard::Models::UpdateTargetRecipeDetectorRuleDetails>]
     attr_accessor :detector_rules
 
@@ -15,6 +23,8 @@ module OCI
     def self.attribute_map
       {
         # rubocop:disable Style/SymbolLiteral
+        'detector_recipe_id': :'detectorRecipeId',
+        'is_validation_only_query': :'isValidationOnlyQuery',
         'detector_rules': :'detectorRules'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -24,6 +34,8 @@ module OCI
     def self.swagger_types
       {
         # rubocop:disable Style/SymbolLiteral
+        'detector_recipe_id': :'String',
+        'is_validation_only_query': :'BOOLEAN',
         'detector_rules': :'Array<OCI::CloudGuard::Models::UpdateTargetRecipeDetectorRuleDetails>'
         # rubocop:enable Style/SymbolLiteral
       }
@@ -35,6 +47,8 @@ module OCI
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
+    # @option attributes [String] :detector_recipe_id The value to assign to the {#detector_recipe_id} property
+    # @option attributes [BOOLEAN] :is_validation_only_query The value to assign to the {#is_validation_only_query} property
     # @option attributes [Array<OCI::CloudGuard::Models::UpdateTargetRecipeDetectorRuleDetails>] :detector_rules The value to assign to the {#detector_rules} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
@@ -42,6 +56,20 @@ module OCI
       # convert string to symbol for hash key
       attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
 
+      self.detector_recipe_id = attributes[:'detectorRecipeId'] if attributes[:'detectorRecipeId']
+
+      raise 'You cannot provide both :detectorRecipeId and :detector_recipe_id' if attributes.key?(:'detectorRecipeId') && attributes.key?(:'detector_recipe_id')
+
+      self.detector_recipe_id = attributes[:'detector_recipe_id'] if attributes[:'detector_recipe_id']
+
+      self.is_validation_only_query = attributes[:'isValidationOnlyQuery'] unless attributes[:'isValidationOnlyQuery'].nil?
+      self.is_validation_only_query = false if is_validation_only_query.nil? && !attributes.key?(:'isValidationOnlyQuery') # rubocop:disable Style/StringLiterals
+
+      raise 'You cannot provide both :isValidationOnlyQuery and :is_validation_only_query' if attributes.key?(:'isValidationOnlyQuery') && attributes.key?(:'is_validation_only_query')
+
+      self.is_validation_only_query = attributes[:'is_validation_only_query'] unless attributes[:'is_validation_only_query'].nil?
+      self.is_validation_only_query = false if is_validation_only_query.nil? && !attributes.key?(:'isValidationOnlyQuery') && !attributes.key?(:'is_validation_only_query') # rubocop:disable Style/StringLiterals
+
       self.detector_rules = attributes[:'detectorRules'] if attributes[:'detectorRules']
 
       raise 'You cannot provide both :detectorRules and :detector_rules' if attributes.key?(:'detectorRules') && attributes.key?(:'detector_rules')
@@ -60,6 +88,8 @@ module OCI
       return true if equal?(other)
 
       self.class == other.class &&
+        detector_recipe_id == other.detector_recipe_id &&
+        is_validation_only_query == other.is_validation_only_query &&
         detector_rules == other.detector_rules
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
@@ -76,7 +106,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [detector_rules].hash
+      [detector_recipe_id, is_validation_only_query, detector_rules].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines
 

data/lib/oci/container_engine/container_engine.rb

@@ -22,6 +22,7 @@ require 'oci/container_engine/models/cluster_metadata'
 require 'oci/container_engine/models/cluster_migrate_to_native_vcn_details'
 require 'oci/container_engine/models/cluster_migrate_to_native_vcn_status'
 require 'oci/container_engine/models/cluster_options'
+require 'oci/container_engine/models/cluster_pod_network_option_details'
 require 'oci/container_engine/models/cluster_summary'
 require 'oci/container_engine/models/create_cluster_details'
 require 'oci/container_engine/models/create_cluster_endpoint_config_details'
@@ -30,16 +31,21 @@ require 'oci/container_engine/models/create_image_policy_config_details'
 require 'oci/container_engine/models/create_node_pool_details'
 require 'oci/container_engine/models/create_node_pool_node_config_details'
 require 'oci/container_engine/models/create_node_shape_config_details'
+require 'oci/container_engine/models/flannel_overlay_cluster_pod_network_option_details'
+require 'oci/container_engine/models/flannel_overlay_node_pool_pod_network_option_details'
 require 'oci/container_engine/models/image_policy_config'
 require 'oci/container_engine/models/key_details'
 require 'oci/container_engine/models/key_value'
 require 'oci/container_engine/models/kubernetes_network_config'
 require 'oci/container_engine/models/node'
 require 'oci/container_engine/models/node_error'
+require 'oci/container_engine/models/node_eviction_node_pool_settings'
 require 'oci/container_engine/models/node_pool'
+require 'oci/container_engine/models/node_pool_lifecycle_state'
 require 'oci/container_engine/models/node_pool_node_config_details'
 require 'oci/container_engine/models/node_pool_options'
 require 'oci/container_engine/models/node_pool_placement_config_details'
+require 'oci/container_engine/models/node_pool_pod_network_option_details'
 require 'oci/container_engine/models/node_pool_summary'
 require 'oci/container_engine/models/node_shape_config'
 require 'oci/container_engine/models/node_source_details'
@@ -47,6 +53,8 @@ require 'oci/container_engine/models/node_source_option'
 require 'oci/container_engine/models/node_source_type'
 require 'oci/container_engine/models/node_source_via_image_details'
 require 'oci/container_engine/models/node_source_via_image_option'
+require 'oci/container_engine/models/oci_vcn_ip_native_cluster_pod_network_option_details'
+require 'oci/container_engine/models/oci_vcn_ip_native_node_pool_pod_network_option_details'
 require 'oci/container_engine/models/persistent_volume_config_details'
 require 'oci/container_engine/models/service_lb_config_details'
 require 'oci/container_engine/models/sort_order'

data/lib/oci/container_engine/container_engine_client.rb

@@ -443,6 +443,77 @@ module OCI
     # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
 
 
+    # Delete node.
+    # @param [String] node_pool_id The OCID of the node pool.
+    # @param [String] node_id The OCID of the compute instance.
+    # @param [Hash] opts the optional parameters
+    # @option opts [OCI::Retry::RetryConfig] :retry_config The retry configuration to apply to this operation. If no key is provided then the service-level
+    #   retry configuration defined by {#retry_config} will be used. If an explicit `nil` value is provided then the operation will not retry
+    # @option opts [BOOLEAN] :is_decrement_size If the nodepool should be scaled down after the node is deleted. (default to true)
+    # @option opts [String] :if_match For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match`
+    #   parameter to the value of the etag from a previous GET or POST response for that resource.  The resource
+    #   will be updated or deleted only if the etag you provide matches the resource's current etag value.
+    #
+    # @option opts [String] :opc_request_id Unique Oracle-assigned identifier for the request. If you need to contact
+    #   Oracle about a particular request, please provide the request ID.
+    #
+    # @option opts [String] :override_eviction_grace_duration Duration after which OKE will give up eviction of the pods on the node.
+    #   PT0M will indicate you want to delete the node without cordon and drain. Default PT60M, Min PT0M, Max: PT60M. Format ISO 8601 e.g PT30M
+    #
+    # @option opts [BOOLEAN] :is_force_deletion_after_override_grace_duration If the underlying compute instance should be deleted if you cannot evict all the pods in grace period
+    # @return [Response] A Response object with data of type nil
+    # @note Click [here](https://docs.cloud.oracle.com/en-us/iaas/tools/ruby-sdk-examples/latest/containerengine/delete_node.rb.html) to see an example of how to use delete_node API.
+    def delete_node(node_pool_id, node_id, opts = {})
+      logger.debug 'Calling operation ContainerEngineClient#delete_node.' if logger
+
+      raise "Missing the required parameter 'node_pool_id' when calling delete_node." if node_pool_id.nil?
+      raise "Missing the required parameter 'node_id' when calling delete_node." if node_id.nil?
+      raise "Parameter value for 'node_pool_id' must not be blank" if OCI::Internal::Util.blank_string?(node_pool_id)
+      raise "Parameter value for 'node_id' must not be blank" if OCI::Internal::Util.blank_string?(node_id)
+
+      path = '/nodePools/{nodePoolId}/node/{nodeId}'.sub('{nodePoolId}', node_pool_id.to_s).sub('{nodeId}', node_id.to_s)
+      operation_signing_strategy = :standard
+
+      # rubocop:disable Style/NegatedIf
+      # Query Params
+      query_params = {}
+      query_params[:isDecrementSize] = opts[:is_decrement_size] if !opts[:is_decrement_size].nil?
+      query_params[:overrideEvictionGraceDuration] = opts[:override_eviction_grace_duration] if opts[:override_eviction_grace_duration]
+      query_params[:isForceDeletionAfterOverrideGraceDuration] = opts[:is_force_deletion_after_override_grace_duration] if !opts[:is_force_deletion_after_override_grace_duration].nil?
+
+      # Header Params
+      header_params = {}
+      header_params[:accept] = 'application/json'
+      header_params[:'content-type'] = 'application/json'
+      header_params[:'if-match'] = opts[:if_match] if opts[:if_match]
+      header_params[:'opc-request-id'] = opts[:opc_request_id] if opts[:opc_request_id]
+      # rubocop:enable Style/NegatedIf
+
+      post_body = nil
+
+      # rubocop:disable Metrics/BlockLength
+      OCI::Retry.make_retrying_call(applicable_retry_config(opts), call_name: 'ContainerEngineClient#delete_node') do
+        @api_client.call_api(
+          :DELETE,
+          path,
+          endpoint,
+          header_params: header_params,
+          query_params: query_params,
+          operation_signing_strategy: operation_signing_strategy,
+          body: post_body
+        )
+      end
+      # rubocop:enable Metrics/BlockLength
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:enable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:enable Metrics/MethodLength, Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
+    # rubocop:disable Style/IfUnlessModifier, Metrics/ParameterLists
+    # rubocop:disable Metrics/MethodLength, Layout/EmptyLines
+
+
     # Delete a node pool.
     # @param [String] node_pool_id The OCID of the node pool.
     # @param [Hash] opts the optional parameters
@@ -455,6 +526,10 @@ module OCI
     # @option opts [String] :opc_request_id Unique Oracle-assigned identifier for the request. If you need to contact
     #   Oracle about a particular request, please provide the request ID.
     #
+    # @option opts [String] :override_eviction_grace_duration Duration after which OKE will give up eviction of the pods on the node.
+    #   PT0M will indicate you want to delete the node without cordon and drain. Default PT60M, Min PT0M, Max: PT60M. Format ISO 8601 e.g PT30M
+    #
+    # @option opts [BOOLEAN] :is_force_deletion_after_override_grace_duration If the underlying compute instance should be deleted if you cannot evict all the pods in grace period
     # @return [Response] A Response object with data of type nil
     # @note Click [here](https://docs.cloud.oracle.com/en-us/iaas/tools/ruby-sdk-examples/latest/containerengine/delete_node_pool.rb.html) to see an example of how to use delete_node_pool API.
     def delete_node_pool(node_pool_id, opts = {})
@@ -469,6 +544,8 @@ module OCI
       # rubocop:disable Style/NegatedIf
       # Query Params
       query_params = {}
+      query_params[:overrideEvictionGraceDuration] = opts[:override_eviction_grace_duration] if opts[:override_eviction_grace_duration]
+      query_params[:isForceDeletionAfterOverrideGraceDuration] = opts[:is_force_deletion_after_override_grace_duration] if !opts[:is_force_deletion_after_override_grace_duration].nil?
 
       # Header Params
       header_params = {}
@@ -1016,6 +1093,8 @@ module OCI
     # @option opts [String] :opc_request_id Unique Oracle-assigned identifier for the request. If you need to contact
     #   Oracle about a particular request, please provide the request ID.
     #
+    # @option opts [Array<String>] :lifecycle_state A list of nodepool lifecycle states on which to filter on, matching any of the list items (OR logic). eg. [ACTIVE, DELETING]
+    #   Allowed values are: DELETED, CREATING, ACTIVE, UPDATING, DELETING, FAILED, INACTIVE, NEEDS_ATTENTION
     # @return [Response] A Response object with data of type Array<{OCI::ContainerEngine::Models::NodePoolSummary NodePoolSummary}>
     # @note Click [here](https://docs.cloud.oracle.com/en-us/iaas/tools/ruby-sdk-examples/latest/containerengine/list_node_pools.rb.html) to see an example of how to use list_node_pools API.
     def list_node_pools(compartment_id, opts = {})
@@ -1031,6 +1110,16 @@ module OCI
         raise 'Invalid value for "sort_by", must be one of ID, NAME, TIME_CREATED.'
       end
 
+
+      lifecycle_state_allowable_values = %w[DELETED CREATING ACTIVE UPDATING DELETING FAILED INACTIVE NEEDS_ATTENTION]
+      if opts[:lifecycle_state] && !opts[:lifecycle_state].empty?
+        opts[:lifecycle_state].each do |val_to_check|
+          unless lifecycle_state_allowable_values.include?(val_to_check)
+            raise 'Invalid value for "lifecycle_state", must be one of DELETED, CREATING, ACTIVE, UPDATING, DELETING, FAILED, INACTIVE, NEEDS_ATTENTION.'
+          end
+        end
+      end
+
       path = '/nodePools'
       operation_signing_strategy = :standard
 
@@ -1044,6 +1133,7 @@ module OCI
       query_params[:page] = opts[:page] if opts[:page]
       query_params[:sortOrder] = opts[:sort_order] if opts[:sort_order]
       query_params[:sortBy] = opts[:sort_by] if opts[:sort_by]
+      query_params[:lifecycleState] = OCI::ApiClient.build_collection_params(opts[:lifecycle_state], :multi) if opts[:lifecycle_state] && !opts[:lifecycle_state].empty?
 
       # Header Params
       header_params = {}
@@ -1424,6 +1514,10 @@ module OCI
     # @option opts [String] :opc_request_id Unique Oracle-assigned identifier for the request. If you need to contact
     #   Oracle about a particular request, please provide the request ID.
     #
+    # @option opts [String] :override_eviction_grace_duration Duration after which OKE will give up eviction of the pods on the node.
+    #   PT0M will indicate you want to delete the node without cordon and drain. Default PT60M, Min PT0M, Max: PT60M. Format ISO 8601 e.g PT30M
+    #
+    # @option opts [BOOLEAN] :is_force_deletion_after_override_grace_duration If the underlying compute instance should be deleted if you cannot evict all the pods in grace period
     # @return [Response] A Response object with data of type nil
     # @note Click [here](https://docs.cloud.oracle.com/en-us/iaas/tools/ruby-sdk-examples/latest/containerengine/update_node_pool.rb.html) to see an example of how to use update_node_pool API.
     def update_node_pool(node_pool_id, update_node_pool_details, opts = {})
@@ -1439,6 +1533,8 @@ module OCI
       # rubocop:disable Style/NegatedIf
       # Query Params
       query_params = {}
+      query_params[:overrideEvictionGraceDuration] = opts[:override_eviction_grace_duration] if opts[:override_eviction_grace_duration]
+      query_params[:isForceDeletionAfterOverrideGraceDuration] = opts[:is_force_deletion_after_override_grace_duration] if !opts[:is_force_deletion_after_override_grace_duration].nil?
 
       # Header Params
       header_params = {}

data/lib/oci/container_engine/container_engine_client_composite_operations.rb

@@ -222,6 +222,56 @@ module OCI
     # rubocop:disable Layout/EmptyLines
 
 
+    # Calls {OCI::ContainerEngine::ContainerEngineClient#delete_node} and then waits for the {OCI::ContainerEngine::Models::WorkRequest}
+    # to enter the given state(s).
+    #
+    # @param [String] node_pool_id The OCID of the node pool.
+    # @param [String] node_id The OCID of the compute instance.
+    # @param [Array<String>] wait_for_states An array of states to wait on. These should be valid values for {OCI::ContainerEngine::Models::WorkRequest#status}
+    # @param [Hash] base_operation_opts Any optional arguments accepted by {OCI::ContainerEngine::ContainerEngineClient#delete_node}
+    # @param [Hash] waiter_opts Optional arguments for the waiter. Keys should be symbols, and the following keys are supported:
+    #   * max_interval_seconds: The maximum interval between queries, in seconds.
+    #   * max_wait_seconds The maximum time to wait, in seconds
+    #
+    # @return [OCI::Response] A {OCI::Response} object containing the completed {OCI::ContainerEngine::Models::WorkRequest}
+    def delete_node_and_wait_for_state(node_pool_id, node_id, wait_for_states = [], base_operation_opts = {}, waiter_opts = {})
+      operation_result = @service_client.delete_node(node_pool_id, node_id, base_operation_opts)
+      use_util = OCI::ContainerEngine::Util.respond_to?(:wait_on_work_request)
+
+      return operation_result if wait_for_states.empty? && !use_util
+
+      lowered_wait_for_states = wait_for_states.map(&:downcase)
+      wait_for_resource_id = operation_result.headers['opc-work-request-id']
+
+      begin
+        if use_util
+          waiter_result = OCI::ContainerEngine::Util.wait_on_work_request(
+            @service_client,
+            wait_for_resource_id,
+            max_interval_seconds: waiter_opts.key?(:max_interval_seconds) ? waiter_opts[:max_interval_seconds] : 30,
+            max_wait_seconds: waiter_opts.key?(:max_wait_seconds) ? waiter_opts[:max_wait_seconds] : 1200
+          )
+        else
+          waiter_result = @service_client.get_work_request(wait_for_resource_id).wait_until(
+            eval_proc: ->(response) { response.data.respond_to?(:status) && lowered_wait_for_states.include?(response.data.status.downcase) },
+            max_interval_seconds: waiter_opts.key?(:max_interval_seconds) ? waiter_opts[:max_interval_seconds] : 30,
+            max_wait_seconds: waiter_opts.key?(:max_wait_seconds) ? waiter_opts[:max_wait_seconds] : 1200
+          )
+        end
+        result_to_return = waiter_result
+
+        return result_to_return
+      rescue StandardError
+        raise OCI::Errors::CompositeOperationError.new(partial_results: [operation_result])
+      end
+    end
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:enable Layout/EmptyLines
+
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/ParameterLists, Metrics/PerceivedComplexity
+    # rubocop:disable Layout/EmptyLines
+
+
     # Calls {OCI::ContainerEngine::ContainerEngineClient#delete_node_pool} and then waits for the {OCI::ContainerEngine::Models::WorkRequest}
     # to enter the given state(s).
     #

data/lib/oci/container_engine/models/cluster.rb

@@ -96,6 +96,10 @@ module OCI
     # @return [OCI::ContainerEngine::Models::ImagePolicyConfig]
     attr_accessor :image_policy_config
 
+    # Available CNIs and network options for existing and new node pools of the cluster
+    # @return [Array<OCI::ContainerEngine::Models::ClusterPodNetworkOptionDetails>]
+    attr_accessor :cluster_pod_network_options
+
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
@@ -116,7 +120,8 @@ module OCI
         'lifecycle_details': :'lifecycleDetails',
         'endpoints': :'endpoints',
         'available_kubernetes_upgrades': :'availableKubernetesUpgrades',
-        'image_policy_config': :'imagePolicyConfig'
+        'image_policy_config': :'imagePolicyConfig',
+        'cluster_pod_network_options': :'clusterPodNetworkOptions'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -141,7 +146,8 @@ module OCI
         'lifecycle_details': :'String',
         'endpoints': :'OCI::ContainerEngine::Models::ClusterEndpoints',
         'available_kubernetes_upgrades': :'Array<String>',
-        'image_policy_config': :'OCI::ContainerEngine::Models::ImagePolicyConfig'
+        'image_policy_config': :'OCI::ContainerEngine::Models::ImagePolicyConfig',
+        'cluster_pod_network_options': :'Array<OCI::ContainerEngine::Models::ClusterPodNetworkOptionDetails>'
         # rubocop:enable Style/SymbolLiteral
       }
     end
@@ -169,6 +175,7 @@ module OCI
     # @option attributes [OCI::ContainerEngine::Models::ClusterEndpoints] :endpoints The value to assign to the {#endpoints} property
     # @option attributes [Array<String>] :available_kubernetes_upgrades The value to assign to the {#available_kubernetes_upgrades} property
     # @option attributes [OCI::ContainerEngine::Models::ImagePolicyConfig] :image_policy_config The value to assign to the {#image_policy_config} property
+    # @option attributes [Array<OCI::ContainerEngine::Models::ClusterPodNetworkOptionDetails>] :cluster_pod_network_options The value to assign to the {#cluster_pod_network_options} property
     def initialize(attributes = {})
       return unless attributes.is_a?(Hash)
 
@@ -256,6 +263,12 @@ module OCI
       raise 'You cannot provide both :imagePolicyConfig and :image_policy_config' if attributes.key?(:'imagePolicyConfig') && attributes.key?(:'image_policy_config')
 
       self.image_policy_config = attributes[:'image_policy_config'] if attributes[:'image_policy_config']
+
+      self.cluster_pod_network_options = attributes[:'clusterPodNetworkOptions'] if attributes[:'clusterPodNetworkOptions']
+
+      raise 'You cannot provide both :clusterPodNetworkOptions and :cluster_pod_network_options' if attributes.key?(:'clusterPodNetworkOptions') && attributes.key?(:'cluster_pod_network_options')
+
+      self.cluster_pod_network_options = attributes[:'cluster_pod_network_options'] if attributes[:'cluster_pod_network_options']
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity
     # rubocop:enable Metrics/MethodLength, Layout/EmptyLines, Style/SymbolLiteral
@@ -298,7 +311,8 @@ module OCI
         lifecycle_details == other.lifecycle_details &&
         endpoints == other.endpoints &&
         available_kubernetes_upgrades == other.available_kubernetes_upgrades &&
-        image_policy_config == other.image_policy_config
+        image_policy_config == other.image_policy_config &&
+        cluster_pod_network_options == other.cluster_pod_network_options
     end
     # rubocop:enable Metrics/CyclomaticComplexity, Metrics/AbcSize, Metrics/PerceivedComplexity, Layout/EmptyLines
 
@@ -314,7 +328,7 @@ module OCI
     # Calculates hash code according to all attributes.
     # @return [Fixnum] Hash code
     def hash
-      [id, name, compartment_id, endpoint_config, vcn_id, kubernetes_version, kms_key_id, freeform_tags, defined_tags, system_tags, options, metadata, lifecycle_state, lifecycle_details, endpoints, available_kubernetes_upgrades, image_policy_config].hash
+      [id, name, compartment_id, endpoint_config, vcn_id, kubernetes_version, kms_key_id, freeform_tags, defined_tags, system_tags, options, metadata, lifecycle_state, lifecycle_details, endpoints, available_kubernetes_upgrades, image_policy_config, cluster_pod_network_options].hash
     end
     # rubocop:enable Metrics/AbcSize, Layout/EmptyLines