merge from master

Azure · Aug 23, 2024 · 5acef5d · 5acef5d
2 parents 66d69a5 + ad7a193
commit 5acef5d
Show file tree

Hide file tree

Showing 20 changed files with 754 additions and 55 deletions.
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
@@ -2,12 +2,12 @@ name: "CodeQL"
 on:
   push:
     branches:
-    - master
-    - release/*
+      - master
+      - release/*
   pull_request:
     branches:
-    - master
-    - release/*
+      - master
+      - release/*
     types:
       - opened
       - reopened
@@ -32,20 +32,21 @@ jobs:
       contents: read
       security-events: write
     steps:
-    - name: Setup go
-      uses: actions/setup-go@v5
-      with:
-        go-version: '1.22'
-        check-latest: true
-    - name: Checkout repository
-      uses: actions/checkout@v4
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"
+      - name: Setup go
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.22"
+          check-latest: true
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          queries: ./codeql/
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"
diff --git a/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml b/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
@@ -238,10 +238,13 @@ stages:
           os: ${{ parameters.os }}
           cni: cilium
           dependsOn: cni_tests
-          datapath: true
           dns: true
           portforward: true
           service: true
+          ${{ if eq(parameters.dualstackVersion, '') }}:
+            datapath: true
+          ${{ else }}:
+            dualstack: true
       - job: failedE2ELogs
         displayName: "Failure Logs"
         dependsOn:

diff --git a/cni/network/invoker.go b/cni/network/invoker.go
@@ -39,3 +39,13 @@ func (ipamAddResult IPAMAddResult) PrettyString() string {
 	}
 	return pStr
 }
+
+// shallow copy options from one map to a new options map
+func (ipamAddConfig IPAMAddConfig) shallowCopyIpamAddConfigOptions() map[string]interface{} {
+	res := map[string]interface{}{}
+	for k, v := range ipamAddConfig.options {
+		// only support primitive type
+		res[k] = v
+	}
+	return res
+}