@@ -18,35 +18,18 @@ for unique in $sufixes; do
1818 POD_CIDR=192.${unique} 0.0.0/16 SVC_CIDR=192.${unique} 1.0.0/16 DNS_IP=192.${unique} 1.0.10 \
1919 VNET_PREFIX=10.${unique} 0.0.0/16 SUBNET_PREFIX=10.${unique} 0.0.0/16
2020
21+ kubectl config use-context ${clusterPrefix} -${unique}
22+
2123 if [ $install == " helm" ]; then
22- cilium install -n kube-system cilium cilium/cilium --version v1.16.1 \
23- --set azure.resourceGroup=${clusterPrefix} -${unique} -rg --set cluster.id=${unique} \
24+ helm upgrade --install -n kube-system cilium cilium/cilium \
25+ --version v1.16.1 \
26+ --set cluster.name=${clusterPrefix} -${unique} \
27+ --set azure.resourceGroup=${clusterPrefix} -${unique} -rg \
28+ --set cluster.id=${unique} \
2429 --set ipam.operator.clusterPoolIPv4PodCIDRList=' {192.' ${unique} ' 0.0.0/16}' \
2530 --set hubble.enabled=false \
2631 --set envoy.enabled=false
27-
28- else # Ignore this block for now, was testing internal resources.
29- kubectl apply -f test/integration/manifests/cilium/v${DIR} /cilium-config/cilium-config.yaml
30- kubectl apply -f test/integration/manifests/cilium/v${DIR} /cilium-agent/files
31- kubectl apply -f test/integration/manifests/cilium/v${DIR} /cilium-operator/files
32- export CILIUM_VERSION_TAG=v1.16-240904
33- export CILIUM_IMAGE_REGISTRY=acnpublic.azurecr.io
34- envsubst ' ${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR} /cilium-agent/templates/daemonset.yaml | kubectl apply -f -
35- envsubst ' ${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR} /cilium-operator/templates/deployment.yaml | kubectl apply -f -
36-
37- export CILIUM_VERSION_TAG=v1.16-240904
38- export CILIUM_IMAGE_REGISTRY=acnpublic.azurecr.io
39- DIR=1.16
40- kubectl apply -f test/manifests/v${DIR} /cilium-agent/files
41- kubectl apply -f test/manifests/v${DIR} /cilium-operator/files
42- envsubst ' ${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/manifests/v${DIR} /cilium-agent/templates/daemonset.yaml | kubectl apply -f -
43- envsubst ' ${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/manifests/v${DIR} /cilium-operator/templates/deployment.yaml | kubectl apply -f -
4432 fi
45-
46- make test-load CNS_ONLY=true \
47- AZURE_IPAM_VERSION=v0.2.0 CNS_VERSION=v1.5.32 \
48- INSTALL_CNS=true INSTALL_OVERLAY=true \
49- CNS_IMAGE_REPO=MCR IPAM_IMAGE_REPO=MCR
5033done
5134
5235cd hack/scripts
0 commit comments