refactor plus check

Author: Jim Ryan

cmd/nginx-ingress/main.go

@@ -142,10 +142,11 @@ func main() {
 
 	mustProcessGlobalConfiguration(ctx)
 
-	mgmtCfgParams := processMGMTConfigMap(kubeClient, configs.NewDefaultMGMTConfigParams(ctx))
-
-	// validate any secrets in mgmtCfgParams.Secrets.
+	var mgmtCfgParams *configs.MGMTConfigParams
 	if *nginxPlus {
+		mgmtCfgParams = processMGMTConfigMap(kubeClient, configs.NewDefaultMGMTConfigParams(ctx))
+
+		// validate any secrets in mgmtCfgParams.Secrets.
 		mustValidateMGMTSecrets(kubeClient, *mgmtCfgParams, controllerNamespace)
 		mustFindMGMTSecretsOnPod(*mgmtCfgParams, staticSSLPath)
 	}
@@ -321,7 +322,7 @@ func mustFindMGMTSecretsOnPod(mgmtConfigParams configs.MGMTConfigParams, secrets
 }
 
 func tryFindFile(filePath string) error {
-	if _, err := os.Stat("filePath"); errors.Is(err, os.ErrNotExist) {
+	if _, err := os.Stat(filePath); errors.Is(err, os.ErrNotExist) {
 		return fmt.Errorf("could not find file at path [%s]: %w", filePath, err)
 	}
 	return nil
@@ -967,9 +968,6 @@ func processConfigMaps(kubeClient *kubernetes.Clientset, cfgParams *configs.Conf
 
 func processMGMTConfigMap(kubeClient *kubernetes.Clientset, mgmtCfgParams *configs.MGMTConfigParams) *configs.MGMTConfigParams {
 	l := nl.LoggerFromContext(mgmtCfgParams.Context)
-	if !*nginxPlus {
-		return mgmtCfgParams
-	}
 
 	if *mgmtConfigMap != "" {
 		ns, name, err := k8s.ParseNamespaceName(*mgmtConfigMap)
@@ -980,10 +978,7 @@ func processMGMTConfigMap(kubeClient *kubernetes.Clientset, mgmtCfgParams *confi
 		if err != nil {
 			nl.Fatalf(l, "Error when getting %v: %v", *mgmtConfigMap, err)
 		}
-		mgmtCfgParams, err = configs.ParseMGMTConfigMap(mgmtCfgParams.Context, cfm, *nginxPlus)
-		if err != nil {
-			nl.Fatalf(l, "Error when getting %v: %v", mgmtCfgParams, err)
-		}
+		mgmtCfgParams = configs.ParseMGMTConfigMap(mgmtCfgParams.Context, cfm)
 	}
 	return mgmtCfgParams
 }

internal/configs/configmaps.go

@@ -2,7 +2,6 @@ package configs
 
 import (
 	"context"
-	"fmt"
 	"strings"
 	"time"
 
@@ -538,11 +537,8 @@ func ParseConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool, has
 }
 
 // ParseMGMTConfigMap parses the mgmt block ConfigMap into MGMTConfigParams.
-func ParseMGMTConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool) (*MGMTConfigParams, error) {
+func ParseMGMTConfigMap(ctx context.Context, cfgm *v1.ConfigMap) *MGMTConfigParams {
 	l := nl.LoggerFromContext(ctx)
-	if !nginxPlus {
-		return nil, fmt.Errorf("mgmt ConfigMap requires NGINX Plus")
-	}
 
 	mgmtCfgParams := NewDefaultMGMTConfigParams(ctx)
 
@@ -594,19 +590,22 @@ func ParseMGMTConfigMap(ctx context.Context, cfgm *v1.ConfigMap, nginxPlus bool)
 		mgmtCfgParams.Secrets.ClientAuth = strings.TrimSpace(clientAuthSecret)
 	}
 
-	return mgmtCfgParams, nil
+	return mgmtCfgParams
 }
 
 // GenerateNginxMainConfig generates MainConfig.
 func GenerateNginxMainConfig(staticCfgParams *StaticConfigParams, config *ConfigParams, mgmtCfgParams *MGMTConfigParams) *version1.MainConfig {
-	mgmtConfig := version1.MGMTConfig{
-		SSLVerify:              mgmtCfgParams.SSLVerify,
-		Resolver:               mgmtCfgParams.Resolver,
-		EnforceInitialReport:   mgmtCfgParams.EnforceInitialReport,
-		Endpoint:               mgmtCfgParams.Endpoint,
-		Interval:               mgmtCfgParams.Interval,
-		EnableClientAuth:       mgmtCfgParams.Secrets.ClientAuth != "",
-		TrustedCertificateFile: mgmtCfgParams.TrustedCertFile,
+	var mgmtConfig version1.MGMTConfig
+	if mgmtCfgParams != nil {
+		mgmtConfig = version1.MGMTConfig{
+			SSLVerify:              mgmtCfgParams.SSLVerify,
+			Resolver:               mgmtCfgParams.Resolver,
+			EnforceInitialReport:   mgmtCfgParams.EnforceInitialReport,
+			Endpoint:               mgmtCfgParams.Endpoint,
+			Interval:               mgmtCfgParams.Interval,
+			EnableClientAuth:       mgmtCfgParams.Secrets.ClientAuth != "",
+			TrustedCertificateFile: mgmtCfgParams.TrustedCertFile,
+		}
 	}
 
 	nginxCfg := &version1.MainConfig{

internal/k8s/controller.go

@@ -878,13 +878,8 @@ func (lbc *LoadBalancerController) updateAllConfigs() {
 	if lbc.configMap != nil {
 		cfgParams = configs.ParseConfigMap(ctx, lbc.configMap, lbc.isNginxPlus, lbc.appProtectEnabled, lbc.appProtectDosEnabled, lbc.configuration.isTLSPassthroughEnabled)
 	}
-	if lbc.mgmtConfigMap != nil {
-		var err error
-		mgmtCfgParams, err = configs.ParseMGMTConfigMap(ctx, lbc.mgmtConfigMap, lbc.isNginxPlus)
-		if err != nil {
-			nl.Errorf(lbc.Logger, "Error parsing MGMT ConfigMap: %v", err)
-		}
-
+	if lbc.mgmtConfigMap != nil && lbc.isNginxPlus {
+		mgmtCfgParams = configs.ParseMGMTConfigMap(ctx, lbc.mgmtConfigMap)
 	}
 
 	resources := lbc.configuration.GetResources()