Do not specify ingressClass. (#44)

UffizziCloud/uffizzi_platform#1171

controllers/ingress.go

@@ -9,7 +9,6 @@ import (
 )
 
 func BuildVClusterIngress(helmReleaseName string, uCluster *v1alpha1.UffizziCluster) *v1.Ingress {
-	nginxIngressClass := INGRESS_CLASS_NGINX
 	uclusterIngressHost := BuildVClusterIngressHost(uCluster)
 	ingress := &v1.Ingress{
 		ObjectMeta: v12.ObjectMeta{
@@ -22,7 +21,6 @@ func BuildVClusterIngress(helmReleaseName string, uCluster *v1alpha1.UffizziClus
 			},
 		},
 		Spec: v1.IngressSpec{
-			IngressClassName: &nginxIngressClass,
 			Rules: []v1.IngressRule{
 				{
 					Host: uclusterIngressHost,
@@ -74,7 +72,6 @@ func BuildVClusterIngress(helmReleaseName string, uCluster *v1alpha1.UffizziClus
 
 func BuildVClusterInternalServiceIngress(service v1alpha1.ExposedVClusterService, uCluster *v1alpha1.UffizziCluster, helmReleaseName string) *v1.Ingress {
 	const PATH = "/"
-	nginxIngressClass := INGRESS_CLASS_NGINX
 	internalServiceHost := BuildVClusterInternalServiceIngressHost(uCluster)
 	ingress := &v1.Ingress{
 		ObjectMeta: v12.ObjectMeta{
@@ -86,7 +83,6 @@ func BuildVClusterInternalServiceIngress(service v1alpha1.ExposedVClusterService
 			},
 		},
 		Spec: v1.IngressSpec{
-			IngressClassName: &nginxIngressClass,
 			Rules: []v1.IngressRule{
 				{
 					Host: internalServiceHost,

controllers/uffizzicluster_controller.go

@@ -52,7 +52,6 @@ const (
 	VCLUSTER_CHART         = "vcluster"
 	VCLUSTER_CHART_VERSION = "0.15.5"
 	LOFT_CHART_REPO_URL    = "https://charts.loft.sh"
-	INGRESS_CLASS_NGINX    = "nginx"
 )
 
 type LIFECYCLE_OP_TYPE string
@@ -171,31 +170,29 @@ func (r *UffizziClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 			logger.Error(err, "Failed to create HelmRelease")
 			return ctrl.Result{}, err
 		}
-		// check if ingresses are enabled and if so create the ingress for the vcluster
-		if uCluster.Spec.Ingress.Class == INGRESS_CLASS_NGINX {
-			vclusterIngressHost := BuildVClusterIngressHost(uCluster) // r.createVClusterIngress(ctx, uCluster)
-			if err != nil {
-				logger.Error(err, "Failed to create ingress to vcluster internal service")
-				return ctrl.Result{}, err
-			}
+		// create the ingress for the vcluster
+		vclusterIngressHost := BuildVClusterIngressHost(uCluster) // r.createVClusterIngress(ctx, uCluster)
+		if err != nil {
+			logger.Error(err, "Failed to create ingress to vcluster internal service")
+			return ctrl.Result{}, err
+		}
+
+		uCluster.Status.Host = &vclusterIngressHost
 
-			uCluster.Status.Host = &vclusterIngressHost
-
-			// check if there are any services that need to be exposed from the vcluster
-			if uCluster.Spec.Ingress.Services != nil {
-				// Create the ingress for each service that is specified in the UffizziCluster services config
-				for _, service := range uCluster.Spec.Ingress.Services {
-					vclusterInternalServiceIngressStatus, err := r.createVClusterInternalServiceIngress(uCluster, service, ctx)
-					if err != nil {
-						logger.Error(err, "Failed to create ingress to vcluster internal service")
-						return ctrl.Result{}, err
-					}
-
-					// add the exposed service to the status
-					uCluster.Status.ExposedServices = append(uCluster.Status.ExposedServices,
-						*vclusterInternalServiceIngressStatus,
-					)
+		// check if there are any services that need to be exposed from the vcluster
+		if uCluster.Spec.Ingress.Services != nil {
+			// Create the ingress for each service that is specified in the UffizziCluster services config
+			for _, service := range uCluster.Spec.Ingress.Services {
+				vclusterInternalServiceIngressStatus, err := r.createVClusterInternalServiceIngress(uCluster, service, ctx)
+				if err != nil {
+					logger.Error(err, "Failed to create ingress to vcluster internal service")
+					return ctrl.Result{}, err
 				}
+
+				// add the exposed service to the status
+				uCluster.Status.ExposedServices = append(uCluster.Status.ExposedServices,
+					*vclusterInternalServiceIngressStatus,
+				)
 			}
 		}
 
@@ -332,20 +329,14 @@ func (r *UffizziClusterReconciler) upsertVClusterHelmRelease(update bool, ctx co
 	var (
 		VClusterIngressHostname     = BuildVClusterIngressHost(uCluster)
 		OutKubeConfigServerArgValue = "https://" + VClusterIngressHostname
-		ingressClass                = "uffizzi"
 	)
 
-	if uCluster.Spec.Ingress.Class != "" {
-		ingressClass = uCluster.Spec.Ingress.Class
-	}
-
 	uClusterHelmValues := VCluster{
 		Init:    VClusterInit{},
 		FsGroup: 12345,
 		Ingress: VClusterIngress{
-			Enabled:          true,
-			IngressClassName: ingressClass,
-			Host:             VClusterIngressHostname,
+			Enabled: true,
+			Host:    VClusterIngressHostname,
 			Annotations: map[string]string{
 				"app.uffizzi.com/ingress-sync": "true",
 			},
@@ -503,20 +494,17 @@ func (r *UffizziClusterReconciler) upsertVClusterHelmRelease(update bool, ctx co
 	//	uClusterHelmValues.Sync.Ingresses.Enabled = *uCluster.Spec.Ingress.SyncFromManifests
 	//}
 
-	if uCluster.Spec.Ingress.Class == INGRESS_CLASS_NGINX {
-		uClusterHelmValues.Syncer.ExtraArgs = append(uClusterHelmValues.Syncer.ExtraArgs,
-			"--tls-san="+VClusterIngressHostname,
-			"--out-kube-config-server="+OutKubeConfigServerArgValue,
-			//"--out-kube-config-secret="+KubeConfigSecretName,
-		)
+	uClusterHelmValues.Syncer.ExtraArgs = append(uClusterHelmValues.Syncer.ExtraArgs,
+		"--tls-san="+VClusterIngressHostname,
+		"--out-kube-config-server="+OutKubeConfigServerArgValue,
+	)
 
-		if uCluster.Spec.Ingress.Services != nil {
-			for _, service := range uCluster.Spec.Ingress.Services {
-				uClusterHelmValues.MapServices.FromVirtual = append(uClusterHelmValues.MapServices.FromVirtual, VClusterMapServicesFromVirtual{
-					From: service.Namespace + "/" + service.Name,
-					To:   helmReleaseName + "-" + service.Name,
-				})
-			}
+	if uCluster.Spec.Ingress.Services != nil {
+		for _, service := range uCluster.Spec.Ingress.Services {
+			uClusterHelmValues.MapServices.FromVirtual = append(uClusterHelmValues.MapServices.FromVirtual, VClusterMapServicesFromVirtual{
+				From: service.Namespace + "/" + service.Name,
+				To:   helmReleaseName + "-" + service.Name,
+			})
 		}
 	}
 

examples/ingress-helm.yml

@@ -4,7 +4,6 @@ metadata:
   name: helm-basic
 spec:
   ingress:
-    class: "nginx"
     host: deleteme2023.uffizzi.cloud
     certManagerTLSEnabled: true
     services:

examples/ingress-manifest.yaml

@@ -5,7 +5,6 @@ metadata:
   namespace: quickstart-too
 spec:
   ingress:
-    class: "nginx"
     host: uffizzi-client-clone-3.app.qa-gke.uffizzi.com
     cluster:
       ingressAnnotations:

examples/ingress.yml

@@ -5,7 +5,6 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: /
 spec:
-  ingressClassName: nginx
   rules:
   - http:
       paths:
@@ -15,4 +14,4 @@ spec:
             service:
               name: test
               port:
-                number: 80
+                number: 80

examples/manifest-basic-ingress.yml

@@ -9,7 +9,6 @@ spec:
     enabled: false
   ingress:
     host: app.qa-gke.uffizzi.com
-    class: nginx
   manifests: |
     apiVersion: networking.k8s.io/v1
     kind: Ingress
@@ -18,7 +17,6 @@ spec:
       annotations:
         nginx.ingress.kubernetes.io/rewrite-target: /
     spec:
-      ingressClassName: nginx
       rules:
         - http:
             paths:
@@ -37,7 +35,6 @@ spec:
       annotations:
         nginx.ingress.kubernetes.io/rewrite-target: /
     spec:
-      ingressClassName: nginx
       rules:
         - host: whathostmost
           http:

examples/testnode-ucluster.yml

@@ -4,7 +4,6 @@ metadata:
   name: testnode
 spec:
 #  ingress:
-#    class: "nginx"
 #    host: deleteme2023.uffizzi.cloud
 #    services:
 #      - name: test-node-svc
@@ -32,4 +31,4 @@ spec:
         namespace: test-node
       values: |
         image: dbpterraform2/test-node-zipofar:latest
-        app_port: 8080
+        app_port: 8080