Skip to content

Commit 255f373

Browse files
authored
Merge branch 'main' into fix/hubble-surface-manager-start-failure
2 parents a07b894 + 1f2445a commit 255f373

66 files changed

Lines changed: 2343 additions & 2199 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.azure-pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# AZURE_AGENT_LINUX_ARM_SKU
1818
# Variables (secret):
1919
# AZURE_APP_INSIGHTS_KEY
20-
# Service connection (Azure RM, WIF): r2d
20+
# Service connection (Azure RM, WIF): Azure Container Networking - Build Validations - Federated
2121
# Settings: "Limit building pull requests from forked GitHub repositories" = Disable
2222

2323
trigger:
@@ -42,7 +42,7 @@ parameters:
4242

4343
variables:
4444
- name: azureServiceConnection
45-
value: r2d
45+
value: Azure Container Networking - Build Validations - Federated
4646
- name: imageNamespace
4747
value: microsoft/retina
4848
# True only when the build was triggered by a push to a merge-queue temp branch,

.azure-pipelines/perf.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# AZURE_AGENT_LINUX_ARM_SKU
1313
# Variables (secret):
1414
# AZURE_APP_INSIGHTS_KEY
15-
# Service connection (Azure RM, WIF): r2d
15+
# Service connection (Azure RM, WIF): Azure Container Networking - Build Validations - Federated
1616
# Settings: "Limit building pull requests from forked GitHub repositories" = Disable
1717

1818
trigger: none
@@ -48,7 +48,7 @@ parameters:
4848

4949
variables:
5050
- name: azureServiceConnection
51-
value: r2d
51+
value: Azure Container Networking - Build Validations - Federated
5252

5353
jobs:
5454
- ${{ each mode in parameters.modes }}:

.azure-pipelines/scale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# ACR_NAME
99
# Variables (secret):
1010
# AZURE_APP_INSIGHTS_KEY
11-
# Service connection (Azure RM, WIF): r2d
11+
# Service connection (Azure RM, WIF): Azure Container Networking - Build Validations - Federated
1212
# Settings: "Limit building pull requests from forked GitHub repositories" = Disable
1313

1414
trigger: none
@@ -63,7 +63,7 @@ parameters:
6363

6464
variables:
6565
- name: azureServiceConnection
66-
value: r2d
66+
value: Azure Container Networking - Build Validations - Federated
6767

6868
jobs:
6969
- job: scale_test

.github/dependabot.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ updates:
1818
prefix: "deps"
1919
labels: ["area/infra", "area/dependencies"]
2020
open-pull-requests-limit: 10
21+
# MCR rebuilds these base images to ship CVE fixes, so a long window
22+
# delays the patches. A tag that is rebuilt more often than the window
23+
# never becomes eligible.
2124
cooldown:
22-
default-days: 7
25+
default-days: 2
2326
groups:
2427
golang-base:
2528
patterns: ["*golang*"]
@@ -44,7 +47,10 @@ updates:
4447
cooldown:
4548
default-days: 3
4649
groups:
50+
codeql-action:
51+
patterns: ["github/codeql-action*"]
4752
actions-patch:
53+
exclude-patterns: ["github/codeql-action*"]
4854
update-types: ["patch"]
4955

5056
# npm (Docusaurus site)
@@ -82,13 +88,21 @@ updates:
8288
cooldown:
8389
default-days: 7
8490
semver-major-days: 30
91+
ignore:
92+
# hive/statedb/stream versions are pinned by cilium/cilium's go.mod;
93+
# they can only move when cilium/cilium moves.
94+
- dependency-name: "github.com/cilium/hive"
95+
- dependency-name: "github.com/cilium/statedb"
96+
- dependency-name: "github.com/cilium/stream"
8597
groups:
8698
k8s:
8799
patterns:
88100
- "k8s.io/*"
89101
- "sigs.k8s.io/*"
102+
- "helm.sh/helm/v4"
103+
- "sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader"
90104
exclude-patterns:
91-
- "sigs.k8s.io/cloud-provider-azure/*"
105+
- "sigs.k8s.io/cloud-provider-azure/pkg/azclient"
92106
update-types: ["patch", "minor"]
93107
cilium:
94108
patterns:
@@ -106,4 +120,4 @@ updates:
106120
otel:
107121
patterns:
108122
- "go.opentelemetry.io/*"
109-
update-types: ["patch"]
123+
update-types: ["patch", "minor"]

.github/workflows/codeql.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ jobs:
4040
with:
4141
go-version-file: go.mod
4242
- name: Initialize CodeQL
43-
uses: github/codeql-action/init@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
43+
uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
4444
with:
4545
languages: ${{ matrix.language }}
4646
- name: Autobuild
47-
uses: github/codeql-action/autobuild@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
47+
uses: github/codeql-action/autobuild@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
4848
- name: Perform CodeQL Analysis
49-
uses: github/codeql-action/analyze@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
49+
uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
5050
with:
5151
category: "/language:${{matrix.language}}"

.github/workflows/daily-scale-test.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/e2e.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ jobs:
128128
- run: go version
129129

130130
- name: Az CLI login
131-
uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
131+
uses: azure/login@f5d393ae46f8fde4be8b75f32e3fc50e654ad0ca # v3.0.1
132132
with:
133133
client-id: ${{ secrets.AZURE_CLIENT_ID }}
134134
tenant-id: ${{ secrets.AZURE_TENANT_ID }}

.github/workflows/govulncheck.yaml

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
name: govulncheck
2+
on:
3+
merge_group:
4+
workflow_dispatch:
5+
push:
6+
branches: [main]
7+
pull_request:
8+
branches: [main]
9+
schedule:
10+
# Scheduled runs catch new vulnerability reports published against
11+
# existing code. PR runs catch new code and dependencies.
12+
- cron: "22 10 * * *"
13+
14+
permissions:
15+
contents: read
16+
17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref }}
19+
cancel-in-progress: true
20+
21+
jobs:
22+
govulncheck:
23+
name: govulncheck (${{ matrix.goos }})
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
goos: [linux, windows]
28+
runs-on: ubuntu-latest
29+
timeout-minutes: 15
30+
permissions:
31+
actions: read
32+
contents: read
33+
security-events: write
34+
steps:
35+
- name: Checkout repository
36+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
37+
# Scan with the toolchain the shipped images build with, so stdlib
38+
# findings track the builder image rather than the go.mod minimum.
39+
# The tag pins a minor version, so read the patch version from the
40+
# image config rather than from the tag.
41+
- name: Read builder Go version
42+
id: goversion
43+
run: |
44+
image="$(grep -m1 -oP '^FROM .*\Kmcr\.microsoft\.com/oss/go/microsoft/golang:\S+' controller/Dockerfile)"
45+
version="$(docker buildx imagetools inspect "${image}" --format '{{ json .Image }}' \
46+
| jq -r 'first(.. | objects | select(has("Env")) | .Env[] | select(startswith("GOLANG_VERSION=")))' \
47+
| cut -d= -f2)"
48+
# An empty version silently installs the wrong toolchain, so stop here.
49+
if [ -z "${version}" ]; then
50+
echo "::error::could not read GOLANG_VERSION from ${image}"
51+
exit 1
52+
fi
53+
echo "builder image ${image} provides Go ${version}"
54+
echo "version=${version}" >> "${GITHUB_OUTPUT}"
55+
- name: Setup go
56+
uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e # v7.0.0
57+
with:
58+
go-version: ${{ steps.goversion.outputs.version }}
59+
# The tool version is pinned by the go.mod tool block; the scanner
60+
# fetches the vulnerability database from vuln.go.dev at run time.
61+
- name: Build govulncheck
62+
run: go build -o "${RUNNER_TEMP}/govulncheck" golang.org/x/vuln/cmd/govulncheck
63+
- name: Run govulncheck
64+
id: scan
65+
env:
66+
GOOS: ${{ matrix.goos }}
67+
run: |
68+
"${RUNNER_TEMP}/govulncheck" -version
69+
set -o pipefail
70+
rc=0
71+
"${RUNNER_TEMP}/govulncheck" ./... | tee govulncheck.txt || rc=$?
72+
# Exit status 3 means reachable findings; anything else non-zero
73+
# is an operational failure and must not read as a CVE signal.
74+
case "${rc}" in
75+
0) result=clean ;;
76+
3) result=findings ;;
77+
*) result=error ;;
78+
esac
79+
echo "result=${result}" >> "${GITHUB_OUTPUT}"
80+
exit "${rc}"
81+
- name: Report results
82+
if: always()
83+
env:
84+
GOOS: ${{ matrix.goos }}
85+
OUTCOME: ${{ steps.scan.outcome }}
86+
RESULT: ${{ steps.scan.outputs.result }}
87+
run: |
88+
{
89+
echo "## govulncheck (${GOOS})"
90+
if [ "${RESULT}" = "findings" ]; then
91+
echo '```'
92+
cat govulncheck.txt 2>/dev/null || echo "The scan produced no output; see the run log."
93+
echo '```'
94+
elif [ "${OUTCOME}" = "success" ]; then
95+
echo "No reachable vulnerabilities."
96+
else
97+
echo "The scan did not complete; see the run log."
98+
fi
99+
} >> "${GITHUB_STEP_SUMMARY}"
100+
if [ "${RESULT}" = "findings" ]; then
101+
echo "::error::govulncheck found reachable vulnerabilities (GOOS=${GOOS}); see the job summary"
102+
elif [ "${OUTCOME}" = "failure" ]; then
103+
echo "::error::the govulncheck scan failed without reporting findings (GOOS=${GOOS}); see the run log"
104+
fi
105+
# Code-scanning alerts track main. PR and merge-queue runs skip the
106+
# SARIF steps; fork PR tokens also lack security-events write.
107+
- name: Generate SARIF
108+
if: always() && github.ref == 'refs/heads/main'
109+
env:
110+
GOOS: ${{ matrix.goos }}
111+
run: '"${RUNNER_TEMP}/govulncheck" -format sarif ./... > govulncheck.sarif'
112+
- name: Upload SARIF to code scanning
113+
if: always() && github.ref == 'refs/heads/main'
114+
uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
115+
with:
116+
sarif_file: govulncheck.sarif
117+
category: govulncheck-${{ matrix.goos }}

.github/workflows/images.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- run: go version
5555

5656
- name: Az CLI login
57-
uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
57+
uses: azure/login@f5d393ae46f8fde4be8b75f32e3fc50e654ad0ca # v3.0.1
5858
if: ${{ github.event_name == 'merge_group' }}
5959
with:
6060
client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -159,7 +159,7 @@ jobs:
159159
throw "Docker daemon failed to start within $timeout seconds"
160160
161161
- name: Az CLI login
162-
uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
162+
uses: azure/login@f5d393ae46f8fde4be8b75f32e3fc50e654ad0ca # v3.0.1
163163
if: ${{ github.event_name == 'merge_group' }}
164164
with:
165165
client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -219,7 +219,7 @@ jobs:
219219
- run: go version
220220

221221
- name: Az CLI login
222-
uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
222+
uses: azure/login@f5d393ae46f8fde4be8b75f32e3fc50e654ad0ca # v3.0.1
223223
if: ${{ github.event_name == 'merge_group' }}
224224
with:
225225
client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -272,7 +272,7 @@ jobs:
272272
- run: go version
273273

274274
- name: Az CLI login
275-
uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
275+
uses: azure/login@f5d393ae46f8fde4be8b75f32e3fc50e654ad0ca # v3.0.1
276276
if: ${{ github.event_name == 'merge_group' }}
277277
with:
278278
client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -324,7 +324,7 @@ jobs:
324324
- run: go version
325325

326326
- name: Az CLI login
327-
uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
327+
uses: azure/login@f5d393ae46f8fde4be8b75f32e3fc50e654ad0ca # v3.0.1
328328
if: ${{ github.event_name == 'merge_group' }}
329329
with:
330330
client-id: ${{ secrets.AZURE_CLIENT_ID }}
@@ -377,7 +377,7 @@ jobs:
377377
uses: docker/setup-qemu-action@96fe6ef7f33517b61c61be40b68a1882f3264fb8 # v4.2.0
378378

379379
- name: Azure CLI login
380-
uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
380+
uses: azure/login@f5d393ae46f8fde4be8b75f32e3fc50e654ad0ca # v3.0.1
381381
with:
382382
client-id: ${{ secrets.AZURE_CLIENT_ID }}
383383
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -411,7 +411,7 @@ jobs:
411411
- run: go version
412412

413413
- name: Az CLI login
414-
uses: azure/login@532459ea530d8321f2fb9bb10d1e0bcf23869a43 # v3.0.0
414+
uses: azure/login@f5d393ae46f8fde4be8b75f32e3fc50e654ad0ca # v3.0.1
415415
if: ${{ github.event_name == 'merge_group' }}
416416
with:
417417
client-id: ${{ secrets.AZURE_CLIENT_ID }}

.github/workflows/kapinger.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
4646

4747
- name: Set up Docker Buildx
48-
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
48+
uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
4949

5050
- name: Log in to GHCR
5151
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
@@ -96,7 +96,7 @@ jobs:
9696
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
9797

9898
- name: Set up Docker Buildx
99-
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
99+
uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
100100

101101
- name: Log in to GHCR
102102
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
@@ -128,7 +128,7 @@ jobs:
128128
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
129129

130130
- name: Set up Docker Buildx
131-
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
131+
uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
132132

133133
- name: Log in to GHCR
134134
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
@@ -159,7 +159,7 @@ jobs:
159159
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
160160

161161
- name: Set up Docker Buildx
162-
uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
162+
uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
163163

164164
- name: Log in to GHCR
165165
if: github.event_name == 'push' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))

0 commit comments

Comments
 (0)