Skip to content

Commit 8b78973

Browse files
jpayne3506jpayne3506
committed
docs: cleanup
1 parent 574f70b commit 8b78973

File tree

2 files changed

+40
-110
lines changed

2 files changed

+40
-110
lines changed

‎docs/feature/swift-v2/setup-guide-azcni.md‎

Lines changed: 22 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Swiftv2 Cilium Setup Guide
1+
# Swiftv2 Cilium Upgrade Guide
22

33
## Steps
44
### Clone repo + checkout branch for *.yamls
@@ -7,6 +7,20 @@ git clone https://github.com/Azure/azure-container-networking.git
77
git checkout jpayne3506/conflist-generation < TODO Change before merge >
88
```
99

10+
### Update Conflist
11+
Leverage a cni build from branch or use `acnpublic.azurecr.io/azure-cni:linux-amd64-v1.7.5-3-g93d32acd0` < TODO Change before merge >
12+
- This will install our chained conflist through the use of `test/integration/manifests/cni/conflist-installer.yaml`
13+
14+
```
15+
export CONFLIST=azure-chained-cilium.conflist
16+
export CONFLIST_PRIORITY=05
17+
export CNI_IMAGE=acnpublic.azurecr.io/azure-cni:linux-amd64-v1.7.5-3-g93d32acd0
18+
envsubst '${CONFLIST},${CONFLIST_PRIORITY},${CNI_IMAGE}' < test/integration/manifests/cni/conflist-installer.yaml | kubectl apply -f -
19+
```
20+
21+
> NOTE: if your current conflist file name starts with `05` then change our previous filename to one with higher priority to ensure that it is consumed. i.e. `03-azure-chained-cilium.conflist`
22+
23+
1024
### Apply cilium config
1125
```
1226
export DIR=1.17
@@ -17,15 +31,12 @@ kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-
1731

1832
- Remove `kube-proxy-replacement-healthz-bind-address: "0.0.0.0:10256"` from configmap if kube-proxy is current on nodes
1933

20-
### Apply cilium Agent + Operator
34+
### Apply cilium Agent + Operator + RBAC
2135
```
2236
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
2337
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
24-
```
25-
26-
### Apply/Edit CNS configmap
27-
```
28-
kubectl apply -f test/integration/manifests/cnsconfig/azcnichainedciliumconfigmap.yaml
38+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
39+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
2940
```
3041

3142
!!!! TODO !!!!
@@ -42,11 +53,6 @@ Remove `#### Must have configmap values`
4253
"CNIConflistFilepath": "/etc/cni/net.d/05-azure-chained-cilium.conflist"
4354
```
4455

45-
### Update CNS image
46-
Leverage a cns build from branch or use `acnpublic.azurecr.io/azure-cns:v1.7.5-2-g94c36c070` < TODO Change before merge >
47-
- This will install our chained conflist through the use of `"CNIConflistScenario": "azurecni-chained-cilium"` and it will be installed on the node here `"CNIConflistFilepath": "/etc/cni/net.d/05-azure-chained-cilium.conflist"`
48-
49-
> NOTE: if your current conflist file name starts with `05` then change our previous filename to one with higher priority to ensure that it is consumed on restart. I.e. `03-azure-chained-cilium.conflist`
5056

5157
### If kube-proxy was present
5258
#### Remove kube-proxy
@@ -65,11 +71,14 @@ kubectl rollout restart ds -n kube-system cilium
6571
- You do not need to remove if node does not have kube-proxy enabled
6672
- If applied before agent is in ready state then no need to restart agent
6773
- Apply Agent + Operator
74+
75+
!!! TODO REPLACE WITH INSTALLER !!!
6876
- Apply/Edit CNS config with
6977
- "ProgramSNATIPTables": false
7078
- "CNIConflistScenario": "azurecni-chained-cilium"
7179
- "CNIConflistFilepath": "/etc/cni/net.d/05-azure-chained-cilium.conflist"
72-
- Update CNS image with build from branch or < TODO IMAGE NAME >
80+
!!!
81+
- Update CNI image with build from branch or < TODO IMAGE NAME >
7382
- This will install chained conflist
7483

7584
#### If kube-proxy was present
@@ -96,27 +105,3 @@ kubectl rollout restart ds -n kube-system cilium
96105
- confirm CNP working by attempting to ping coredns pods
97106
- should fail if both are being maintained by cilium
98107
- confirm with `kubectl get cep -A`
99-
100-
101-
102-
103-
Managed Cil setup
104-
- Watcher deployment
105-
- CIL DS
106-
- RBAC
107-
- CM
108-
- Overwritten by DS
109-
- Conflist installer
110-
- CONFLIST
111-
112-
113-
114-
115-
AZCNI Cil setup
116-
- Deploy from test/integration/manifests/cilium/v1.17
117-
- CIL DS
118-
- RBAC
119-
- CM
120-
- custom for sv2 test/integration/manifests/cilium/v1.17/cilium-config/cilium-chained-config.yaml
121-
- Conflist installer
122-
- CONFLIST

‎docs/feature/swift-v2/setup-guide-cil.md‎

Lines changed: 18 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -7,68 +7,37 @@ git clone https://github.com/Azure/azure-container-networking.git
77
git checkout jpayne3506/conflist-generation < TODO Change before merge >
88
```
99

10-
### Apply cilium config
10+
### Update Conflist
11+
Leverage a cni build from branch or use `acnpublic.azurecr.io/azure-cni:linux-amd64-v1.7.5-3-g93d32acd0` < TODO Change before merge >
12+
- This will install our chained conflist through the use of `test/integration/manifests/cni/conflist-installer.yaml`
13+
1114
```
12-
export DIR=1.17
13-
export CILIUM_VERSION_TAG=v1.17.7-250927
14-
export CILIUM_IMAGE_REGISTRY=mcr.microsoft.com/containernetworking
15-
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-chained-config.yaml
15+
export CONFLIST=azure-chained-cilium.conflist
16+
export CONFLIST_PRIORITY=05
17+
export CNI_IMAGE=acnpublic.azurecr.io/azure-cni:linux-amd64-v1.7.5-3-g93d32acd0
18+
envsubst '${CONFLIST},${CONFLIST_PRIORITY},${CNI_IMAGE}' < test/integration/manifests/cni/conflist-installer.yaml | kubectl apply -f -
1619
```
1720

18-
- Remove `kube-proxy-replacement-healthz-bind-address: "0.0.0.0:10256"` from configmap if kube-proxy is current on nodes
21+
> NOTE: if your current conflist file name starts with `05` then change our previous filename to one with higher priority to ensure that it is consumed. i.e. `03-azure-chained-cilium.conflist`
1922
20-
### Apply cilium Agent + Operator
21-
```
22-
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
23-
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
24-
```
2523

26-
### Apply/Edit CNS configmap
24+
### Apply Watcher
2725
```
28-
kubectl apply -f test/integration/manifests/cnsconfig/azcnichainedciliumconfigmap.yaml
26+
kubectl apply -f test/integration/manifests/cilium/watcher/deployment.yaml
2927
```
30-
#### Must have configmap values
28+
29+
- Watcher obtains existing RBAC and DS from managed node
30+
- We overwrite CM values through the use of DS args on the `cilium-agent` container
31+
i.e. overwrites `--cni-chaining-mode`
3132
```
32-
"ProgramSNATIPTables": false
33-
"CNIConflistScenario": "azurecni-chained-cilium"
34-
"CNIConflistFilepath": "/etc/cni/net.d/05-azure-chained-cilium.conflist"
33+
yq eval '.spec.template.spec.containers[0].args += ["--cni-chaining-mode=generic-veth"]' -i "$temp_file"
3534
```
3635

37-
### Update CNS image
38-
Leverage a cns build from branch or use `acnpublic.azurecr.io/azure-cns:v1.7.5-2-g94c36c070` < TODO Change before merge >
39-
- This will install our chained conflist through the use of `"CNIConflistScenario": "azurecni-chained-cilium"` and it will be installed on the node here `"CNIConflistFilepath": "/etc/cni/net.d/05-azure-chained-cilium.conflist"`
40-
41-
> NOTE: if your current conflist file name starts with `05` then change our previous filename to one with higher priority to ensure that it is consumed on restart. I.e. `03-azure-chained-cilium.conflist`
42-
43-
### If kube-proxy was present
44-
#### Remove kube-proxy
45-
> NOTE: Reapply `kube-proxy-replacement-healthz-bind-address: "0.0.0.0:10256"` to cilium configmap if previously removed
46-
47-
This can be done either by editing the node-selectors or deleting the ds. Both work...
48-
49-
#### Restart Cilium
50-
kubectl rollout restart ds -n kube-system cilium
5136

5237

5338
### Quick Summary
54-
- Apply/Edit Cilium Config with
55-
- `cni-chaining-mode: generic-veth`
56-
- remove `kube-proxy-replacement-healthz-bind-address`
57-
- You do not need to remove if node does not have kube-proxy enabled
58-
- If applied before agent is in ready state then no need to restart agent
59-
- Apply Agent + Operator
60-
- Apply/Edit CNS config with
61-
- "ProgramSNATIPTables": false
62-
- "CNIConflistScenario": "azurecni-chained-cilium"
63-
- "CNIConflistFilepath": "/etc/cni/net.d/05-azure-chained-cilium.conflist"
64-
- Update CNS image with build from branch or < TODO IMAGE NAME >
65-
- This will install chained conflist
66-
67-
#### If kube-proxy was present
68-
- Reapply `kube-proxy-replacement-healthz-bind-address: "0.0.0.0:10256"` to cilium configmap
69-
- Remove Kube-proxy
70-
- Restart Cilium
71-
39+
- Apply conflist installer to update conflist on BYON
40+
- Apply Watcher and Overwrite existing CM values through `cilium-agent` container
7241

7342
## Quick Vaildation testing
7443
- Create pods from deploy
@@ -88,27 +57,3 @@ kubectl rollout restart ds -n kube-system cilium
8857
- confirm CNP working by attempting to ping coredns pods
8958
- should fail if both are being maintained by cilium
9059
- confirm with `kubectl get cep -A`
91-
92-
93-
94-
95-
Managed Cil setup
96-
- Watcher deployment
97-
- CIL DS
98-
- RBAC
99-
- CM
100-
- Overwritten by DS
101-
- Conflist installer
102-
- CONFLIST
103-
104-
105-
106-
107-
AZCNI Cil setup
108-
- Deploy from test/integration/manifests/cilium/v1.17
109-
- CIL DS
110-
- RBAC
111-
- CM
112-
- custom for sv2 test/integration/manifests/cilium/v1.17/cilium-config/cilium-chained-config.yaml
113-
- Conflist installer
114-
- CONFLIST

0 commit comments

Comments
 (0)