revert back to string from iota

Azure · Mar 14, 2024 · 86674ad · 86674ad
1 parent 3aef37c
commit 86674ad
Show file tree

Hide file tree

Showing 71 changed files with 74 additions and 74 deletions.
diff --git a/pkg/agent/datamodel/types.go b/pkg/agent/datamodel/types.go
@@ -123,11 +123,11 @@ const (
 )
 
 // OutboundType describes the options for outbound internet access.
-type OutboundType int
+type OutboundType string
 
 const (
-	OutboundTypeNone OutboundType = iota
-	OutboundTypeBlock
+	OutboundTypeNone  string = "none"
+	OutboundTypeBlock string = "block"
 )
 
 /*
@@ -1683,7 +1683,7 @@ type NodeBootstrappingConfiguration struct {
 	DisableUnattendedUpgrades              bool
 	SSHStatus                              SSHStatus
 	DisableCustomData                      bool
-	OutboundType                           OutboundType
+	OutboundType                           string
 }
 
 type SSHStatus int

diff --git a/pkg/agent/testdata/AKSUbuntu1604+Containerd/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+Containerd/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+DynamicKubeletConfig/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=true/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+Docker/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+Docker/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+DynamicKubeletConfig/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+EnablePrivateClusterHostsConfigAgent/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+GPUDedicatedVHD/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S115/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+K8S115/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S117/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+K8S117/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+K8S118/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+K8S118/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+KubeletConfigFile/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+OSKubeletDisk/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+TempDisk+Containerd/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+TempDiskExplicit/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CSECommand b/pkg/agent/testdata/AKSUbuntu1604+TempDiskToggle/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+ArtifactStreaming/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd++GPU+runcshimv2/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Certsd/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+ContainerdVersion/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPAddress+FQDN/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+IPMasqAgent/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+Calico/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet+FIPSEnabled/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Kubenet/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG+NoFabricManager/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MIG/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+MotD/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+NSeriesSku/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+PrivateACR/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+Teleport/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Containerd+runcshimv2/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+CustomCATrust/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=false/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+Disable1804SystemdResolved=true/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+DisableCustomData/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+HTTPProxy/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+KubeletClientTLSBootstrapping/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+NoArtifactStreaming/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+NoneCNI/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804+krustlet/CSECommand b/pkg/agent/testdata/AKSUbuntu1804+krustlet/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CSECommand b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+CustomKubeImageandBinaries/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CSECommand b/pkg/agent/testdata/AKSUbuntu1804ARM64Containerd+NoCustomKubeImageandBinaries/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CSECommand b/pkg/agent/testdata/AKSUbuntu1804Containerd+RuncVersion/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu2204+China/CSECommand b/pkg/agent/testdata/AKSUbuntu2204+China/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CSECommand b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG+ArtifactStreaming/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CSECommand b/pkg/agent/testdata/AKSUbuntu2204+Containerd+MIG/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CSECommand b/pkg/agent/testdata/AKSUbuntu2204+CustomKubeletConfig+CustomLinuxOSConfig/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CSECommand b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOff/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CSECommand b/pkg/agent/testdata/AKSUbuntu2204+SSHStatusOn/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CSECommand b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBoostrapping/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CSECommand b/pkg/agent/testdata/AKSUbuntu2204+SecureTLSBootstrapping+CustomAADResource/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CSECommand b/pkg/agent/testdata/AKSUbuntu2204+SecurityProfile/CSECommand
diff --git a/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CSECommand b/pkg/agent/testdata/AKSUbuntu2204+cgroupv2/CSECommand
diff --git a/pkg/agent/testdata/AzureLinuxV2+Kata/CSECommand b/pkg/agent/testdata/AzureLinuxV2+Kata/CSECommand
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CSECommand b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=false/CSECommand
diff --git a/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CSECommand b/pkg/agent/testdata/AzureLinuxv2+DisableUnattendedUpgrades=true/CSECommand
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CSECommand b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=false/CSECommand
diff --git a/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CSECommand b/pkg/agent/testdata/AzureLinuxv2+Kata+DisableUnattendedUpgrades=true/CSECommand
diff --git a/pkg/agent/testdata/CustomizedImage/CSECommand b/pkg/agent/testdata/CustomizedImage/CSECommand
diff --git a/pkg/agent/testdata/CustomizedImageKata/CSECommand b/pkg/agent/testdata/CustomizedImageKata/CSECommand
diff --git a/pkg/agent/testdata/MarinerV2+Kata/CSECommand b/pkg/agent/testdata/MarinerV2+Kata/CSECommand
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CSECommand b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=false/CSECommand
diff --git a/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CSECommand b/pkg/agent/testdata/Marinerv2+DisableUnattendedUpgrades=true/CSECommand
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CSECommand b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=false/CSECommand
diff --git a/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CSECommand b/pkg/agent/testdata/Marinerv2+Kata+DisableUnattendedUpgrades=true/CSECommand
diff --git a/pkg/agent/testdata/RawUbuntu/CSECommand b/pkg/agent/testdata/RawUbuntu/CSECommand
diff --git a/pkg/agent/testdata/RawUbuntuContainerd/CSECommand b/pkg/agent/testdata/RawUbuntuContainerd/CSECommand
diff --git a/pkg/agent/variables.go b/pkg/agent/variables.go
@@ -178,7 +178,7 @@ func getOutBoundCmd(nbc *datamodel.NodeBootstrappingConfiguration, cloudSpecConf
 		return ""
 	}
 
-	if nbc.OutboundType == datamodel.OutboundTypeBlock || nbc.OutboundType == datamodel.OutboundTypeNone {
+	if strings.ToLower(nbc.OutboundType) == datamodel.OutboundTypeBlock || strings.ToLower(nbc.OutboundType) == datamodel.OutboundTypeNone {
 		return ""
 	}