Skip to content

Commit e419d2f

Browse files
camrynlcamrynl
authored
chore: create directory for cilium 1.12 templates (#2582)
* add v1.12 files to its own directory * update e2e scripts * overlay cilium e2e changes * update load template * update configmap path * move call to configmap * remove hubble config from 1.12 dir
1 parent aa5a9a3 commit e419d2f

File tree

16 files changed

+637
-48
lines changed

16 files changed

+637
-48
lines changed

‎.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,18 +70,17 @@ stages:
7070
kubectl cluster-info
7171
kubectl get po -owide -A
7272
73+
echo "install Cilium ${CILIUM_VERSION_TAG}"
74+
export DIR=${CILIUM_VERSION_TAG%.*}
75+
echo "installing files from ${DIR}"
7376
echo "deploy Cilium ConfigMap"
74-
kubectl apply -f test/integration/manifests/cilium/cilium-config.yaml
75-
76-
echo "install Cilium onto Overlay Cluster"
77-
kubectl apply -f test/integration/manifests/cilium/cilium-agent
78-
kubectl apply -f test/integration/manifests/cilium/cilium-operator
79-
80-
81-
echo "install Cilium ${CILIUM_VERSION_TAG} onto Overlay Cluster"
77+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml
8278
# Passes Cilium image to daemonset and deployment
83-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
84-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
79+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
80+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
81+
82+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
83+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
8584
kubectl get po -owide -A
8685
8786
echo "Deploy Azure-CNS"
@@ -109,11 +108,13 @@ stages:
109108
110109
echo "install Cilium onto Overlay Cluster with hubble enabled"
111110
export CILIUM_VERSION_TAG=${CILIUM_HUBBLE_VERSION_TAG}
112-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-config/cilium-config-hubble.yaml
113-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-agent/files
114-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-operator/files
115-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
116-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
111+
export DIR=${CILIUM_VERSION_TAG%.*}
112+
echo "installing files from ${DIR}"
113+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
114+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
115+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
116+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
117+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
117118
kubectl get po -owide -A
118119
119120
echo "Deploy Azure-CNS"

‎.pipelines/networkobservability/pipeline.yaml‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,13 @@ stages:
7777
scriptType: "bash"
7878
addSpnToEnvironment: true
7979
inlineScript: |
80-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-config/cilium-config-hubble.yaml
81-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-agent/files
82-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-operator/files
83-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
84-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
80+
export DIR=${CILIUM_VERSION_TAG%.*}
81+
echo "installing files from ${DIR}"
82+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
83+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
84+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
85+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
86+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
8587
# Use different file directories for nightly and current cilium version
8688
name: "installCilium"
8789
displayName: "Install Cilium on AKS Overlay"
@@ -121,7 +123,8 @@ stages:
121123
enabled: true
122124
123125
- script: |
124-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/hubble/hubble-peer-svc.yaml
126+
export DIR=${CILIUM_VERSION_TAG%.*}
127+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/hubble/hubble-peer-svc.yaml
125128
kubectl get pods -Aowide
126129
echo "verify Hubble metrics endpoint is usable"
127130
go test ./test/integration/networkobservability -tags=networkobservability

‎.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,19 @@ steps:
3232
pwd
3333
kubectl cluster-info
3434
kubectl get po -owide -A
35-
echo "deploy Cilium ConfigMap"
36-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-config/cilium-config-dualstack.yaml
3735
echo "install Cilium ${CILIUM_DUALSTACK_VERSION}"
36+
export DIR=${CILIUM_DUALSTACK_VERSION%.*}
37+
echo "installing files from ${DIR}"
38+
echo "deploy Cilium ConfigMap"
39+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-dualstack.yaml
3840
# Passes Cilium image to daemonset and deployment
39-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-agent/files
40-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-operator/files
41+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
42+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
4143
4244
export CILIUM_VERSION_TAG=${CILIUM_DUALSTACK_VERSION}
4345
echo "install Cilium ${CILIUM_DUALSTACK_VERSION} onto Overlay Cluster"
44-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
45-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
46+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
47+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
4648
kubectl get po -owide -A
4749
name: "installCilium"
4850
displayName: "Install Cilium on AKS Dualstack Overlay"

‎.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,13 @@ steps:
3737
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
3838
ls -lah
3939
export CILIUM_VERSION_TAG=${CILIUM_HUBBLE_VERSION_TAG}
40-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-config/cilium-config-hubble.yaml
41-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-agent/files
42-
kubectl apply -f test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-operator/files
43-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
44-
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${CILIUM_TEMPLATE_DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
40+
export DIR=${CILIUM_VERSION_TAG%.*}
41+
echo "installing files from ${DIR}"
42+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config-hubble.yaml
43+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
44+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
45+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
46+
envsubst '${CILIUM_IMAGE_REGISTRY},${CILIUM_VERSION_TAG}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.tpl | kubectl apply -f -
4547
# Use different file directories for nightly and current cilium version
4648
name: "installCilium"
4749
displayName: "Install Cilium on AKS Overlay"

‎.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,31 @@ steps:
3939
pwd
4040
kubectl cluster-info
4141
kubectl get po -owide -A
42-
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then FILE_PATH=-nightly && echo "Running nightly"; fi
43-
echo "deploy Cilium ConfigMap"
44-
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-config.yaml
45-
echo "install Cilium ${CILIUM_VERSION_TAG}"
46-
# Passes Cilium image to daemonset and deployment
47-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
48-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
49-
# Use different file directories for nightly and current cilium version
50-
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-agent
51-
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-operator
42+
if [ "$CILIUM_VERSION_TAG" = "cilium-nightly-pipeline" ]; then
43+
FILE_PATH=-nightly
44+
echo "Running nightly"
45+
echo "deploy Cilium ConfigMap"
46+
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-config.yaml
47+
# Passes Cilium image to daemonset and deployment
48+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
49+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
50+
# Use different file directories for nightly and current cilium version
51+
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-agent
52+
kubectl apply -f test/integration/manifests/cilium/cilium${FILE_PATH}-operator
53+
else
54+
echo "install Cilium ${CILIUM_VERSION_TAG}"
55+
export DIR=${CILIUM_VERSION_TAG%.*}
56+
echo "installing files from ${DIR}"
57+
echo "deploy Cilium ConfigMap"
58+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml
59+
# Passes Cilium image to daemonset and deployment
60+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
61+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
62+
63+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
64+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
65+
fi
66+
5267
kubectl get po -owide -A
5368
name: "installCilium"
5469
displayName: "Install Cilium on AKS Overlay"

‎.pipelines/singletenancy/cilium/cilium-e2e-step-template.yaml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,17 @@ steps:
3838
pwd
3939
kubectl cluster-info
4040
kubectl get po -owide -A
41-
echo "deploy Cilium ConfigMap"
42-
kubectl apply -f test/integration/manifests/cilium/cilium-config.yaml
4341
echo "install Cilium ${CILIUM_VERSION_TAG}"
44-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
45-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
46-
kubectl apply -f test/integration/manifests/cilium/cilium-agent
47-
kubectl apply -f test/integration/manifests/cilium/cilium-operator
42+
export DIR=${CILIUM_VERSION_TAG%.*}
43+
echo "installing files from ${DIR}"
44+
echo "deploy Cilium ConfigMap"
45+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-config/cilium-config.yaml
46+
# Passes Cilium image to daemonset and deployment
47+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-agent/files
48+
kubectl apply -f test/integration/manifests/cilium/v${DIR}/cilium-operator/files
49+
50+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
51+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
4852
kubectl get po -owide -A
4953
name: "installCilium"
5054
displayName: "Install Cilium"

‎test/integration/manifests/cilium/cilium-agent/clusterrole.yaml‎ renamed to ‎test/integration/manifests/cilium/v1.12/cilium-agent/files/clusterrole.yaml‎

File renamed without changes.

‎test/integration/manifests/cilium/cilium-agent/clusterrolebinding.yaml‎ renamed to ‎test/integration/manifests/cilium/v1.12/cilium-agent/files/clusterrolebinding.yaml‎

File renamed without changes.

‎test/integration/manifests/cilium/cilium-agent/serviceaccount.yaml‎ renamed to ‎test/integration/manifests/cilium/v1.12/cilium-agent/files/serviceaccount.yaml‎

File renamed without changes.

0 commit comments

Comments
 (0)