Cr 14274 - Fix ingress class assignment (#545)

* fix ingressclasss assignment

* bump

Author: danielm-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.0.489
+VERSION=v0.0.490
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/runtime_install.go

@@ -471,7 +471,7 @@ func ensureRoutingControllerSupported(ctx context.Context, opts *RuntimeInstallO
 	if opts.useGatewayAPI {
 		controller, err = routingutil.ValidateGatewayController(ctx, opts.KubeFactory, opts.GatewayName, opts.GatewayNamespace)
 	} else {
-		controller, err = routingutil.ValidateIngressControlelr(ctx, opts.KubeFactory, opts.IngressClass)
+		controller, err = routingutil.ValidateIngressControlelr(ctx, opts.KubeFactory, &opts.IngressClass)
 	}
 
 	opts.IngressController = controller

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.489/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.490/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.489/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.490/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.1
-  version: 0.0.489
+  version: 0.0.490
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/util/routing/ingress.go

@@ -181,7 +181,7 @@ func CreateIngress(opts *CreateRouteOpts) *netv1.Ingress {
 	return ingress
 }
 
-func ValidateIngressControlelr(ctx context.Context, kubeFactory kube.Factory, ingressClass string) (RoutingController, error) {
+func ValidateIngressControlelr(ctx context.Context, kubeFactory kube.Factory, ingressClass *string) (RoutingController, error) {
 	var ingressController RoutingController
 	if store.Get().BypassIngressClassCheck || store.Get().SkipIngress {
 		ingressController = GetIngressController("")
@@ -206,26 +206,26 @@ func ValidateIngressControlelr(ctx context.Context, kubeFactory kube.Factory, in
 				ingressClassNames = append(ingressClassNames, ic.Name)
 				ingressClassNameToController[ic.Name] = GetIngressController(string(controller))
 
-				if ingressClass == ic.Name { // if ingress class provided via flag
+				if *ingressClass == ic.Name { // if ingress class provided via flag
 					isValidClass = true
 				}
 				break
 			}
 		}
 	}
 
-	if ingressClass != "" { // if ingress class provided via flag
+	if *ingressClass != "" { // if ingress class provided via flag
 		if !isValidClass {
-			return nil, fmt.Errorf("ingress class '%s' is not supported", ingressClass)
+			return nil, fmt.Errorf("ingress class '%s' is not supported", *ingressClass)
 		}
 	} else if len(ingressClassNames) == 0 {
 		return nil, fmt.Errorf("no ingress classes of the supported types were found")
 	} else if len(ingressClassNames) == 1 {
 		log.G(ctx).Info("Using ingress class: ", ingressClassNames[0])
-		ingressClass = ingressClassNames[0]
+		*ingressClass = ingressClassNames[0]
 	} else if len(ingressClassNames) > 1 {
 		if !store.Get().Silent {
-			ingressClass, err = getIngressClassFromUserSelect(ingressClassNames)
+			*ingressClass, err = getIngressClassFromUserSelect(ingressClassNames)
 			if err != nil {
 				return nil, err
 			}
@@ -234,7 +234,7 @@ func ValidateIngressControlelr(ctx context.Context, kubeFactory kube.Factory, in
 		}
 	}
 
-	ingressController = ingressClassNameToController[ingressClass]
+	ingressController = ingressClassNameToController[*ingressClass]
 
 	if ingressController.Name() == string(IngressControllerNginxEnterprise) {
 		log.G(ctx).Warn("You are using the NGINX enterprise edition (nginx.org/ingress-controller) as your ingress controller. To successfully install the runtime, configure all required settings, as described in : ", store.Get().RequirementsLink)