From f7f3daac801c923d1cc2ef4a6b689f0d84ef7dcf Mon Sep 17 00:00:00 2001 From: Massaki Archambault Date: Thu, 8 Aug 2024 22:19:35 -0400 Subject: [PATCH] expose ollama via nodeport instead --- kustomize/bases/ollama/kustomization.yaml | 19 ---------------- kustomize/bases/ollama/ollama-deployment.yaml | 22 ++++++++++++++++--- kustomize/bases/ollama/ollama-ingress.yaml | 19 ---------------- 3 files changed, 19 insertions(+), 41 deletions(-) delete mode 100644 kustomize/bases/ollama/ollama-ingress.yaml diff --git a/kustomize/bases/ollama/kustomization.yaml b/kustomize/bases/ollama/kustomization.yaml index 11d899f..f61f906 100644 --- a/kustomize/bases/ollama/kustomization.yaml +++ b/kustomize/bases/ollama/kustomization.yaml @@ -1,26 +1,7 @@ resources: - ollama-deployment.yaml - - ollama-ingress.yaml namePrefix: ollama- commonLabels: app.kubernetes.io/name: ollama - -configMapGenerator: - - name: kustomize-generated-config - literals: - - OLLAMA_EXTERNAL_HOST=ollama.badjware.dev - - OLLAMA_EXTERNAL_URL=http://ollama.badjware.dev - -replacements: - - source: - kind: ConfigMap - name: kustomize-generated-config - fieldPath: data.OLLAMA_EXTERNAL_HOST - targets: - - select: - kind: Ingress - name: server - fieldPaths: - - spec.rules.0.host diff --git a/kustomize/bases/ollama/ollama-deployment.yaml b/kustomize/bases/ollama/ollama-deployment.yaml index 8a1bee4..7ee842f 100644 --- a/kustomize/bases/ollama/ollama-deployment.yaml +++ b/kustomize/bases/ollama/ollama-deployment.yaml @@ -46,8 +46,9 @@ spec: cpu: 3000m nvidia.com/gpu: 1 ports: - - containerPort: 11434 - name: http + - name: http + hostPort: 11434 + containerPort: 11434 volumeMounts: - name: server-data mountPath: /root/.ollama @@ -76,4 +77,19 @@ spec: ports: - name: http port: 11434 - targetPort: http \ No newline at end of file + targetPort: http +--- +apiVersion: v1 +kind: Service +metadata: + name: nodeport + labels: + app.kubernetes.io/component: nodeport +spec: + type: NodePort + selector: + app.kubernetes.io/component: server + ports: + - targetPort: http + port: 11434 + nodePort: 31002 \ No newline at end of file diff --git a/kustomize/bases/ollama/ollama-ingress.yaml b/kustomize/bases/ollama/ollama-ingress.yaml deleted file mode 100644 index 8cf7956..0000000 --- a/kustomize/bases/ollama/ollama-ingress.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: server - labels: - app.kubernetes.io/name: ollama - probe: blackbox-http -spec: - rules: - - host: ${OLLAMA_EXTERNAL_HOST} - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: server - port: - name: http