From 234ae789c3b8337c5c00061d767412379561942e Mon Sep 17 00:00:00 2001 From: dutchie031 Date: Thu, 30 Jul 2026 12:10:12 +0200 Subject: [PATCH] updated ingress --- .helm/templates/deployment.yaml | 14 +++---- .helm/templates/network.yaml | 66 +++++++++++++++++---------------- .helm/values.yaml | 1 + 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/.helm/templates/deployment.yaml b/.helm/templates/deployment.yaml index 40417d3..fe0592d 100644 --- a/.helm/templates/deployment.yaml +++ b/.helm/templates/deployment.yaml @@ -1,24 +1,24 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: ${{ .Values.app }} + name: {{ .Values.app }} labels: - app: ${{ .Values.app }} + app: {{ .Values.app }} namespace: spearhead-docs spec: replicas: 1 selector: matchLabels: - app: ${{ .Values.app }} + app: {{ .Values.app }} template: metadata: labels: - app: ${{ .Values.app }} + app: {{ .Values.app }} spec: containers: - - name: ${{ .Values.app }} - image: ${{ .Values.image.registry }}/${{ .Values.image.repository }}:${{ .Values.image.tag }} + - name: {{ .Values.app }} + image: {{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }} ports: - - containerPort: ${{ .Values.ports.containerPort }} + - containerPort: {{ .Values.ports.containerPort }} \ No newline at end of file diff --git a/.helm/templates/network.yaml b/.helm/templates/network.yaml index 777d0e0..a84a2e9 100644 --- a/.helm/templates/network.yaml +++ b/.helm/templates/network.yaml @@ -1,31 +1,35 @@ - -# apiVersion: v1 -# kind: Service - - - -# apiVersion: networking.k8s.io/v1 -# kind: Ingress -# metadata: -# name: docker-registry-ingress -# namespace: docker-registry -# annotations: -# cert-manager.io/cluster-issuer: "internal-ca-issuer" -# nginx.ingress.kubernetes.io/proxy-body-size: "0" -# spec: -# ingressClassName: nginx -# tls: -# - secretName: registry-tls -# hosts: -# - registry.dutchie031.net -# rules: -# - host: registry.dutchie031.net -# http: -# paths: -# - path: / -# pathType: Prefix -# backend: -# service: -# name: docker-registry -# port: -# number: 5000 \ No newline at end of file +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ .Values.app }}-ingress + namespace: spearhead-docs + annotations: + cert-manager.io/cluster-issuer: "letsencrypt-prod" +spec: + ingressClassName: nginx + rules: + - host: spearhead.dutchie031.net + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ .Values.app }} + port: + number: {{ .Values.ports.servicePort }} + # - host: spearhead.rocks + # http: + # paths: + # - path: / + # pathType: Prefix + # backend: + # service: + # name: {{ .Values.app }} + # port: + # number: {{ .Values.ports.servicePort }} + tls: + - hosts: + - spearhead.dutchie031.net + #- spearhead.rocks + secretName: spearhead-docs-tls \ No newline at end of file diff --git a/.helm/values.yaml b/.helm/values.yaml index e51ab58..52d9542 100644 --- a/.helm/values.yaml +++ b/.helm/values.yaml @@ -8,4 +8,5 @@ image: tag: latest ports: + servicePort: 80 containerPort: 80 \ No newline at end of file