optimizing NB contract including CustomLinuxOSConfig and others

pkg/proto/nbcontract/v1/config.proto

@@ -98,22 +98,21 @@ message Configuration {
   // custom_search_domain specifies the custom search domain configuration
   CustomSearchDomain custom_search_domain = 46;
   optional CustomLinuxOSConfig custom_linux_os_config = 47;
-
-  //we do not need these in the final contract, these are consts
-  string cse_helper_filepath = 49;
-  string cse_distro_helper_filepath = 50;
-  string cse_install_filepath = 51;
-  string cse_distro_install_filepath = 52;
-  string cse_config_filepath = 53;
-
-  string dhcpv6_service_filepath = 54;
-  string dhcpv6_config_filepath = 55;
 
+  // azure_private_registry_server specifies the Azure private registry server
   string azure_private_registry_server = 56;
+
+  // private_egress_proxy_address specifies the private egress proxy address
   string private_egress_proxy_address = 57;
-  FeatureState artifact_streaming_enabled = 58;
-  bool is_kata = 59; // we can calculate this on the VHD, will remove from final contract
-  bool needs_cgroupv2 = 60; // we can calculate this on the VHD, will remove from final contract
+
+  // enable_artifact_streaming specifies whether artifact streaming is enabled or disabled on the VM node
+  bool enable_artifact_streaming = 58;
+
+  // is_kata specifies whether the node is a Kata node
+  bool is_kata = 59; 
+
+  // needs_cgroupv2 specifies whether the node needs cgroupv2
+  bool needs_cgroupv2 = 60;
 
   // Here begins the final contract
   optional HTTPProxyConfig http_proxy_config = 61;

pkg/proto/nbcontract/v1/customlinuxosconfig.proto

@@ -4,22 +4,23 @@ package nbcontract.v1;
 // Custom Linux Node OS Config
 message CustomLinuxOSConfig {
     // The size in MB of a swap file that will be created on each node
-    optional int32 swap_file_size = 1;
+    int32 swap_file_size = 1;
 
     // Valid values are "always", "defer", "defer+madvise", "madvise" and "never"
-    optional string transparent_hugepage_support = 2;
+    string transparent_hugepage_support = 2;
 
     // Valid values are "always", "madvise" and "never"
-    optional string transparent_defrag = 3;
+    string transparent_defrag = 3;
 
     // Sysctl settings for Linux agent nodes
-    optional SysctlConfig sysctl_config = 4;
+    SysctlConfig sysctl_config = 4;
 
     // Ulimit settings for Linux agent nodes
-    optional UlimitConfig ulimit_config = 5;
+    UlimitConfig ulimit_config = 5;
   }
 
 message SysctlConfig {
+    // using optional here to allow detecting if the field is set or not (explicit presence in proto3)
     optional int32 NetCoreSomaxconn = 1;
     optional int32 NetCoreNetdevMaxBacklog = 2;
     optional int32 NetCoreRmemDefault = 3;
@@ -51,6 +52,7 @@ message SysctlConfig {
   }
 
   message UlimitConfig {
+    // using optional here to allow detecting if the field is set or not (explicit presence in proto3)
     optional string NoFile = 1;
     optional string MaxLockedMemory = 2; 
   }

pkg/proto/nbcontract/v1/kubeletconfig.proto

@@ -10,13 +10,10 @@ message KubeletConfig {
   repeated Taint startup_taints = 4;
   KubeletDiskType kubelet_disk_type = 5;
 
-  // kubelet_config_file_status specifies if the kubelet_config_file_content should be applied. 
-  FeatureState kubelet_config_file_status = 6;
-
   // kubelet_config_file_content is the content of the kubelet config file.
-  string kubelet_config_file_content = 7;
-  string kubelet_client_key = 8;
-  string kubelet_client_cert_content = 9;
+  string kubelet_config_file_content = 6;
+  string kubelet_client_key = 7;
+  string kubelet_client_cert_content = 8;
 }
 
 message Taint {