Start using ingress instead of virtual service

kube/values-main.yaml

@@ -5,11 +5,33 @@ values: |
       tag: $ARGO_APP_IMAGE_TAG
     env:
       HUGO_PARAMS_GITCOMMIT: $ARGO_APP_IMAGE_TAG
-  istio:
-    annotations:
+  ingress:
+    enabled: true
+    className: ~
+    annotations: 
+      kubernetes.io/ingress.class: traefik
+      kubernetes.io/tls-acme: "true"
+      kubernetes.io/ingress.allow-http: "false"
+      kubernetes.io/ingress.global-static-ip-name: ""
+      cert-manager.io/cluster-issuer: badhouseplants-issuer-http01
       link.argocd.argoproj.io/env: https://badhouseplants.net/
       link.argocd.argoproj.io/build: $DRONE_BUILD_LINK
-      link.argocd.argoproj.io/remark42: https://remark42.badhouseplants.net/web
+    pathtype: ImplementationSpecific
+    hosts:
+      - host: badhouseplants.net
+        paths: 
+          - path: /
+            pathType: ImplementationSpecific
+      - host: www.badhouseplants.net
+        paths: 
+          - path: /
+            pathType: ImplementationSpecific
+    tls: 
+      - secretName: badhp-tls
+        hosts:
+          - badhouseplants.net
+          - www.badhouseplants.net
+    
   remark42:
     settings:
       secret: $ARGO_REMARK_SECRET
@@ -26,3 +48,25 @@ values: |
           secret: $ARGO_GOOGLE_OAUTH_KEY
     storage:
       requestedSize: 300Mi
+    ingress:
+      enabled: true
+      className: ~
+      annotations:
+        kubernetes.io/ingress.class: traefik
+        kubernetes.io/tls-acme: "true"
+        kubernetes.io/ingress.allow-http: "false"
+        kubernetes.io/ingress.global-static-ip-name: ""
+        cert-manager.io/cluster-issuer: badhouseplants-issuer-http01
+        link.argocd.argoproj.io/remark42: https://remark42.badhouseplants.net/web
+      ## Hosts
+      hosts:
+        - host: remark42.badhouseplants.net
+          paths:
+            - path: /
+              pathType: ImplementationSpecific
+    
+      tls:
+        secretName: chart-example-tls
+        hosts:
+          - remark42.badhouseplants.net
+  

kube/values-preview.yaml

@@ -1,12 +1,27 @@
 ---
 values: |
-  istio:
-    hosts:
-      - $ARGO_APP_HOSTNAME
-    annotations:
+  ingress:
+    enabled: true
+    className: ~
+    annotations: 
+      kubernetes.io/ingress.class: traefik
+      kubernetes.io/tls-acme: "true"
+      kubernetes.io/ingress.allow-http: "false"
+      kubernetes.io/ingress.global-static-ip-name: ""
+      cert-manager.io/cluster-issuer: badhouseplants-issuer-http01
       link.argocd.argoproj.io/env: https://$ARGO_APP_HOSTNAME/
-      link.argocd.argoproj.io/remark42: https://remark42-$ARGO_APP_HOSTNAME/web
       link.argocd.argoproj.io/build: $DRONE_BUILD_LINK
+    pathtype: ImplementationSpecific
+    hosts:
+      - host: $ARGO_APP_HOSTNAME
+        paths: 
+          - path: /
+            pathType: ImplementationSpecific
+    tls: 
+      - secretName: badhp-$ARGO_APP_BRANCH-tls
+        hosts:
+          - $ARGO_APP_HOSTNAME
+
   hugo:
     image:
       tag: $ARGO_APP_IMAGE_TAG
@@ -17,13 +32,31 @@ values: |
       HUGO_PARAMS_COMMENTS_REMARK42_HOST: https://remark42-$ARGO_APP_HOSTNAME
       HUGO_PARAMS_GITCOMMIT: $ARGO_APP_IMAGE_TAG
   remark42:
-    istio:
-      hosts:
-        - remark42-$ARGO_APP_HOSTNAME
     settings:
       url: https://remark42-$ARGO_APP_HOSTNAME/
       auth:
         anonymous: true
       secretKey: $ARGO_REMARK_SECRET
+    ingress:
+      enabled: true
+      className: ~
+      annotations:
+        kubernetes.io/ingress.class: traefik
+        kubernetes.io/tls-acme: "true"
+        kubernetes.io/ingress.allow-http: "false"
+        kubernetes.io/ingress.global-static-ip-name: ""
+        cert-manager.io/cluster-issuer: badhouseplants-issuer-http01
+        link.argocd.argoproj.io/remark42: https://remark42-$ARGO_APP_HOSTNAME/
+      ## Hosts
+      hosts:
+        - host: remark42.badhouseplants.net
+          paths:
+            - path: /
+              pathType: ImplementationSpecific
+    
+      tls:
+        secretName: remark-$ARGO_APP_BRANCH-tls
+        hosts:
+          - remark42-$ARGO_APP_HOSTNAME
   rclone:
     command: 'rclone copy -P badhouseplants-public:/badhouseplants-net/$ARGO_APP_IMAGE_TAG /static'