Skip to content

Commit fea43a3

Browse files
authored
Cilium Load Test with Hubble Enabled. (#2558)
* load test with huble enabled config file fix config file fix config file path fix fix: typo removing socket path to use default enabling hubble with parameters chaging the directory for cilium removing extra space setting version for cilium cleaning up exporting cilium image version replacing cilium hubble version var * addressed comments * changing daemonset dir to v1.14.4 * replaced variable with version
1 parent 01d26ff commit fea43a3

File tree

3 files changed

+86
-31
lines changed

3 files changed

+86
-31
lines changed

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

Lines changed: 73 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ parameters:
88
os: "linux"
99
arch: ""
1010
osSKU: Ubuntu
11+
hubbleEnabled: false
1112

1213
# Condition confirms that:
1314
# Previous job has reported Succeeded. Previous job is currently setup which controls variable assignment and we are dependent on its success.
@@ -48,38 +49,80 @@ stages:
4849
- setup
4950
displayName: "Cilium Test - ${{ parameters.name }}"
5051
jobs:
51-
- job: deploy_cilium_components
52-
steps:
53-
- task: AzureCLI@1
54-
displayName: "Install Cilium, CNS, and ip-masq-agent"
55-
inputs:
56-
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
57-
scriptLocation: "inlineScript"
58-
scriptType: "bash"
59-
addSpnToEnvironment: true
60-
inlineScript: |
61-
set -ex
62-
az extension add --name aks-preview
63-
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
64-
ls -lah
65-
pwd
66-
kubectl cluster-info
67-
kubectl get po -owide -A
52+
- ${{if eq(parameters.hubbleEnabled, false)}}:
53+
- job: deploy_cilium_components
54+
displayName: Deploy Cilium
55+
steps:
56+
- task: AzureCLI@1
57+
displayName: "Install Cilium, CNS, and ip-masq-agent"
58+
inputs:
59+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
60+
scriptLocation: "inlineScript"
61+
scriptType: "bash"
62+
addSpnToEnvironment: true
63+
inlineScript: |
64+
set -ex
65+
az extension add --name aks-preview
66+
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
67+
ls -lah
68+
pwd
69+
kubectl cluster-info
70+
kubectl get po -owide -A
71+
72+
echo "deploy Cilium ConfigMap"
73+
kubectl apply -f test/integration/manifests/cilium/cilium-config.yaml
74+
75+
echo "install Cilium onto Overlay Cluster"
76+
kubectl apply -f test/integration/manifests/cilium/cilium-agent
77+
kubectl apply -f test/integration/manifests/cilium/cilium-operator
78+
79+
80+
echo "install Cilium ${CILIUM_VERSION_TAG} onto Overlay Cluster"
81+
# Passes Cilium image to daemonset and deployment
82+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
83+
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
84+
kubectl get po -owide -A
85+
86+
echo "Deploy Azure-CNS"
87+
sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=$(make azure-ipam-version) CNS_VERSION=$(make cns-version) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
88+
kubectl get po -owide -A
89+
- ${{if eq(parameters.hubbleEnabled, true)}}:
90+
- job: deploy_cilium_components
91+
displayName: Deploy Cilium with Hubble
92+
steps:
93+
- task: AzureCLI@1
94+
displayName: "Install Cilium, CNS, and ip-masq-agent"
95+
inputs:
96+
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
97+
scriptLocation: "inlineScript"
98+
scriptType: "bash"
99+
addSpnToEnvironment: true
100+
inlineScript: |
101+
set -ex
102+
az extension add --name aks-preview
103+
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
104+
ls -lah
105+
pwd
106+
kubectl cluster-info
107+
kubectl get po -owide -A
68108
69-
echo "deploy Cilium ConfigMap"
70-
kubectl apply -f test/integration/manifests/cilium/cilium-config.yaml
71-
echo "install Cilium onto Overlay Cluster"
72-
kubectl apply -f test/integration/manifests/cilium/cilium-agent
73-
kubectl apply -f test/integration/manifests/cilium/cilium-operator
74-
echo "install Cilium ${CILIUM_VERSION_TAG} onto Overlay Cluster"
75-
# Passes Cilium image to daemonset and deployment
76-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/daemonset.yaml | kubectl apply -f -
77-
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/deployment.yaml | kubectl apply -f -
78-
kubectl get po -owide -A
109+
echo "deploy Cilium ConfigMap"
110+
kubectl apply -f test/integration/manifests/cilium/v1.14.4/cilium-config/cilium-config-hubble.yaml
111+
112+
echo "install Cilium onto Overlay Cluster with hubble enabled"
113+
kubectl apply -f test/integration/manifests/cilium/v1.14.4/cilium-agent/files
114+
kubectl apply -f test/integration/manifests/cilium/v1.14.4/cilium-operator/files
115+
116+
echo "install Cilium v1.14.4 onto Overlay Cluster"
117+
# Passes Cilium image to daemonset and deployment
118+
envsubst '${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v1.14.4/cilium-agent/templates/daemonset.tpl | kubectl apply -f -
119+
envsubst '${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v1.14.4/cilium-operator/templates/deployment.tpl | kubectl apply -f -
120+
kubectl get po -owide -A
79121
80-
echo "Deploy Azure-CNS"
81-
sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=$(make azure-ipam-version) CNS_VERSION=$(make cns-version) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
82-
kubectl get po -owide -A
122+
echo "Deploy Azure-CNS"
123+
sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=$(make azure-ipam-version) CNS_VERSION=$(make cns-version) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
124+
kubectl get po -owide -A
125+
83126
- job: deploy_pods
84127
condition: and( and( not(canceled()), not(failed()) ), or( contains(variables.CONTROL_SCENARIO, 'scaleTest') , contains(variables.CONTROL_SCENARIO, 'all') ) )
85128
displayName: "Scale Test"

.pipelines/cni/pipeline.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,15 @@ stages:
162162
nodeCount: ${NODE_COUNT_CILIUM}
163163
vmSize: ${VM_SIZE_CILIUM}
164164

165+
- template: cilium/cilium-overlay-load-test-template.yaml
166+
parameters:
167+
name: cilium_overlay_hubble
168+
clusterType: overlay-byocni-nokubeproxy-up
169+
clusterName: "cil-over-hub"
170+
hubbleEnabled: true
171+
nodeCount: ${NODE_COUNT_CILIUM}
172+
vmSize: ${VM_SIZE_CILIUM}
173+
165174
- template: cilium/cilium-overlay-load-test-template.yaml
166175
parameters:
167176
name: cilium_overlay_mariner
@@ -269,6 +278,7 @@ stages:
269278
condition: always()
270279
dependsOn:
271280
- cilium_overlay
281+
- cilium_overlay_hubble
272282
- cilium_overlay_mariner
273283
- cilium_overlay_arm
274284
- cilium_overlay_rdma
@@ -292,6 +302,9 @@ stages:
292302
cilium_overlay:
293303
name: cilium_overlay
294304
clusterName: "cilium-over"
305+
cilium_overlay_hubble:
306+
name: cilium_overlay_hubble
307+
clusterName: "cil-over-hub"
295308
cilium_overlay_mariner:
296309
name: cilium_overlay_mariner
297310
clusterName: "cil-over-mar"

test/integration/manifests/cilium/cilium-config-hubble.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ data:
4949
hubble-metrics-server: :9965
5050
hubble-disable-tls: "false"
5151
hubble-listen-address: ""
52-
hubble-socket-path: /dev/null
5352
hubble-tls-cert-file: /var/lib/cilium/tls/hubble/server.crt
5453
hubble-tls-client-ca-files: /var/lib/cilium/tls/hubble/client-ca.crt
5554
hubble-tls-key-file: /var/lib/cilium/tls/hubble/server.key

0 commit comments

Comments
 (0)