update

dmz/internalproxy/templates/octopus.yaml

@@ -1,41 +0,0 @@
-#apiVersion: traefik.io/v1alpha1
-#kind: IngressRoute
-#metadata:
-#  name: octopus-ingress
-#spec:
-#  entryPoints:
-#    - websecure
-#  routes:
-#    - match: Host(`octopus.durp.info`) && PathPrefix(`/`)
-#      kind: Rule
-#      services:
-#        - name: infra-cluster
-#          port: 443
-#  tls:
-#    secretName: octopus-tls
-#
-#---
-#apiVersion: cert-manager.io/v1
-#kind: Certificate
-#metadata:
-#  name: octopus-tls
-#spec:
-#  issuerRef:
-#    name: letsencrypt-production
-#    kind: ClusterIssuer
-#  secretName: octopus-tls
-#  commonName: "octopus.durp.info"
-#  dnsNames:
-#    - "octopus.durp.info"
-#
-#---
-#kind: Service
-#apiVersion: v1
-#metadata:
-#  name: octopus-external-dns
-#  annotations:
-#    external-dns.alpha.kubernetes.io/hostname: octopus.durp.info
-#spec:
-#  type: ExternalName
-#  externalName: durp.info
-#

dmz/internalproxy/templates/portainer.yaml

@@ -1,32 +1,3 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: portainer
-spec:
-  ports:
-  - name: app
-    port: 9443
-    protocol: TCP
-    targetPort: 9443
-  clusterIP: None
-  type: ClusterIP
-
----
-
-apiVersion: v1
-kind: Endpoints
-metadata:
-  name: portainer
-subsets:
-- addresses:
-  - ip: 192.168.20.104
-  ports:
-  - name: app
-    port: 9443
-    protocol: TCP
-
----    
-
 apiVersion: traefik.io/v1alpha1
 kind: IngressRoute
 metadata:
@@ -41,9 +12,8 @@ spec:
       #  namespace: traefik
     kind: Rule
     services:
-    - name: portainer
+      - name: infra-cluster
-      port: 9443
+        port: 443
-      scheme: https
   tls:
     secretName: portainer-tls
 
@@ -60,4 +30,4 @@ spec:
     kind: ClusterIssuer
   commonName: "portainer.internal.durp.info"
   dnsNames:
-  - "portainer.internal.durp.info"  
+  - "portainer.internal.durp.info"

infra/portainer/templates/ingress.yaml

@@ -0,0 +1,30 @@
+apiVersion: traefik.io/v1alpha1
+kind: IngressRoute
+metadata:
+  name: portainer-ingress
+spec:
+  entryPoints:
+    - websecure
+  routes:
+    - match: Host(`portainer.durp.info`) && PathPrefix(`/`)
+      kind: Rule
+      services:
+        - name: portainer
+          port: 9443
+  tls:
+    secretName: portainer-tls
+
+---
+
+apiVersion: cert-manager.io/v1
+kind: Certificate
+metadata:
+  name: portainer-tls
+spec:
+  secretName: portainer-tls
+  issuerRef:
+    name: vault-issuer
+    kind: ClusterIssuer
+  commonName: "portainer.internal.durp.info"
+  dnsNames:
+    - "portainer.internal.durp.info"