Merge branch 'master' into spathak/add-service-tag

Signed-off-by: Keerthana Routhu <[email protected]>

Author: k-routhu

.config/.gdnsuppress

@@ -0,0 +1,26 @@
+{
+  "version": "latest",
+  "suppressionSets": {
+    "default": {
+      "name": "default",
+      "createdDate": "2022-11-28 20:04:38Z",
+      "lastUpdatedDate": "2022-11-28 20:04:38Z"
+    }
+  },
+  "results": {
+    "d7e55b5f3e54f9253a2fec595f97520ab0ffece607981d2db0fcfe4dae4cd490": {
+      "signature": "d7e55b5f3e54f9253a2fec595f97520ab0ffece607981d2db0fcfe4dae4cd490",
+      "alternativeSignatures": [],
+      "target": "**/testdata/dummy.pem",
+      "memberOf": [
+        "default"
+      ],
+      "tool": "credscan",
+      "ruleId": "CSCAN-GENERAL0020",
+      "justification": null,
+      "createdDate": "2022-11-28 20:04:38Z",
+      "expirationDate": null,
+      "type": null
+    }
+  }
+}

.config/credScanSuppressions.json

@@ -0,0 +1,4 @@
+{
+ "tool": "Credential Scanner",
+ "suppressions": []
+}

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-ARG VARIANT="1.21"
+ARG VARIANT="1.23"
 FROM mcr.microsoft.com/vscode/devcontainers/go:${VARIANT}
 RUN apt-get update && \
     export DEBIAN_FRONTEND=noninteractive && \

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
 	"build": {
 		"dockerfile": "Dockerfile",
 		"args": {
-			"VARIANT": "1.21-bullseye",
+			"VARIANT": "1.23-bullseye",
 			"NODE_VERSION": "none"
 		}
 	},

.github/dependabot.yaml

@@ -29,6 +29,7 @@ updates:
     - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
+  labels: [ "dependencies" ]
   open-pull-requests-limit: 10
 - package-ecosystem: "gomod"
   directory: "/azure-ipam"
@@ -38,6 +39,7 @@ updates:
     - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
+  labels: [ "dependencies", "azure-ipam" ]
   open-pull-requests-limit: 10
 - package-ecosystem: "gomod"
   directory: "/build/tools"
@@ -47,18 +49,65 @@ updates:
     - "azure/azure-sdn-members"
   commit-message:
     prefix: "deps"
+  labels: [ "dependencies" ]
   open-pull-requests-limit: 10
 - package-ecosystem: "gomod"
   directory: "/dropgz"
   schedule:
     interval: "daily"
   commit-message:
     prefix: "deps"
+  labels: [ "dependencies", "dropgz" ]
   open-pull-requests-limit: 10
 - package-ecosystem: "gomod"
   directory: "/zapai"
   schedule:
     interval: "daily"
   commit-message:
     prefix: "deps"
+  labels: [ "dependencies" ]
   open-pull-requests-limit: 10
+- package-ecosystem: "gomod"
+  directory: "/"
+  schedule:
+    interval: "daily"
+  reviewers:
+    - "azure/azure-sdn-members"
+  commit-message:
+    prefix: "deps"
+  labels: [ "dependencies", "release/1.5" ]
+  open-pull-requests-limit: 10
+  target-branch: "release/v1.5"
+- package-ecosystem: "gomod"
+  directory: "/azure-ipam"
+  schedule:
+    interval: "daily"
+  reviewers:
+    - "azure/azure-sdn-members"
+  commit-message:
+    prefix: "deps"
+  labels: [ "dependencies", "azure-ipam", "release/1.5" ]
+  open-pull-requests-limit: 10
+  target-branch: "release/v1.5"
+- package-ecosystem: "gomod"
+  directory: "/"
+  schedule:
+    interval: "daily"
+  reviewers:
+    - "azure/azure-sdn-members"
+  commit-message:
+    prefix: "deps"
+  labels: [ "dependencies", "release/1.4" ]
+  open-pull-requests-limit: 10
+  target-branch: "release/v1.4"
+- package-ecosystem: "gomod"
+  directory: "/azure-ipam"
+  schedule:
+    interval: "daily"
+  reviewers:
+    - "azure/azure-sdn-members"
+  commit-message:
+    prefix: "deps"
+  labels: [ "dependencies", "azure-ipam", "release/1.4" ]
+  open-pull-requests-limit: 10
+  target-branch: "release/v1.4"

.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.21'
-        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.23"
+          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}}"

.github/workflows/crdgen.yaml

@@ -14,7 +14,7 @@ jobs:
   crdgen:
     strategy:
       matrix:
-        go-version: ['1.21']
+        go-version: ['1.22', '1.23']
         os: [ubuntu-latest]
     name: CRDs are Generated
     runs-on: ${{ matrix.os }}
@@ -31,5 +31,9 @@ jobs:
       run: make -C crd/multitenantnetworkcontainer
     - name: Regenerate Multitenancy CRDs
       run: make -C crd/multitenancy
+    - name: Regenerate ClusterSubnetState CRD
+      run: make -C crd/clustersubnetstate
+    - name: Regenerate OverlayExtensionConfig CRD
+      run: make -C crd/overlayextensionconfig
     - name: Fail if the tree is dirty
       run: test -z "$(git status --porcelain)"

.github/workflows/cyclonus-netpol-extended-nightly-test.yaml

@@ -26,10 +26,10 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: "^1.21"
+          go-version: "^1.23"
 
       - name: Setup Kind
-        uses: engineerd/setup-kind@v0.5.0
+        uses: engineerd/setup-kind@v0.6.2
         with:
           version: "v0.11.1"
           config: ./test/kind/kind.yaml
@@ -73,7 +73,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: logs
+          name: logs-${{ matrix.profile }}
           path: |
             ./npm-logs_${{ matrix.profile }}.txt
             ./cyclonus-test_${{ matrix.profile }}.txt

.github/workflows/cyclonus-netpol-test.yaml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - main
+      - release/*
   pull_request:
     paths:
       - 'npm/**'
@@ -32,7 +33,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '^1.21'
+          go-version: '^1.23'
 
       - name: Setup Kind
         uses: helm/kind-action@v1
@@ -49,7 +50,7 @@ jobs:
       - name: Make NPM image
         run: |
           make npm-image NPM_PLATFORM_TAG=cyclonus PLATFORM=linux/amd64 CONTAINER_BUILDER=docker BUILDX_ACTION='--load'
-      
+
       - name: Install Azure NPM
         # set the ConfigMap based on the build matrix
         # currently have to restart the daemonset because changing the ConfigMap doesn't restart NPM
@@ -60,7 +61,7 @@ jobs:
           echo "Applying profile: ${{ matrix.profile }}"
           kubectl apply -f ./npm/profiles/${{ matrix.profile }}
           kubectl rollout restart ds azure-npm -n kube-system
-    
+
       - name: Check Cluster Components
         run: |
           sleep 10
@@ -80,7 +81,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: logs
+          name: logs-${{ matrix.profile }}
           path: |
             ./npm-logs_${{ matrix.profile }}.txt
             ./cyclonus-test_${{ matrix.profile }}.txt

.github/workflows/golangci.yaml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: ['1.21.x']
+        go-version: ['1.22.x', '1.23.x']
         os: [ubuntu-latest, windows-latest]
     name: Lint
     runs-on: ${{ matrix.os }}
@@ -29,5 +29,5 @@ jobs:
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.55
+        version: v1.61
         args: --new-from-rev=origin/master --config=.golangci.yml --timeout=25m