Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 57822a7

Browse files
committedOct 25, 2022
feat(composer): update the api
#### composer:v1 The following keys were added: - schemas.NetworkingConfig (Total Keys: 3) - schemas.PrivateEnvironmentConfig.properties.networkingConfig.$ref (Total Keys: 1)
1 parent b46ddfd commit 57822a7

File tree

3 files changed

+39
-2
lines changed

3 files changed

+39
-2
lines changed
 

‎docs/dyn/composer_v1.projects.locations.environments.html

+12
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@ <h3>Method Details</h3>
166166
&quot;cloudSqlIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IP range in tenant project will be reserved for Cloud SQL. Needs to be disjoint from `web_server_ipv4_cidr_block`.
167167
&quot;enablePrivateEnvironment&quot;: True or False, # Optional. If `true`, a Private IP Cloud Composer environment is created. If this field is set to true, `IPAllocationPolicy.use_ip_aliases` must be set to true for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
168168
&quot;enablePrivatelyUsedPublicIps&quot;: True or False, # Optional. When enabled, IPs from public (non-RFC1918) ranges can be used for `IPAllocationPolicy.cluster_ipv4_cidr_block` and `IPAllocationPolicy.service_ipv4_cidr_block`.
169+
&quot;networkingConfig&quot;: { # Configuration options for networking connections in the Composer 2 environment. # Optional. Configuration for the network connections configuration in the environment.
170+
&quot;connectionType&quot;: &quot;A String&quot;, # Optional. Indicates the user requested specifc connection type between Tenant and Customer projects. You cannot set networking connection type in public IP environment.
171+
},
169172
&quot;privateClusterConfig&quot;: { # Configuration options for the private GKE cluster in a Cloud Composer environment. # Optional. Configuration for the private GKE cluster for a Private IP Cloud Composer environment.
170173
&quot;enablePrivateEndpoint&quot;: True or False, # Optional. If `true`, access to the public endpoint of the GKE cluster is denied.
171174
&quot;masterIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IPv4 range for GKE master will be reserved. If left blank, the default value of &#x27;172.16.0.0/23&#x27; is used.
@@ -364,6 +367,9 @@ <h3>Method Details</h3>
364367
&quot;cloudSqlIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IP range in tenant project will be reserved for Cloud SQL. Needs to be disjoint from `web_server_ipv4_cidr_block`.
365368
&quot;enablePrivateEnvironment&quot;: True or False, # Optional. If `true`, a Private IP Cloud Composer environment is created. If this field is set to true, `IPAllocationPolicy.use_ip_aliases` must be set to true for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
366369
&quot;enablePrivatelyUsedPublicIps&quot;: True or False, # Optional. When enabled, IPs from public (non-RFC1918) ranges can be used for `IPAllocationPolicy.cluster_ipv4_cidr_block` and `IPAllocationPolicy.service_ipv4_cidr_block`.
370+
&quot;networkingConfig&quot;: { # Configuration options for networking connections in the Composer 2 environment. # Optional. Configuration for the network connections configuration in the environment.
371+
&quot;connectionType&quot;: &quot;A String&quot;, # Optional. Indicates the user requested specifc connection type between Tenant and Customer projects. You cannot set networking connection type in public IP environment.
372+
},
367373
&quot;privateClusterConfig&quot;: { # Configuration options for the private GKE cluster in a Cloud Composer environment. # Optional. Configuration for the private GKE cluster for a Private IP Cloud Composer environment.
368374
&quot;enablePrivateEndpoint&quot;: True or False, # Optional. If `true`, access to the public endpoint of the GKE cluster is denied.
369375
&quot;masterIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IPv4 range for GKE master will be reserved. If left blank, the default value of &#x27;172.16.0.0/23&#x27; is used.
@@ -503,6 +509,9 @@ <h3>Method Details</h3>
503509
&quot;cloudSqlIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IP range in tenant project will be reserved for Cloud SQL. Needs to be disjoint from `web_server_ipv4_cidr_block`.
504510
&quot;enablePrivateEnvironment&quot;: True or False, # Optional. If `true`, a Private IP Cloud Composer environment is created. If this field is set to true, `IPAllocationPolicy.use_ip_aliases` must be set to true for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
505511
&quot;enablePrivatelyUsedPublicIps&quot;: True or False, # Optional. When enabled, IPs from public (non-RFC1918) ranges can be used for `IPAllocationPolicy.cluster_ipv4_cidr_block` and `IPAllocationPolicy.service_ipv4_cidr_block`.
512+
&quot;networkingConfig&quot;: { # Configuration options for networking connections in the Composer 2 environment. # Optional. Configuration for the network connections configuration in the environment.
513+
&quot;connectionType&quot;: &quot;A String&quot;, # Optional. Indicates the user requested specifc connection type between Tenant and Customer projects. You cannot set networking connection type in public IP environment.
514+
},
506515
&quot;privateClusterConfig&quot;: { # Configuration options for the private GKE cluster in a Cloud Composer environment. # Optional. Configuration for the private GKE cluster for a Private IP Cloud Composer environment.
507516
&quot;enablePrivateEndpoint&quot;: True or False, # Optional. If `true`, access to the public endpoint of the GKE cluster is denied.
508517
&quot;masterIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IPv4 range for GKE master will be reserved. If left blank, the default value of &#x27;172.16.0.0/23&#x27; is used.
@@ -650,6 +659,9 @@ <h3>Method Details</h3>
650659
&quot;cloudSqlIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IP range in tenant project will be reserved for Cloud SQL. Needs to be disjoint from `web_server_ipv4_cidr_block`.
651660
&quot;enablePrivateEnvironment&quot;: True or False, # Optional. If `true`, a Private IP Cloud Composer environment is created. If this field is set to true, `IPAllocationPolicy.use_ip_aliases` must be set to true for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
652661
&quot;enablePrivatelyUsedPublicIps&quot;: True or False, # Optional. When enabled, IPs from public (non-RFC1918) ranges can be used for `IPAllocationPolicy.cluster_ipv4_cidr_block` and `IPAllocationPolicy.service_ipv4_cidr_block`.
662+
&quot;networkingConfig&quot;: { # Configuration options for networking connections in the Composer 2 environment. # Optional. Configuration for the network connections configuration in the environment.
663+
&quot;connectionType&quot;: &quot;A String&quot;, # Optional. Indicates the user requested specifc connection type between Tenant and Customer projects. You cannot set networking connection type in public IP environment.
664+
},
653665
&quot;privateClusterConfig&quot;: { # Configuration options for the private GKE cluster in a Cloud Composer environment. # Optional. Configuration for the private GKE cluster for a Private IP Cloud Composer environment.
654666
&quot;enablePrivateEndpoint&quot;: True or False, # Optional. If `true`, access to the public endpoint of the GKE cluster is denied.
655667
&quot;masterIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IPv4 range for GKE master will be reserved. If left blank, the default value of &#x27;172.16.0.0/23&#x27; is used.

‎googleapiclient/discovery_cache/documents/composer.v1.json

+26-1
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@
406406
}
407407
}
408408
},
409-
"revision": "20220926",
409+
"revision": "20221012",
410410
"rootUrl": "https://composer.googleapis.com/",
411411
"schemas": {
412412
"AllowedIpRange": {
@@ -828,6 +828,27 @@
828828
},
829829
"type": "object"
830830
},
831+
"NetworkingConfig": {
832+
"description": "Configuration options for networking connections in the Composer 2 environment.",
833+
"id": "NetworkingConfig",
834+
"properties": {
835+
"connectionType": {
836+
"description": "Optional. Indicates the user requested specifc connection type between Tenant and Customer projects. You cannot set networking connection type in public IP environment.",
837+
"enum": [
838+
"CONNECTION_TYPE_UNSPECIFIED",
839+
"VPC_PEERING",
840+
"PRIVATE_SERVICE_CONNECT"
841+
],
842+
"enumDescriptions": [
843+
"No specific connection type was requested, so the environment uses the default value corresponding to the rest of its configuration.",
844+
"Requests the use of VPC peerings for connecting the Customer and Tenant projects.",
845+
"Requests the use of Private Service Connect for connecting the Customer and Tenant projects."
846+
],
847+
"type": "string"
848+
}
849+
},
850+
"type": "object"
851+
},
831852
"NodeConfig": {
832853
"description": "The configuration information for the Kubernetes Engine nodes running the Apache Airflow software.",
833854
"id": "NodeConfig",
@@ -1033,6 +1054,10 @@
10331054
"description": "Optional. When enabled, IPs from public (non-RFC1918) ranges can be used for `IPAllocationPolicy.cluster_ipv4_cidr_block` and `IPAllocationPolicy.service_ipv4_cidr_block`.",
10341055
"type": "boolean"
10351056
},
1057+
"networkingConfig": {
1058+
"$ref": "NetworkingConfig",
1059+
"description": "Optional. Configuration for the network connections configuration in the environment."
1060+
},
10361061
"privateClusterConfig": {
10371062
"$ref": "PrivateClusterConfig",
10381063
"description": "Optional. Configuration for the private GKE cluster for a Private IP Cloud Composer environment."

‎googleapiclient/discovery_cache/documents/composer.v1beta1.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@
518518
}
519519
}
520520
},
521-
"revision": "20220926",
521+
"revision": "20221012",
522522
"rootUrl": "https://composer.googleapis.com/",
523523
"schemas": {
524524
"AllowedIpRange": {

0 commit comments

Comments
 (0)
Please sign in to comment.