diff --git a/Makefile b/Makefile index c30e012..8a81b69 100644 --- a/Makefile +++ b/Makefile @@ -49,6 +49,9 @@ kind: chisel: ./scripts/k8s-chisel-operator.sh +clean: + ./packages/infra/vultr-delete-orphaned-resources.js + deps: sudo pamac install make entr nvm minikube kubectl docker helm expect curl -fsSL https://raw.githubusercontent.com/tilt-dev/tilt/master/scripts/install.sh | bash diff --git a/README.md b/README.md index 6a5542e..9694d9c 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,9 @@ See ./ARCHITECTURE.md for overview Code for https://futureporn.net +## Jun update todo list + +* [ ] bunny support for external-dns +* [ ] traefik well understood +* [ ] staging test with *.futureporn.net domains + diff --git a/charts/fp/templates/certresolver.yaml.old b/charts/fp/templates/certresolver.yaml.old index e69de29..539a76e 100644 --- a/charts/fp/templates/certresolver.yaml.old +++ b/charts/fp/templates/certresolver.yaml.old @@ -0,0 +1,15 @@ +# acme.caserver: "{{ .Values.letsencrypt.caServer }}" + + +## traefik certresolver +--- + +# acme.caserver: "{{ .Values.letsencrypt.caServer }}" +## staging +https://acme-staging-v02.api.letsencrypt.org/directory + + + +--- +## production +https://acme-v02.api.letsencrypt.org/directory \ No newline at end of file diff --git a/charts/fp/templates/next.yaml b/charts/fp/templates/next.yaml index 0bffd07..19bcbf0 100644 --- a/charts/fp/templates/next.yaml +++ b/charts/fp/templates/next.yaml @@ -65,7 +65,7 @@ metadata: namespace: futureporn annotations: traefik.ingress.kubernetes.io/router.entrypoints: http - traefik.ingress.kubernetes.io/router.tls: true + traefik.ingress.kubernetes.io/router.tls: "true" traefik.ingress.kubernetes.io/tls.certresolver: "{{ .Values.next.certResolver }}" kubernetes.io/ingress.class: traefik cert-manager.io/cluster-issuer: "{{ .Values.next.certIssuer }}" diff --git a/charts/fp/values-dev.yaml b/charts/fp/values-dev.yaml index b98175f..0bd8cb0 100644 --- a/charts/fp/values-dev.yaml +++ b/charts/fp/values-dev.yaml @@ -7,6 +7,7 @@ next: imageName: fp/next certIssuer: letsencrypt-staging hostname: next.futureporn.svc.cluster.local + ingressClassName: traefik capture: imageName: fp/capture scout: @@ -33,6 +34,4 @@ realtime: imageName: fp/realtime adminEmail: cj@futureporn.net chisel: - exitNodeIp: "155.138.254.201" -letsencrypt: - caServer: https://acme-staging-v02.api.letsencrypt.org/directory \ No newline at end of file + exitNodeIp: "155.138.254.201" \ No newline at end of file diff --git a/packages/infra/vultr-delete-orphaned-resources.js b/packages/infra/vultr-delete-orphaned-resources.js old mode 100644 new mode 100755