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 a8331e0

Browse files
committedDec 7, 2023
feat(composer): update the api
#### composer:v1beta1 The following keys were added: - schemas.DagProcessorResource (Total Keys: 10) - schemas.NodeConfig.properties.composerInternalIpv4CidrBlock.type (Total Keys: 1) - schemas.NodeConfig.properties.composerNetworkAttachment.type (Total Keys: 1) - schemas.PrivateEnvironmentConfig.properties.enablePrivateBuildsOnly.type (Total Keys: 1) - schemas.SoftwareConfig.properties.webServerPluginsMode.type (Total Keys: 1) - schemas.WorkloadsConfig.properties.dagProcessor.$ref (Total Keys: 1)
1 parent e0465dc commit a8331e0

File tree

3 files changed

+99
-2
lines changed

3 files changed

+99
-2
lines changed
 

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

+40
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,8 @@ <h3>Method Details</h3>
208208
&quot;enabled&quot;: True or False, # Whether or not master authorized networks feature is enabled.
209209
},
210210
&quot;nodeConfig&quot;: { # The configuration information for the Kubernetes Engine nodes running the Apache Airflow software. # The configuration used for the Kubernetes Engine cluster.
211+
&quot;composerInternalIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The IP range in CIDR notation to use internally by Cloud Composer. IP addresses are not reserved - and the same range can be used by multiple Cloud Composer environments. In case of overlap, IPs from this range will not be accessible in the user&#x27;s VPC network. Cannot be updated. If not specified, the default value of &#x27;100.64.128.0/20&#x27; is used. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
212+
&quot;composerNetworkAttachment&quot;: &quot;A String&quot;, # Optional. Network Attachment that Cloud Composer environment is connected to, which provides connectivity with a user&#x27;s VPC network. Takes precedence over network and subnetwork settings. If not provided, but network and subnetwork are defined during environment, it will be provisioned. If not provided and network and subnetwork are also empty, then connectivity to user&#x27;s VPC network is disabled. Network attachment must be provided in format projects/{project}/regions/{region}/networkAttachments/{networkAttachment}. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
211213
&quot;diskSizeGb&quot;: 42, # Optional. The disk size in GB used for node VMs. Minimum size is 30GB. If unspecified, defaults to 100GB. Cannot be updated. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
212214
&quot;enableIpMasqAgent&quot;: True or False, # Optional. Deploys &#x27;ip-masq-agent&#x27; daemon set in the GKE cluster and defines nonMasqueradeCIDRs equals to pod IP range so IP masquerading is used for all destination addresses, except between pods traffic. See: https://cloud.google.com/kubernetes-engine/docs/how-to/ip-masquerade-agent
213215
&quot;ipAllocationPolicy&quot;: { # Configuration for controlling how IPs are allocated in the GKE cluster. # Optional. The IPAllocationPolicy fields for the GKE cluster.
@@ -236,6 +238,7 @@ <h3>Method Details</h3>
236238
&quot;cloudComposerNetworkIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IP range for Cloud Composer Network in tenant project will be reserved. Needs to be disjoint from private_cluster_config.master_ipv4_cidr_block and cloud_sql_ipv4_cidr_block. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
237239
&quot;cloudComposerNetworkIpv4ReservedRange&quot;: &quot;A String&quot;, # Output only. The IP range reserved for the tenant project&#x27;s Cloud Composer network. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
238240
&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
241+
&quot;enablePrivateBuildsOnly&quot;: True or False, # Optional. If `true`, builds performed during operations that install Python packages have only private connectivity to Google services (including Artifact Registry) and VPC network (if either `NodeConfig.network` and `NodeConfig.subnetwork` fields or `NodeConfig.composer_network_attachment` field are specified). If `false`, the builds also have access to the internet. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
239242
&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-*.*.*.
240243
&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`.
241244
&quot;networkingConfig&quot;: { # Configuration options for networking connections in the Composer 2 environment. # Optional. Configuration for the network connections configuration in the environment.
@@ -274,6 +277,7 @@ <h3>Method Details</h3>
274277
},
275278
&quot;pythonVersion&quot;: &quot;A String&quot;, # Optional. The major version of Python used to run the Apache Airflow scheduler, worker, and webserver processes. Can be set to &#x27;2&#x27; or &#x27;3&#x27;. If not specified, the default is &#x27;3&#x27;. Cannot be updated. This field is only supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*. Environments in newer versions always use Python major version 3.
276279
&quot;schedulerCount&quot;: 42, # Optional. The number of schedulers for Airflow. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-2.*.*.
280+
&quot;webServerPluginsMode&quot;: &quot;A String&quot;, # Optional. Whether or not the web server uses custom plugins. If unspecified, the field defaults to `PLUGINS_ENABLED`. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
277281
},
278282
&quot;webServerConfig&quot;: { # The configuration settings for the Airflow web server App Engine instance. Supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*. # Optional. The configuration settings for the Airflow web server App Engine instance. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
279283
&quot;machineType&quot;: &quot;A String&quot;, # Optional. Machine type on which Airflow web server is running. It has to be one of: composer-n1-webserver-2, composer-n1-webserver-4 or composer-n1-webserver-8. If not specified, composer-n1-webserver-2 will be used. Value custom is returned only in response, if Airflow web server parameters were manually changed to a non-standard values.
@@ -287,6 +291,12 @@ <h3>Method Details</h3>
287291
],
288292
},
289293
&quot;workloadsConfig&quot;: { # The Kubernetes workloads configuration for GKE cluster associated with the Cloud Composer environment. Supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer. # Optional. The workloads configuration settings for the GKE cluster associated with the Cloud Composer environment. The GKE cluster runs Airflow scheduler, web server and workers workloads. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
294+
&quot;dagProcessor&quot;: { # Configuration for resources used by Airflow DAG processors. # Optional. Resources used by Airflow DAG processors. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
295+
&quot;count&quot;: 42, # Optional. The number of DAG processors. If not provided or set to 0, a single DAG processor instance will be created.
296+
&quot;cpu&quot;: 3.14, # Optional. CPU request and limit for a single Airflow DAG processor replica.
297+
&quot;memoryGb&quot;: 3.14, # Optional. Memory (GB) request and limit for a single Airflow DAG processor replica.
298+
&quot;storageGb&quot;: 3.14, # Optional. Storage (GB) request and limit for a single Airflow DAG processor replica.
299+
},
290300
&quot;scheduler&quot;: { # Configuration for resources used by Airflow schedulers. # Optional. Resources used by Airflow schedulers.
291301
&quot;count&quot;: 42, # Optional. The number of schedulers.
292302
&quot;cpu&quot;: 3.14, # Optional. CPU request and limit for a single Airflow scheduler replica.
@@ -528,6 +538,8 @@ <h3>Method Details</h3>
528538
&quot;enabled&quot;: True or False, # Whether or not master authorized networks feature is enabled.
529539
},
530540
&quot;nodeConfig&quot;: { # The configuration information for the Kubernetes Engine nodes running the Apache Airflow software. # The configuration used for the Kubernetes Engine cluster.
541+
&quot;composerInternalIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The IP range in CIDR notation to use internally by Cloud Composer. IP addresses are not reserved - and the same range can be used by multiple Cloud Composer environments. In case of overlap, IPs from this range will not be accessible in the user&#x27;s VPC network. Cannot be updated. If not specified, the default value of &#x27;100.64.128.0/20&#x27; is used. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
542+
&quot;composerNetworkAttachment&quot;: &quot;A String&quot;, # Optional. Network Attachment that Cloud Composer environment is connected to, which provides connectivity with a user&#x27;s VPC network. Takes precedence over network and subnetwork settings. If not provided, but network and subnetwork are defined during environment, it will be provisioned. If not provided and network and subnetwork are also empty, then connectivity to user&#x27;s VPC network is disabled. Network attachment must be provided in format projects/{project}/regions/{region}/networkAttachments/{networkAttachment}. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
531543
&quot;diskSizeGb&quot;: 42, # Optional. The disk size in GB used for node VMs. Minimum size is 30GB. If unspecified, defaults to 100GB. Cannot be updated. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
532544
&quot;enableIpMasqAgent&quot;: True or False, # Optional. Deploys &#x27;ip-masq-agent&#x27; daemon set in the GKE cluster and defines nonMasqueradeCIDRs equals to pod IP range so IP masquerading is used for all destination addresses, except between pods traffic. See: https://cloud.google.com/kubernetes-engine/docs/how-to/ip-masquerade-agent
533545
&quot;ipAllocationPolicy&quot;: { # Configuration for controlling how IPs are allocated in the GKE cluster. # Optional. The IPAllocationPolicy fields for the GKE cluster.
@@ -556,6 +568,7 @@ <h3>Method Details</h3>
556568
&quot;cloudComposerNetworkIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IP range for Cloud Composer Network in tenant project will be reserved. Needs to be disjoint from private_cluster_config.master_ipv4_cidr_block and cloud_sql_ipv4_cidr_block. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
557569
&quot;cloudComposerNetworkIpv4ReservedRange&quot;: &quot;A String&quot;, # Output only. The IP range reserved for the tenant project&#x27;s Cloud Composer network. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
558570
&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
571+
&quot;enablePrivateBuildsOnly&quot;: True or False, # Optional. If `true`, builds performed during operations that install Python packages have only private connectivity to Google services (including Artifact Registry) and VPC network (if either `NodeConfig.network` and `NodeConfig.subnetwork` fields or `NodeConfig.composer_network_attachment` field are specified). If `false`, the builds also have access to the internet. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
559572
&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-*.*.*.
560573
&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`.
561574
&quot;networkingConfig&quot;: { # Configuration options for networking connections in the Composer 2 environment. # Optional. Configuration for the network connections configuration in the environment.
@@ -594,6 +607,7 @@ <h3>Method Details</h3>
594607
},
595608
&quot;pythonVersion&quot;: &quot;A String&quot;, # Optional. The major version of Python used to run the Apache Airflow scheduler, worker, and webserver processes. Can be set to &#x27;2&#x27; or &#x27;3&#x27;. If not specified, the default is &#x27;3&#x27;. Cannot be updated. This field is only supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*. Environments in newer versions always use Python major version 3.
596609
&quot;schedulerCount&quot;: 42, # Optional. The number of schedulers for Airflow. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-2.*.*.
610+
&quot;webServerPluginsMode&quot;: &quot;A String&quot;, # Optional. Whether or not the web server uses custom plugins. If unspecified, the field defaults to `PLUGINS_ENABLED`. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
597611
},
598612
&quot;webServerConfig&quot;: { # The configuration settings for the Airflow web server App Engine instance. Supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*. # Optional. The configuration settings for the Airflow web server App Engine instance. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
599613
&quot;machineType&quot;: &quot;A String&quot;, # Optional. Machine type on which Airflow web server is running. It has to be one of: composer-n1-webserver-2, composer-n1-webserver-4 or composer-n1-webserver-8. If not specified, composer-n1-webserver-2 will be used. Value custom is returned only in response, if Airflow web server parameters were manually changed to a non-standard values.
@@ -607,6 +621,12 @@ <h3>Method Details</h3>
607621
],
608622
},
609623
&quot;workloadsConfig&quot;: { # The Kubernetes workloads configuration for GKE cluster associated with the Cloud Composer environment. Supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer. # Optional. The workloads configuration settings for the GKE cluster associated with the Cloud Composer environment. The GKE cluster runs Airflow scheduler, web server and workers workloads. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
624+
&quot;dagProcessor&quot;: { # Configuration for resources used by Airflow DAG processors. # Optional. Resources used by Airflow DAG processors. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
625+
&quot;count&quot;: 42, # Optional. The number of DAG processors. If not provided or set to 0, a single DAG processor instance will be created.
626+
&quot;cpu&quot;: 3.14, # Optional. CPU request and limit for a single Airflow DAG processor replica.
627+
&quot;memoryGb&quot;: 3.14, # Optional. Memory (GB) request and limit for a single Airflow DAG processor replica.
628+
&quot;storageGb&quot;: 3.14, # Optional. Storage (GB) request and limit for a single Airflow DAG processor replica.
629+
},
610630
&quot;scheduler&quot;: { # Configuration for resources used by Airflow schedulers. # Optional. Resources used by Airflow schedulers.
611631
&quot;count&quot;: 42, # Optional. The number of schedulers.
612632
&quot;cpu&quot;: 3.14, # Optional. CPU request and limit for a single Airflow scheduler replica.
@@ -694,6 +714,8 @@ <h3>Method Details</h3>
694714
&quot;enabled&quot;: True or False, # Whether or not master authorized networks feature is enabled.
695715
},
696716
&quot;nodeConfig&quot;: { # The configuration information for the Kubernetes Engine nodes running the Apache Airflow software. # The configuration used for the Kubernetes Engine cluster.
717+
&quot;composerInternalIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The IP range in CIDR notation to use internally by Cloud Composer. IP addresses are not reserved - and the same range can be used by multiple Cloud Composer environments. In case of overlap, IPs from this range will not be accessible in the user&#x27;s VPC network. Cannot be updated. If not specified, the default value of &#x27;100.64.128.0/20&#x27; is used. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
718+
&quot;composerNetworkAttachment&quot;: &quot;A String&quot;, # Optional. Network Attachment that Cloud Composer environment is connected to, which provides connectivity with a user&#x27;s VPC network. Takes precedence over network and subnetwork settings. If not provided, but network and subnetwork are defined during environment, it will be provisioned. If not provided and network and subnetwork are also empty, then connectivity to user&#x27;s VPC network is disabled. Network attachment must be provided in format projects/{project}/regions/{region}/networkAttachments/{networkAttachment}. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
697719
&quot;diskSizeGb&quot;: 42, # Optional. The disk size in GB used for node VMs. Minimum size is 30GB. If unspecified, defaults to 100GB. Cannot be updated. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
698720
&quot;enableIpMasqAgent&quot;: True or False, # Optional. Deploys &#x27;ip-masq-agent&#x27; daemon set in the GKE cluster and defines nonMasqueradeCIDRs equals to pod IP range so IP masquerading is used for all destination addresses, except between pods traffic. See: https://cloud.google.com/kubernetes-engine/docs/how-to/ip-masquerade-agent
699721
&quot;ipAllocationPolicy&quot;: { # Configuration for controlling how IPs are allocated in the GKE cluster. # Optional. The IPAllocationPolicy fields for the GKE cluster.
@@ -722,6 +744,7 @@ <h3>Method Details</h3>
722744
&quot;cloudComposerNetworkIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IP range for Cloud Composer Network in tenant project will be reserved. Needs to be disjoint from private_cluster_config.master_ipv4_cidr_block and cloud_sql_ipv4_cidr_block. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
723745
&quot;cloudComposerNetworkIpv4ReservedRange&quot;: &quot;A String&quot;, # Output only. The IP range reserved for the tenant project&#x27;s Cloud Composer network. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
724746
&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
747+
&quot;enablePrivateBuildsOnly&quot;: True or False, # Optional. If `true`, builds performed during operations that install Python packages have only private connectivity to Google services (including Artifact Registry) and VPC network (if either `NodeConfig.network` and `NodeConfig.subnetwork` fields or `NodeConfig.composer_network_attachment` field are specified). If `false`, the builds also have access to the internet. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
725748
&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-*.*.*.
726749
&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`.
727750
&quot;networkingConfig&quot;: { # Configuration options for networking connections in the Composer 2 environment. # Optional. Configuration for the network connections configuration in the environment.
@@ -760,6 +783,7 @@ <h3>Method Details</h3>
760783
},
761784
&quot;pythonVersion&quot;: &quot;A String&quot;, # Optional. The major version of Python used to run the Apache Airflow scheduler, worker, and webserver processes. Can be set to &#x27;2&#x27; or &#x27;3&#x27;. If not specified, the default is &#x27;3&#x27;. Cannot be updated. This field is only supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*. Environments in newer versions always use Python major version 3.
762785
&quot;schedulerCount&quot;: 42, # Optional. The number of schedulers for Airflow. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-2.*.*.
786+
&quot;webServerPluginsMode&quot;: &quot;A String&quot;, # Optional. Whether or not the web server uses custom plugins. If unspecified, the field defaults to `PLUGINS_ENABLED`. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
763787
},
764788
&quot;webServerConfig&quot;: { # The configuration settings for the Airflow web server App Engine instance. Supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*. # Optional. The configuration settings for the Airflow web server App Engine instance. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
765789
&quot;machineType&quot;: &quot;A String&quot;, # Optional. Machine type on which Airflow web server is running. It has to be one of: composer-n1-webserver-2, composer-n1-webserver-4 or composer-n1-webserver-8. If not specified, composer-n1-webserver-2 will be used. Value custom is returned only in response, if Airflow web server parameters were manually changed to a non-standard values.
@@ -773,6 +797,12 @@ <h3>Method Details</h3>
773797
],
774798
},
775799
&quot;workloadsConfig&quot;: { # The Kubernetes workloads configuration for GKE cluster associated with the Cloud Composer environment. Supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer. # Optional. The workloads configuration settings for the GKE cluster associated with the Cloud Composer environment. The GKE cluster runs Airflow scheduler, web server and workers workloads. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
800+
&quot;dagProcessor&quot;: { # Configuration for resources used by Airflow DAG processors. # Optional. Resources used by Airflow DAG processors. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
801+
&quot;count&quot;: 42, # Optional. The number of DAG processors. If not provided or set to 0, a single DAG processor instance will be created.
802+
&quot;cpu&quot;: 3.14, # Optional. CPU request and limit for a single Airflow DAG processor replica.
803+
&quot;memoryGb&quot;: 3.14, # Optional. Memory (GB) request and limit for a single Airflow DAG processor replica.
804+
&quot;storageGb&quot;: 3.14, # Optional. Storage (GB) request and limit for a single Airflow DAG processor replica.
805+
},
776806
&quot;scheduler&quot;: { # Configuration for resources used by Airflow schedulers. # Optional. Resources used by Airflow schedulers.
777807
&quot;count&quot;: 42, # Optional. The number of schedulers.
778808
&quot;cpu&quot;: 3.14, # Optional. CPU request and limit for a single Airflow scheduler replica.
@@ -914,6 +944,8 @@ <h3>Method Details</h3>
914944
&quot;enabled&quot;: True or False, # Whether or not master authorized networks feature is enabled.
915945
},
916946
&quot;nodeConfig&quot;: { # The configuration information for the Kubernetes Engine nodes running the Apache Airflow software. # The configuration used for the Kubernetes Engine cluster.
947+
&quot;composerInternalIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The IP range in CIDR notation to use internally by Cloud Composer. IP addresses are not reserved - and the same range can be used by multiple Cloud Composer environments. In case of overlap, IPs from this range will not be accessible in the user&#x27;s VPC network. Cannot be updated. If not specified, the default value of &#x27;100.64.128.0/20&#x27; is used. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
948+
&quot;composerNetworkAttachment&quot;: &quot;A String&quot;, # Optional. Network Attachment that Cloud Composer environment is connected to, which provides connectivity with a user&#x27;s VPC network. Takes precedence over network and subnetwork settings. If not provided, but network and subnetwork are defined during environment, it will be provisioned. If not provided and network and subnetwork are also empty, then connectivity to user&#x27;s VPC network is disabled. Network attachment must be provided in format projects/{project}/regions/{region}/networkAttachments/{networkAttachment}. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
917949
&quot;diskSizeGb&quot;: 42, # Optional. The disk size in GB used for node VMs. Minimum size is 30GB. If unspecified, defaults to 100GB. Cannot be updated. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
918950
&quot;enableIpMasqAgent&quot;: True or False, # Optional. Deploys &#x27;ip-masq-agent&#x27; daemon set in the GKE cluster and defines nonMasqueradeCIDRs equals to pod IP range so IP masquerading is used for all destination addresses, except between pods traffic. See: https://cloud.google.com/kubernetes-engine/docs/how-to/ip-masquerade-agent
919951
&quot;ipAllocationPolicy&quot;: { # Configuration for controlling how IPs are allocated in the GKE cluster. # Optional. The IPAllocationPolicy fields for the GKE cluster.
@@ -942,6 +974,7 @@ <h3>Method Details</h3>
942974
&quot;cloudComposerNetworkIpv4CidrBlock&quot;: &quot;A String&quot;, # Optional. The CIDR block from which IP range for Cloud Composer Network in tenant project will be reserved. Needs to be disjoint from private_cluster_config.master_ipv4_cidr_block and cloud_sql_ipv4_cidr_block. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
943975
&quot;cloudComposerNetworkIpv4ReservedRange&quot;: &quot;A String&quot;, # Output only. The IP range reserved for the tenant project&#x27;s Cloud Composer network. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
944976
&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
977+
&quot;enablePrivateBuildsOnly&quot;: True or False, # Optional. If `true`, builds performed during operations that install Python packages have only private connectivity to Google services (including Artifact Registry) and VPC network (if either `NodeConfig.network` and `NodeConfig.subnetwork` fields or `NodeConfig.composer_network_attachment` field are specified). If `false`, the builds also have access to the internet. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
945978
&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-*.*.*.
946979
&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`.
947980
&quot;networkingConfig&quot;: { # Configuration options for networking connections in the Composer 2 environment. # Optional. Configuration for the network connections configuration in the environment.
@@ -980,6 +1013,7 @@ <h3>Method Details</h3>
9801013
},
9811014
&quot;pythonVersion&quot;: &quot;A String&quot;, # Optional. The major version of Python used to run the Apache Airflow scheduler, worker, and webserver processes. Can be set to &#x27;2&#x27; or &#x27;3&#x27;. If not specified, the default is &#x27;3&#x27;. Cannot be updated. This field is only supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*. Environments in newer versions always use Python major version 3.
9821015
&quot;schedulerCount&quot;: 42, # Optional. The number of schedulers for Airflow. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-2.*.*.
1016+
&quot;webServerPluginsMode&quot;: &quot;A String&quot;, # Optional. Whether or not the web server uses custom plugins. If unspecified, the field defaults to `PLUGINS_ENABLED`. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
9831017
},
9841018
&quot;webServerConfig&quot;: { # The configuration settings for the Airflow web server App Engine instance. Supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*. # Optional. The configuration settings for the Airflow web server App Engine instance. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
9851019
&quot;machineType&quot;: &quot;A String&quot;, # Optional. Machine type on which Airflow web server is running. It has to be one of: composer-n1-webserver-2, composer-n1-webserver-4 or composer-n1-webserver-8. If not specified, composer-n1-webserver-2 will be used. Value custom is returned only in response, if Airflow web server parameters were manually changed to a non-standard values.
@@ -993,6 +1027,12 @@ <h3>Method Details</h3>
9931027
],
9941028
},
9951029
&quot;workloadsConfig&quot;: { # The Kubernetes workloads configuration for GKE cluster associated with the Cloud Composer environment. Supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer. # Optional. The workloads configuration settings for the GKE cluster associated with the Cloud Composer environment. The GKE cluster runs Airflow scheduler, web server and workers workloads. This field is supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
1030+
&quot;dagProcessor&quot;: { # Configuration for resources used by Airflow DAG processors. # Optional. Resources used by Airflow DAG processors. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.
1031+
&quot;count&quot;: 42, # Optional. The number of DAG processors. If not provided or set to 0, a single DAG processor instance will be created.
1032+
&quot;cpu&quot;: 3.14, # Optional. CPU request and limit for a single Airflow DAG processor replica.
1033+
&quot;memoryGb&quot;: 3.14, # Optional. Memory (GB) request and limit for a single Airflow DAG processor replica.
1034+
&quot;storageGb&quot;: 3.14, # Optional. Storage (GB) request and limit for a single Airflow DAG processor replica.
1035+
},
9961036
&quot;scheduler&quot;: { # Configuration for resources used by Airflow schedulers. # Optional. Resources used by Airflow schedulers.
9971037
&quot;count&quot;: 42, # Optional. The number of schedulers.
9981038
&quot;cpu&quot;: 3.14, # Optional. CPU request and limit for a single Airflow scheduler replica.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@
599599
}
600600
}
601601
},
602-
"revision": "20231105",
602+
"revision": "20231129",
603603
"rootUrl": "https://composer.googleapis.com/",
604604
"schemas": {
605605
"AllowedIpRange": {

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

+58-1
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@
655655
}
656656
}
657657
},
658-
"revision": "20231105",
658+
"revision": "20231129",
659659
"rootUrl": "https://composer.googleapis.com/",
660660
"schemas": {
661661
"AllowedIpRange": {
@@ -753,6 +753,33 @@
753753
},
754754
"type": "object"
755755
},
756+
"DagProcessorResource": {
757+
"description": "Configuration for resources used by Airflow DAG processors.",
758+
"id": "DagProcessorResource",
759+
"properties": {
760+
"count": {
761+
"description": "Optional. The number of DAG processors. If not provided or set to 0, a single DAG processor instance will be created.",
762+
"format": "int32",
763+
"type": "integer"
764+
},
765+
"cpu": {
766+
"description": "Optional. CPU request and limit for a single Airflow DAG processor replica.",
767+
"format": "float",
768+
"type": "number"
769+
},
770+
"memoryGb": {
771+
"description": "Optional. Memory (GB) request and limit for a single Airflow DAG processor replica.",
772+
"format": "float",
773+
"type": "number"
774+
},
775+
"storageGb": {
776+
"description": "Optional. Storage (GB) request and limit for a single Airflow DAG processor replica.",
777+
"format": "float",
778+
"type": "number"
779+
}
780+
},
781+
"type": "object"
782+
},
756783
"DatabaseConfig": {
757784
"description": "The configuration of Cloud SQL instance that is used by the Apache Airflow software.",
758785
"id": "DatabaseConfig",
@@ -1299,6 +1326,14 @@
12991326
"description": "The configuration information for the Kubernetes Engine nodes running the Apache Airflow software.",
13001327
"id": "NodeConfig",
13011328
"properties": {
1329+
"composerInternalIpv4CidrBlock": {
1330+
"description": "Optional. The IP range in CIDR notation to use internally by Cloud Composer. IP addresses are not reserved - and the same range can be used by multiple Cloud Composer environments. In case of overlap, IPs from this range will not be accessible in the user's VPC network. Cannot be updated. If not specified, the default value of '100.64.128.0/20' is used. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.",
1331+
"type": "string"
1332+
},
1333+
"composerNetworkAttachment": {
1334+
"description": "Optional. Network Attachment that Cloud Composer environment is connected to, which provides connectivity with a user's VPC network. Takes precedence over network and subnetwork settings. If not provided, but network and subnetwork are defined during environment, it will be provisioned. If not provided and network and subnetwork are also empty, then connectivity to user's VPC network is disabled. Network attachment must be provided in format projects/{project}/regions/{region}/networkAttachments/{networkAttachment}. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.",
1335+
"type": "string"
1336+
},
13021337
"diskSizeGb": {
13031338
"description": "Optional. The disk size in GB used for node VMs. Minimum size is 30GB. If unspecified, defaults to 100GB. Cannot be updated. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.",
13041339
"format": "int32",
@@ -1543,6 +1578,10 @@
15431578
"description": "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",
15441579
"type": "string"
15451580
},
1581+
"enablePrivateBuildsOnly": {
1582+
"description": "Optional. If `true`, builds performed during operations that install Python packages have only private connectivity to Google services (including Artifact Registry) and VPC network (if either `NodeConfig.network` and `NodeConfig.subnetwork` fields or `NodeConfig.composer_network_attachment` field are specified). If `false`, the builds also have access to the internet. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.",
1583+
"type": "boolean"
1584+
},
15461585
"enablePrivateEnvironment": {
15471586
"description": "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-*.*.*.",
15481587
"type": "boolean"
@@ -1701,6 +1740,20 @@
17011740
"description": "Optional. The number of schedulers for Airflow. This field is supported for Cloud Composer environments in versions composer-1.*.*-airflow-2.*.*.",
17021741
"format": "int32",
17031742
"type": "integer"
1743+
},
1744+
"webServerPluginsMode": {
1745+
"description": "Optional. Whether or not the web server uses custom plugins. If unspecified, the field defaults to `PLUGINS_ENABLED`. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer.",
1746+
"enum": [
1747+
"WEB_SERVER_PLUGINS_MODE_UNSPECIFIED",
1748+
"PLUGINS_DISABLED",
1749+
"PLUGINS_ENABLED"
1750+
],
1751+
"enumDescriptions": [
1752+
"Default mode.",
1753+
"Web server plugins are not supported.",
1754+
"Web server plugins are supported."
1755+
],
1756+
"type": "string"
17041757
}
17051758
},
17061759
"type": "object"
@@ -1889,6 +1942,10 @@
18891942
"description": "The Kubernetes workloads configuration for GKE cluster associated with the Cloud Composer environment. Supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.",
18901943
"id": "WorkloadsConfig",
18911944
"properties": {
1945+
"dagProcessor": {
1946+
"$ref": "DagProcessorResource",
1947+
"description": "Optional. Resources used by Airflow DAG processors. This field is supported for Cloud Composer environments in versions composer-3.*.*-airflow-*.*.* and newer."
1948+
},
18921949
"scheduler": {
18931950
"$ref": "SchedulerResource",
18941951
"description": "Optional. Resources used by Airflow schedulers."

0 commit comments

Comments
 (0)
Please sign in to comment.