From 615f02b4281c46af7c5a809abb0a99afb830dcba Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Wed, 8 May 2024 15:11:54 -0500 Subject: [PATCH] More bgp->l2 changes --- .../crunchy-postgres-operator/cluster/postgrescluster.yaml | 2 +- .../apps/home-automation/mosquitto/app/helmrelease.yaml | 4 ++-- kubernetes/apps/kube-system/cilium/config/l2.yaml | 4 ++-- .../apps/network/ingress-nginx/external/helmrelease.yaml | 2 +- .../apps/network/ingress-nginx/internal/helmrelease.yaml | 2 +- .../apps/observability/vector/app/aggregator/helmrelease.yaml | 2 +- kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kubernetes/apps/database/crunchy-postgres-operator/cluster/postgrescluster.yaml b/kubernetes/apps/database/crunchy-postgres-operator/cluster/postgrescluster.yaml index 15b9d76c..679b1323 100644 --- a/kubernetes/apps/database/crunchy-postgres-operator/cluster/postgrescluster.yaml +++ b/kubernetes/apps/database/crunchy-postgres-operator/cluster/postgrescluster.yaml @@ -17,7 +17,7 @@ spec: metadata: annotations: external-dns.alpha.kubernetes.io/hostname: postgres.jahanson.tech - io.cilium/lb-ipam-ips: 10.45.0.7 + io.cilium/lb-ipam-ips: 10.1.1.35 monitoring: pgmonitor: diff --git a/kubernetes/apps/home-automation/mosquitto/app/helmrelease.yaml b/kubernetes/apps/home-automation/mosquitto/app/helmrelease.yaml index 51d142d2..5c725d24 100644 --- a/kubernetes/apps/home-automation/mosquitto/app/helmrelease.yaml +++ b/kubernetes/apps/home-automation/mosquitto/app/helmrelease.yaml @@ -70,7 +70,7 @@ spec: type: LoadBalancer annotations: external-dns.alpha.kubernetes.io/hostname: "mqtt.jahanson.tech" - io.cilium/lb-ipam-ips: "10.45.0.10" + io.cilium/lb-ipam-ips: "10.1.1.36" externalTrafficPolicy: Local ports: mqtt: @@ -102,4 +102,4 @@ spec: mosquitto-externalconfig: type: emptyDir globalMounts: - - path: /mosquitto/external_config \ No newline at end of file + - path: /mosquitto/external_config diff --git a/kubernetes/apps/kube-system/cilium/config/l2.yaml b/kubernetes/apps/kube-system/cilium/config/l2.yaml index 5c68a493..5ab17a47 100644 --- a/kubernetes/apps/kube-system/cilium/config/l2.yaml +++ b/kubernetes/apps/kube-system/cilium/config/l2.yaml @@ -20,5 +20,5 @@ spec: allowFirstLastIPs: "Yes" blocks: - # Controller VIP: 192.168.42.120 - start: 10.45.0.1 - stop: 10.45.0.30 + start: 10.1.1.30 + stop: 10.1.1.49 diff --git a/kubernetes/apps/network/ingress-nginx/external/helmrelease.yaml b/kubernetes/apps/network/ingress-nginx/external/helmrelease.yaml index 52f2ac6a..10281f99 100644 --- a/kubernetes/apps/network/ingress-nginx/external/helmrelease.yaml +++ b/kubernetes/apps/network/ingress-nginx/external/helmrelease.yaml @@ -32,7 +32,7 @@ spec: type: LoadBalancer annotations: external-dns.alpha.kubernetes.io/hostname: external.hsn.dev - io.cilium/lb-ipam-ips: 10.45.0.2 + io.cilium/lb-ipam-ips: 10.1.1.30 publishService: enabled: true diff --git a/kubernetes/apps/network/ingress-nginx/internal/helmrelease.yaml b/kubernetes/apps/network/ingress-nginx/internal/helmrelease.yaml index 77e46347..ef623132 100644 --- a/kubernetes/apps/network/ingress-nginx/internal/helmrelease.yaml +++ b/kubernetes/apps/network/ingress-nginx/internal/helmrelease.yaml @@ -33,7 +33,7 @@ spec: type: LoadBalancer annotations: external-dns.alpha.kubernetes.io/hostname: "internal.jahanson.tech" - io.cilium/lb-ipam-ips: "10.45.0.3" + io.cilium/lb-ipam-ips: "10.1.1.31" externalTrafficPolicy: Cluster publishService: diff --git a/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml b/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml index 0100c459..ef3e4bf1 100644 --- a/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml +++ b/kubernetes/apps/observability/vector/app/aggregator/helmrelease.yaml @@ -62,7 +62,7 @@ spec: type: LoadBalancer annotations: external-dns.alpha.kubernetes.io/hostname: vector.jahanson.tech - io.cilium/lb-ipam-ips: 10.45.0.4 + io.cilium/lb-ipam-ips: 10.1.1.33 ports: http: port: 8686 diff --git a/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml b/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml index 0b77447b..cf132e4f 100644 --- a/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml +++ b/kubernetes/apps/qbittorrent/qbittorrent/app/helmrelease.yaml @@ -119,7 +119,7 @@ spec: controller: qbittorrent type: LoadBalancer annotations: - io.cilium/lb-ipam-ips: 10.45.0.5 + io.cilium/lb-ipam-ips: 10.1.1.34 ports: bittorrent: enabled: true