google-api-client 0.11.2 → 0.11.3

data/generated/google/apis/container_v1.rb

@@ -26,7 +26,7 @@ module Google
     # @see https://cloud.google.com/container-engine/
     module ContainerV1
       VERSION = 'V1'
-      REVISION = '20170424'
+      REVISION = '20170430'
 
       # View and manage your data across Google Cloud Platform services
       AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform'

data/generated/google/apis/container_v1/classes.rb

@@ -22,6 +22,21 @@ module Google
   module Apis
     module ContainerV1
       
+      # RollbackNodePoolUpgradeRequest rollbacks the previously Aborted or Failed
+      # NodePool upgrade. This will be an no-op if the last upgrade successfully
+      # completed.
+      class RollbackNodePoolUpgradeRequest
+        include Google::Apis::Core::Hashable
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+        end
+      end
+      
       # UpdateClusterRequest updates the settings of a cluster.
       class UpdateClusterRequest
         include Google::Apis::Core::Hashable
@@ -47,6 +62,80 @@ module Google
       class Cluster
         include Google::Apis::Core::Hashable
       
+        # [Output only] The number of nodes currently in the cluster.
+        # Corresponds to the JSON property `currentNodeCount`
+        # @return [Fixnum]
+        attr_accessor :current_node_count
+      
+        # The monitoring service the cluster should use to write metrics.
+        # Currently available options:
+        # * `monitoring.googleapis.com` - the Google Cloud Monitoring service.
+        # * `none` - no metrics will be exported from the cluster.
+        # * if left as an empty string, `monitoring.googleapis.com` will be used.
+        # Corresponds to the JSON property `monitoringService`
+        # @return [String]
+        attr_accessor :monitoring_service
+      
+        # The name of the Google Compute Engine
+        # [network](/compute/docs/networks-and-firewalls#networks) to which the
+        # cluster is connected. If left unspecified, the `default` network
+        # will be used.
+        # Corresponds to the JSON property `network`
+        # @return [String]
+        attr_accessor :network
+      
+        # The fingerprint of the set of labels for this cluster.
+        # Corresponds to the JSON property `labelFingerprint`
+        # @return [String]
+        attr_accessor :label_fingerprint
+      
+        # [Output only] The name of the Google Compute Engine
+        # [zone](/compute/docs/zones#available) in which the cluster
+        # resides.
+        # Corresponds to the JSON property `zone`
+        # @return [String]
+        attr_accessor :zone
+      
+        # [Output only] The time the cluster will be automatically
+        # deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
+        # Corresponds to the JSON property `expireTime`
+        # @return [String]
+        attr_accessor :expire_time
+      
+        # [Output only] The size of the address space on each node for hosting
+        # containers. This is provisioned from within the `container_ipv4_cidr`
+        # range.
+        # Corresponds to the JSON property `nodeIpv4CidrSize`
+        # @return [Fixnum]
+        attr_accessor :node_ipv4_cidr_size
+      
+        # The logging service the cluster should use to write logs.
+        # Currently available options:
+        # * `logging.googleapis.com` - the Google Cloud Logging service.
+        # * `none` - no logs will be exported from the cluster.
+        # * if left as an empty string,`logging.googleapis.com` will be used.
+        # Corresponds to the JSON property `loggingService`
+        # @return [String]
+        attr_accessor :logging_service
+      
+        # [Output only] Additional information about the current status of this
+        # cluster, if available.
+        # Corresponds to the JSON property `statusMessage`
+        # @return [String]
+        attr_accessor :status_message
+      
+        # The authentication information for accessing the master endpoint.
+        # Authentication can be done using HTTP basic auth or using client
+        # certificates.
+        # Corresponds to the JSON property `masterAuth`
+        # @return [Google::Apis::ContainerV1::MasterAuth]
+        attr_accessor :master_auth
+      
+        # [Output only] The current software version of the master endpoint.
+        # Corresponds to the JSON property `currentMasterVersion`
+        # @return [String]
+        attr_accessor :current_master_version
+      
         # Parameters that describe the nodes in a cluster.
         # Corresponds to the JSON property `nodeConfig`
         # @return [Google::Apis::ContainerV1::NodeConfig]
@@ -63,13 +152,6 @@ module Google
         # @return [String]
         attr_accessor :status
       
-        # The name of the Google Compute Engine
-        # [subnetwork](/compute/docs/subnetworks) to which the
-        # cluster is connected.
-        # Corresponds to the JSON property `subnetwork`
-        # @return [String]
-        attr_accessor :subnetwork
-      
         # [Output only] The current version of the node software components.
         # If they are currently at multiple versions because they're in the process
         # of being upgraded, this reflects the minimum version of all nodes.
@@ -77,6 +159,13 @@ module Google
         # @return [String]
         attr_accessor :current_node_version
       
+        # The name of the Google Compute Engine
+        # [subnetwork](/compute/docs/subnetworks) to which the
+        # cluster is connected.
+        # Corresponds to the JSON property `subnetwork`
+        # @return [String]
+        attr_accessor :subnetwork
+      
         # The resource labels for the cluster to use to annotate any related GCE
         # resources.
         # Corresponds to the JSON property `resourceLabels`
@@ -100,6 +189,12 @@ module Google
         # @return [String]
         attr_accessor :initial_cluster_version
       
+        # Configuration for the legacy Attribute Based Access Control authorization
+        # mode.
+        # Corresponds to the JSON property `legacyAbac`
+        # @return [Google::Apis::ContainerV1::LegacyAbac]
+        attr_accessor :legacy_abac
+      
         # [Output only] The IP address of this cluster's master endpoint.
         # The endpoint can be accessed from the internet at
         # `https://username:password@endpoint/`.
@@ -109,12 +204,6 @@ module Google
         # @return [String]
         attr_accessor :endpoint
       
-        # Configuration for the legacy Attribute Based Access Control authorization
-        # mode.
-        # Corresponds to the JSON property `legacyAbac`
-        # @return [Google::Apis::ContainerV1::LegacyAbac]
-        attr_accessor :legacy_abac
-      
         # [Output only] The time the cluster was created, in
         # [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
         # Corresponds to the JSON property `createTime`
@@ -192,96 +281,33 @@ module Google
         # @return [String]
         attr_accessor :description
       
-        # [Output only] The number of nodes currently in the cluster.
-        # Corresponds to the JSON property `currentNodeCount`
-        # @return [Fixnum]
-        attr_accessor :current_node_count
-      
-        # The monitoring service the cluster should use to write metrics.
-        # Currently available options:
-        # * `monitoring.googleapis.com` - the Google Cloud Monitoring service.
-        # * `none` - no metrics will be exported from the cluster.
-        # * if left as an empty string, `monitoring.googleapis.com` will be used.
-        # Corresponds to the JSON property `monitoringService`
-        # @return [String]
-        attr_accessor :monitoring_service
-      
-        # The name of the Google Compute Engine
-        # [network](/compute/docs/networks-and-firewalls#networks) to which the
-        # cluster is connected. If left unspecified, the `default` network
-        # will be used.
-        # Corresponds to the JSON property `network`
-        # @return [String]
-        attr_accessor :network
-      
-        # The fingerprint of the set of labels for this cluster.
-        # Corresponds to the JSON property `labelFingerprint`
-        # @return [String]
-        attr_accessor :label_fingerprint
-      
-        # [Output only] The name of the Google Compute Engine
-        # [zone](/compute/docs/zones#available) in which the cluster
-        # resides.
-        # Corresponds to the JSON property `zone`
-        # @return [String]
-        attr_accessor :zone
-      
-        # The logging service the cluster should use to write logs.
-        # Currently available options:
-        # * `logging.googleapis.com` - the Google Cloud Logging service.
-        # * `none` - no logs will be exported from the cluster.
-        # * if left as an empty string,`logging.googleapis.com` will be used.
-        # Corresponds to the JSON property `loggingService`
-        # @return [String]
-        attr_accessor :logging_service
-      
-        # [Output only] The size of the address space on each node for hosting
-        # containers. This is provisioned from within the `container_ipv4_cidr`
-        # range.
-        # Corresponds to the JSON property `nodeIpv4CidrSize`
-        # @return [Fixnum]
-        attr_accessor :node_ipv4_cidr_size
-      
-        # [Output only] The time the cluster will be automatically
-        # deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format.
-        # Corresponds to the JSON property `expireTime`
-        # @return [String]
-        attr_accessor :expire_time
-      
-        # [Output only] Additional information about the current status of this
-        # cluster, if available.
-        # Corresponds to the JSON property `statusMessage`
-        # @return [String]
-        attr_accessor :status_message
-      
-        # The authentication information for accessing the master endpoint.
-        # Authentication can be done using HTTP basic auth or using client
-        # certificates.
-        # Corresponds to the JSON property `masterAuth`
-        # @return [Google::Apis::ContainerV1::MasterAuth]
-        attr_accessor :master_auth
-      
-        # [Output only] The current software version of the master endpoint.
-        # Corresponds to the JSON property `currentMasterVersion`
-        # @return [String]
-        attr_accessor :current_master_version
-      
         def initialize(**args)
            update!(**args)
         end
       
         # Update properties of this object
         def update!(**args)
+          @current_node_count = args[:current_node_count] if args.key?(:current_node_count)
+          @monitoring_service = args[:monitoring_service] if args.key?(:monitoring_service)
+          @network = args[:network] if args.key?(:network)
+          @label_fingerprint = args[:label_fingerprint] if args.key?(:label_fingerprint)
+          @zone = args[:zone] if args.key?(:zone)
+          @expire_time = args[:expire_time] if args.key?(:expire_time)
+          @node_ipv4_cidr_size = args[:node_ipv4_cidr_size] if args.key?(:node_ipv4_cidr_size)
+          @logging_service = args[:logging_service] if args.key?(:logging_service)
+          @status_message = args[:status_message] if args.key?(:status_message)
+          @master_auth = args[:master_auth] if args.key?(:master_auth)
+          @current_master_version = args[:current_master_version] if args.key?(:current_master_version)
           @node_config = args[:node_config] if args.key?(:node_config)
           @addons_config = args[:addons_config] if args.key?(:addons_config)
           @status = args[:status] if args.key?(:status)
-          @subnetwork = args[:subnetwork] if args.key?(:subnetwork)
           @current_node_version = args[:current_node_version] if args.key?(:current_node_version)
+          @subnetwork = args[:subnetwork] if args.key?(:subnetwork)
           @resource_labels = args[:resource_labels] if args.key?(:resource_labels)
           @name = args[:name] if args.key?(:name)
           @initial_cluster_version = args[:initial_cluster_version] if args.key?(:initial_cluster_version)
-          @endpoint = args[:endpoint] if args.key?(:endpoint)
           @legacy_abac = args[:legacy_abac] if args.key?(:legacy_abac)
+          @endpoint = args[:endpoint] if args.key?(:endpoint)
           @create_time = args[:create_time] if args.key?(:create_time)
           @cluster_ipv4_cidr = args[:cluster_ipv4_cidr] if args.key?(:cluster_ipv4_cidr)
           @initial_node_count = args[:initial_node_count] if args.key?(:initial_node_count)
@@ -292,41 +318,6 @@ module Google
           @services_ipv4_cidr = args[:services_ipv4_cidr] if args.key?(:services_ipv4_cidr)
           @enable_kubernetes_alpha = args[:enable_kubernetes_alpha] if args.key?(:enable_kubernetes_alpha)
           @description = args[:description] if args.key?(:description)
-          @current_node_count = args[:current_node_count] if args.key?(:current_node_count)
-          @monitoring_service = args[:monitoring_service] if args.key?(:monitoring_service)
-          @network = args[:network] if args.key?(:network)
-          @label_fingerprint = args[:label_fingerprint] if args.key?(:label_fingerprint)
-          @zone = args[:zone] if args.key?(:zone)
-          @logging_service = args[:logging_service] if args.key?(:logging_service)
-          @node_ipv4_cidr_size = args[:node_ipv4_cidr_size] if args.key?(:node_ipv4_cidr_size)
-          @expire_time = args[:expire_time] if args.key?(:expire_time)
-          @status_message = args[:status_message] if args.key?(:status_message)
-          @master_auth = args[:master_auth] if args.key?(:master_auth)
-          @current_master_version = args[:current_master_version] if args.key?(:current_master_version)
-        end
-      end
-      
-      # CreateNodePoolRequest creates a node pool for a cluster.
-      class CreateNodePoolRequest
-        include Google::Apis::Core::Hashable
-      
-        # NodePool contains the name and configuration for a cluster's node pool.
-        # Node pools are a set of nodes (i.e. VM's), with a common configuration and
-        # specification, under the control of the cluster master. They may have a set
-        # of Kubernetes labels applied to them, which may be used to reference them
-        # during pod scheduling. They may also be resized up or down, to accommodate
-        # the workload.
-        # Corresponds to the JSON property `nodePool`
-        # @return [Google::Apis::ContainerV1::NodePool]
-        attr_accessor :node_pool
-      
-        def initialize(**args)
-           update!(**args)
-        end
-      
-        # Update properties of this object
-        def update!(**args)
-          @node_pool = args[:node_pool] if args.key?(:node_pool)
         end
       end
       
@@ -356,6 +347,30 @@ module Google
         end
       end
       
+      # CreateNodePoolRequest creates a node pool for a cluster.
+      class CreateNodePoolRequest
+        include Google::Apis::Core::Hashable
+      
+        # NodePool contains the name and configuration for a cluster's node pool.
+        # Node pools are a set of nodes (i.e. VM's), with a common configuration and
+        # specification, under the control of the cluster master. They may have a set
+        # of Kubernetes labels applied to them, which may be used to reference them
+        # during pod scheduling. They may also be resized up or down, to accommodate
+        # the workload.
+        # Corresponds to the JSON property `nodePool`
+        # @return [Google::Apis::ContainerV1::NodePool]
+        attr_accessor :node_pool
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @node_pool = args[:node_pool] if args.key?(:node_pool)
+        end
+      end
+      
       # Container Engine service configuration.
       class ServerConfig
         include Google::Apis::Core::Hashable
@@ -403,50 +418,6 @@ module Google
       class NodeConfig
         include Google::Apis::Core::Hashable
       
-        # The set of Google API scopes to be made available on all of the
-        # node VMs under the "default" service account.
-        # The following scopes are recommended, but not required, and by default are
-        # not included:
-        # * `https://www.googleapis.com/auth/compute` is required for mounting
-        # persistent storage on your nodes.
-        # * `https://www.googleapis.com/auth/devstorage.read_only` is required for
-        # communicating with **gcr.io**
-        # (the [Google Container Registry](/container-registry/)).
-        # If unspecified, no scopes are added, unless Cloud Logging or Cloud
-        # Monitoring are enabled, in which case their required scopes will be added.
-        # Corresponds to the JSON property `oauthScopes`
-        # @return [Array<String>]
-        attr_accessor :oauth_scopes
-      
-        # Whether the nodes are created as preemptible VM instances. See:
-        # https://cloud.google.com/compute/docs/instances/preemptible for more
-        # inforamtion about preemptible VM instances.
-        # Corresponds to the JSON property `preemptible`
-        # @return [Boolean]
-        attr_accessor :preemptible
-        alias_method :preemptible?, :preemptible
-      
-        # The map of Kubernetes labels (key/value pairs) to be applied to each node.
-        # These will added in addition to any default label(s) that
-        # Kubernetes may apply to the node.
-        # In case of conflict in label keys, the applied set may differ depending on
-        # the Kubernetes version -- it's best to assume the behavior is undefined
-        # and conflicts should be avoided.
-        # For more information, including usage and the valid values, see:
-        # http://kubernetes.io/v1.1/docs/user-guide/labels.html
-        # Corresponds to the JSON property `labels`
-        # @return [Hash<String,String>]
-        attr_accessor :labels
-      
-        # The number of local SSD disks to be attached to the node.
-        # The limit for this value is dependant upon the maximum number of
-        # disks available on a machine per zone. See:
-        # https://cloud.google.com/compute/docs/disks/local-ssd#local_ssd_limits
-        # for more information.
-        # Corresponds to the JSON property `localSsdCount`
-        # @return [Fixnum]
-        attr_accessor :local_ssd_count
-      
         # The metadata key/value pairs assigned to instances in the cluster.
         # Keys must conform to the regexp [a-zA-Z0-9-_]+ and be less than 128 bytes
         # in length. These are reflected as part of a URL in the metadata server.
@@ -497,22 +468,66 @@ module Google
         # @return [String]
         attr_accessor :image_type
       
+        # The set of Google API scopes to be made available on all of the
+        # node VMs under the "default" service account.
+        # The following scopes are recommended, but not required, and by default are
+        # not included:
+        # * `https://www.googleapis.com/auth/compute` is required for mounting
+        # persistent storage on your nodes.
+        # * `https://www.googleapis.com/auth/devstorage.read_only` is required for
+        # communicating with **gcr.io**
+        # (the [Google Container Registry](/container-registry/)).
+        # If unspecified, no scopes are added, unless Cloud Logging or Cloud
+        # Monitoring are enabled, in which case their required scopes will be added.
+        # Corresponds to the JSON property `oauthScopes`
+        # @return [Array<String>]
+        attr_accessor :oauth_scopes
+      
+        # Whether the nodes are created as preemptible VM instances. See:
+        # https://cloud.google.com/compute/docs/instances/preemptible for more
+        # inforamtion about preemptible VM instances.
+        # Corresponds to the JSON property `preemptible`
+        # @return [Boolean]
+        attr_accessor :preemptible
+        alias_method :preemptible?, :preemptible
+      
+        # The map of Kubernetes labels (key/value pairs) to be applied to each node.
+        # These will added in addition to any default label(s) that
+        # Kubernetes may apply to the node.
+        # In case of conflict in label keys, the applied set may differ depending on
+        # the Kubernetes version -- it's best to assume the behavior is undefined
+        # and conflicts should be avoided.
+        # For more information, including usage and the valid values, see:
+        # http://kubernetes.io/v1.1/docs/user-guide/labels.html
+        # Corresponds to the JSON property `labels`
+        # @return [Hash<String,String>]
+        attr_accessor :labels
+      
+        # The number of local SSD disks to be attached to the node.
+        # The limit for this value is dependant upon the maximum number of
+        # disks available on a machine per zone. See:
+        # https://cloud.google.com/compute/docs/disks/local-ssd#local_ssd_limits
+        # for more information.
+        # Corresponds to the JSON property `localSsdCount`
+        # @return [Fixnum]
+        attr_accessor :local_ssd_count
+      
         def initialize(**args)
            update!(**args)
         end
       
         # Update properties of this object
         def update!(**args)
-          @oauth_scopes = args[:oauth_scopes] if args.key?(:oauth_scopes)
-          @preemptible = args[:preemptible] if args.key?(:preemptible)
-          @labels = args[:labels] if args.key?(:labels)
-          @local_ssd_count = args[:local_ssd_count] if args.key?(:local_ssd_count)
           @metadata = args[:metadata] if args.key?(:metadata)
           @disk_size_gb = args[:disk_size_gb] if args.key?(:disk_size_gb)
           @tags = args[:tags] if args.key?(:tags)
           @service_account = args[:service_account] if args.key?(:service_account)
           @machine_type = args[:machine_type] if args.key?(:machine_type)
           @image_type = args[:image_type] if args.key?(:image_type)
+          @oauth_scopes = args[:oauth_scopes] if args.key?(:oauth_scopes)
+          @preemptible = args[:preemptible] if args.key?(:preemptible)
+          @labels = args[:labels] if args.key?(:labels)
+          @local_ssd_count = args[:local_ssd_count] if args.key?(:local_ssd_count)
         end
       end
       
@@ -522,6 +537,19 @@ module Google
       class MasterAuth
         include Google::Apis::Core::Hashable
       
+        # The username to use for HTTP basic authentication to the master endpoint.
+        # For clusters v1.6.0 and later, you can disable basic authentication by
+        # providing an empty username.
+        # Corresponds to the JSON property `username`
+        # @return [String]
+        attr_accessor :username
+      
+        # [Output only] Base64-encoded private key used by clients to authenticate
+        # to the cluster endpoint.
+        # Corresponds to the JSON property `clientKey`
+        # @return [String]
+        attr_accessor :client_key
+      
         # [Output only] Base64-encoded public certificate that is the root of
         # trust for the cluster.
         # Corresponds to the JSON property `clusterCaCertificate`
@@ -542,30 +570,17 @@ module Google
         # @return [String]
         attr_accessor :client_certificate
       
-        # The username to use for HTTP basic authentication to the master endpoint.
-        # For clusters v1.6.0 and later, you can disable basic authentication by
-        # providing an empty username.
-        # Corresponds to the JSON property `username`
-        # @return [String]
-        attr_accessor :username
-      
-        # [Output only] Base64-encoded private key used by clients to authenticate
-        # to the cluster endpoint.
-        # Corresponds to the JSON property `clientKey`
-        # @return [String]
-        attr_accessor :client_key
-      
         def initialize(**args)
            update!(**args)
         end
       
         # Update properties of this object
         def update!(**args)
+          @username = args[:username] if args.key?(:username)
+          @client_key = args[:client_key] if args.key?(:client_key)
           @cluster_ca_certificate = args[:cluster_ca_certificate] if args.key?(:cluster_ca_certificate)
           @password = args[:password] if args.key?(:password)
           @client_certificate = args[:client_certificate] if args.key?(:client_certificate)
-          @username = args[:username] if args.key?(:username)
-          @client_key = args[:client_key] if args.key?(:client_key)
         end
       end
       
@@ -680,12 +695,6 @@ module Google
       class NodePoolAutoscaling
         include Google::Apis::Core::Hashable
       
-        # Is autoscaling enabled for this node pool.
-        # Corresponds to the JSON property `enabled`
-        # @return [Boolean]
-        attr_accessor :enabled
-        alias_method :enabled?, :enabled
-      
         # Maximum number of nodes in the NodePool. Must be >= min_node_count. There
         # has to enough quota to scale up the cluster.
         # Corresponds to the JSON property `maxNodeCount`
@@ -698,15 +707,21 @@ module Google
         # @return [Fixnum]
         attr_accessor :min_node_count
       
+        # Is autoscaling enabled for this node pool.
+        # Corresponds to the JSON property `enabled`
+        # @return [Boolean]
+        attr_accessor :enabled
+        alias_method :enabled?, :enabled
+      
         def initialize(**args)
            update!(**args)
         end
       
         # Update properties of this object
         def update!(**args)
-          @enabled = args[:enabled] if args.key?(:enabled)
           @max_node_count = args[:max_node_count] if args.key?(:max_node_count)
           @min_node_count = args[:min_node_count] if args.key?(:min_node_count)
+          @enabled = args[:enabled] if args.key?(:enabled)
         end
       end
       
@@ -716,6 +731,22 @@ module Google
       class ClusterUpdate
         include Google::Apis::Core::Hashable
       
+        # NodePoolAutoscaling contains information required by cluster autoscaler to
+        # adjust the size of the node pool to the current cluster usage.
+        # Corresponds to the JSON property `desiredNodePoolAutoscaling`
+        # @return [Google::Apis::ContainerV1::NodePoolAutoscaling]
+        attr_accessor :desired_node_pool_autoscaling
+      
+        # The desired list of Google Compute Engine
+        # [locations](/compute/docs/zones#available) in which the cluster's nodes
+        # should be located. Changing the locations a cluster is in will result
+        # in nodes being either created or removed from the cluster, depending on
+        # whether locations are being added or removed.
+        # This list must always include the cluster's primary zone.
+        # Corresponds to the JSON property `desiredLocations`
+        # @return [Array<String>]
+        attr_accessor :desired_locations
+      
         # The monitoring service the cluster should use to write metrics.
         # Currently available options:
         # * "monitoring.googleapis.com" - the Google Cloud Monitoring service
@@ -758,36 +789,20 @@ module Google
         # @return [String]
         attr_accessor :desired_master_version
       
-        # The desired list of Google Compute Engine
-        # [locations](/compute/docs/zones#available) in which the cluster's nodes
-        # should be located. Changing the locations a cluster is in will result
-        # in nodes being either created or removed from the cluster, depending on
-        # whether locations are being added or removed.
-        # This list must always include the cluster's primary zone.
-        # Corresponds to the JSON property `desiredLocations`
-        # @return [Array<String>]
-        attr_accessor :desired_locations
-      
-        # NodePoolAutoscaling contains information required by cluster autoscaler to
-        # adjust the size of the node pool to the current cluster usage.
-        # Corresponds to the JSON property `desiredNodePoolAutoscaling`
-        # @return [Google::Apis::ContainerV1::NodePoolAutoscaling]
-        attr_accessor :desired_node_pool_autoscaling
-      
         def initialize(**args)
            update!(**args)
         end
       
         # Update properties of this object
         def update!(**args)
+          @desired_node_pool_autoscaling = args[:desired_node_pool_autoscaling] if args.key?(:desired_node_pool_autoscaling)
+          @desired_locations = args[:desired_locations] if args.key?(:desired_locations)
           @desired_monitoring_service = args[:desired_monitoring_service] if args.key?(:desired_monitoring_service)
           @desired_image_type = args[:desired_image_type] if args.key?(:desired_image_type)
           @desired_addons_config = args[:desired_addons_config] if args.key?(:desired_addons_config)
           @desired_node_pool_id = args[:desired_node_pool_id] if args.key?(:desired_node_pool_id)
           @desired_node_version = args[:desired_node_version] if args.key?(:desired_node_version)
           @desired_master_version = args[:desired_master_version] if args.key?(:desired_master_version)
-          @desired_locations = args[:desired_locations] if args.key?(:desired_locations)
-          @desired_node_pool_autoscaling = args[:desired_node_pool_autoscaling] if args.key?(:desired_node_pool_autoscaling)
         end
       end
       
@@ -944,6 +959,38 @@ module Google
         end
       end
       
+      # SetLabelsRequest sets the Google Cloud Platform labels on a Google Container
+      # Engine cluster, which will in turn set them for Google Compute Engine
+      # resources used by that cluster
+      class SetLabelsRequest
+        include Google::Apis::Core::Hashable
+      
+        # The labels to set for that cluster.
+        # Corresponds to the JSON property `resourceLabels`
+        # @return [Hash<String,String>]
+        attr_accessor :resource_labels
+      
+        # The fingerprint of the previous set of labels for this resource,
+        # used to detect conflicts. The fingerprint is initially generated by
+        # Container Engine and changes after every request to modify or update
+        # labels. You must always provide an up-to-date fingerprint hash when
+        # updating or changing labels. Make a <code>get()</code> request to the
+        # resource to get the latest fingerprint.
+        # Corresponds to the JSON property `labelFingerprint`
+        # @return [String]
+        attr_accessor :label_fingerprint
+      
+        def initialize(**args)
+           update!(**args)
+        end
+      
+        # Update properties of this object
+        def update!(**args)
+          @resource_labels = args[:resource_labels] if args.key?(:resource_labels)
+          @label_fingerprint = args[:label_fingerprint] if args.key?(:label_fingerprint)
+        end
+      end
+      
       # NodePool contains the name and configuration for a cluster's node pool.
       # Node pools are a set of nodes (i.e. VM's), with a common configuration and
       # specification, under the control of the cluster master. They may have a set
@@ -953,6 +1000,27 @@ module Google
       class NodePool
         include Google::Apis::Core::Hashable
       
+        # [Output only] The status of the nodes in this pool instance.
+        # Corresponds to the JSON property `status`
+        # @return [String]
+        attr_accessor :status
+      
+        # Parameters that describe the nodes in a cluster.
+        # Corresponds to the JSON property `config`
+        # @return [Google::Apis::ContainerV1::NodeConfig]
+        attr_accessor :config
+      
+        # [Output only] Additional information about the current status of this
+        # node pool instance, if available.
+        # Corresponds to the JSON property `statusMessage`
+        # @return [String]
+        attr_accessor :status_message
+      
+        # The name of the node pool.
+        # Corresponds to the JSON property `name`
+        # @return [String]
+        attr_accessor :name
+      
         # NodePoolAutoscaling contains information required by cluster autoscaler to
         # adjust the size of the node pool to the current cluster usage.
         # Corresponds to the JSON property `autoscaling`
@@ -990,75 +1058,22 @@ module Google
         # @return [Array<String>]
         attr_accessor :instance_group_urls
       
-        # [Output only] The status of the nodes in this pool instance.
-        # Corresponds to the JSON property `status`
-        # @return [String]
-        attr_accessor :status
-      
-        # Parameters that describe the nodes in a cluster.
-        # Corresponds to the JSON property `config`
-        # @return [Google::Apis::ContainerV1::NodeConfig]
-        attr_accessor :config
-      
-        # [Output only] Additional information about the current status of this
-        # node pool instance, if available.
-        # Corresponds to the JSON property `statusMessage`
-        # @return [String]
-        attr_accessor :status_message
-      
-        # The name of the node pool.
-        # Corresponds to the JSON property `name`
-        # @return [String]
-        attr_accessor :name
-      
         def initialize(**args)
            update!(**args)
         end
       
         # Update properties of this object
         def update!(**args)
+          @status = args[:status] if args.key?(:status)
+          @config = args[:config] if args.key?(:config)
+          @status_message = args[:status_message] if args.key?(:status_message)
+          @name = args[:name] if args.key?(:name)
           @autoscaling = args[:autoscaling] if args.key?(:autoscaling)
           @initial_node_count = args[:initial_node_count] if args.key?(:initial_node_count)
           @management = args[:management] if args.key?(:management)
           @self_link = args[:self_link] if args.key?(:self_link)
           @version = args[:version] if args.key?(:version)
           @instance_group_urls = args[:instance_group_urls] if args.key?(:instance_group_urls)
-          @status = args[:status] if args.key?(:status)
-          @config = args[:config] if args.key?(:config)
-          @status_message = args[:status_message] if args.key?(:status_message)
-          @name = args[:name] if args.key?(:name)
-        end
-      end
-      
-      # SetLabelsRequest sets the Google Cloud Platform labels on a Google Container
-      # Engine cluster, which will in turn set them for Google Compute Engine
-      # resources used by that cluster
-      class SetLabelsRequest
-        include Google::Apis::Core::Hashable
-      
-        # The labels to set for that cluster.
-        # Corresponds to the JSON property `resourceLabels`
-        # @return [Hash<String,String>]
-        attr_accessor :resource_labels
-      
-        # The fingerprint of the previous set of labels for this resource,
-        # used to detect conflicts. The fingerprint is initially generated by
-        # Container Engine and changes after every request to modify or update
-        # labels. You must always provide an up-to-date fingerprint hash when
-        # updating or changing labels. Make a <code>get()</code> request to the
-        # resource to get the latest fingerprint.
-        # Corresponds to the JSON property `labelFingerprint`
-        # @return [String]
-        attr_accessor :label_fingerprint
-      
-        def initialize(**args)
-           update!(**args)
-        end
-      
-        # Update properties of this object
-        def update!(**args)
-          @resource_labels = args[:resource_labels] if args.key?(:resource_labels)
-          @label_fingerprint = args[:label_fingerprint] if args.key?(:label_fingerprint)
         end
       end
       
@@ -1067,6 +1082,12 @@ module Google
       class NodeManagement
         include Google::Apis::Core::Hashable
       
+        # AutoUpgradeOptions defines the set of options for the user to control how
+        # the Auto Upgrades will proceed.
+        # Corresponds to the JSON property `upgradeOptions`
+        # @return [Google::Apis::ContainerV1::AutoUpgradeOptions]
+        attr_accessor :upgrade_options
+      
         # A flag that specifies whether node auto-upgrade is enabled for the node
         # pool. If enabled, node auto-upgrade helps keep the nodes in your node pool
         # up to date with the latest release version of Kubernetes.
@@ -1084,21 +1105,15 @@ module Google
         attr_accessor :auto_repair
         alias_method :auto_repair?, :auto_repair
       
-        # AutoUpgradeOptions defines the set of options for the user to control how
-        # the Auto Upgrades will proceed.
-        # Corresponds to the JSON property `upgradeOptions`
-        # @return [Google::Apis::ContainerV1::AutoUpgradeOptions]
-        attr_accessor :upgrade_options
-      
         def initialize(**args)
            update!(**args)
         end
       
         # Update properties of this object
         def update!(**args)
+          @upgrade_options = args[:upgrade_options] if args.key?(:upgrade_options)
           @auto_upgrade = args[:auto_upgrade] if args.key?(:auto_upgrade)
           @auto_repair = args[:auto_repair] if args.key?(:auto_repair)
-          @upgrade_options = args[:upgrade_options] if args.key?(:upgrade_options)
         end
       end
       
@@ -1141,16 +1156,21 @@ module Google
       class Operation
         include Google::Apis::Core::Hashable
       
-        # If an error has occurred, a textual description of the error.
-        # Corresponds to the JSON property `statusMessage`
+        # The current status of the operation.
+        # Corresponds to the JSON property `status`
         # @return [String]
-        attr_accessor :status_message
+        attr_accessor :status
       
         # The server-assigned ID for the operation.
         # Corresponds to the JSON property `name`
         # @return [String]
         attr_accessor :name
       
+        # If an error has occurred, a textual description of the error.
+        # Corresponds to the JSON property `statusMessage`
+        # @return [String]
+        attr_accessor :status_message
+      
         # Server-defined URL for the resource.
         # Corresponds to the JSON property `selfLink`
         # @return [String]
@@ -1178,25 +1198,20 @@ module Google
         # @return [String]
         attr_accessor :zone
       
-        # The current status of the operation.
-        # Corresponds to the JSON property `status`
-        # @return [String]
-        attr_accessor :status
-      
         def initialize(**args)
            update!(**args)
         end
       
         # Update properties of this object
         def update!(**args)
-          @status_message = args[:status_message] if args.key?(:status_message)
+          @status = args[:status] if args.key?(:status)
           @name = args[:name] if args.key?(:name)
+          @status_message = args[:status_message] if args.key?(:status_message)
           @self_link = args[:self_link] if args.key?(:self_link)
           @target_link = args[:target_link] if args.key?(:target_link)
           @detail = args[:detail] if args.key?(:detail)
           @operation_type = args[:operation_type] if args.key?(:operation_type)
           @zone = args[:zone] if args.key?(:zone)
-          @status = args[:status] if args.key?(:status)
         end
       end
       
@@ -1228,21 +1243,6 @@ module Google
           @http_load_balancing = args[:http_load_balancing] if args.key?(:http_load_balancing)
         end
       end
-      
-      # RollbackNodePoolUpgradeRequest rollbacks the previously Aborted or Failed
-      # NodePool upgrade. This will be an no-op if the last upgrade successfully
-      # completed.
-      class RollbackNodePoolUpgradeRequest
-        include Google::Apis::Core::Hashable
-      
-        def initialize(**args)
-           update!(**args)
-        end
-      
-        # Update properties of this object
-        def update!(**args)
-        end
-      end
     end
   end
 end