home/kubernetes-deployments
2
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

Move to new house

Browse source
This commit is contained in:
Pim Kunis 2025-04-30 22:29:13 +02:00
parent 2371c6f03f
commit 241847c7c7
4 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
applyset-deploy.sh
View file

@ -23,7 +23,7 @@ done
first_server="${SERVERS%% *}" first_server="${SERVERS%% *}"
previous_manifest=$( previous_manifest=$(
envsubst <<EOF | ssh -T "root@$first_server.dmz" envsubst <<EOF | ssh -T "root@$first_server"
if [[ -f "$GCROOTDIR/$NAME.yml" ]]; then if [[ -f "$GCROOTDIR/$NAME.yml" ]]; then
cat "$GCROOTDIR/$NAME.yml" cat "$GCROOTDIR/$NAME.yml"
fi fi
@ -46,7 +46,7 @@ read -r -p "Continue? " _
echo Uploading closure... echo Uploading closure...
for server in $SERVERS; do for server in $SERVERS; do
echo Uploading closure to "$server"... echo Uploading closure to "$server"...
nix copy --to "ssh://root@$server.dmz" "$MANIFEST" nix copy --to "ssh://root@$server" "$MANIFEST"
done done
echo Applying Kubernetes manifest... echo Applying Kubernetes manifest...
@ -59,7 +59,7 @@ vals eval -fail-on-missing-key-in-map <"$MANIFEST" |
echo Creating GC roots echo Creating GC roots
for server in $SERVERS; do for server in $SERVERS; do
ssh "root@$server.dmz" "mkdir -p $GCROOTDIR && ln -sf $MANIFEST $GCROOTDIR/${NAME}.yml" ssh "root@$server" "mkdir -p $GCROOTDIR && ln -sf $MANIFEST $GCROOTDIR/${NAME}.yml"
done done
if $CREATE_LOCAL_GCROOT; then if $CREATE_LOCAL_GCROOT; then

4
globals.nix
View file

@ -34,8 +34,8 @@ _: {
}; };
}; };
routerPublicIPv4 = "192.145.57.90"; routerPublicIPv4 = "89.220.7.89";
routerPublicIPv6 = "2a0d:6e00:1a77::1"; #routerPublicIPv6 = "2a0d:6e00:1a77::1";
bind9Ipv6 = "2a0d:6e00:1a77:30::134"; bind9Ipv6 = "2a0d:6e00:1a77:30::134";
# Load balancer IPv4 # Load balancer IPv4

2
modules/bind9/default.nix
View file

@ -117,6 +117,7 @@ in {
bind9-udp = { bind9-udp = {
metadata.annotations = { metadata.annotations = {
"metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4},${globals.bind9Ipv6}"; "metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4},${globals.bind9Ipv6}";
# "metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4}";
"metallb.universe.tf/allow-shared-ip" = "dns"; "metallb.universe.tf/allow-shared-ip" = "dns";
}; };
@ -137,6 +138,7 @@ in {
bind9-tcp = { bind9-tcp = {
metadata.annotations = { metadata.annotations = {
"metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4},${globals.bind9Ipv6}"; "metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4},${globals.bind9Ipv6}";
# "metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4}";
"metallb.universe.tf/allow-shared-ip" = "dns"; "metallb.universe.tf/allow-shared-ip" = "dns";
}; };

10
modules/bind9/kun.is.zone.nix
View file

@ -5,7 +5,7 @@ with dns.lib.combinators; {
SOA = { SOA = {
nameServer = "ns1"; nameServer = "ns1";
adminEmail = "webmaster.kun.is"; adminEmail = "webmaster.kun.is";
serial = 2024041301; serial = 2024041302;
}; };
NS = [ NS = [
@ -24,13 +24,15 @@ with dns.lib.combinators; {
subdomains = rec { subdomains = rec {
"*".A = [globals.routerPublicIPv4]; "*".A = [globals.routerPublicIPv4];
ns = { ns1 = {
A = [globals.routerPublicIPv4]; A = [globals.routerPublicIPv4];
AAAA = []; AAAA = [];
}; };
ns1 = ns; ns2 = {
ns2 = ns; A = ["192.145.57.90"];
AAAA = [];
};
wg = { wg = {
A = [globals.routerPublicIPv4]; A = [globals.routerPublicIPv4];