cleaning up generator constants

Azure · Apr 11, 2023 · 09cd53a · 09cd53a
1 parent fc6760b
commit 09cd53a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/cns/cniconflist/generator.go b/cns/cniconflist/generator.go
@@ -7,10 +7,15 @@ import (
 )
 
 const (
-	cniVersion     = "0.3.0"         //nolint:unused,deadcode,varcheck // used in linux
-	cniName        = "azure"         //nolint:unused,deadcode,varcheck // used in linux
-	cniType        = "azure-vnet"    //nolint:unused,deadcode,varcheck // used in linux
-	nodeLocalDNSIP = "169.254.20.10" //nolint:unused,deadcode,varcheck // used in linux
+	ciliumcniVersion  = "0.3.1"                   //nolint:unused,deadcode,varcheck // used in linux
+	ciliumcniName     = "cilium"                  //nolint:unused,deadcode,varcheck // used in linux
+	ciliumcniType     = "cilium-cni"              //nolint:unused,deadcode,varcheck // used in linux
+	ciliumLogFile     = "/var/log/cilium-cni.log" //nolint:unused,deadcode,varcheck // used in linux
+	ciliumIPAM        = "azure-ipam"              //nolint:unused,deadcode,varcheck // used in linux
+	overlaycniVersion = "0.3.0"                   //nolint:unused,deadcode,varcheck // used in linux
+	overlaycniName    = "azure"                   //nolint:unused,deadcode,varcheck // used in linux
+	overlaycniType    = "azure-vnet"              //nolint:unused,deadcode,varcheck // used in linux
+	nodeLocalDNSIP    = "169.254.20.10"           //nolint:unused,deadcode,varcheck // used in linux
 )
 
 // cniConflist represents the containernetworking/cni/pkg/types.NetConfList
@@ -23,8 +28,7 @@ type cniConflist struct { //nolint:unused,deadcode // used in linux
 
 // NetConf describes a network. It represents the Cilium specific containernetworking/cni/pkg/types.NetConf
 type NetConf struct {
-	CNIVersion string `json:"cniVersion,omitempty"`
-
+	CNIVersion   string          `json:"cniVersion,omitempty"`
 	Name         string          `json:"name,omitempty"`
 	Type         string          `json:"type,omitempty"`
 	Capabilities map[string]bool `json:"capabilities,omitempty"`

diff --git a/cns/cniconflist/generator_linux.go b/cns/cniconflist/generator_linux.go
@@ -26,11 +26,11 @@ var portmapConfig any = struct {
 // Generate writes the CNI conflist to the Generator's output stream
 func (v *V4OverlayGenerator) Generate() error {
 	conflist := cniConflist{
-		CNIVersion: cniVersion,
-		Name:       cniName,
+		CNIVersion: overlaycniVersion,
+		Name:       overlaycniName,
 		Plugins: []any{
 			cni.NetworkConfig{
-				Type:              cniType,
+				Type:              overlaycniType,
 				Mode:              cninet.OpModeTransparent,
 				ExecutionMode:     string(util.V4Swift),
 				IPsToRouteViaHost: []string{nodeLocalDNSIP},
@@ -55,15 +55,15 @@ func (v *V4OverlayGenerator) Generate() error {
 // Generate writes the CNI conflist to the Generator's output stream
 func (v *CiliumGenerator) Generate() error {
 	conflist := cniConflist{
-		CNIVersion: "0.3.1",
-		Name:       "cilium",
+		CNIVersion: ciliumcniVersion,
+		Name:       ciliumcniName,
 		Plugins: []any{
 			NetConf{
-				Type:        "cilium-cni",
-				LogFile:     "/var/log/cilium-cni.log",
+				Type:        ciliumcniType,
+				LogFile:     ciliumLogFile,
 				EnableDebug: true,
 				IPAM: IPAM{
-					Type: "azure-ipam",
+					Type: ciliumIPAM,
 				},
 			},
 		},