updated ingress

.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 }}
           

.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
+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

.helm/values.yaml

@@ -8,4 +8,5 @@ image:
   tag: latest
 
 ports:
+  servicePort: 80
   containerPort: 80