diff --git a/README.md b/README.md index 680ddcc..97d797a 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ This tutorial requires four (4) ARM64 or AMD64 based virtual or physical machine * [Generating Kubernetes Configuration Files for Authentication](docs/05-kubernetes-configuration-files.md) * [Generating the Data Encryption Config and Key](docs/06-data-encryption-keys.md) * [Bootstrapping the etcd Cluster](docs/07-bootstrapping-etcd.md) -* [Bootstrapping the Kubernetes Control Plane](docs/08-bootstrapping-kubernetes-controlplane) +* [Bootstrapping the Kubernetes Control Plane](docs/08-bootstrapping-kubernetes-controlplane.md) * [Bootstrapping the Kubernetes Worker Nodes](docs/09-bootstrapping-kubernetes-workers.md) * [Configuring kubectl for Remote Access](docs/10-configuring-kubectl.md) * [Provisioning Pod Network Routes](docs/11-pod-network-routes.md) diff --git a/configs/10-bridge.conf b/configs/10-bridge.conf index e9a3bff..ab665f3 100644 --- a/configs/10-bridge.conf +++ b/configs/10-bridge.conf @@ -1,15 +1,24 @@ { "cniVersion": "1.0.0", - "name": "bridge", - "type": "bridge", - "bridge": "cni0", - "isGateway": true, - "ipMasq": true, - "ipam": { - "type": "host-local", - "ranges": [ - [{"subnet": "SUBNET"}] - ], - "routes": [{"dst": "0.0.0.0/0"}] - } + "name": "crio", + "plugins": [ + { + "type": "bridge", + "bridge": "cni0", + "isGateway": true, + "ipMasq": true, + "hairpinMode": true, + "ipam": { + "type": "host-local", + "routes": [ + { "dst": "0.0.0.0/0" }, + { "dst": "::/0" } + ], + "ranges": [ + [{ "subnet": "IPV4_SUBNET" }], + [{ "subnet": "IPV6_SUBNET" }] + ] + } + } + ] } \ No newline at end of file diff --git a/configs/11-crio-ipv4-bridge.conflist b/configs/11-crio-ipv4-bridge.conflist new file mode 100644 index 0000000..62d76b9 --- /dev/null +++ b/configs/11-crio-ipv4-bridge.conflist @@ -0,0 +1,22 @@ +{ + "cniVersion": "1.0.0", + "name": "crio", + "plugins": [ + { + "type": "bridge", + "bridge": "cni0", + "isGateway": true, + "ipMasq": true, + "hairpinMode": true, + "ipam": { + "type": "host-local", + "routes": [ + { "dst": "0.0.0.0/0" } + ], + "ranges": [ + [{ "subnet": "SUBNET" }] + ] + } + } + ] +} \ No newline at end of file