S-128939 Remove all ingress controllers

Chart.yaml

@@ -24,15 +24,6 @@ dependencies:
       - bitnami-common
     version: 2.x.x
 
-  - name: haproxy-ingress
-    version: 0.15.0
-    repository: "https://haproxy-ingress.github.io/charts"
-    condition: haproxy-ingress.install
-
-  - name: nginx-ingress-controller
-    version: 12.0.7
-    repository: "https://charts.bitnami.com/bitnami"
-    condition: nginx-ingress-controller.install
 
   - name: postgresql
     version: 16.7.27

README.md

@@ -953,33 +953,6 @@ kubectl delete namespace digitalai
 | `busyBox.image.pullPolicy`  | busyBox container image pull policy              | `IfNotPresent`    |
 | `busyBox.image.pullSecrets` | Specify docker-registry secret names as an array | `[]`              |
 
-### Ingress HAProxy
-
-| Name                                      | Description                                                | Value          |
-| ----------------------------------------- | ---------------------------------------------------------- | -------------- |
-| `haproxy-ingress.install`                 | Enable Haproxy Ingress helm subchart installation          | `false`        |
-| `haproxy-ingress.controller.ingressClass` | Name of the ingress class to route through this controller | `haproxy-daid` |
-| `haproxy-ingress.controller.service.type` | Kubernetes Service type for Controller                     | `LoadBalancer` |
-
-### Ingress Nginx
-
-| Name                                                            | Description                                                           | Value                       |
-| --------------------------------------------------------------- | --------------------------------------------------------------------- | --------------------------- |
-| `nginx-ingress-controller.install`                              | Enable NGINX Ingress Controller helm subchart installation            | `false`                     |
-| `nginx-ingress-controller.image.tag`                            | NGINX Ingress Controller image tag (immutable tags are recommended)   | `1.9.6-debian-12-r8`        |
-| `nginx-ingress-controller.defaultBackend.image.tag`             | Default backend image tag (immutable tags are recommended)            | `1.25.4-debian-12-r3`       |
-| `nginx-ingress-controller.extraArgs`                            | Additional command line arguments to pass to nginx-ingress-controller |                             |
-| `nginx-ingress-controller.extraArgs.ingress-class`              | Name of the IngressClass resource                                     | `nginx-daid`                |
-| `nginx-ingress-controller.ingressClassResource.name`            | Name of the IngressClass resource                                     | `nginx-daid`                |
-| `nginx-ingress-controller.ingressClassResource.controllerClass` | IngressClass identifier for the controller                            | `k8s.io/ingress-nginx-daid` |
-| `nginx-ingress-controller.replicaCount`                         | Desired number of Controller pods                                     | `1`                         |
-
-### Traffic exposure parameters
-
-| Name                                    | Description                            | Value          |
-| --------------------------------------- | -------------------------------------- | -------------- |
-| `nginx-ingress-controller.service.type` | Kubernetes Service type for Controller | `LoadBalancer` |
-
 ### Postgresql
 
 | Name                   | Description                                           | Value                 |

documentation/docs/air-gapped-installation.md

@@ -65,15 +65,6 @@ For example, for version 23.1.x, following is the list of the images that you wi
 - docker.io/xebialabs/deploy-operator:23.1.x
 - gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
 
-#### If you are using nginx include
-
-- docker.io/bitnami/nginx:1.22.1-debian-11-r44
-- docker.io/bitnami/nginx-ingress-controller:1.6.4-debian-11-r5
-
-#### If you are using haproxy include
-
-- quay.io/jcmoraisjr/haproxy-ingress:v0.14.2
-
 #### If you are using embedded keycloak include
 
 - docker.io/jboss/keycloak:17.0.1
@@ -202,11 +193,6 @@ During upgrade for the question `Edit list of custom resource keys that will mig
 ### For Default image registry
 ```
 .spec.TinyToolsImageRepository
-.spec.nginx-ingress-controller.defaultBackend.image.registry
-.spec.nginx-ingress-controller.defaultBackend.image.repository
-.spec.nginx-ingress-controller.image.registry
-.spec.nginx-ingress-controller.image.repository
-.spec.haproxy-ingress.controller.image.repository
 .spec.keycloak.image.repository
 .spec.keycloak.postgresql.image.registry
 .spec.keycloak.postgresql.image.repository
@@ -221,10 +207,6 @@ During upgrade for the question `Edit list of custom resource keys that will mig
 ### For custom docker registry (public)
 ```
 .spec.TinyToolsImageRepository
-.spec.nginx-ingress-controller.defaultBackend.image.repository
-.spec.nginx-ingress-controller.image.repository
-.spec.nginx-ingress-controller.global.imageRegistry
-.spec.haproxy-ingress.controller.image.repository
 .spec.keycloak.image.repository
 .spec.keycloak.postgresql.image.registry
 .spec.keycloak.postgresql.image.repository
@@ -238,10 +220,6 @@ During upgrade for the question `Edit list of custom resource keys that will mig
 ### For custom docker registry (private)
 ```
 .spec.TinyToolsImageRepository
-.spec.nginx-ingress-controller.defaultBackend.image.repository
-.spec.nginx-ingress-controller.image.repository
-.spec.nginx-ingress-controller.global.imageRegistry
-.spec.haproxy-ingress.controller.image.repository
 .spec.keycloak.image.repository
 .spec.keycloak.postgresql.image.registry
 .spec.keycloak.postgresql.image.repository
@@ -266,19 +244,6 @@ During upgrade for the question `Edit list of custom resource keys that will mig
 - spec.TinyToolsImageRepository: "myrepo_host/myrepo/tiny-tools"
 - spec.ImagePullSecret: regcred (only for custom private image registry requiring authentication)
 
-#### If you are using nginx
-
-- spec.nginx-ingress-controller.defaultBackend.image.registry: myrepo_host
-- spec.nginx-ingress-controller.defaultBackend.image.repository: myrepo/nginx
-- spec.nginx-ingress-controller.image.registry: myrepo_host
-- spec.nginx-ingress-controller.image.repository: myrepo/nginx-ingress-controller
-- spec.nginx-ingress-controller.imagePullSecrets.[0]: regcred (only for custom private image registry requiring authentication)
-
-#### If you are using haproxy
-
-- spec.haproxy-ingress.controller.image.repository: myrepo_host/myrepo/haproxy-ingress
-- spec.haproxy-ingress.imagePullSecrets[0].name: regcred (only for custom private image registry requiring authentication)
-
 #### If you are using embedded keycloak
 
 - spec.keycloak.image.repository: myrepo_host/myrepo/keycloak

documentation/docs/yamls/dai-deploy_cr-example.yaml

@@ -115,17 +115,6 @@ spec:
     path: /
   route:
     enabled: false
-  haproxy-ingress:
-    controller:
-      ingressClass: haproxy-dai-xld
-    install: false
-  nginx-ingress-controller:
-    extraArgs:
-      ingress-class: nginx-dai-xld
-    ingressClassResource:
-      controllerClass: k8s.io/ingress-nginx-dai-xld
-      name: nginx-dai-xld
-    install: false
   postgresql:
     global:
       storageClass: "local-path"

operator/config/manifests/bases/xld.clusterserviceversion.yaml

@@ -44,15 +44,12 @@ spec:
     ## About this Operator
 
     Digital.ai Deploy operator is based on helm chart that is available from [here](https://github.com/digital-ai/deploy-helm-chart).
-    The operator includes subcharts which are dependencies for the Deploy containers to run successfully. 
-    Nginx Ingress and Haproxy ingress are disabled and not used with installations on the Openshift (and the images are not used in the installation)
+    The operator includes subcharts which are dependencies for the Deploy containers to run successfully.
 
     ### Subcharts include:
 
     - [PostgresSQL](https://github.com/bitnami/charts/tree/main/bitnami/postgresql)
     - [RabbitMQ](https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq)
-    - [Nginx Ingress controller](https://github.com/bitnami/charts/tree/main/bitnami/nginx-ingress-controller)
-    - [Haproxy Ingress controller](https://github.com/jcmoraisjr/haproxy-ingress/)
 
     ## Installation
 

operator/config/samples/xld_placeholders.yaml

@@ -119,10 +119,6 @@ spec:
     tls:
       enabled: true
       termination: edge
-  haproxy-ingress:
-    install: false
-  nginx-ingress-controller:
-    install: false
   postgresql:
     install: true
     primary:

tests/values/images.yaml

@@ -14,10 +14,6 @@ master:
 worker:
   volumePermissions:
     enabled: true
-haproxy-ingress:
-  install: true
-nginx-ingress-controller:
-  install: true
 postgresql:
   install: true
   volumePermissions: