Skip to content
This repository was archived by the owner on Nov 29, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions google/cloud/container/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
ListUsableSubnetworksResponse,
LoggingComponentConfig,
LoggingConfig,
LoggingVariantConfig,
MaintenanceExclusionOptions,
MaintenancePolicy,
MaintenanceWindow,
Expand All @@ -106,6 +107,7 @@
NodePoolAutoConfig,
NodePoolAutoscaling,
NodePoolDefaults,
NodePoolLoggingConfig,
NodePoolUpdateStrategy,
NodeTaint,
NodeTaints,
Expand Down Expand Up @@ -219,6 +221,7 @@
"ListUsableSubnetworksResponse",
"LoggingComponentConfig",
"LoggingConfig",
"LoggingVariantConfig",
"MaintenanceExclusionOptions",
"MaintenancePolicy",
"MaintenanceWindow",
Expand All @@ -243,6 +246,7 @@
"NodePoolAutoConfig",
"NodePoolAutoscaling",
"NodePoolDefaults",
"NodePoolLoggingConfig",
"NodeTaint",
"NodeTaints",
"NotificationConfig",
Expand Down
4 changes: 4 additions & 0 deletions google/cloud/container_v1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
ListUsableSubnetworksResponse,
LoggingComponentConfig,
LoggingConfig,
LoggingVariantConfig,
MaintenanceExclusionOptions,
MaintenancePolicy,
MaintenanceWindow,
Expand All @@ -101,6 +102,7 @@
NodePoolAutoConfig,
NodePoolAutoscaling,
NodePoolDefaults,
NodePoolLoggingConfig,
NodePoolUpdateStrategy,
NodeTaint,
NodeTaints,
Expand Down Expand Up @@ -215,6 +217,7 @@
"ListUsableSubnetworksResponse",
"LoggingComponentConfig",
"LoggingConfig",
"LoggingVariantConfig",
"MaintenanceExclusionOptions",
"MaintenancePolicy",
"MaintenanceWindow",
Expand All @@ -239,6 +242,7 @@
"NodePoolAutoConfig",
"NodePoolAutoscaling",
"NodePoolDefaults",
"NodePoolLoggingConfig",
"NodePoolUpdateStrategy",
"NodeTaint",
"NodeTaints",
Expand Down
4 changes: 4 additions & 0 deletions google/cloud/container_v1/types/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
ListUsableSubnetworksResponse,
LoggingComponentConfig,
LoggingConfig,
LoggingVariantConfig,
MaintenanceExclusionOptions,
MaintenancePolicy,
MaintenanceWindow,
Expand All @@ -99,6 +100,7 @@
NodePoolAutoConfig,
NodePoolAutoscaling,
NodePoolDefaults,
NodePoolLoggingConfig,
NodePoolUpdateStrategy,
NodeTaint,
NodeTaints,
Expand Down Expand Up @@ -210,6 +212,7 @@
"ListUsableSubnetworksResponse",
"LoggingComponentConfig",
"LoggingConfig",
"LoggingVariantConfig",
"MaintenanceExclusionOptions",
"MaintenancePolicy",
"MaintenanceWindow",
Expand All @@ -234,6 +237,7 @@
"NodePoolAutoConfig",
"NodePoolAutoscaling",
"NodePoolDefaults",
"NodePoolLoggingConfig",
"NodeTaint",
"NodeTaints",
"NotificationConfig",
Expand Down
75 changes: 72 additions & 3 deletions google/cloud/container_v1/types/cluster_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@
"LoggingConfig",
"LoggingComponentConfig",
"MonitoringConfig",
"NodePoolLoggingConfig",
"LoggingVariantConfig",
"MonitoringComponentConfig",
"ManagedPrometheusConfig",
},
Expand Down Expand Up @@ -469,6 +471,8 @@ class NodeConfig(proto.Message):
Confidential nodes config.
All the nodes in the node pool will be
Confidential VM once enabled.
logging_config (google.cloud.container_v1.types.NodePoolLoggingConfig):
Logging configuration.
"""

machine_type = proto.Field(
Expand Down Expand Up @@ -593,6 +597,11 @@ class NodeConfig(proto.Message):
number=35,
message="ConfidentialNodes",
)
logging_config = proto.Field(
proto.MESSAGE,
number=38,
message="NodePoolLoggingConfig",
)


class AdvancedMachineFeatures(proto.Message):
Expand Down Expand Up @@ -795,8 +804,8 @@ class ReservationAffinity(proto.Message):
key (str):
Corresponds to the label key of a reservation resource. To
target a SPECIFIC_RESERVATION by name, specify
"googleapis.com/reservation-name" as the key and specify the
name of your reservation as its value.
"compute.googleapis.com/reservation-name" as the key and
specify the name of your reservation as its value.
values (Sequence[str]):
Corresponds to the label value(s) of
reservation resource(s).
Expand Down Expand Up @@ -2290,13 +2299,20 @@ class NodeConfigDefaults(proto.Message):
gcfs_config (google.cloud.container_v1.types.GcfsConfig):
GCFS (Google Container File System, also
known as Riptide) options.
logging_config (google.cloud.container_v1.types.NodePoolLoggingConfig):
Logging configuration for node pools.
"""

gcfs_config = proto.Field(
proto.MESSAGE,
number=1,
message="GcfsConfig",
)
logging_config = proto.Field(
proto.MESSAGE,
number=3,
message="NodePoolLoggingConfig",
)


class ClusterUpdate(proto.Message):
Expand Down Expand Up @@ -2453,6 +2469,9 @@ class ClusterUpdate(proto.Message):
auto-provisioned node pools in autopilot
clusters and node auto-provisioning enabled
clusters.
desired_node_pool_logging_config (google.cloud.container_v1.types.NodePoolLoggingConfig):
The desired node pool logging configuration
defaults for the cluster.
"""

desired_node_version = proto.Field(
Expand Down Expand Up @@ -2618,6 +2637,11 @@ class ClusterUpdate(proto.Message):
number=110,
message="NetworkTags",
)
desired_node_pool_logging_config = proto.Field(
proto.MESSAGE,
number=116,
message="NodePoolLoggingConfig",
)


class Operation(proto.Message):
Expand Down Expand Up @@ -3085,6 +3109,8 @@ class UpdateNodePoolRequest(proto.Message):
Confidential VM once enabled.
gvnic (google.cloud.container_v1.types.VirtualNIC):
Enable or disable gvnic on the node pool.
logging_config (google.cloud.container_v1.types.NodePoolLoggingConfig):
Logging configuration.
"""

project_id = proto.Field(
Expand Down Expand Up @@ -3174,6 +3200,11 @@ class UpdateNodePoolRequest(proto.Message):
number=29,
message="VirtualNIC",
)
logging_config = proto.Field(
proto.MESSAGE,
number=32,
message="NodePoolLoggingConfig",
)


class SetNodePoolAutoscalingRequest(proto.Message):
Expand Down Expand Up @@ -5131,7 +5162,7 @@ class AutoprovisioningNodePoolDefaults(proto.Message):
names of CPU platforms, such as minCpuPlatform: Intel
Haswell or minCpuPlatform: Intel Sandy Bridge. For more
information, read `how to specify min CPU
platform <https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform>`__
platform <https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform>`__.
This field is deprecated, min_cpu_platform should be
specified using
https://cloud.google.com/requested-min-cpu-platform label
Expand Down Expand Up @@ -6862,6 +6893,44 @@ class MonitoringConfig(proto.Message):
)


class NodePoolLoggingConfig(proto.Message):
r"""NodePoolLoggingConfig specifies logging configuration for
nodepools.

Attributes:
variant_config (google.cloud.container_v1.types.LoggingVariantConfig):
Logging variant configuration.
"""

variant_config = proto.Field(
proto.MESSAGE,
number=1,
message="LoggingVariantConfig",
)


class LoggingVariantConfig(proto.Message):
r"""LoggingVariantConfig specifies the behaviour of the logging
component.

Attributes:
variant (google.cloud.container_v1.types.LoggingVariantConfig.Variant):
Logging variant deployed on nodes.
"""

class Variant(proto.Enum):
r"""Logging component variants."""
VARIANT_UNSPECIFIED = 0
DEFAULT = 1
MAX_THROUGHPUT = 2

variant = proto.Field(
proto.ENUM,
number=1,
enum=Variant,
)


class MonitoringComponentConfig(proto.Message):
r"""MonitoringComponentConfig is cluster monitoring component
configuration.
Expand Down
4 changes: 4 additions & 0 deletions google/cloud/container_v1beta1/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@
Location,
LoggingComponentConfig,
LoggingConfig,
LoggingVariantConfig,
MaintenanceExclusionOptions,
MaintenancePolicy,
MaintenanceWindow,
Expand All @@ -111,6 +112,7 @@
NodePoolAutoConfig,
NodePoolAutoscaling,
NodePoolDefaults,
NodePoolLoggingConfig,
NodePoolUpdateStrategy,
NodeTaint,
NodeTaints,
Expand Down Expand Up @@ -241,6 +243,7 @@
"Location",
"LoggingComponentConfig",
"LoggingConfig",
"LoggingVariantConfig",
"MaintenanceExclusionOptions",
"MaintenancePolicy",
"MaintenanceWindow",
Expand All @@ -266,6 +269,7 @@
"NodePoolAutoConfig",
"NodePoolAutoscaling",
"NodePoolDefaults",
"NodePoolLoggingConfig",
"NodePoolUpdateStrategy",
"NodeTaint",
"NodeTaints",
Expand Down
4 changes: 4 additions & 0 deletions google/cloud/container_v1beta1/types/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
Location,
LoggingComponentConfig,
LoggingConfig,
LoggingVariantConfig,
MaintenanceExclusionOptions,
MaintenancePolicy,
MaintenanceWindow,
Expand All @@ -109,6 +110,7 @@
NodePoolAutoConfig,
NodePoolAutoscaling,
NodePoolDefaults,
NodePoolLoggingConfig,
NodePoolUpdateStrategy,
NodeTaint,
NodeTaints,
Expand Down Expand Up @@ -236,6 +238,7 @@
"Location",
"LoggingComponentConfig",
"LoggingConfig",
"LoggingVariantConfig",
"MaintenanceExclusionOptions",
"MaintenancePolicy",
"MaintenanceWindow",
Expand All @@ -261,6 +264,7 @@
"NodePoolAutoConfig",
"NodePoolAutoscaling",
"NodePoolDefaults",
"NodePoolLoggingConfig",
"NodeTaint",
"NodeTaints",
"NotificationConfig",
Expand Down
Loading