Skip to content

Commit

Permalink
Update Network
Browse files Browse the repository at this point in the history
  • Loading branch information
cftechwiz committed May 19, 2024
1 parent 41f4eb6 commit b1fb814
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .taskfiles/Kubernetes/Tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion ansible/kubernetes/inventory/group_vars/all/k3s-calico.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions ansible/kubernetes/inventory/group_vars/all/k3s.yml
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
cache
loop
local
prometheus 172.16.100.1:9153
prometheus 172.16.70.254:9153
}

(localhostz) {
Expand Down
4 changes: 2 additions & 2 deletions docs/src/notes/opnsense.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/src/notes/pikvm.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ reboot
drivers:
tes:
type: tesmart
host: 172.16.100.1
host: 172.16.70.254
port: 5000
scheme:
server0_led:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
jobLabel: coredns
subsets:
- addresses:
- ip: 172.16.100.1
- ip: 172.16.70.254
ports:
- name: metrics
port: 9153
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ metadata:
jobLabel: haproxy
subsets:
- addresses:
- ip: 172.16.100.1
- ip: 172.16.70.254
ports:
- name: metrics
port: 8404
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit b1fb814

Please sign in to comment.