Skip to content

Commit 3fa5448

Browse files
BeegiiKBeegiiK
committed
WIP:
2 parents db554dd + 3d0f319 commit 3fa5448

24 files changed

+628
-337
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@
5757
"postCreateCommand": "make setup",
5858
"remoteUser": "vscode",
5959
"features": {
60+
"ghcr.io/devcontainers/features/go:1": {
61+
"version": "1.23.2"
62+
},
6063
"docker-in-docker": "latest",
6164
"kubectl-helm-minikube": "latest",
6265
"git": "latest",

‎.github/dependabot.yaml‎

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ updates:
1717
prefix: "ci"
1818
labels: [ "ci", "dependencies" ]
1919
open-pull-requests-limit: 10
20+
21+
22+
# Constrain Kubernetes dependencies to compatibility with default branch - v1.33-v1.35
2023
- package-ecosystem: "gomod"
2124
directory: "/"
2225
schedule:
@@ -25,6 +28,19 @@ updates:
2528
prefix: "deps"
2629
labels: [ "dependencies" ]
2730
open-pull-requests-limit: 10
31+
ignore:
32+
- dependency-name: "k8s.io/api"
33+
versions: [">=0.35.0"]
34+
- dependency-name: "k8s.io/apiextensions-apiserver"
35+
versions: [">=0.35.0"]
36+
- dependency-name: "k8s.io/apimachinery"
37+
versions: [">=0.35.0"]
38+
- dependency-name: "k8s.io/client-go"
39+
versions: [">=0.35.0"]
40+
- dependency-name: "k8s.io/kubelet"
41+
versions: [">=0.35.0"]
42+
- dependency-name: "k8s.io/kubectl"
43+
versions: [">=0.35.0"]
2844
- package-ecosystem: "gomod"
2945
directory: "/azure-ipam"
3046
schedule:
@@ -33,6 +49,19 @@ updates:
3349
prefix: "deps"
3450
labels: [ "dependencies", "azure-ipam" ]
3551
open-pull-requests-limit: 10
52+
ignore:
53+
- dependency-name: "k8s.io/api"
54+
versions: [">=0.35.0"]
55+
- dependency-name: "k8s.io/apiextensions-apiserver"
56+
versions: [">=0.35.0"]
57+
- dependency-name: "k8s.io/apimachinery"
58+
versions: [">=0.35.0"]
59+
- dependency-name: "k8s.io/client-go"
60+
versions: [">=0.35.0"]
61+
- dependency-name: "k8s.io/kubelet"
62+
versions: [">=0.35.0"]
63+
- dependency-name: "k8s.io/kubectl"
64+
versions: [">=0.35.0"]
3665
- package-ecosystem: "gomod"
3766
directory: "/build/tools"
3867
schedule:
@@ -41,6 +70,19 @@ updates:
4170
prefix: "deps"
4271
labels: [ "dependencies" ]
4372
open-pull-requests-limit: 10
73+
ignore:
74+
- dependency-name: "k8s.io/api"
75+
versions: [">=0.35.0"]
76+
- dependency-name: "k8s.io/apiextensions-apiserver"
77+
versions: [">=0.35.0"]
78+
- dependency-name: "k8s.io/apimachinery"
79+
versions: [">=0.35.0"]
80+
- dependency-name: "k8s.io/client-go"
81+
versions: [">=0.35.0"]
82+
- dependency-name: "k8s.io/kubelet"
83+
versions: [">=0.35.0"]
84+
- dependency-name: "k8s.io/kubectl"
85+
versions: [">=0.35.0"]
4486
- package-ecosystem: "gomod"
4587
directory: "/dropgz"
4688
schedule:
@@ -57,6 +99,60 @@ updates:
5799
prefix: "deps"
58100
labels: [ "dependencies" ]
59101
open-pull-requests-limit: 10
102+
103+
104+
# Constrain Kubernetes dependencies to compatibility with release/v1.6 branch - v1.30-v1.32
105+
- package-ecosystem: "gomod"
106+
directory: "/"
107+
schedule:
108+
interval: "daily"
109+
reviewers:
110+
- "azure/azure-sdn-members"
111+
commit-message:
112+
prefix: "deps"
113+
labels: [ "dependencies" ]
114+
open-pull-requests-limit: 10
115+
target-branch: "release/v1.6"
116+
ignore:
117+
- dependency-name: "k8s.io/api"
118+
versions: [">=0.32.0"]
119+
- dependency-name: "k8s.io/apiextensions-apiserver"
120+
versions: [">=0.32.0"]
121+
- dependency-name: "k8s.io/apimachinery"
122+
versions: [">=0.32.0"]
123+
- dependency-name: "k8s.io/client-go"
124+
versions: [">=0.32.0"]
125+
- dependency-name: "k8s.io/kubelet"
126+
versions: [">=0.32.0"]
127+
- dependency-name: "k8s.io/kubectl"
128+
versions: [">=0.32.0"]
129+
- package-ecosystem: "gomod"
130+
directory: "/azure-ipam"
131+
schedule:
132+
interval: "daily"
133+
reviewers:
134+
- "azure/azure-sdn-members"
135+
commit-message:
136+
prefix: "deps"
137+
labels: [ "dependencies", "azure-ipam" ]
138+
open-pull-requests-limit: 10
139+
target-branch: "release/v1.6"
140+
ignore:
141+
- dependency-name: "k8s.io/api"
142+
versions: [">=0.32.0"]
143+
- dependency-name: "k8s.io/apiextensions-apiserver"
144+
versions: [">=0.32.0"]
145+
- dependency-name: "k8s.io/apimachinery"
146+
versions: [">=0.32.0"]
147+
- dependency-name: "k8s.io/client-go"
148+
versions: [">=0.32.0"]
149+
- dependency-name: "k8s.io/kubelet"
150+
versions: [">=0.32.0"]
151+
- dependency-name: "k8s.io/kubectl"
152+
versions: [">=0.32.0"]
153+
154+
155+
# Constrain Kubernetes dependencies to compatibility with release/v1.5 branch - v1.28-v1.30
60156
- package-ecosystem: "gomod"
61157
directory: "/"
62158
schedule:
@@ -66,6 +162,19 @@ updates:
66162
labels: [ "dependencies", "release/1.5" ]
67163
open-pull-requests-limit: 10
68164
target-branch: "release/v1.5"
165+
ignore:
166+
- dependency-name: "k8s.io/api"
167+
versions: [">=0.30.0"]
168+
- dependency-name: "k8s.io/apiextensions-apiserver"
169+
versions: [">=0.30.0"]
170+
- dependency-name: "k8s.io/apimachinery"
171+
versions: [">=0.30.0"]
172+
- dependency-name: "k8s.io/client-go"
173+
versions: [">=0.30.0"]
174+
- dependency-name: "k8s.io/kubelet"
175+
versions: [">=0.30.0"]
176+
- dependency-name: "k8s.io/kubectl"
177+
versions: [">=0.30.0"]
69178
- package-ecosystem: "gomod"
70179
directory: "/azure-ipam"
71180
schedule:
@@ -75,6 +184,22 @@ updates:
75184
labels: [ "dependencies", "azure-ipam", "release/1.5" ]
76185
open-pull-requests-limit: 10
77186
target-branch: "release/v1.5"
187+
ignore:
188+
- dependency-name: "k8s.io/api"
189+
versions: [">=0.30.0"]
190+
- dependency-name: "k8s.io/apiextensions-apiserver"
191+
versions: [">=0.30.0"]
192+
- dependency-name: "k8s.io/apimachinery"
193+
versions: [">=0.30.0"]
194+
- dependency-name: "k8s.io/client-go"
195+
versions: [">=0.30.0"]
196+
- dependency-name: "k8s.io/kubelet"
197+
versions: [">=0.30.0"]
198+
- dependency-name: "k8s.io/kubectl"
199+
versions: [">=0.30.0"]
200+
201+
202+
# Constrain Kubernetes dependencies to compatibility with release/v1.4 branch - v1.25-v1.27
78203
- package-ecosystem: "gomod"
79204
directory: "/"
80205
schedule:
@@ -84,6 +209,19 @@ updates:
84209
labels: [ "dependencies", "release/1.4" ]
85210
open-pull-requests-limit: 10
86211
target-branch: "release/v1.4"
212+
ignore:
213+
- dependency-name: "k8s.io/api"
214+
versions: [">=0.27.0"]
215+
- dependency-name: "k8s.io/apiextensions-apiserver"
216+
versions: [">=0.27.0"]
217+
- dependency-name: "k8s.io/apimachinery"
218+
versions: [">=0.27.0"]
219+
- dependency-name: "k8s.io/client-go"
220+
versions: [">=0.27.0"]
221+
- dependency-name: "k8s.io/kubelet"
222+
versions: [">=0.27.0"]
223+
- dependency-name: "k8s.io/kubectl"
224+
versions: [">=0.27.0"]
87225
- package-ecosystem: "gomod"
88226
directory: "/azure-ipam"
89227
schedule:
@@ -93,3 +231,16 @@ updates:
93231
labels: [ "dependencies", "azure-ipam", "release/1.4" ]
94232
open-pull-requests-limit: 10
95233
target-branch: "release/v1.4"
234+
ignore:
235+
- dependency-name: "k8s.io/api"
236+
versions: [">=0.27.0"]
237+
- dependency-name: "k8s.io/apiextensions-apiserver"
238+
versions: [">=0.27.0"]
239+
- dependency-name: "k8s.io/apimachinery"
240+
versions: [">=0.27.0"]
241+
- dependency-name: "k8s.io/client-go"
242+
versions: [">=0.27.0"]
243+
- dependency-name: "k8s.io/kubelet"
244+
versions: [">=0.27.0"]
245+
- dependency-name: "k8s.io/kubectl"
246+
versions: [">=0.27.0"]

‎.github/workflows/golangci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ jobs:
3030
uses: golangci/golangci-lint-action@v6
3131
with:
3232
version: v1.61
33-
args: --new-from-rev=origin/master --config=.golangci.yml --timeout=25m
33+
args: ${{ github.event_name == 'pull_request' && format('--new-from-rev=origin/{0}', github.base_ref) || '' }} --config=.golangci.yml --timeout=25m

‎.golangci.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
issues:
22
max-same-issues: 0
33
max-issues-per-linter: 0
4-
new-from-rev: origin/master
54
linters:
65
presets:
76
- bugs

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ stages:
6565
- ${{ if eq(parameters.upgradeScenario, false) }}:
6666
- create_${{ parameters.name }}
6767
- ${{ else }}:
68-
- ${{ parameters.dependsOn }}
68+
- ${{ parameters.dependsOn }}
6969
- publish
7070
- setup
7171
displayName: "Cilium Test - ${{ parameters.name }}"
@@ -122,7 +122,7 @@ stages:
122122
123123
envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
124124
kubectl get po -owide -A
125-
125+
126126
- ${{if eq(parameters.hubbleEnabled, true)}}:
127127
- job: deploy_cilium_components
128128
displayName: Deploy Cilium with Hubble
@@ -184,7 +184,7 @@ stages:
184184
IPAM=$(UPGRADE_AZURE_IPAM_VERSION)
185185
echo "UPGRADE_AZURE_IPAM_VERSION is set to $IPAM"
186186
fi
187-
187+
188188
if [ -z "$UPGRADE_CNS_VERSION" ]
189189
then
190190
echo "UPGRADE_CNS_VERSION is not set, using default value"
@@ -214,9 +214,9 @@ stages:
214214
echo "TEST_CNS_VERSION is set to $CNS"
215215
fi
216216
fi
217-
217+
218218
echo "Deploy Azure-CNS"
219-
sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=${IPAM} CNS_VERSION=${CNS} INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_REPO=$(IPAM_IMAGE_REPO)
219+
sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=${IPAM} CNS_VERSION=${CNS} INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO) IPAM_IMAGE_REPO=$(IPAM_IMAGE_REPO)
220220
kubectl get po -owide -A
221221
kubectl get crd -A
222222
@@ -287,12 +287,7 @@ stages:
287287
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
288288
name: "GetCluster"
289289
displayName: "Get AKS Cluster"
290-
- script: |
291-
kubectl delete ns load-test
292-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors,!no-unexpected-packet-drops'
293-
retryCountOnTaskFailure: 6
294-
name: "CiliumConnectivityTests"
295-
displayName: "Run Cilium Connectivity Tests"
290+
- template: ../../templates/cilium-connectivity-tests.yaml
296291
- script: |
297292
cd hack/scripts
298293
chmod +x async-delete-test.sh

‎.pipelines/cni/cilium/nightly-release-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ stages:
162162
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=ciliumnightly-$(commitID)
163163
164164
set -e
165-
echo "Run Cilium Connectivity Tests"
165+
echo "Check Cilium Connectivity Test Logs"
166166
cilium status
167167
cilium connectivity test --test check-log-errors --log-check-levels error
168-
name: "ciliumConnectivityTests"
169-
displayName: "Run Cilium Connectivity Tests"
168+
name: "ciliumConnectivityLogs"
169+
displayName: "Check Cilium Connectivity Test Logs"
170170
condition: always()
171171

172172
- template: ../../templates/log-check-template.yaml # Operator Check

‎.pipelines/cni/lsg/lsg-cni-intergration-template.yaml‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -187,24 +187,7 @@ stages:
187187
dependsOn: recover
188188
condition: and( succeeded(), ${{ contains(parameters.cni, 'cilium') }} )
189189
steps:
190-
- script: |
191-
echo "install cilium CLI"
192-
if [[ ${CILIUM_VERSION_TAG} =~ ^1.1[1-3].[0-9]{1,2} ]]; then
193-
echo "Cilium Agent Version ${BASH_REMATCH[0]}"
194-
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/main/stable-v0.14.txt)
195-
else
196-
echo "Cilium Agent Version ${CILIUM_VERSION_TAG}"
197-
CILIUM_CLI_VERSION=$(curl -s https://raw.githubusercontent.com/cilium/cilium-cli/master/stable.txt)
198-
fi
199-
CLI_ARCH=amd64
200-
curl -L --fail --remote-name-all https://github.com/cilium/cilium-cli/releases/download/${CILIUM_CLI_VERSION}/cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
201-
sha256sum --check cilium-linux-${CLI_ARCH}.tar.gz.sha256sum
202-
sudo tar xzvfC cilium-linux-${CLI_ARCH}.tar.gz /usr/local/bin
203-
rm cilium-linux-${CLI_ARCH}.tar.gz{,.sha256sum}
204-
cilium status
205-
cilium version
206-
name: "InstallCiliumCli"
207-
displayName: "Install Cilium CLI"
190+
- template: ../../templates/cilium-cli.yaml
208191
- task: AzureCLI@2
209192
inputs:
210193
azureSubscription: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
@@ -216,12 +199,7 @@ stages:
216199
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
217200
name: "GetCluster"
218201
displayName: "Get AKS Cluster"
219-
- script: |
220-
kubectl delete ns load-test
221-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
222-
retryCountOnTaskFailure: 6
223-
name: "CiliumConnectivityTests"
224-
displayName: "Run Cilium Connectivity Tests"
202+
- template: ../../templates/cilium-connectivity-tests.yaml
225203
- ${{ if contains(parameters.cni, 'cilium') }}:
226204
- template: ../k8s-e2e/k8s-e2e-job-template.yaml
227205
parameters:

‎.pipelines/networkobservability/pipeline.yaml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,9 @@ stages:
113113
displayName: "Wait for all pods to be running"
114114
retryCountOnTaskFailure: 3
115115
116-
- script: |
117-
echo "Run Cilium Connectivity Tests"
118-
cilium status
119-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors'
120-
retryCountOnTaskFailure: 3
121-
name: "ciliumConnectivityTests"
122-
displayName: "Run Cilium Connectivity Tests"
123-
enabled: true
116+
- template: ../templates/cilium-connectivity-tests.yaml
117+
parameters:
118+
skipTests: '!pod-to-pod-encryption,!node-to-node-encryption,!check-log-errors,!to-fqdns'
124119

125120
- script: |
126121
export DIR=${CILIUM_VERSION_TAG%.*}

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -107,16 +107,14 @@ steps:
107107
displayName: "Validate Node Restart"
108108
retryCountOnTaskFailure: 3
109109

110+
- template: ../../templates/cilium-connectivity-tests.yaml
111+
110112
- script: |
111-
set -e
112-
echo "Run Cilium Connectivity Tests"
113-
cilium status
114-
cilium connectivity test --connect-timeout 4s --request-timeout 30s --test '!pod-to-pod-encryption,!node-to-node-encryption,!no-unexpected-packet-drops,!check-log-errors' --force-deploy
115113
ns=`kubectl get ns | grep cilium-test | awk '{print $1}'`
116114
echo "##vso[task.setvariable variable=ciliumNamespace]$ns"
117115
retryCountOnTaskFailure: 3
118-
name: "ciliumConnectivityTests"
119-
displayName: "Run Cilium Connectivity Tests"
116+
name: "nsCapture"
117+
displayName: "Capture Connectivity Test Namespace"
120118
121119
- script: |
122120
set -e
@@ -158,5 +156,5 @@ steps:
158156
fi
159157
name: "testAsyncDelete"
160158
displayName: "Verify Async Delete when CNS is down"
161-
159+
162160
- template: ../../templates/cilium-mtu-check.yaml

0 commit comments

Comments
 (0)