google-apis-composer_v1beta1 0.7.0 → 0.11.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4293d033ad6e5ab75b6016d62188122c2920a974be70ba9e4f42d97c2474aad1
4
- data.tar.gz: 1e25b569723414ab424024d8da9daeab9ab08383bc8dac8b48005e476f1f63d3
3
+ metadata.gz: b88a1bcf19f0fb7922d052cc70b81b0e2e36d38af1be9d3bc68084df8d2729b7
4
+ data.tar.gz: f2c71647b11051448303cfe90a5aff4450ea25453559a92bcb7ffc276c8d58bf
5
5
  SHA512:
6
- metadata.gz: 93bccaa6e22c07ba100061502bfb3a90b6074f3c8e4c097be95a11b3bd91d5319c9bf8a28118443be67be7b122b2bce173019b9c7bd344199a77b34f56f29480
7
- data.tar.gz: 22dee365760ae55991753491ff0e451120b07f1492978b18127a396418ba569f6b2a2e49b8c7a8588e50c689478b510a2824ee80b28e7aea32206941ad134256
6
+ metadata.gz: c3bd0a611ca8740584e5e789b2e4ece382c102f6402b0f68105fb9239132d3bd9be89a7d0fb83437fb7c17a4b27d1e669d0d93d873c370927c3c891282f98a59
7
+ data.tar.gz: 841f45121e972a0e038a4c08c067183969a9af34bad851dd0c3cf6a24d30138d25758932614c919af9f1a38589e8215b72d95426f92c90de14d7c2bdeae96b9a
data/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # Release history for google-apis-composer_v1beta1
2
2
 
3
+ ### v0.11.0 (2021-08-04)
4
+
5
+ * Regenerated from discovery document revision 20210728
6
+
7
+ ### v0.10.0 (2021-07-14)
8
+
9
+ * Regenerated from discovery document revision 20210705
10
+
11
+ ### v0.9.0 (2021-07-06)
12
+
13
+ * Regenerated from discovery document revision 20210625
14
+
15
+ ### v0.8.0 (2021-06-29)
16
+
17
+ * Regenerated using generator version 0.4.0
18
+
3
19
  ### v0.7.0 (2021-06-24)
4
20
 
5
21
  * Unspecified changes
@@ -97,12 +97,23 @@ module Google
97
97
  # @return [String]
98
98
  attr_accessor :contains_pypi_modules_conflict
99
99
 
100
+ # Composer image for which the build was happening.
101
+ # Corresponds to the JSON property `imageVersion`
102
+ # @return [String]
103
+ attr_accessor :image_version
104
+
100
105
  # Output only. Extract from a docker image build log containing information
101
106
  # about pypi modules conflicts.
102
107
  # Corresponds to the JSON property `pypiConflictBuildLogExtract`
103
108
  # @return [String]
104
109
  attr_accessor :pypi_conflict_build_log_extract
105
110
 
111
+ # Pypi dependencies specified in the environment configuration, at the time when
112
+ # the build was triggered.
113
+ # Corresponds to the JSON property `pypiDependencies`
114
+ # @return [Hash<String,String>]
115
+ attr_accessor :pypi_dependencies
116
+
106
117
  def initialize(**args)
107
118
  update!(**args)
108
119
  end
@@ -111,12 +122,15 @@ module Google
111
122
  def update!(**args)
112
123
  @build_log_uri = args[:build_log_uri] if args.key?(:build_log_uri)
113
124
  @contains_pypi_modules_conflict = args[:contains_pypi_modules_conflict] if args.key?(:contains_pypi_modules_conflict)
125
+ @image_version = args[:image_version] if args.key?(:image_version)
114
126
  @pypi_conflict_build_log_extract = args[:pypi_conflict_build_log_extract] if args.key?(:pypi_conflict_build_log_extract)
127
+ @pypi_dependencies = args[:pypi_dependencies] if args.key?(:pypi_dependencies)
115
128
  end
116
129
  end
117
130
 
118
131
  # The configuration of Cloud SQL instance that is used by the Apache Airflow
119
- # software.
132
+ # software. Supported for Cloud Composer environments in versions composer-1.*.*-
133
+ # airflow-*.*.*.
120
134
  class DatabaseConfig
121
135
  include Google::Apis::Core::Hashable
122
136
 
@@ -196,6 +210,8 @@ module Google
196
210
  end
197
211
 
198
212
  # The encryption options for the Cloud Composer environment and its dependencies.
213
+ # Supported for Cloud Composer environments in versions composer-1.*.*-airflow-*
214
+ # .*.*.
199
215
  class EncryptionConfig
200
216
  include Google::Apis::Core::Hashable
201
217
 
@@ -299,16 +315,26 @@ module Google
299
315
  attr_accessor :dag_gcs_prefix
300
316
 
301
317
  # The configuration of Cloud SQL instance that is used by the Apache Airflow
302
- # software.
318
+ # software. Supported for Cloud Composer environments in versions composer-1.*.*-
319
+ # airflow-*.*.*.
303
320
  # Corresponds to the JSON property `databaseConfig`
304
321
  # @return [Google::Apis::ComposerV1beta1::DatabaseConfig]
305
322
  attr_accessor :database_config
306
323
 
307
324
  # The encryption options for the Cloud Composer environment and its dependencies.
325
+ # Supported for Cloud Composer environments in versions composer-1.*.*-airflow-*
326
+ # .*.*.
308
327
  # Corresponds to the JSON property `encryptionConfig`
309
328
  # @return [Google::Apis::ComposerV1beta1::EncryptionConfig]
310
329
  attr_accessor :encryption_config
311
330
 
331
+ # Optional. The size of the Cloud Composer environment. This field is supported
332
+ # for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and
333
+ # newer.
334
+ # Corresponds to the JSON property `environmentSize`
335
+ # @return [String]
336
+ attr_accessor :environment_size
337
+
312
338
  # Output only. The Kubernetes Engine cluster used to run this environment.
313
339
  # Corresponds to the JSON property `gkeCluster`
314
340
  # @return [String]
@@ -330,7 +356,8 @@ module Google
330
356
  attr_accessor :node_config
331
357
 
332
358
  # The number of nodes in the Kubernetes Engine cluster that will be used to run
333
- # this environment.
359
+ # this environment. This field is supported for Cloud Composer environments in
360
+ # versions composer-1.*.*-airflow-*.*.*.
334
361
  # Corresponds to the JSON property `nodeCount`
335
362
  # @return [Fixnum]
336
363
  attr_accessor :node_count
@@ -347,15 +374,25 @@ module Google
347
374
  attr_accessor :software_config
348
375
 
349
376
  # The configuration settings for the Airflow web server App Engine instance.
377
+ # Supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.
378
+ # *.*.
350
379
  # Corresponds to the JSON property `webServerConfig`
351
380
  # @return [Google::Apis::ComposerV1beta1::WebServerConfig]
352
381
  attr_accessor :web_server_config
353
382
 
354
- # Network-level access control policy for the Airflow web server.
383
+ # Network-level access control policy for the Airflow web server. Supported for
384
+ # Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
355
385
  # Corresponds to the JSON property `webServerNetworkAccessControl`
356
386
  # @return [Google::Apis::ComposerV1beta1::WebServerNetworkAccessControl]
357
387
  attr_accessor :web_server_network_access_control
358
388
 
389
+ # The Kubernetes workloads configuration for GKE cluster associated with the
390
+ # Cloud Composer environment. Supported for Cloud Composer environments in
391
+ # versions composer-2.*.*-airflow-*.*.* and newer.
392
+ # Corresponds to the JSON property `workloadsConfig`
393
+ # @return [Google::Apis::ComposerV1beta1::WorkloadsConfig]
394
+ attr_accessor :workloads_config
395
+
359
396
  def initialize(**args)
360
397
  update!(**args)
361
398
  end
@@ -366,6 +403,7 @@ module Google
366
403
  @dag_gcs_prefix = args[:dag_gcs_prefix] if args.key?(:dag_gcs_prefix)
367
404
  @database_config = args[:database_config] if args.key?(:database_config)
368
405
  @encryption_config = args[:encryption_config] if args.key?(:encryption_config)
406
+ @environment_size = args[:environment_size] if args.key?(:environment_size)
369
407
  @gke_cluster = args[:gke_cluster] if args.key?(:gke_cluster)
370
408
  @maintenance_window = args[:maintenance_window] if args.key?(:maintenance_window)
371
409
  @node_config = args[:node_config] if args.key?(:node_config)
@@ -374,6 +412,7 @@ module Google
374
412
  @software_config = args[:software_config] if args.key?(:software_config)
375
413
  @web_server_config = args[:web_server_config] if args.key?(:web_server_config)
376
414
  @web_server_network_access_control = args[:web_server_network_access_control] if args.key?(:web_server_network_access_control)
415
+ @workloads_config = args[:workloads_config] if args.key?(:workloads_config)
377
416
  end
378
417
  end
379
418
 
@@ -382,12 +421,14 @@ module Google
382
421
  include Google::Apis::Core::Hashable
383
422
 
384
423
  # Optional. The IP address range used to allocate IP addresses to pods in the
385
- # cluster. This field is applicable only when `use_ip_aliases` is true. Set to
386
- # blank to have GKE choose a range with the default size. Set to /netmask (e.g. `
387
- # /14`) to have GKE choose a range with a specific netmask. Set to a [CIDR](http:
388
- # //en.wikipedia.org/wiki/Classless_Inter-Domain_Routing) notation (e.g. `10.96.
389
- # 0.0/14`) from the RFC-1918 private networks (e.g. `10.0.0.0/8`, `172.16.0.0/12`
390
- # , `192.168.0.0/16`) to pick a specific range to use. Specify `
424
+ # cluster. This field is applicable only when `use_ip_aliases` is true. For
425
+ # Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*, this
426
+ # field is applicable only when `use_ip_aliases` is true. Set to blank to have
427
+ # GKE choose a range with the default size. Set to /netmask (e.g. `/14`) to have
428
+ # GKE choose a range with a specific netmask. Set to a [CIDR](http://en.
429
+ # wikipedia.org/wiki/Classless_Inter-Domain_Routing) notation (e.g. `10.96.0.0/
430
+ # 14`) from the RFC-1918 private networks (e.g. `10.0.0.0/8`, `172.16.0.0/12`, `
431
+ # 192.168.0.0/16`) to pick a specific range to use. Specify `
391
432
  # cluster_secondary_range_name` or `cluster_ipv4_cidr_block` but not both.
392
433
  # Corresponds to the JSON property `clusterIpv4CidrBlock`
393
434
  # @return [String]
@@ -396,19 +437,23 @@ module Google
396
437
  # Optional. The name of the cluster's secondary range used to allocate IP
397
438
  # addresses to pods. Specify either `cluster_secondary_range_name` or `
398
439
  # cluster_ipv4_cidr_block` but not both. This field is applicable only when `
399
- # use_ip_aliases` is true.
440
+ # use_ip_aliases` is true. For Cloud Composer environments in versions composer-
441
+ # 1.*.*-airflow-*.*.*, this field is applicable only when `use_ip_aliases` is
442
+ # true.
400
443
  # Corresponds to the JSON property `clusterSecondaryRangeName`
401
444
  # @return [String]
402
445
  attr_accessor :cluster_secondary_range_name
403
446
 
404
447
  # Optional. The IP address range of the services IP addresses in this cluster.
405
- # This field is applicable only when `use_ip_aliases` is true. Set to blank to
406
- # have GKE choose a range with the default size. Set to /netmask (e.g. `/14`) to
407
- # have GKE choose a range with a specific netmask. Set to a [CIDR](http://en.
408
- # wikipedia.org/wiki/Classless_Inter-Domain_Routing) notation (e.g. `10.96.0.0/
409
- # 14`) from the RFC-1918 private networks (e.g. `10.0.0.0/8`, `172.16.0.0/12`, `
410
- # 192.168.0.0/16`) to pick a specific range to use. Specify `
411
- # services_secondary_range_name` or `services_ipv4_cidr_block` but not both.
448
+ # This field is applicable only when `use_ip_aliases` is true. For Cloud
449
+ # Composer environments in versions composer-1.*.*-airflow-*.*.*, this field is
450
+ # applicable only when `use_ip_aliases` is true. Set to blank to have GKE choose
451
+ # a range with the default size. Set to /netmask (e.g. `/14`) to have GKE choose
452
+ # a range with a specific netmask. Set to a [CIDR](http://en.wikipedia.org/wiki/
453
+ # Classless_Inter-Domain_Routing) notation (e.g. `10.96.0.0/14`) from the RFC-
454
+ # 1918 private networks (e.g. `10.0.0.0/8`, `172.16.0.0/12`, `192.168.0.0/16`)
455
+ # to pick a specific range to use. Specify `services_secondary_range_name` or `
456
+ # services_ipv4_cidr_block` but not both.
412
457
  # Corresponds to the JSON property `servicesIpv4CidrBlock`
413
458
  # @return [String]
414
459
  attr_accessor :services_ipv4_cidr_block
@@ -416,13 +461,17 @@ module Google
416
461
  # Optional. The name of the services' secondary range used to allocate IP
417
462
  # addresses to the cluster. Specify either `services_secondary_range_name` or `
418
463
  # services_ipv4_cidr_block` but not both. This field is applicable only when `
419
- # use_ip_aliases` is true.
464
+ # use_ip_aliases` is true. For Cloud Composer environments in versions composer-
465
+ # 1.*.*-airflow-*.*.*, this field is applicable only when `use_ip_aliases` is
466
+ # true.
420
467
  # Corresponds to the JSON property `servicesSecondaryRangeName`
421
468
  # @return [String]
422
469
  attr_accessor :services_secondary_range_name
423
470
 
424
471
  # Optional. Whether or not to enable Alias IPs in the GKE cluster. If `true`, a
425
- # VPC-native cluster is created.
472
+ # VPC-native cluster is created. This field is only supported for Cloud Composer
473
+ # environments in versions composer-1.*.*-airflow-*.*.*. Environments in newer
474
+ # versions always use VPC-native GKE clusters.
426
475
  # Corresponds to the JSON property `useIpAliases`
427
476
  # @return [Boolean]
428
477
  attr_accessor :use_ip_aliases
@@ -625,7 +674,8 @@ module Google
625
674
  include Google::Apis::Core::Hashable
626
675
 
627
676
  # Optional. The disk size in GB used for node VMs. Minimum size is 20GB. If
628
- # unspecified, defaults to 100GB. Cannot be updated.
677
+ # unspecified, defaults to 100GB. Cannot be updated. This field is supported for
678
+ # Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
629
679
  # Corresponds to the JSON property `diskSizeGb`
630
680
  # @return [Fixnum]
631
681
  attr_accessor :disk_size_gb
@@ -645,7 +695,9 @@ module Google
645
695
  # zone in the Compute Engine region corresponding to the Cloud Composer location,
646
696
  # and propagate that choice to both fields. If only one field (`location` or `
647
697
  # nodeConfig.machineType`) is specified, the location information from the
648
- # specified field will be propagated to the unspecified field.
698
+ # specified field will be propagated to the unspecified field. This field is
699
+ # supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.
700
+ # *.*.
649
701
  # Corresponds to the JSON property `location`
650
702
  # @return [String]
651
703
  attr_accessor :location
@@ -663,6 +715,8 @@ module Google
663
715
  # field will be propagated to the unspecified field. The `machineTypeId` must
664
716
  # not be a [shared-core machine type](/compute/docs/machine-types#sharedcore).
665
717
  # If this field is unspecified, the `machineTypeId` defaults to "n1-standard-1".
718
+ # This field is supported for Cloud Composer environments in versions composer-1.
719
+ # *.*-airflow-*.*.*.
666
720
  # Corresponds to the JSON property `machineType`
667
721
  # @return [String]
668
722
  attr_accessor :machine_type
@@ -675,7 +729,8 @@ module Google
675
729
  # newly created node pools if their value is not explicitly set during node pool
676
730
  # creation. For more information, see [Optimizing IP address allocation] (https:/
677
731
  # /cloud.google.com/kubernetes-engine/docs/how-to/flexible-pod-cidr). Cannot be
678
- # updated.
732
+ # updated. This field is supported for Cloud Composer environments in versions
733
+ # composer-1.*.*-airflow-*.*.*.
679
734
  # Corresponds to the JSON property `maxPodsPerNode`
680
735
  # @return [Fixnum]
681
736
  attr_accessor :max_pods_per_node
@@ -693,14 +748,15 @@ module Google
693
748
 
694
749
  # Optional. The set of Google API scopes to be made available on all node VMs.
695
750
  # If `oauth_scopes` is empty, defaults to ["https://www.googleapis.com/auth/
696
- # cloud-platform"]. Cannot be updated.
751
+ # cloud-platform"]. Cannot be updated. This field is supported for Cloud
752
+ # Composer environments in versions composer-1.*.*-airflow-*.*.*.
697
753
  # Corresponds to the JSON property `oauthScopes`
698
754
  # @return [Array<String>]
699
755
  attr_accessor :oauth_scopes
700
756
 
701
757
  # Optional. The Google Cloud Platform Service Account to be used by the
702
758
  # workloads. If a service account is not specified, the "default" Compute Engine
703
- # service account is used. Cannot be updated .
759
+ # service account is used. Cannot be updated.
704
760
  # Corresponds to the JSON property `serviceAccount`
705
761
  # @return [String]
706
762
  attr_accessor :service_account
@@ -718,7 +774,8 @@ module Google
718
774
  # Optional. The list of instance tags applied to all node VMs. Tags are used to
719
775
  # identify valid sources or targets for network firewalls. Each tag within the
720
776
  # list must comply with [RFC1035](https://www.ietf.org/rfc/rfc1035.txt). Cannot
721
- # be updated.
777
+ # be updated. This field is supported for Cloud Composer environments in
778
+ # versions composer-1.*.*-airflow-*.*.*.
722
779
  # Corresponds to the JSON property `tags`
723
780
  # @return [Array<String>]
724
781
  attr_accessor :tags
@@ -899,6 +956,22 @@ module Google
899
956
  class PrivateEnvironmentConfig
900
957
  include Google::Apis::Core::Hashable
901
958
 
959
+ # Optional. The CIDR block from which IP range for Cloud Composer Network in
960
+ # tenant project will be reserved. Needs to be disjoint from
961
+ # private_cluster_config.master_ipv4_cidr_block and cloud_sql_ipv4_cidr_block.
962
+ # This field is supported for Cloud Composer environments in versions composer-2.
963
+ # *.*-airflow-*.*.* and newer.
964
+ # Corresponds to the JSON property `cloudComposerNetworkIpv4CidrBlock`
965
+ # @return [String]
966
+ attr_accessor :cloud_composer_network_ipv4_cidr_block
967
+
968
+ # Output only. The IP range reserved for the tenant project's Cloud Composer
969
+ # network. This field is supported for Cloud Composer environments in versions
970
+ # composer-2.*.*-airflow-*.*.* and newer.
971
+ # Corresponds to the JSON property `cloudComposerNetworkIpv4ReservedRange`
972
+ # @return [String]
973
+ attr_accessor :cloud_composer_network_ipv4_reserved_range
974
+
902
975
  # Optional. The CIDR block from which IP range in tenant project will be
903
976
  # reserved for Cloud SQL. Needs to be disjoint from web_server_ipv4_cidr_block
904
977
  # Corresponds to the JSON property `cloudSqlIpv4CidrBlock`
@@ -907,7 +980,7 @@ module Google
907
980
 
908
981
  # Optional. If `true`, a Private IP Cloud Composer environment is created. If
909
982
  # this field is set to true, `IPAllocationPolicy.use_ip_aliases` must be set to
910
- # true .
983
+ # true for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
911
984
  # Corresponds to the JSON property `enablePrivateEnvironment`
912
985
  # @return [Boolean]
913
986
  attr_accessor :enable_private_environment
@@ -921,12 +994,15 @@ module Google
921
994
 
922
995
  # Optional. The CIDR block from which IP range for web server will be reserved.
923
996
  # Needs to be disjoint from private_cluster_config.master_ipv4_cidr_block and
924
- # cloud_sql_ipv4_cidr_block.
997
+ # cloud_sql_ipv4_cidr_block. This field is supported for Cloud Composer
998
+ # environments in versions composer-1.*.*-airflow-*.*.*.
925
999
  # Corresponds to the JSON property `webServerIpv4CidrBlock`
926
1000
  # @return [String]
927
1001
  attr_accessor :web_server_ipv4_cidr_block
928
1002
 
929
1003
  # Output only. The IP range reserved for the tenant project's App Engine VMs.
1004
+ # This field is supported for Cloud Composer environments in versions composer-1.
1005
+ # *.*-airflow-*.*.*.
930
1006
  # Corresponds to the JSON property `webServerIpv4ReservedRange`
931
1007
  # @return [String]
932
1008
  attr_accessor :web_server_ipv4_reserved_range
@@ -937,6 +1013,8 @@ module Google
937
1013
 
938
1014
  # Update properties of this object
939
1015
  def update!(**args)
1016
+ @cloud_composer_network_ipv4_cidr_block = args[:cloud_composer_network_ipv4_cidr_block] if args.key?(:cloud_composer_network_ipv4_cidr_block)
1017
+ @cloud_composer_network_ipv4_reserved_range = args[:cloud_composer_network_ipv4_reserved_range] if args.key?(:cloud_composer_network_ipv4_reserved_range)
940
1018
  @cloud_sql_ipv4_cidr_block = args[:cloud_sql_ipv4_cidr_block] if args.key?(:cloud_sql_ipv4_cidr_block)
941
1019
  @enable_private_environment = args[:enable_private_environment] if args.key?(:enable_private_environment)
942
1020
  @private_cluster_config = args[:private_cluster_config] if args.key?(:private_cluster_config)
@@ -958,6 +1036,44 @@ module Google
958
1036
  end
959
1037
  end
960
1038
 
1039
+ # Configuration for resources used by Airflow schedulers.
1040
+ class SchedulerResource
1041
+ include Google::Apis::Core::Hashable
1042
+
1043
+ # Optional. The number of schedulers.
1044
+ # Corresponds to the JSON property `count`
1045
+ # @return [Fixnum]
1046
+ attr_accessor :count
1047
+
1048
+ # Optional. CPU request and limit for a single Airflow scheduler replica.
1049
+ # Corresponds to the JSON property `cpu`
1050
+ # @return [Float]
1051
+ attr_accessor :cpu
1052
+
1053
+ # Optional. Memory (GB) request and limit for a single Airflow scheduler replica.
1054
+ # Corresponds to the JSON property `memoryGb`
1055
+ # @return [Float]
1056
+ attr_accessor :memory_gb
1057
+
1058
+ # Optional. Storage (GB) request and limit for a single Airflow scheduler
1059
+ # replica.
1060
+ # Corresponds to the JSON property `storageGb`
1061
+ # @return [Float]
1062
+ attr_accessor :storage_gb
1063
+
1064
+ def initialize(**args)
1065
+ update!(**args)
1066
+ end
1067
+
1068
+ # Update properties of this object
1069
+ def update!(**args)
1070
+ @count = args[:count] if args.key?(:count)
1071
+ @cpu = args[:cpu] if args.key?(:cpu)
1072
+ @memory_gb = args[:memory_gb] if args.key?(:memory_gb)
1073
+ @storage_gb = args[:storage_gb] if args.key?(:storage_gb)
1074
+ end
1075
+ end
1076
+
961
1077
  # Specifies the selection and configuration of software inside the environment.
962
1078
  class SoftwareConfig
963
1079
  include Google::Apis::Core::Hashable
@@ -1019,11 +1135,19 @@ module Google
1019
1135
 
1020
1136
  # Optional. The major version of Python used to run the Apache Airflow scheduler,
1021
1137
  # worker, and webserver processes. Can be set to '2' or '3'. If not specified,
1022
- # the default is '3'. Cannot be updated.
1138
+ # the default is '3'. Cannot be updated. This field is only supported for Cloud
1139
+ # Composer environments in versions composer-1.*.*-airflow-*.*.*. Environments
1140
+ # in newer versions always use Python major version 3.
1023
1141
  # Corresponds to the JSON property `pythonVersion`
1024
1142
  # @return [String]
1025
1143
  attr_accessor :python_version
1026
1144
 
1145
+ # Optional. The number of schedulers for Airflow. This field is supported for
1146
+ # Cloud Composer environments in versions composer-1.*.*-airflow-2.*.*.
1147
+ # Corresponds to the JSON property `schedulerCount`
1148
+ # @return [Fixnum]
1149
+ attr_accessor :scheduler_count
1150
+
1027
1151
  def initialize(**args)
1028
1152
  update!(**args)
1029
1153
  end
@@ -1035,6 +1159,7 @@ module Google
1035
1159
  @image_version = args[:image_version] if args.key?(:image_version)
1036
1160
  @pypi_packages = args[:pypi_packages] if args.key?(:pypi_packages)
1037
1161
  @python_version = args[:python_version] if args.key?(:python_version)
1162
+ @scheduler_count = args[:scheduler_count] if args.key?(:scheduler_count)
1038
1163
  end
1039
1164
  end
1040
1165
 
@@ -1078,6 +1203,8 @@ module Google
1078
1203
  end
1079
1204
 
1080
1205
  # The configuration settings for the Airflow web server App Engine instance.
1206
+ # Supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.
1207
+ # *.*.
1081
1208
  class WebServerConfig
1082
1209
  include Google::Apis::Core::Hashable
1083
1210
 
@@ -1100,7 +1227,8 @@ module Google
1100
1227
  end
1101
1228
  end
1102
1229
 
1103
- # Network-level access control policy for the Airflow web server.
1230
+ # Network-level access control policy for the Airflow web server. Supported for
1231
+ # Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
1104
1232
  class WebServerNetworkAccessControl
1105
1233
  include Google::Apis::Core::Hashable
1106
1234
 
@@ -1118,6 +1246,113 @@ module Google
1118
1246
  @allowed_ip_ranges = args[:allowed_ip_ranges] if args.key?(:allowed_ip_ranges)
1119
1247
  end
1120
1248
  end
1249
+
1250
+ # Configuration for resources used by Airflow web server.
1251
+ class WebServerResource
1252
+ include Google::Apis::Core::Hashable
1253
+
1254
+ # Optional. CPU request and limit for Airflow web server.
1255
+ # Corresponds to the JSON property `cpu`
1256
+ # @return [Float]
1257
+ attr_accessor :cpu
1258
+
1259
+ # Optional. Memory (GB) request and limit for Airflow web server.
1260
+ # Corresponds to the JSON property `memoryGb`
1261
+ # @return [Float]
1262
+ attr_accessor :memory_gb
1263
+
1264
+ # Optional. Storage (GB) request and limit for Airflow web server.
1265
+ # Corresponds to the JSON property `storageGb`
1266
+ # @return [Float]
1267
+ attr_accessor :storage_gb
1268
+
1269
+ def initialize(**args)
1270
+ update!(**args)
1271
+ end
1272
+
1273
+ # Update properties of this object
1274
+ def update!(**args)
1275
+ @cpu = args[:cpu] if args.key?(:cpu)
1276
+ @memory_gb = args[:memory_gb] if args.key?(:memory_gb)
1277
+ @storage_gb = args[:storage_gb] if args.key?(:storage_gb)
1278
+ end
1279
+ end
1280
+
1281
+ # Configuration for resources used by Airflow workers.
1282
+ class WorkerResource
1283
+ include Google::Apis::Core::Hashable
1284
+
1285
+ # Optional. CPU request and limit for a single Airflow worker replica.
1286
+ # Corresponds to the JSON property `cpu`
1287
+ # @return [Float]
1288
+ attr_accessor :cpu
1289
+
1290
+ # Optional. Maximum number of workers for autoscaling.
1291
+ # Corresponds to the JSON property `maxCount`
1292
+ # @return [Fixnum]
1293
+ attr_accessor :max_count
1294
+
1295
+ # Optional. Memory (GB) request and limit for a single Airflow worker replica.
1296
+ # Corresponds to the JSON property `memoryGb`
1297
+ # @return [Float]
1298
+ attr_accessor :memory_gb
1299
+
1300
+ # Optional. Minimum number of workers for autoscaling.
1301
+ # Corresponds to the JSON property `minCount`
1302
+ # @return [Fixnum]
1303
+ attr_accessor :min_count
1304
+
1305
+ # Optional. Storage (GB) request and limit for a single Airflow worker replica.
1306
+ # Corresponds to the JSON property `storageGb`
1307
+ # @return [Float]
1308
+ attr_accessor :storage_gb
1309
+
1310
+ def initialize(**args)
1311
+ update!(**args)
1312
+ end
1313
+
1314
+ # Update properties of this object
1315
+ def update!(**args)
1316
+ @cpu = args[:cpu] if args.key?(:cpu)
1317
+ @max_count = args[:max_count] if args.key?(:max_count)
1318
+ @memory_gb = args[:memory_gb] if args.key?(:memory_gb)
1319
+ @min_count = args[:min_count] if args.key?(:min_count)
1320
+ @storage_gb = args[:storage_gb] if args.key?(:storage_gb)
1321
+ end
1322
+ end
1323
+
1324
+ # The Kubernetes workloads configuration for GKE cluster associated with the
1325
+ # Cloud Composer environment. Supported for Cloud Composer environments in
1326
+ # versions composer-2.*.*-airflow-*.*.* and newer.
1327
+ class WorkloadsConfig
1328
+ include Google::Apis::Core::Hashable
1329
+
1330
+ # Configuration for resources used by Airflow schedulers.
1331
+ # Corresponds to the JSON property `scheduler`
1332
+ # @return [Google::Apis::ComposerV1beta1::SchedulerResource]
1333
+ attr_accessor :scheduler
1334
+
1335
+ # Configuration for resources used by Airflow web server.
1336
+ # Corresponds to the JSON property `webServer`
1337
+ # @return [Google::Apis::ComposerV1beta1::WebServerResource]
1338
+ attr_accessor :web_server
1339
+
1340
+ # Configuration for resources used by Airflow workers.
1341
+ # Corresponds to the JSON property `worker`
1342
+ # @return [Google::Apis::ComposerV1beta1::WorkerResource]
1343
+ attr_accessor :worker
1344
+
1345
+ def initialize(**args)
1346
+ update!(**args)
1347
+ end
1348
+
1349
+ # Update properties of this object
1350
+ def update!(**args)
1351
+ @scheduler = args[:scheduler] if args.key?(:scheduler)
1352
+ @web_server = args[:web_server] if args.key?(:web_server)
1353
+ @worker = args[:worker] if args.key?(:worker)
1354
+ end
1355
+ end
1121
1356
  end
1122
1357
  end
1123
1358
  end
@@ -16,13 +16,13 @@ module Google
16
16
  module Apis
17
17
  module ComposerV1beta1
18
18
  # Version of the google-apis-composer_v1beta1 gem
19
- GEM_VERSION = "0.7.0"
19
+ GEM_VERSION = "0.11.0"
20
20
 
21
21
  # Version of the code generator used to generate this client
22
- GENERATOR_VERSION = "0.3.0"
22
+ GENERATOR_VERSION = "0.4.0"
23
23
 
24
24
  # Revision of the discovery document this client was generated from
25
- REVISION = "20210601"
25
+ REVISION = "20210728"
26
26
  end
27
27
  end
28
28
  end
@@ -148,6 +148,12 @@ module Google
148
148
  include Google::Apis::Core::JsonObjectSupport
149
149
  end
150
150
 
151
+ class SchedulerResource
152
+ class Representation < Google::Apis::Core::JsonRepresentation; end
153
+
154
+ include Google::Apis::Core::JsonObjectSupport
155
+ end
156
+
151
157
  class SoftwareConfig
152
158
  class Representation < Google::Apis::Core::JsonRepresentation; end
153
159
 
@@ -172,6 +178,24 @@ module Google
172
178
  include Google::Apis::Core::JsonObjectSupport
173
179
  end
174
180
 
181
+ class WebServerResource
182
+ class Representation < Google::Apis::Core::JsonRepresentation; end
183
+
184
+ include Google::Apis::Core::JsonObjectSupport
185
+ end
186
+
187
+ class WorkerResource
188
+ class Representation < Google::Apis::Core::JsonRepresentation; end
189
+
190
+ include Google::Apis::Core::JsonObjectSupport
191
+ end
192
+
193
+ class WorkloadsConfig
194
+ class Representation < Google::Apis::Core::JsonRepresentation; end
195
+
196
+ include Google::Apis::Core::JsonObjectSupport
197
+ end
198
+
175
199
  class AllowedIpRange
176
200
  # @private
177
201
  class Representation < Google::Apis::Core::JsonRepresentation
@@ -192,7 +216,9 @@ module Google
192
216
  class Representation < Google::Apis::Core::JsonRepresentation
193
217
  property :build_log_uri, as: 'buildLogUri'
194
218
  property :contains_pypi_modules_conflict, as: 'containsPypiModulesConflict'
219
+ property :image_version, as: 'imageVersion'
195
220
  property :pypi_conflict_build_log_extract, as: 'pypiConflictBuildLogExtract'
221
+ hash :pypi_dependencies, as: 'pypiDependencies'
196
222
  end
197
223
  end
198
224
 
@@ -248,6 +274,7 @@ module Google
248
274
 
249
275
  property :encryption_config, as: 'encryptionConfig', class: Google::Apis::ComposerV1beta1::EncryptionConfig, decorator: Google::Apis::ComposerV1beta1::EncryptionConfig::Representation
250
276
 
277
+ property :environment_size, as: 'environmentSize'
251
278
  property :gke_cluster, as: 'gkeCluster'
252
279
  property :maintenance_window, as: 'maintenanceWindow', class: Google::Apis::ComposerV1beta1::MaintenanceWindow, decorator: Google::Apis::ComposerV1beta1::MaintenanceWindow::Representation
253
280
 
@@ -262,6 +289,8 @@ module Google
262
289
 
263
290
  property :web_server_network_access_control, as: 'webServerNetworkAccessControl', class: Google::Apis::ComposerV1beta1::WebServerNetworkAccessControl, decorator: Google::Apis::ComposerV1beta1::WebServerNetworkAccessControl::Representation
264
291
 
292
+ property :workloads_config, as: 'workloadsConfig', class: Google::Apis::ComposerV1beta1::WorkloadsConfig, decorator: Google::Apis::ComposerV1beta1::WorkloadsConfig::Representation
293
+
265
294
  end
266
295
  end
267
296
 
@@ -378,6 +407,8 @@ module Google
378
407
  class PrivateEnvironmentConfig
379
408
  # @private
380
409
  class Representation < Google::Apis::Core::JsonRepresentation
410
+ property :cloud_composer_network_ipv4_cidr_block, as: 'cloudComposerNetworkIpv4CidrBlock'
411
+ property :cloud_composer_network_ipv4_reserved_range, as: 'cloudComposerNetworkIpv4ReservedRange'
381
412
  property :cloud_sql_ipv4_cidr_block, as: 'cloudSqlIpv4CidrBlock'
382
413
  property :enable_private_environment, as: 'enablePrivateEnvironment'
383
414
  property :private_cluster_config, as: 'privateClusterConfig', class: Google::Apis::ComposerV1beta1::PrivateClusterConfig, decorator: Google::Apis::ComposerV1beta1::PrivateClusterConfig::Representation
@@ -393,6 +424,16 @@ module Google
393
424
  end
394
425
  end
395
426
 
427
+ class SchedulerResource
428
+ # @private
429
+ class Representation < Google::Apis::Core::JsonRepresentation
430
+ property :count, as: 'count'
431
+ property :cpu, as: 'cpu'
432
+ property :memory_gb, as: 'memoryGb'
433
+ property :storage_gb, as: 'storageGb'
434
+ end
435
+ end
436
+
396
437
  class SoftwareConfig
397
438
  # @private
398
439
  class Representation < Google::Apis::Core::JsonRepresentation
@@ -401,6 +442,7 @@ module Google
401
442
  property :image_version, as: 'imageVersion'
402
443
  hash :pypi_packages, as: 'pypiPackages'
403
444
  property :python_version, as: 'pythonVersion'
445
+ property :scheduler_count, as: 'schedulerCount'
404
446
  end
405
447
  end
406
448
 
@@ -427,6 +469,38 @@ module Google
427
469
 
428
470
  end
429
471
  end
472
+
473
+ class WebServerResource
474
+ # @private
475
+ class Representation < Google::Apis::Core::JsonRepresentation
476
+ property :cpu, as: 'cpu'
477
+ property :memory_gb, as: 'memoryGb'
478
+ property :storage_gb, as: 'storageGb'
479
+ end
480
+ end
481
+
482
+ class WorkerResource
483
+ # @private
484
+ class Representation < Google::Apis::Core::JsonRepresentation
485
+ property :cpu, as: 'cpu'
486
+ property :max_count, as: 'maxCount'
487
+ property :memory_gb, as: 'memoryGb'
488
+ property :min_count, as: 'minCount'
489
+ property :storage_gb, as: 'storageGb'
490
+ end
491
+ end
492
+
493
+ class WorkloadsConfig
494
+ # @private
495
+ class Representation < Google::Apis::Core::JsonRepresentation
496
+ property :scheduler, as: 'scheduler', class: Google::Apis::ComposerV1beta1::SchedulerResource, decorator: Google::Apis::ComposerV1beta1::SchedulerResource::Representation
497
+
498
+ property :web_server, as: 'webServer', class: Google::Apis::ComposerV1beta1::WebServerResource, decorator: Google::Apis::ComposerV1beta1::WebServerResource::Representation
499
+
500
+ property :worker, as: 'worker', class: Google::Apis::ComposerV1beta1::WorkerResource, decorator: Google::Apis::ComposerV1beta1::WorkerResource::Representation
501
+
502
+ end
503
+ end
430
504
  end
431
505
  end
432
506
  end
@@ -246,52 +246,67 @@ module Google
246
246
  # pre-existing user-specified PyPI packages and install botocore at version 1.7.
247
247
  # 14, the `updateMask` would contain the path "config.softwareConfig.
248
248
  # pypiPackages", and the patch environment would be the following: ` "config":` "
249
- # softwareConfig":` "pypiPackages":` "botocore":"==1.7.14" ` ` ` ` *Note:* Only
250
- # the following fields can be updated: * config.softwareConfig.pypiPackages *
251
- # Replace all custom custom PyPI packages. If a replacement package map is not
252
- # included in `environment`, all custom PyPI packages are cleared. It is an
253
- # error to provide both this mask and a mask specifying an individual package. *
254
- # config.softwareConfig.pypiPackages.packagename * Update the custom PyPI
255
- # package packagename, preserving other packages. To delete the package, include
256
- # it in `updateMask`, and omit the mapping for it in `environment.config.
257
- # softwareConfig.pypiPackages`. It is an error to provide both a mask of this
258
- # form and the "config.softwareConfig.pypiPackages" mask. * labels * Replace all
259
- # environment labels. If a replacement labels map is not included in `
260
- # environment`, all labels are cleared. It is an error to provide both this mask
261
- # and a mask specifying one or more individual labels. * labels.labelName * Set
262
- # the label named labelName, while preserving other labels. To delete the label,
263
- # include it in `updateMask` and omit its mapping in `environment.labels`. It is
264
- # an error to provide both a mask of this form and the "labels" mask. * config.
265
- # nodeCount * Horizontally scale the number of nodes in the environment. An
266
- # integer greater than or equal to 3 must be provided in the `config.nodeCount`
267
- # field. * config.webServerNetworkAccessControl * Replace the environment's
268
- # current WebServerNetworkAccessControl. * config.softwareConfig.
269
- # airflowConfigOverrides * Replace all Apache Airflow config overrides. If a
249
+ # softwareConfig":` "pypiPackages":` "botocore":"==1.7.14" ` ` ` ` **Note:**
250
+ # Only the following fields can be updated: * `config.softwareConfig.
251
+ # pypiPackages` * Replace all custom custom PyPI packages. If a replacement
252
+ # package map is not included in `environment`, all custom PyPI packages are
253
+ # cleared. It is an error to provide both this mask and a mask specifying an
254
+ # individual package. * `config.softwareConfig.pypiPackages.`packagename *
255
+ # Update the custom PyPI package *packagename*, preserving other packages. To
256
+ # delete the package, include it in `updateMask`, and omit the mapping for it in
257
+ # `environment.config.softwareConfig.pypiPackages`. It is an error to provide
258
+ # both a mask of this form and the `config.softwareConfig.pypiPackages` mask. * `
259
+ # labels` * Replace all environment labels. If a replacement labels map is not
260
+ # included in `environment`, all labels are cleared. It is an error to provide
261
+ # both this mask and a mask specifying one or more individual labels. * `labels.`
262
+ # labelName * Set the label named *labelName*, while preserving other labels. To
263
+ # delete the label, include it in `updateMask` and omit its mapping in `
264
+ # environment.labels`. It is an error to provide both a mask of this form and
265
+ # the `labels` mask. * `config.nodeCount` * Horizontally scale the number of
266
+ # nodes in the environment. An integer greater than or equal to 3 must be
267
+ # provided in the `config.nodeCount` field. Supported for Cloud Composer
268
+ # environments in versions composer-1.*.*-airflow-*.*.*. * `config.
269
+ # webServerNetworkAccessControl` * Replace the environment's current
270
+ # WebServerNetworkAccessControl. Supported for Cloud Composer environments in
271
+ # versions composer-1.*.*-airflow-*.*.*. * `config.softwareConfig.
272
+ # airflowConfigOverrides` * Replace all Apache Airflow config overrides. If a
270
273
  # replacement config overrides map is not included in `environment`, all config
271
274
  # overrides are cleared. It is an error to provide both this mask and a mask
272
- # specifying one or more individual config overrides. * config.softwareConfig.
273
- # airflowConfigOverrides.section- name * Override the Apache Airflow config
274
- # property name in the section named section, preserving other properties. To
275
- # delete the property override, include it in `updateMask` and omit its mapping
276
- # in `environment.config.softwareConfig.airflowConfigOverrides`. It is an error
277
- # to provide both a mask of this form and the "config.softwareConfig.
278
- # airflowConfigOverrides" mask. * config.softwareConfig.envVariables * Replace
275
+ # specifying one or more individual config overrides. * `config.softwareConfig.
276
+ # airflowConfigOverrides.`section-name * Override the Apache Airflow config
277
+ # property *name* in the section named *section*, preserving other properties.
278
+ # To delete the property override, include it in `updateMask` and omit its
279
+ # mapping in `environment.config.softwareConfig.airflowConfigOverrides`. It is
280
+ # an error to provide both a mask of this form and the `config.softwareConfig.
281
+ # airflowConfigOverrides` mask. * `config.softwareConfig.envVariables` * Replace
279
282
  # all environment variables. If a replacement environment variable map is not
280
283
  # included in `environment`, all custom environment variables are cleared. It is
281
284
  # an error to provide both this mask and a mask specifying one or more
282
- # individual environment variables. * config.softwareConfig.imageVersion *
285
+ # individual environment variables. * `config.softwareConfig.imageVersion` *
283
286
  # Upgrade the version of the environment in-place. Refer to `SoftwareConfig.
284
287
  # image_version` for information on how to format the new image version.
285
288
  # Additionally, the new image version cannot effect a version downgrade and must
286
289
  # match the current image version's Composer major version and Airflow major and
287
- # minor versions. Consult the Cloud Composer Version List for valid values. *
288
- # config.databaseConfig.machineType * Cloud SQL machine type used by Airflow
289
- # database. It has to be one of: db-n1-standard-2, db-n1-standard-4, db-n1-
290
- # standard-8 or db-n1-standard-16. * config.webServerConfig.machineType *
291
- # Machine type on which Airflow web server is running. It has to be one of:
292
- # composer-n1-webserver-2, composer-n1-webserver-4 or composer-n1-webserver-8. *
293
- # config.maintenanceWindow * Maintenance window during which Cloud Composer
294
- # components may be under maintenance.
290
+ # minor versions. Consult the [Cloud Composer Version List](https://cloud.google.
291
+ # com/composer/docs/concepts/versioning/composer-versions) for valid values. * `
292
+ # config.softwareConfig.schedulerCount` * Horizontally scale the number of
293
+ # schedulers in Airflow. A positive integer not greater than the number of nodes
294
+ # must be provided in the `config.softwareConfig.schedulerCount` field.
295
+ # Supported for Cloud Composer environments in versions composer-1.*.*-airflow-2.
296
+ # *.*. * `config.databaseConfig.machineType` * Cloud SQL machine type used by
297
+ # Airflow database. It has to be one of: db-n1-standard-2, db-n1-standard-4, db-
298
+ # n1-standard-8 or db-n1-standard-16. Supported for Cloud Composer environments
299
+ # in versions composer-1.*.*-airflow-*.*.*. * `config.webServerConfig.
300
+ # machineType` * Machine type on which Airflow web server is running. It has to
301
+ # be one of: composer-n1-webserver-2, composer-n1-webserver-4 or composer-n1-
302
+ # webserver-8. Supported for Cloud Composer environments in versions composer-1.*
303
+ # .*-airflow-*.*.*. * `config.maintenanceWindow` * Maintenance window during
304
+ # which Cloud Composer components may be under maintenance. * `config.
305
+ # workloadsConfig` * The workloads configuration settings for the GKE cluster
306
+ # associated with the Cloud Composer environment. Supported for Cloud Composer
307
+ # environments in versions composer-2.*.*-airflow-*.*.* and newer. * `config.
308
+ # environmentSize` * The size of the Cloud Composer environment. Supported for
309
+ # Cloud Composer environments in versions composer-2.*.*-airflow-*.*.* and newer.
295
310
  # @param [String] fields
296
311
  # Selector specifying which fields to include in a partial response.
297
312
  # @param [String] quota_user
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: google-apis-composer_v1beta1
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.0
4
+ version: 0.11.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Google LLC
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-06-28 00:00:00.000000000 Z
11
+ date: 2021-08-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: google-apis-core
@@ -16,7 +16,7 @@ dependencies:
16
16
  requirements:
17
17
  - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: '0.3'
19
+ version: '0.4'
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
22
  version: 2.a
@@ -26,7 +26,7 @@ dependencies:
26
26
  requirements:
27
27
  - - ">="
28
28
  - !ruby/object:Gem::Version
29
- version: '0.3'
29
+ version: '0.4'
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
32
  version: 2.a
@@ -58,7 +58,7 @@ licenses:
58
58
  metadata:
59
59
  bug_tracker_uri: https://github.com/googleapis/google-api-ruby-client/issues
60
60
  changelog_uri: https://github.com/googleapis/google-api-ruby-client/tree/master/generated/google-apis-composer_v1beta1/CHANGELOG.md
61
- documentation_uri: https://googleapis.dev/ruby/google-apis-composer_v1beta1/v0.7.0
61
+ documentation_uri: https://googleapis.dev/ruby/google-apis-composer_v1beta1/v0.11.0
62
62
  source_code_uri: https://github.com/googleapis/google-api-ruby-client/tree/master/generated/google-apis-composer_v1beta1
63
63
  post_install_message:
64
64
  rdoc_options: []