Skip to content

Commit 4e5da84

Browse files
QxBytesQxBytes
authored
docs: update images for swiftv2 cilium (#4424)
update images for swiftv2 cilium
1 parent 0722fab commit 4e5da84

5 files changed

Lines changed: 18 additions & 1059 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@ git checkout master
5757

5858
### All: Update Conflist
5959
> [!NOTE]
60-
> You can replace `acnpublic.azurecr.io/public/containernetworking/azure-cni:v1.7.5-3` with an mcr image in prod that has the chained cilium conflist. The installer only installs the conflist (not cni) so the above image should be sufficient.
60+
> The image below is an mcr image in prod that has the chained cilium conflist. The installer only installs the conflist (not cni) so this image is sufficient.
6161
```
6262
export CONFLIST=azure-chained-cilium.conflist
6363
export CONFLIST_PRIORITY=05
64-
export CNI_IMAGE=acnpublic.azurecr.io/public/containernetworking/azure-cni:v1.7.5-3
64+
export CNI_IMAGE=mcr.microsoft.com/containernetworking/v2/azure-cni:v1.8.7-1
6565
envsubst '${CONFLIST},${CONFLIST_PRIORITY},${CNI_IMAGE}' < test/integration/manifests/cni/conflist-installer-byon.yaml | kubectl apply -f -
6666
```
6767

6868
### Existing Cluster Only: Apply Unmanaged Cilium Daemonset with Alt Healthz Bind Port
69-
Unmanaged daemonset uses Cilium v1.18.6 (matches AKS managed Cilium for k8s 1.34 overlay clusters).
69+
Unmanaged daemonset uses Cilium v1.18.9 (matches AKS managed Cilium for k8s 1.34 overlay clusters).
7070
```
7171
kubectl apply -f test/integration/manifests/cilium/v1.18/unmanaged/daemonset-alt-healthz-port.yaml
7272
```
@@ -79,7 +79,7 @@ kubectl apply -f test/integration/manifests/cilium/v1.18/unmanaged/daemonset-alt
7979
- After removing kube-proxy succeeds, we can start to apply the normal unmanaged cilium ds below
8080

8181
### All: Apply Unmanaged Cilium Daemonset
82-
Assuming k8s 1.34. Unmanaged daemonset uses Cilium v1.18.6 (matches AKS managed Cilium for k8s 1.34 overlay clusters).
82+
Assuming k8s 1.34. Unmanaged daemonset uses Cilium v1.18.9 (matches AKS managed Cilium for k8s 1.34 overlay clusters).
8383
```
8484
kubectl apply -f test/integration/manifests/cilium/v1.18/unmanaged/daemonset.yaml
8585
```

‎test/integration/manifests/cilium/v1.18/unmanaged/daemonset-alt-healthz-port.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
value: "1"
6262
- name: KUBE_CLIENT_BACKOFF_DURATION
6363
value: "120"
64-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless:v1.18.6-260319
64+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless:v1.18.9-260508
6565
imagePullPolicy: IfNotPresent
6666
livenessProbe:
6767
failureThreshold: 10
@@ -231,7 +231,7 @@ spec:
231231
- /install-plugin.sh
232232
command:
233233
- sh
234-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
234+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
235235
imagePullPolicy: IfNotPresent
236236
name: install-cni-binaries
237237
resources: {}
@@ -259,7 +259,7 @@ spec:
259259
value: /run/cilium/cgroupv2
260260
- name: BIN_PATH
261261
value: /opt/cni/bin
262-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
262+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
263263
imagePullPolicy: IfNotPresent
264264
name: mount-cgroup
265265
resources: {}
@@ -293,7 +293,7 @@ spec:
293293
env:
294294
- name: BIN_PATH
295295
value: /opt/cni/bin
296-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
296+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
297297
imagePullPolicy: IfNotPresent
298298
name: apply-sysctl-overwrites
299299
resources: {}
@@ -323,7 +323,7 @@ spec:
323323
- /bin/sh
324324
- -c
325325
- --
326-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
326+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
327327
imagePullPolicy: IfNotPresent
328328
name: mount-bpf-fs
329329
resources: {}
@@ -350,7 +350,7 @@ spec:
350350
key: clean-cilium-bpf-state
351351
name: cilium-config
352352
optional: true
353-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
353+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
354354
imagePullPolicy: IfNotPresent
355355
name: clean-cilium-state
356356
resources:
@@ -396,7 +396,7 @@ spec:
396396
}
397397
installRuleIdempotent "FORWARD -d 168.63.129.16 -p tcp --dport 80 -j DROP"
398398
installRuleIdempotent "FORWARD -d 168.63.129.16 -p tcp --dport 32526 -j DROP"
399-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
399+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
400400
imagePullPolicy: IfNotPresent
401401
name: block-wireserver
402402
resources: {}

‎test/integration/manifests/cilium/v1.18/unmanaged/daemonset.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ spec:
6060
value: "1"
6161
- name: KUBE_CLIENT_BACKOFF_DURATION
6262
value: "120"
63-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless:v1.18.6-260319
63+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless:v1.18.9-260508
6464
imagePullPolicy: IfNotPresent
6565
livenessProbe:
6666
failureThreshold: 10
@@ -230,7 +230,7 @@ spec:
230230
- /install-plugin.sh
231231
command:
232232
- sh
233-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
233+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
234234
imagePullPolicy: IfNotPresent
235235
name: install-cni-binaries
236236
resources: {}
@@ -258,7 +258,7 @@ spec:
258258
value: /run/cilium/cgroupv2
259259
- name: BIN_PATH
260260
value: /opt/cni/bin
261-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
261+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
262262
imagePullPolicy: IfNotPresent
263263
name: mount-cgroup
264264
resources: {}
@@ -292,7 +292,7 @@ spec:
292292
env:
293293
- name: BIN_PATH
294294
value: /opt/cni/bin
295-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
295+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
296296
imagePullPolicy: IfNotPresent
297297
name: apply-sysctl-overwrites
298298
resources: {}
@@ -322,7 +322,7 @@ spec:
322322
- /bin/sh
323323
- -c
324324
- --
325-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
325+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
326326
imagePullPolicy: IfNotPresent
327327
name: mount-bpf-fs
328328
resources: {}
@@ -349,7 +349,7 @@ spec:
349349
key: clean-cilium-bpf-state
350350
name: cilium-config
351351
optional: true
352-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
352+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
353353
imagePullPolicy: IfNotPresent
354354
name: clean-cilium-state
355355
resources:
@@ -395,7 +395,7 @@ spec:
395395
}
396396
installRuleIdempotent "FORWARD -d 168.63.129.16 -p tcp --dport 80 -j DROP"
397397
installRuleIdempotent "FORWARD -d 168.63.129.16 -p tcp --dport 32526 -j DROP"
398-
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.6-260319
398+
image: mcr.microsoft.com/containernetworking/cilium/cilium-distroless-init:v1.18.9-260508
399399
imagePullPolicy: IfNotPresent
400400
name: block-wireserver
401401
resources: {}

0 commit comments

Comments
 (0)