move vmtype and lbconfig to clusterconfig

Azure · Mar 27, 2024 · 96b373c · 96b373c
1 parent 8bf7226
commit 96b373c
Show file tree

Hide file tree

Showing 6 changed files with 290 additions and 491 deletions.
diff --git a/pkg/proto/nbcontract/v1/clusterconfig.pb.go b/pkg/proto/nbcontract/v1/clusterconfig.pb.go
diff --git a/pkg/proto/nbcontract/v1/clusterconfig.proto b/pkg/proto/nbcontract/v1/clusterconfig.proto
@@ -1,9 +1,6 @@
 syntax = "proto3";
 package nbcontract.v1;
 
-import "pkg/proto/nbcontract/v1/loadbalancerconfig.proto";
-import "pkg/proto/nbcontract/v1/vmtype.proto";
-
 // Cluster Config fields stored in azure.json used by cloud-provider-azure
 message ClusterConfig {
   string resource_group = 1;
@@ -16,11 +13,28 @@ message ClusterConfig {
   LoadBalancerConfig load_balancer_config = 8;
 }
 
+enum VmType {
+  VM_TYPE_UNSPECIFIED = 0;
+  VM_TYPE_STANDARD = 1;
+  VM_TYPE_VMSS = 2;
+}
 
 message ClusterNetworkConfig {
   string vnet_name = 1;
   string vnet_resource_group = 2;
   string subnet = 3;
   string security_group_name = 4;
   string route_table = 5;
+}
+
+message LoadBalancerConfig {
+  LoadBalancerSku load_balancer_sku = 1;
+  bool exclude_master_from_standard_load_balancer = 2;
+  int32 max_load_balancer_rule_count = 3;
+}
+
+enum LoadBalancerSku {
+  LOAD_BALANCER_SKU_UNSPECIFIED = 0;
+  LOAD_BALANCER_SKU_BASIC = 1;  // to be confirmed
+  LOAD_BALANCER_SKU_STANDARD = 2;
 }
diff --git a/pkg/proto/nbcontract/v1/loadbalancerconfig.pb.go b/pkg/proto/nbcontract/v1/loadbalancerconfig.pb.go
diff --git a/pkg/proto/nbcontract/v1/loadbalancerconfig.proto b/pkg/proto/nbcontract/v1/loadbalancerconfig.proto