From b1fb814f1297bc328c2bdc596e020bbbe8eb30ca Mon Sep 17 00:00:00 2001 From: cftechwiz Date: Sun, 19 May 2024 13:32:22 -0500 Subject: [PATCH] Update Network --- .taskfiles/Kubernetes/Tasks.yml | 4 ++-- ansible/kubernetes/inventory/group_vars/all/k3s-calico.yml | 2 +- ansible/kubernetes/inventory/group_vars/all/k3s.yml | 4 ++-- .../roles/k8s_gateway.router/templates/Corefile.j2 | 2 +- docs/src/notes/opnsense.md | 4 ++-- docs/src/notes/pikvm.md | 2 +- .../monitoring/kube-prometheus-stack/app/helmrelease.yaml | 6 +++--- .../miscellaneous/servicemonitors/opnsense-coredns.yaml | 2 +- .../servicemonitors/opnsense-frr-exporter.yaml | 2 +- .../miscellaneous/servicemonitors/opnsense-haproxy.yaml | 2 +- .../servicemonitors/opnsense-node-exporter.yaml | 2 +- .../apps/monitoring/snmp-exporter/apc-ups/dashboard.json | 4 ++-- .../apps/tigera-operator/tigera-operator/app/configmap.yaml | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.taskfiles/Kubernetes/Tasks.yml b/.taskfiles/Kubernetes/Tasks.yml index 138418935f..c061a22799 100644 --- a/.taskfiles/Kubernetes/Tasks.yml +++ b/.taskfiles/Kubernetes/Tasks.yml @@ -6,8 +6,8 @@ tasks: desc: Download kubeconfig from a remote k3s master node vars: MASTER_USERNAME: '{{.MASTER_USERNAME | default "cftechwiz"}}' - MASTER_HOST: '{{.MASTER_HOST | default "172.16.70.30"}}' - KUBERNETES_API: '{{.KUBERNETES_API | default "172.16.70.30"}}' + MASTER_HOST: '{{.MASTER_HOST | default "172.16.70.254"}}' + KUBERNETES_API: '{{.KUBERNETES_API | default "172.16.70.254"}}' cmds: - rsync --verbose --progress --partial --rsync-path="sudo rsync" {{.MASTER_USERNAME}}@{{.MASTER_HOST}}:/etc/rancher/k3s/k3s.yaml "${KUBECONFIG}" - sed -i '' 's/127.0.0.1/{{.KUBERNETES_API}}/g' "${KUBECONFIG}" diff --git a/ansible/kubernetes/inventory/group_vars/all/k3s-calico.yml b/ansible/kubernetes/inventory/group_vars/all/k3s-calico.yml index e749df8a8b..864cb010dc 100644 --- a/ansible/kubernetes/inventory/group_vars/all/k3s-calico.yml +++ b/ansible/kubernetes/inventory/group_vars/all/k3s-calico.yml @@ -1,5 +1,5 @@ calico_encapsulation: "None" -calico_bgp_peer_ip: 172.16.70.1 +calico_bgp_peer_ip: 172.16.70.254 calico_bgp_as_number: 64514 calico_bgp_external_ips: 192.168.69.0/24 calico_node_cidr: 172.16.70.0/24 diff --git a/ansible/kubernetes/inventory/group_vars/all/k3s.yml b/ansible/kubernetes/inventory/group_vars/all/k3s.yml index 5d25654245..4ffb8d9152 100644 --- a/ansible/kubernetes/inventory/group_vars/all/k3s.yml +++ b/ansible/kubernetes/inventory/group_vars/all/k3s.yml @@ -1,5 +1,5 @@ # Calico configuration -calico_bgp_peer_ip: 172.16.70.1 +calico_bgp_peer_ip: 172.16.70.254 calico_bgp_peer_as_number: 64513 calico_bgp_external_ips: 192.168.69.0/24 k3s_release_version: "v1.29.2+k3s1" @@ -10,7 +10,7 @@ k3s_become: true k3s_debug: false # (bool) Enable etcd embedded datastore k3s_etcd_datastore: true -k3s_registration_address: 172.16.70.30 +k3s_registration_address: 172.16.70.254 k3s_use_unsupported_config: true k3s_server_manifests_templates: - calico-installation.yaml.j2 diff --git a/ansible/router/playbooks/roles/k8s_gateway.router/templates/Corefile.j2 b/ansible/router/playbooks/roles/k8s_gateway.router/templates/Corefile.j2 index f57a7052a5..0d062e75b3 100644 --- a/ansible/router/playbooks/roles/k8s_gateway.router/templates/Corefile.j2 +++ b/ansible/router/playbooks/roles/k8s_gateway.router/templates/Corefile.j2 @@ -6,7 +6,7 @@ cache loop local - prometheus 172.16.100.1:9153 + prometheus 172.16.70.254:9153 } (localhostz) { diff --git a/docs/src/notes/opnsense.md b/docs/src/notes/opnsense.md index cab62268cb..44143df3a2 100644 --- a/docs/src/notes/opnsense.md +++ b/docs/src/notes/opnsense.md @@ -57,14 +57,14 @@ While kube-vip is very nice for having a API server ready to go and running in y 2. `Name` = `k8s-apiserver-be` 3. `Mode` = `TCP (Layer 4)` 4. `Servers` = `k8s-apiserver-x` ... (Add one for each server you created. Use TAB key to complete typing each server) - 5. `Source address` = `172.16.100.1` (Your Opnsense IP address) + 5. `Source address` = `172.16.70.254` (Your Opnsense IP address) 6. `Enable Health Checking` = `true` 7. `Health Monitor` = `k8s-apiserver-health` 8. Apply/Save 4. Services > HAProxy | Virtual Services > Public Services 1. `Enabled` = `true` 2. `Name` = `k8s-apiserver-fe` - 3. `Listen Addresses` = `172.16.100.1:6443` (Your Opnsense IP address. Use TAB key to complete typing a listen address) + 3. `Listen Addresses` = `172.16.70.254:6443` (Your Opnsense IP address. Use TAB key to complete typing a listen address) 4. `Type` = `TCP` 5. `Default Backend Pool` = `k8s-apiserver-be` 6. Apply/Save diff --git a/docs/src/notes/pikvm.md b/docs/src/notes/pikvm.md index 4c0af6cc16..7fbd14c090 100644 --- a/docs/src/notes/pikvm.md +++ b/docs/src/notes/pikvm.md @@ -16,7 +16,7 @@ reboot drivers: tes: type: tesmart - host: 172.16.100.1 + host: 172.16.70.254 port: 5000 scheme: server0_led: diff --git a/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml index ebd117c074..4998d6b25c 100644 --- a/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml +++ b/kubernetes/apps/monitoring/kube-prometheus-stack/app/helmrelease.yaml @@ -154,16 +154,16 @@ spec: enabled: true kubeControllerManager: enabled: true - endpoints: ["172.16.100.1"] + endpoints: ["172.16.70.254"] kubeScheduler: enabled: true - endpoints: ["172.16.100.1"] + endpoints: ["172.16.70.254"] kubeProxy: enabled: false # Enable if not using eBPF # endpoints: ["172.16.70.30", "172.16.70.11", "172.16.70.12"] kubeEtcd: enabled: true - endpoints: ["172.16.100.1"] + endpoints: ["172.16.70.254"] service: enabled: true port: 2381 diff --git a/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-coredns.yaml b/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-coredns.yaml index 7db4727592..831400339e 100644 --- a/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-coredns.yaml +++ b/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-coredns.yaml @@ -10,7 +10,7 @@ metadata: jobLabel: coredns subsets: - addresses: - - ip: 172.16.100.1 + - ip: 172.16.70.254 ports: - name: metrics port: 9153 diff --git a/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-frr-exporter.yaml b/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-frr-exporter.yaml index 03ba6262b9..03ca13b50c 100644 --- a/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-frr-exporter.yaml +++ b/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-frr-exporter.yaml @@ -10,7 +10,7 @@ metadata: jobLabel: frr-exporter subsets: - addresses: - - ip: 172.16.100.1 + - ip: 172.16.70.254 ports: - name: metrics port: 9342 diff --git a/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-haproxy.yaml b/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-haproxy.yaml index 4f0eaa7fbb..9957429dcc 100644 --- a/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-haproxy.yaml +++ b/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-haproxy.yaml @@ -10,7 +10,7 @@ metadata: jobLabel: haproxy subsets: - addresses: - - ip: 172.16.100.1 + - ip: 172.16.70.254 ports: - name: metrics port: 8404 diff --git a/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-node-exporter.yaml b/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-node-exporter.yaml index 976e0cfa48..13527cef97 100644 --- a/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-node-exporter.yaml +++ b/kubernetes/apps/monitoring/miscellaneous/servicemonitors/opnsense-node-exporter.yaml @@ -10,7 +10,7 @@ metadata: jobLabel: node-exporter subsets: - addresses: - - ip: 172.16.100.1 + - ip: 172.16.70.254 ports: - name: metrics port: 9100 diff --git a/kubernetes/apps/monitoring/snmp-exporter/apc-ups/dashboard.json b/kubernetes/apps/monitoring/snmp-exporter/apc-ups/dashboard.json index 9358361213..54869f7893 100644 --- a/kubernetes/apps/monitoring/snmp-exporter/apc-ups/dashboard.json +++ b/kubernetes/apps/monitoring/snmp-exporter/apc-ups/dashboard.json @@ -1059,8 +1059,8 @@ { "allValue": null, "current": { - "text": "172.16.100.1", - "value": "172.16.100.1" + "text": "172.16.70.254", + "value": "172.16.70.254" }, "datasource": "Prometheus", "definition": "label_values(upsCommStatus,instance)", diff --git a/kubernetes/apps/tigera-operator/tigera-operator/app/configmap.yaml b/kubernetes/apps/tigera-operator/tigera-operator/app/configmap.yaml index 11550d9059..701c27ae8b 100644 --- a/kubernetes/apps/tigera-operator/tigera-operator/app/configmap.yaml +++ b/kubernetes/apps/tigera-operator/tigera-operator/app/configmap.yaml @@ -5,5 +5,5 @@ metadata: name: kubernetes-services-endpoint namespace: tigera-operator data: - KUBERNETES_SERVICE_HOST: "172.16.70.30" + KUBERNETES_SERVICE_HOST: "172.16.70.254" KUBERNETES_SERVICE_PORT: "6443"