talexander/machine_setup
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Add missing cidr declarations.

Browse Source
This commit is contained in:
Tom Alexander 2025-12-23 06:48:06 -05:00 committed by Tom Alexander
parent f34e393803
commit dcfbc0864e
Signed by: talexander
GPG Key ID: 36C99E8B3C39D85F
7 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nix/kubernetes/hosts/controller0/default.nix
View File

@ -117,7 +117,8 @@
]; ];
me.kube_apiserver.internal_ip = "2620:11f:7001:7:ffff:ffff:0ad7:01dd"; me.kube_apiserver.internal_ip = "2620:11f:7001:7:ffff:ffff:0ad7:01dd";
me.kube_apiserver.external_ip = "74.80.180.138"; # me.kube_apiserver.external_ip = "74.80.180.138";
me.kube_apiserver.external_ip = "2620:11f:7001:7:ffff:ffff:0ad7:01dd";
me.kube_apiserver.etcd_services = [ me.kube_apiserver.etcd_services = [
"https://[2620:11f:7001:7:ffff:ffff:0ad7:01dd]:2379" # 10.215.1.221 "https://[2620:11f:7001:7:ffff:ffff:0ad7:01dd]:2379" # 10.215.1.221
"https://[2620:11f:7001:7:ffff:ffff:0ad7:01de]:2379" # 10.215.1.222 "https://[2620:11f:7001:7:ffff:ffff:0ad7:01de]:2379" # 10.215.1.222

3
nix/kubernetes/hosts/controller1/default.nix
View File

@ -117,7 +117,8 @@
]; ];
me.kube_apiserver.internal_ip = "2620:11f:7001:7:ffff:ffff:0ad7:01de"; me.kube_apiserver.internal_ip = "2620:11f:7001:7:ffff:ffff:0ad7:01de";
me.kube_apiserver.external_ip = "74.80.180.138"; # me.kube_apiserver.external_ip = "74.80.180.138";
me.kube_apiserver.external_ip = "2620:11f:7001:7:ffff:ffff:0ad7:01de";
me.kube_apiserver.etcd_services = [ me.kube_apiserver.etcd_services = [
"https://[2620:11f:7001:7:ffff:ffff:0ad7:01dd]:2379" # 10.215.1.221 "https://[2620:11f:7001:7:ffff:ffff:0ad7:01dd]:2379" # 10.215.1.221
"https://[2620:11f:7001:7:ffff:ffff:0ad7:01de]:2379" # 10.215.1.222 "https://[2620:11f:7001:7:ffff:ffff:0ad7:01de]:2379" # 10.215.1.222

3
nix/kubernetes/hosts/controller2/default.nix
View File

@ -117,7 +117,8 @@
]; ];
me.kube_apiserver.internal_ip = "2620:11f:7001:7:ffff:ffff:0ad7:01df"; me.kube_apiserver.internal_ip = "2620:11f:7001:7:ffff:ffff:0ad7:01df";
me.kube_apiserver.external_ip = "74.80.180.138"; # me.kube_apiserver.external_ip = "74.80.180.138";
me.kube_apiserver.external_ip = "2620:11f:7001:7:ffff:ffff:0ad7:01df";
me.kube_apiserver.etcd_services = [ me.kube_apiserver.etcd_services = [
"https://[2620:11f:7001:7:ffff:ffff:0ad7:01dd]:2379" # 10.215.1.221 "https://[2620:11f:7001:7:ffff:ffff:0ad7:01dd]:2379" # 10.215.1.221
"https://[2620:11f:7001:7:ffff:ffff:0ad7:01de]:2379" # 10.215.1.222 "https://[2620:11f:7001:7:ffff:ffff:0ad7:01de]:2379" # 10.215.1.222

3
nix/kubernetes/keys/package/bootstrap-script/files/manifests/coredns.yaml
View File

@ -201,7 +201,8 @@ metadata:
spec: spec:
selector: selector:
k8s-app: kube-dns k8s-app: kube-dns
clusterIP: 10.197.0.10 # clusterIP: 10.197.0.10
clusterIP: "fd00:3e42:e349::10"
ports: ports:
- name: dns - name: dns
port: 53 port: 53

2
nix/kubernetes/roles/kube_apiserver/default.nix
View File

@ -57,6 +57,7 @@ in
shellCommand [ shellCommand [
# NEW: # NEW:
"${pkgs.kubernetes}/bin/kube-apiserver" "${pkgs.kubernetes}/bin/kube-apiserver"
"--advertise-address=${config.me.kube_apiserver.external_ip}"
"--allow-privileged=true" "--allow-privileged=true"
"--audit-log-maxage=30" "--audit-log-maxage=30"
"--audit-log-maxbackup=3" "--audit-log-maxbackup=3"
@ -83,6 +84,7 @@ in
"--tls-cert-file=/.persist/keys/kube/kube-api-server.crt" "--tls-cert-file=/.persist/keys/kube/kube-api-server.crt"
"--tls-private-key-file=/.persist/keys/kube/kube-api-server.key" "--tls-private-key-file=/.persist/keys/kube/kube-api-server.key"
"--tls-min-version=VersionTLS13" "--tls-min-version=VersionTLS13"
"--service-cluster-ip-range=fd00:3e42:e349::/48"
"--v=2" "--v=2"
# OLD: # OLD:

1
nix/kubernetes/roles/kube_proxy/default.nix
View File

@ -57,6 +57,7 @@ in
"${pkgs.kubernetes}/bin/kube-proxy" "${pkgs.kubernetes}/bin/kube-proxy"
"--config=${config_file}" "--config=${config_file}"
"--nodeport-addresses=primary" "--nodeport-addresses=primary"
"--cluster-cidr=fd49:0595:2bba::/48"
] ]
); );
Restart = "on-failure"; Restart = "on-failure";

6
nix/kubernetes/roles/kubelet/files/kubelet-config.yaml
View File

@ -23,6 +23,6 @@ registerNode: true
runtimeRequestTimeout: "15m" runtimeRequestTimeout: "15m"
tlsCertFile: "/.persist/keys/kube/kubelet.crt" tlsCertFile: "/.persist/keys/kube/kubelet.crt"
tlsPrivateKeyFile: "/.persist/keys/kube/kubelet.key" tlsPrivateKeyFile: "/.persist/keys/kube/kubelet.key"
clusterDomain: "cluster.local" # clusterDomain: "cluster.local"
clusterDNS: # clusterDNS:
- "10.197.0.10" # - "10.197.0.10"