Skip to content

Commit c2b38df

Browse files
authored
Merge pull request #28138 from aanm/update-cilium-docs
Update cilium docs
2 parents e3a4ff9 + e4615a2 commit c2b38df

File tree

2 files changed

+40
-26
lines changed

2 files changed

+40
-26
lines changed

content/en/docs/tasks/administer-cluster/network-policy-provider/cilium-network-policy.md

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -24,45 +24,59 @@ For background on Cilium, read the [Introduction to Cilium](https://docs.cilium.
2424
## Deploying Cilium on Minikube for Basic Testing
2525

2626
To get familiar with Cilium easily you can follow the
27-
[Cilium Kubernetes Getting Started Guide](https://docs.cilium.io/en/stable/gettingstarted/minikube/)
27+
[Cilium Kubernetes Getting Started Guide](https://docs.cilium.io/en/stable/gettingstarted/k8s-install-default/)
2828
to perform a basic DaemonSet installation of Cilium in minikube.
2929

30-
To start minikube, minimal version required is >= v1.3.1, run the with the
30+
To start minikube, minimal version required is >= v1.5.2, run the with the
3131
following arguments:
3232

3333
```shell
3434
minikube version
3535
```
3636
```
37-
minikube version: v1.3.1
37+
minikube version: v1.5.2
3838
```
3939

4040
```shell
41-
minikube start --network-plugin=cni --memory=4096
41+
minikube start --network-plugin=cni
4242
```
4343

44-
Mount the BPF filesystem:
44+
For minikube you can install Cilium using its CLI tool. Cilium will
45+
automatically detect the cluster configuration and will install the appropriate
46+
components for a successful installation:
4547

4648
```shell
47-
minikube ssh -- sudo mount bpffs -t bpf /sys/fs/bpf
48-
```
49-
50-
For minikube you can deploy this simple ''all-in-one'' YAML file that includes
51-
DaemonSet configurations for Cilium as well as appropriate RBAC settings:
52-
53-
```shell
54-
kubectl create -f https://raw.githubusercontent.com/cilium/cilium/v1.8/install/kubernetes/quick-install.yaml
49+
curl -LO https://github.com/cilium/cilium-cli/releases/latest/download/cilium-linux-amd64.tar.gz
50+
sudo tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
51+
rm cilium-linux-amd64.tar.gz
52+
cilium install
5553
```
5654
```
57-
configmap/cilium-config created
58-
serviceaccount/cilium created
59-
serviceaccount/cilium-operator created
60-
clusterrole.rbac.authorization.k8s.io/cilium created
61-
clusterrole.rbac.authorization.k8s.io/cilium-operator created
62-
clusterrolebinding.rbac.authorization.k8s.io/cilium created
63-
clusterrolebinding.rbac.authorization.k8s.io/cilium-operator created
64-
daemonset.apps/cilium create
65-
deployment.apps/cilium-operator created
55+
🔮 Auto-detected Kubernetes kind: minikube
56+
✨ Running "minikube" validation checks
57+
✅ Detected minikube version "1.20.0"
58+
ℹ️ Cilium version not set, using default version "v1.10.0"
59+
🔮 Auto-detected cluster name: minikube
60+
🔮 Auto-detected IPAM mode: cluster-pool
61+
🔮 Auto-detected datapath mode: tunnel
62+
🔑 Generating CA...
63+
2021/05/27 02:54:44 [INFO] generate received request
64+
2021/05/27 02:54:44 [INFO] received CSR
65+
2021/05/27 02:54:44 [INFO] generating key: ecdsa-256
66+
2021/05/27 02:54:44 [INFO] encoded CSR
67+
2021/05/27 02:54:44 [INFO] signed certificate with serial number 48713764918856674401136471229482703021230538642
68+
🔑 Generating certificates for Hubble...
69+
2021/05/27 02:54:44 [INFO] generate received request
70+
2021/05/27 02:54:44 [INFO] received CSR
71+
2021/05/27 02:54:44 [INFO] generating key: ecdsa-256
72+
2021/05/27 02:54:44 [INFO] encoded CSR
73+
2021/05/27 02:54:44 [INFO] signed certificate with serial number 3514109734025784310086389188421560613333279574
74+
🚀 Creating Service accounts...
75+
🚀 Creating Cluster roles...
76+
🚀 Creating ConfigMap...
77+
🚀 Creating Agent DaemonSet...
78+
🚀 Creating Operator Deployment...
79+
⌛ Waiting for Cilium to be installed...
6680
```
6781

6882
The remainder of the Getting Started Guide explains how to enforce both L3/L4
@@ -85,14 +99,14 @@ Deploying a cluster with Cilium adds Pods to the `kube-system` namespace. To see
8599
this list of Pods run:
86100

87101
```shell
88-
kubectl get pods --namespace=kube-system
102+
kubectl get pods --namespace=kube-system -l k8s-app=cilium
89103
```
90104

91105
You'll see a list of Pods similar to this:
92106

93107
```console
94-
NAME READY STATUS RESTARTS AGE
95-
cilium-6rxbd 1/1 Running 0 1m
108+
NAME READY STATUS RESTARTS AGE
109+
cilium-kkdhz 1/1 Running 0 3m23s
96110
...
97111
```
98112

content/en/docs/tasks/network/validate-dual-stack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This document shares how to validate IPv4/IPv6 dual-stack enabled Kubernetes clu
1616

1717

1818
* Provider support for dual-stack networking (Cloud provider or otherwise must be able to provide Kubernetes nodes with routable IPv4/IPv6 network interfaces)
19-
* A [network plugin](/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/) that supports dual-stack (such as Kubenet or Calico)
19+
* A [network plugin](/docs/concepts/extend-kubernetes/compute-storage-net/network-plugins/) that supports dual-stack (such as Calico, Cilium or Kubenet)
2020
* [Dual-stack enabled](/docs/concepts/services-networking/dual-stack/) cluster
2121

2222
{{< version-check >}}

0 commit comments

Comments
 (0)