feat: add policy_name to PlacementPolicy message within a node pool

Google APIs · copybara-github · commit b53aeac1895c · 2023-07-22T03:13:06.000-07:00
feat: add support for HostMaintenancePolicy
feat: add support for AdditionalPodNetworkConfig and AdditionalNodeNetworkConfig
feat: add enable_multi_networking to NetworkConfig

PiperOrigin-RevId: 550168784
diff --git a/google/container/v1beta1/cluster_service.proto b/google/container/v1beta1/cluster_service.proto
@@ -828,6 +828,10 @@ message NodeConfig {
 
   // Parameters for node pools to be backed by shared sole tenant node groups.
   SoleTenantConfig sole_tenant_config = 42;
+
+  // HostMaintenancePolicy contains the desired maintenance policy for the
+  // Google Compute Engine hosts.
+  HostMaintenancePolicy host_maintenance_policy = 44;
 }
 
 // Specifies options for controlling advanced machine features.
@@ -922,13 +926,45 @@ message NodeNetworkConfig {
   // overprovisioning is disabled.
   PodCIDROverprovisionConfig pod_cidr_overprovision_config = 13;
 
+  // We specify the additional node networks for this node pool using this list.
+  // Each node network corresponds to an additional interface
+  repeated AdditionalNodeNetworkConfig additional_node_network_configs = 14;
+
+  // We specify the additional pod networks for this node pool using this list.
+  // Each pod network corresponds to an additional alias IP range for the node
+  repeated AdditionalPodNetworkConfig additional_pod_network_configs = 15;
+
   // Output only. [Output only] The utilization of the IPv4 range for the pod.
   // The ratio is Usage/[Total number of IPs in the secondary range],
   // Usage=numNodes*numZones*podIPsPerNode.
   double pod_ipv4_range_utilization = 16
       [(google.api.field_behavior) = OUTPUT_ONLY];
 }
 
+// AdditionalNodeNetworkConfig is the configuration for additional node networks
+// within the NodeNetworkConfig message
+message AdditionalNodeNetworkConfig {
+  // Name of the VPC where the additional interface belongs
+  string network = 1;
+
+  // Name of the subnetwork where the additional interface belongs
+  string subnetwork = 2;
+}
+
+// AdditionalPodNetworkConfig is the configuration for additional pod networks
+// within the NodeNetworkConfig message
+message AdditionalPodNetworkConfig {
+  // Name of the subnetwork where the additional pod network belongs
+  string subnetwork = 1;
+
+  // The name of the secondary range on the subnet which provides IP address for
+  // this pod range
+  string secondary_pod_range = 2;
+
+  // The maximum number of pods per node which use this pod network
+  optional MaxPodsConstraint max_pods_per_node = 3;
+}
+
 // A set of Shielded Instance options.
 message ShieldedInstanceConfig {
   // Defines whether the instance has Secure Boot enabled.
@@ -1073,6 +1109,33 @@ message SoleTenantConfig {
   repeated NodeAffinity node_affinities = 1;
 }
 
+// HostMaintenancePolicy contains the maintenance policy for the hosts on which
+// the GKE VMs run on.
+message HostMaintenancePolicy {
+  // Allows selecting how infrastructure upgrades should be applied to the
+  // cluster or node pool.
+  enum MaintenanceInterval {
+    // The maintenance interval is not explicitly specified.
+    MAINTENANCE_INTERVAL_UNSPECIFIED = 0;
+
+    // Nodes are eligible to receive infrastructure and hypervisor updates as
+    // they become available.  This may result in more maintenance operations
+    // (live migrations or terminations) for the node than the PERIODIC option.
+    AS_NEEDED = 1;
+
+    // Nodes receive infrastructure and hypervisor updates on a periodic basis,
+    // minimizing the number of maintenance operations (live migrations or
+    // terminations) on an individual VM.  This may mean underlying VMs will
+    // take longer to receive an update than if it was configured for
+    // AS_NEEDED.  Security updates will still be applied as soon
+    // as they are available.
+    PERIODIC = 2;
+  }
+
+  // Specifies the frequency of planned maintenance events.
+  optional MaintenanceInterval maintenance_interval = 1;
+}
+
 // Kubernetes taint is composed of three fields: key, value, and effect. Effect
 // can only be one of three types:  NoSchedule, PreferNoSchedule or NoExecute.
 //
@@ -2222,6 +2285,10 @@ message NodeConfigDefaults {
 
   // Logging configuration for node pools.
   NodePoolLoggingConfig logging_config = 3;
+
+  // HostMaintenancePolicy contains the desired maintenance policy for the
+  // Google Compute Engine hosts.
+  HostMaintenancePolicy host_maintenance_policy = 5;
 }
 
 // node pool configs that apply to all auto-provisioned node pools
@@ -2472,6 +2539,10 @@ message ClusterUpdate {
 
   // Beta APIs enabled for cluster.
   K8sBetaAPIConfig desired_k8s_beta_apis = 131;
+
+  // HostMaintenancePolicy contains the desired maintenance policy for the
+  // Google Compute Engine hosts.
+  HostMaintenancePolicy desired_host_maintenance_policy = 132;
 }
 
 // AdditionalPodRangesConfig is the configuration for additional pod secondary
@@ -3741,6 +3812,11 @@ message NodePool {
     // TPU placement topology for pod slice node pool.
     // https://cloud.google.com/tpu/docs/types-topologies#tpu_topologies
     string tpu_topology = 2;
+
+    // If set, refers to the name of a custom resource policy supplied by the
+    // user. The resource policy must be in the same project and region as the
+    // node pool. If not found, InvalidArgument error is returned.
+    string policy_name = 3;
   }
 
   // The name of the node pool.
@@ -4722,6 +4798,9 @@ message NetworkConfig {
   // cluster.
   GatewayAPIConfig gateway_api_config = 16;
 
+  // Whether multi-networking is enabled for this cluster.
+  bool enable_multi_networking = 17;
+
   // Network bandwidth tier configuration.
   ClusterNetworkPerformanceConfig network_performance_config = 18;
 
