From 84cb3e4f64c4349deb66cc6fb235757be2452f5a Mon Sep 17 00:00:00 2001 From: Radar231 Date: Sat, 23 Mar 2024 20:18:07 -0400 Subject: [PATCH] updated files for new k8s deployment --- README.md | 4 ++++ vaultwarden-lan.crt | 24 ------------------------ vaultwarden-lan.key | 28 ---------------------------- vaultwarden_ingress.yml | 21 --------------------- vaultwarden_ingress.yml-old | 10 ++++++---- vaultwarden_lb.yml | 19 +++++++++++++++++++ vaultwarden_pv.yml | 2 +- 7 files changed, 30 insertions(+), 78 deletions(-) delete mode 100644 vaultwarden-lan.crt delete mode 100644 vaultwarden-lan.key delete mode 100644 vaultwarden_ingress.yml create mode 100644 vaultwarden_lb.yml diff --git a/README.md b/README.md index baa11da..472ffe9 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,7 @@ This deploys a vaultwarden server. * https://github.com/dani-garcia/vaultwarden * https://github.com/dani-garcia/vaultwarden/wiki +## SSL Cert + +This deployment uses the *.delfax.net cert provided by Let's Encrypt. + diff --git a/vaultwarden-lan.crt b/vaultwarden-lan.crt deleted file mode 100644 index 63f6c24..0000000 --- a/vaultwarden-lan.crt +++ /dev/null @@ -1,24 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID/zCCAuegAwIBAgIUQ0E6q+ue0llS0kZYQfwSUATEciEwDQYJKoZIhvcNAQEL -BQAwgY4xCzAJBgNVBAYTAkNBMRAwDgYDVQQIDAdPbnRhcmlvMQ8wDQYDVQQHDAZP -dHRhd2ExDzANBgNVBAoMBkRlbGZheDEPMA0GA1UECwwGRGVsZmF4MRgwFgYDVQQD -DA92YXVsdHdhcmRlbi5sYW4xIDAeBgkqhkiG9w0BCQEWEXJtb3Jyb3dAZ21haWwu -Y29tMB4XDTIyMDIwMjE4MTUzNFoXDTI2MDMxMzE4MTUzNFowgY4xCzAJBgNVBAYT -AkNBMRAwDgYDVQQIDAdPbnRhcmlvMQ8wDQYDVQQHDAZPdHRhd2ExDzANBgNVBAoM -BkRlbGZheDEPMA0GA1UECwwGRGVsZmF4MRgwFgYDVQQDDA92YXVsdHdhcmRlbi5s -YW4xIDAeBgkqhkiG9w0BCQEWEXJtb3Jyb3dAZ21haWwuY29tMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNJFygAfMaJZ82DfYyyguxS5NKBCh6Dd9yEe -a/YuVKkOPjLzq86MjRFCfJFAL6E63JX7J3XLjJkVPas5t2kYBNJqEcsW/I3ncDDk -c1V9My3YZut0r6fslJBw9usboP/E1MsAdoFDP38auWJNzDIH8wHv9SsoWE7sg/+z -oUsF+crF/WTUed9+HEYqsx/RBNz4Nc/g+YSFYnK59mUJ0uL9/AoaTekDxTsPZCM2 -6iulmMoJiII5Yu9H7OtQ5h1qjr0NzY6qsaGxI+mAPjj84S0l1X6EGMIBjwfxrZFJ -rAL2rsMt3y0MG3hF4O4s7/FzKtYxK83KYMj0jZFGQ5Z80m4OxwIDAQABo1MwUTAd -BgNVHQ4EFgQUE2E9OwELmp8jq64wTtGTVAG4PkUwHwYDVR0jBBgwFoAUE2E9OwEL -mp8jq64wTtGTVAG4PkUwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC -AQEAHD351v6vAYvdkx6CQFEwU8zo3j363W5ECzLk5ZjnhOk4zL6a8Z82UjCSvCWy -1719vnjQkXv6r+5zwpZR+lHMtg+PyzCXIxo7wVKKoSAS1vkJ6CJUr08uxeI4qtH0 -AgrQu6GF/kxOTIPcFZb/NqWakTVBJprHyVm4z1WdgbOg6v81qmjPDdFoySQX+rQz -GBZI/lEvd/q9bpzXA/1g3GdtxGaE1UCToSdQTu3Bw87IIswaTeZqqVSW51cRnkxi -u+W7VVljA/BD+PCJXQeNE0EfnFUbGUbYRgYRLSb5Gu0elFBV1ZiqwW/D7qmfzy4A -w1OlAtmu1xD06NKIcDBzdE4N7g== ------END CERTIFICATE----- diff --git a/vaultwarden-lan.key b/vaultwarden-lan.key deleted file mode 100644 index 9af53df..0000000 --- a/vaultwarden-lan.key +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC40kXKAB8xolnz -YN9jLKC7FLk0oEKHoN33IR5r9i5UqQ4+MvOrzoyNEUJ8kUAvoTrclfsndcuMmRU9 -qzm3aRgE0moRyxb8jedwMORzVX0zLdhm63Svp+yUkHD26xug/8TUywB2gUM/fxq5 -Yk3MMgfzAe/1KyhYTuyD/7OhSwX5ysX9ZNR5334cRiqzH9EE3Pg1z+D5hIVicrn2 -ZQnS4v38ChpN6QPFOw9kIzbqK6WYygmIgjli70fs61DmHWqOvQ3NjqqxobEj6YA+ -OPzhLSXVfoQYwgGPB/GtkUmsAvauwy3fLQwbeEXg7izv8XMq1jErzcpgyPSNkUZD -lnzSbg7HAgMBAAECggEAHWZNdbGJRML3nhBl2IfL1ZaZU3a+voZnaJ1bEn9ppUvz -GQ/P1R+ZGgOJ2PjeBfWWwGoXNpK1W1sqltG676MHEBVMjCILOQd1rlIItRP/Q3ni -d5SyzhJfPs6vOYfysCyfad4U58TuJpaYcK7jgzzeKNjBC/XeiBWd5+1v7JNbkv1a -N3d2734YlplmcfBHISlaxZ9lWx1OZmSVr2ezEQFMvAEArLkAeizrl6NRuqugC433 -KEB8A2aDOMBFErKJNM3Wj7oh4Gi1I7ImpWAhPdtLn6qBQ+gppebcU9nrvpI7DpI1 -csW/58jfXUypo401o+gqilRxhp7i+f0H9hm+VS0PyQKBgQDi9cZna05fAbG6lZ5S -aI1xoElLpOTB25ZLbu1bbNynd60ZAFdYI3U4ICq7ZMkEHCqdUHqLxQZ8v5eZba+l -lyFn0DtLD3GAudUauZrWJETDQPeW52iUjbemgk9NjBTsEAakz0zIREdbz0BLEkWc -KN865VAeBkT6R6ZThpM3QjulNQKBgQDQeDeyZ7SnDieUG0cr6yYy8hlbcE6wzDVl -w0b/vIceLWQiYxzmal0pr/8HsF/vxJ8o4Uf8Gg2perEobjLJk1GaHW2omgu1n2iw -rA+P3S+pDtCGC8SAn8Nofw//gFz/CMnxVCmS2Y3OrzttN8v6u/vcv8Zv8YCfkKR/ -S7FEddBPiwKBgQCNMJxmxeiRTfqEuoMtfQFRCIfQWRo+Rx6ueqmKUKTMQbUbcozj -tds8OTacMUykE+mmx+QUg1NP09i5h/TXLLeJX48jWM4haHncEE70nMdyOD5OUFNM -5wSyvyoaceSqHiYj7Ro1E9TYlovGp+1KAlssxm8a3oeWs3ATUgrPO5LjaQKBgGaz -Ms0jJe4+nOTr404RlEn41uEjHMEgeRXe8/U8zVvihLgkF7Kzp53H5F3HWBvow3gC -M9JQi3Z4yRnf4AlKGCNSaBltemNJWuved/QpxTcF41iGJ5IuIrgyEJGQjT/e9o17 -Jtf/cUrnLOGLYWPuhA+mMn4nfXQeb8t+YKAXYj4tAoGBAJL+q3pfd03UqTfKL3vr -uoLpKldsddP192JOekv9PrasTTjzv5CRthwS5uCZhE8k5bwdk1hK7P0DnkHkSZnh -8x73tXn4ycMyFGhFIvUsVSb7IOaNZ7YuU4hs2623l5VDy16WRPJ7GzpwrnPfWoe4 -xYGLk3A1BiR9/xTCjDi/MwuJ ------END PRIVATE KEY----- diff --git a/vaultwarden_ingress.yml b/vaultwarden_ingress.yml deleted file mode 100644 index ee5a349..0000000 --- a/vaultwarden_ingress.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: vaultwarden - annotations: - kubernetes.io/ingress.class: haproxy -spec: - rules: - - host: vaultwarden.lan - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: vaultwarden - port: - number: 80 - -# EOF diff --git a/vaultwarden_ingress.yml-old b/vaultwarden_ingress.yml-old index 38a629b..ee5a349 100644 --- a/vaultwarden_ingress.yml-old +++ b/vaultwarden_ingress.yml-old @@ -1,10 +1,10 @@ --- -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: vaultwarden annotations: - kubernetes.io/ingress.class: traefik + kubernetes.io/ingress.class: haproxy spec: rules: - host: vaultwarden.lan @@ -13,7 +13,9 @@ spec: - path: / pathType: Prefix backend: - serviceName: vaultwarden - servicePort: 80 + service: + name: vaultwarden + port: + number: 80 # EOF diff --git a/vaultwarden_lb.yml b/vaultwarden_lb.yml new file mode 100644 index 0000000..79a9975 --- /dev/null +++ b/vaultwarden_lb.yml @@ -0,0 +1,19 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: vaultwarden + annotations: + metallb.universe.tf/address-pool: default + metallb.universe.tf/allow-shared-ip: "dot83" +spec: + loadBalancerIP: 192.168.20.83 + ports: + - port: 80 + targetPort: 80 + name: port80 + selector: + app: vaultwarden + type: LoadBalancer + +# EOF diff --git a/vaultwarden_pv.yml b/vaultwarden_pv.yml index 9af68cd..41dff1f 100644 --- a/vaultwarden_pv.yml +++ b/vaultwarden_pv.yml @@ -16,6 +16,6 @@ spec: - nfsvers=4.0 nfs: server: 192.168.20.11 - path: "/volume1/k8s-storage/vaultwarden-data" + path: "/volume1/k8s-storage/vaultwarden/data" # EOF