diff --git a/discovery/container-v1.json b/discovery/container-v1.json index cf0d77d2ddb..dea9e07e610 100644 --- a/discovery/container-v1.json +++ b/discovery/container-v1.json @@ -2459,7 +2459,7 @@ } } }, - "revision": "20200505", + "revision": "20200519", "rootUrl": "https://container.googleapis.com/", "schemas": { "AcceleratorConfig": { @@ -2544,14 +2544,14 @@ "description": "Specifies the node management options for NAP created node-pools." }, "oauthScopes": { - "description": "Scopes that are used by NAP when creating node pools. If oauth_scopes are\nspecified, service_account should be empty.", + "description": "Scopes that are used by NAP when creating node pools.", "items": { "type": "string" }, "type": "array" }, "serviceAccount": { - "description": "The Google Cloud Platform Service Account to be used by the node VMs. If\nservice_account is specified, scopes should be empty.", + "description": "The Google Cloud Platform Service Account to be used by the node VMs.", "type": "string" }, "upgradeSettings": { diff --git a/discovery/container-v1beta1.json b/discovery/container-v1beta1.json index a9b6b921eb4..5a20db1189c 100644 --- a/discovery/container-v1beta1.json +++ b/discovery/container-v1beta1.json @@ -2484,7 +2484,7 @@ } } }, - "revision": "20200505", + "revision": "20200519", "rootUrl": "https://container.googleapis.com/", "schemas": { "AcceleratorConfig": { @@ -2593,14 +2593,14 @@ "type": "string" }, "oauthScopes": { - "description": "Scopes that are used by NAP when creating node pools. If oauth_scopes are\nspecified, service_account should be empty.", + "description": "Scopes that are used by NAP when creating node pools.", "items": { "type": "string" }, "type": "array" }, "serviceAccount": { - "description": "The Google Cloud Platform Service Account to be used by the node VMs. If\nservice_account is specified, scopes should be empty.", + "description": "The Google Cloud Platform Service Account to be used by the node VMs.", "type": "string" }, "upgradeSettings": { @@ -2834,6 +2834,10 @@ "$ref": "MaintenancePolicy", "description": "Configure the maintenance policy for this cluster." }, + "master": { + "$ref": "Master", + "description": "Configuration for master components." + }, "masterAuth": { "$ref": "MasterAuth", "description": "The authentication information for accessing the master endpoint.\nIf unspecified, the defaults are used:\nFor clusters before v1.12, if master_auth is unspecified, `username` will\nbe set to \"admin\", a random password will be generated, and a client\ncertificate will be issued." @@ -3087,6 +3091,10 @@ "description": "The logging service the cluster should use to write logs.\nCurrently available options:\n\n* `logging.googleapis.com/kubernetes` - The Cloud Logging\nservice with a Kubernetes-native resource model\n* `logging.googleapis.com` - The legacy Cloud Logging service (no longer\n available as of GKE 1.15).\n* `none` - no logs will be exported from the cluster.\n\nIf left as an empty string,`logging.googleapis.com/kubernetes` will be\nused for GKE 1.14+ or `logging.googleapis.com` for earlier versions.", "type": "string" }, + "desiredMaster": { + "$ref": "Master", + "description": "Configuration for master components." + }, "desiredMasterAuthorizedNetworksConfig": { "$ref": "MasterAuthorizedNetworksConfig", "description": "The desired configuration options for master authorized networks feature." @@ -3765,6 +3773,12 @@ }, "type": "object" }, + "Master": { + "description": "Master is the configuration for components on master.", + "id": "Master", + "properties": {}, + "type": "object" + }, "MasterAuth": { "description": "The authentication information for accessing the master endpoint.\nAuthentication can be done using HTTP basic auth or using client\ncertificates.", "id": "MasterAuth", diff --git a/src/apis/container/v1.ts b/src/apis/container/v1.ts index 3a1843f3b3f..4922ab55ef5 100644 --- a/src/apis/container/v1.ts +++ b/src/apis/container/v1.ts @@ -187,11 +187,11 @@ export namespace container_v1 { */ management?: Schema$NodeManagement; /** - * Scopes that are used by NAP when creating node pools. If oauth_scopes are specified, service_account should be empty. + * Scopes that are used by NAP when creating node pools. */ oauthScopes?: string[] | null; /** - * The Google Cloud Platform Service Account to be used by the node VMs. If service_account is specified, scopes should be empty. + * The Google Cloud Platform Service Account to be used by the node VMs. */ serviceAccount?: string | null; /** diff --git a/src/apis/container/v1beta1.ts b/src/apis/container/v1beta1.ts index 6aceaf16762..5c903567b25 100644 --- a/src/apis/container/v1beta1.ts +++ b/src/apis/container/v1beta1.ts @@ -211,11 +211,11 @@ export namespace container_v1beta1 { */ minCpuPlatform?: string | null; /** - * Scopes that are used by NAP when creating node pools. If oauth_scopes are specified, service_account should be empty. + * Scopes that are used by NAP when creating node pools. */ oauthScopes?: string[] | null; /** - * The Google Cloud Platform Service Account to be used by the node VMs. If service_account is specified, scopes should be empty. + * The Google Cloud Platform Service Account to be used by the node VMs. */ serviceAccount?: string | null; /** @@ -435,6 +435,10 @@ export namespace container_v1beta1 { * Configure the maintenance policy for this cluster. */ maintenancePolicy?: Schema$MaintenancePolicy; + /** + * Configuration for master components. + */ + master?: Schema$Master; /** * The authentication information for accessing the master endpoint. If unspecified, the defaults are used: For clusters before v1.12, if master_auth is unspecified, `username` will be set to "admin", a random password will be generated, and a client certificate will be issued. */ @@ -626,6 +630,10 @@ export namespace container_v1beta1 { * The logging service the cluster should use to write logs. Currently available options: * `logging.googleapis.com/kubernetes` - The Cloud Logging service with a Kubernetes-native resource model * `logging.googleapis.com` - The legacy Cloud Logging service (no longer available as of GKE 1.15). * `none` - no logs will be exported from the cluster. If left as an empty string,`logging.googleapis.com/kubernetes` will be used for GKE 1.14+ or `logging.googleapis.com` for earlier versions. */ desiredLoggingService?: string | null; + /** + * Configuration for master components. + */ + desiredMaster?: Schema$Master; /** * The desired configuration options for master authorized networks feature. */ @@ -1169,6 +1177,10 @@ export namespace container_v1beta1 { */ recurringWindow?: Schema$RecurringTimeWindow; } + /** + * Master is the configuration for components on master. + */ + export interface Schema$Master {} /** * The authentication information for accessing the master endpoint. Authentication can be done using HTTP basic auth or using client certificates. */ @@ -3458,6 +3470,7 @@ export namespace container_v1beta1 { * // "locations": [], * // "loggingService": "my_loggingService", * // "maintenancePolicy": {}, + * // "master": {}, * // "masterAuth": {}, * // "masterAuthorizedNetworksConfig": {}, * // "masterIpv4CidrBlock": "my_masterIpv4CidrBlock", @@ -9178,6 +9191,7 @@ export namespace container_v1beta1 { * // "locations": [], * // "loggingService": "my_loggingService", * // "maintenancePolicy": {}, + * // "master": {}, * // "masterAuth": {}, * // "masterAuthorizedNetworksConfig": {}, * // "masterIpv4CidrBlock": "my_masterIpv4CidrBlock",