diff --git a/manifests/apps/dvwa/Ingress.yaml b/manifests/apps/Ingress.yaml similarity index 93% rename from manifests/apps/dvwa/Ingress.yaml rename to manifests/apps/Ingress.yaml index c8f7a684..7c89b9f6 100644 --- a/manifests/apps/dvwa/Ingress.yaml +++ b/manifests/apps/Ingress.yaml @@ -1,8 +1,8 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: dvwa-ingress - namespace: dvwa + name: app-ingress + namespace: fortiweb-ingress annotations: { "fortiweb-ip" : "10.0.0.4", "fortiweb-login" : "fortiweb-login-secret", diff --git a/manifests/apps/dvwa/kustomization.yaml b/manifests/apps/dvwa/kustomization.yaml index 514feb30..a6f91d5d 100644 --- a/manifests/apps/dvwa/kustomization.yaml +++ b/manifests/apps/dvwa/kustomization.yaml @@ -4,4 +4,4 @@ resources: - Deployment.yaml - mariadb.yaml - rbac.yaml - - Ingress.yaml + diff --git a/manifests/apps/kustomization.yaml b/manifests/apps/kustomization.yaml index 422daa05..7c0aa34a 100644 --- a/manifests/apps/kustomization.yaml +++ b/manifests/apps/kustomization.yaml @@ -3,3 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ./ollama + - Ingress.yaml + diff --git a/manifests/apps/ollama/HelmRelease.yaml b/manifests/apps/ollama/HelmRelease.yaml index b6e786c8..77f18b7e 100644 --- a/manifests/apps/ollama/HelmRelease.yaml +++ b/manifests/apps/ollama/HelmRelease.yaml @@ -44,27 +44,6 @@ spec: models: - nomic-embed-text - codestral:latest - ingress: - enabled: true - className: "fwb-ingress-controller" - annotations: { - "fortiweb-ip" : "10.0.0.4", - "fortiweb-login" : "fortiweb-login-secret", - "fortiweb-port": "8443", - "fortiweb-ctrl-log" : "disable", - "virtual-server-ip" : "10.0.0.5", - "virtual-server-addr-type" : "ipv4", - "virtual-server-interface" : "port1", - "server-policy-web-protection-profile" : "Inline Standard Protection", - "server-policy-https-service" : "HTTPS", - "server-policy-http-service" : "HTTP", - "server-policy-syn-cookie" : "enable", - "server-policy-http-to-https" : "disable" - } - hosts: - - paths: - - path: /api - pathType: Prefix persistentVolume: enabled: true size: 100Gi