adding ks8

robinmordasiewicz · Aug 5, 2024 · 6903a75 · 6903a75
1 parent df4f7c9
commit 6903a75
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 24 deletions.
diff --git a/manifests/apps/dvwa/Ingress.yaml → manifests/apps/Ingress.yaml b/manifests/apps/dvwa/Ingress.yaml → 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
@@ -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
@@ -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
@@ -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