Merge branch 'master' into abelch/refine-win-cse-params

parts/linux/cloud-init/artifacts/sync-container-logs.sh

@@ -39,7 +39,7 @@ while true; do
 done &
 
 # Manually sync all matching logs once
-for CONTAINER_LOG_FILE in $(compgen -G "$SRC/*_kube-system_*.log"); do
+for CONTAINER_LOG_FILE in $(compgen -G "$SRC/*_@(kube-system|tigera-operator|calico-system)_*.log"); do
    echo "Linking $CONTAINER_LOG_FILE"
    /bin/ln -Lf $CONTAINER_LOG_FILE $DST/
 done
@@ -48,7 +48,7 @@ echo "Starting inotifywait..."
 # Monitor for changes
 inotifywait -q -m -r -e delete,create $SRC | while read DIRECTORY EVENT FILE; do
     case $FILE in
-        *_kube-system_*.log)
+        *_@(kube-system|tigera-operator|calico-system)_*.log)
             case $EVENT in
                 CREATE*)
                     echo "Linking $FILE"

pkg/parser/utilities.go

@@ -10,17 +10,15 @@ func getBaseTemplate() *nbcontractv1.Configuration {
 	return &nbcontractv1.Configuration{
 		ProvisionOutput:    "/var/log/azure/cluster-provision-cse-output.log",
 		LinuxAdminUsername: "azureuser",
-		MobyVersion:        "",
 		TenantId:           "",
 		KubernetesVersion:  "1.26.0",
-		HyperkubeUrl:       "mcr.microsoft.com/oss/kubernetes/",
 		KubeBinaryConfig: &nbcontractv1.KubeBinaryConfig{
 			KubeBinaryUrl:        "",
 			CustomKubeBinaryUrl:  "https://acs-mirror.azureedge.net/kubernetes/v1.26.0/binaries/kubernetes-node-linux-amd64.tar.gz",
 			PrivateKubeBinaryUrl: "",
 		},
 		KubeproxyUrl: "",
-		SshStatus:    nbcontractv1.FeatureState_FEATURE_STATE_ENABLED,
+		EnableSsh:    true,
 	}
 }
 

pkg/proto/nbcontract/v1/config.proto

@@ -16,15 +16,19 @@ import "pkg/proto/nbcontract/v1/featurestate.proto";
 import "pkg/proto/nbcontract/v1/teleportconfig.proto";
 import "pkg/proto/nbcontract/v1/runcconfig.proto";
 import "pkg/proto/nbcontract/v1/customcloudconfig.proto";
-import "pkg/proto/nbcontract/v1/customcatrustconfig.proto";
 import "pkg/proto/nbcontract/v1/apiserverconfig.proto";
 import "pkg/proto/nbcontract/v1/tlsbootstrappingconfig.proto";
 import "pkg/proto/nbcontract/v1/nodepoolprofile.proto";
 
+enum WorkloadRuntime {
+  WR_UNSPECIFIED = 0;
+  OCI_CONTAINER= 1;
+  WASM_WASI = 2;
+}
+
 // illustrative division only
 message Configuration {
   // System Configuration
-
   string cluster_certificate_authority = 1;
   TLSBootstrappingConfig tls_bootstrapping_config = 2;
 
@@ -57,24 +61,42 @@ message Configuration {
   NetworkConfig network_config = 24;
   bool is_sgx_node = 25;
   TeleportConfig teleport_config = 26;
-  FeatureState ssh_status = 27;
-  optional FeatureState unattended_upgrade_status = 28;
+
+  // enable_ssh specifies whether SSH is enabled or disabled on the VM node
+  bool enable_ssh = 27;
+
+  // enable_unattended_upgrade specifies whether unattended upgrade is enabled or disabled on the VM node
+  bool enable_unattended_upgrade = 28;
+
+  // message_of_the_day specifies the message of the day that is displayed on the VM node when a user logs in
   string message_of_the_day = 29;
+
+  // kubelet_config specifies the kubelet configuration
   KubeletConfig kubelet_config = 31;
-  FeatureState hosts_config_agent_status = 32;
-  CustomCATrustConfig custom_ca_trust_config = 33;
+
+  // enable_hosts_config_agent specifies whether the hosts config agent is enabled or disabled on the VM node
+  bool enable_hosts_config_agent = 32;
+
+  // custom_ca_certs specifies the custom CA certificates
+  repeated string custom_ca_certs = 33;  
+
+  // provision_output specifies where cluster provision cse output should be stored at
   string provision_output = 34;
-  string hyperkube_url = 35; //will be removed later
-  string moby_version = 36; //will be removed later
-  string container_runtime = 37; //will be removed later
-  string cli_tool = 38;  //will be removed later
-  bool needs_containerd = 39; //will be removed later
-  bool is_krustlet = 40; //can be removed, this only depends on workload runtime, which is a better contract input
-  bool needs_docker_login = 41; //useless, will remove
-  optional FeatureState ipv6_dual_stack_enabled = 42; //seems very specific to RP, discuss with Alex wrt Karpenter
-  optional string outbound_command = 43; //this is const depending on cloud, can be removed later with smart refactoring
-  optional bool ensure_no_dupe_promiscuous_bridge = 45; //this is little weird, check cse_cmd.sh for actual condition
-  optional CustomSearchDomain custom_search_domain = 46;
+
+  // workload_runtime describes the workload runtime, e.g., either "OCIContainer" or "WasmWasi", currently.
+  WorkloadRuntime workload_runtime = 40;
+
+  // ipv6_dual_stack_enabled specifies whether IPv6 dual stack is enabled or disabled on the VM node
+  bool ipv6_dual_stack_enabled = 42;
+
+  // outbound_command specifies the command to use for outbound traffic
+  string outbound_command = 43; 
+
+  // ensure_no_dupe_promiscuous_bridge specifies whether to ensure no duplicate promiscuous bridge
+  bool ensure_no_dupe_promiscuous_bridge = 45; 
+
+  // 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