Skip to content

Commit 97f1a6b

Browse files
SoumyaRaikwarSoumyaRaikwar
authored
Merge branch 'kubernetes:main' into add-deployment-topology-spread-constraints-metric
2 parents 4a76538 + c892a3f commit 97f1a6b

File tree

7 files changed

+91
-55
lines changed

7 files changed

+91
-55
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3333

3434
- name: Set up Go 1.x
35-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
35+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
3636
with:
3737
go-version: ${{ env.GO_VERSION }}
3838
id: go
@@ -50,7 +50,7 @@ jobs:
5050
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5151

5252
- name: Set up Go 1.x
53-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
53+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
5454
with:
5555
go-version: ${{ env.GO_VERSION }}
5656
id: go
@@ -67,7 +67,7 @@ jobs:
6767
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6868

6969
- name: Set up Go 1.x
70-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
70+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
7171
with:
7272
go-version: ${{ env.GO_VERSION }}
7373
id: go
@@ -84,7 +84,7 @@ jobs:
8484
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
8585

8686
- name: Set up Go 1.x
87-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
87+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
8888
with:
8989
go-version: ${{ env.GO_VERSION }}
9090
id: go
@@ -101,7 +101,7 @@ jobs:
101101
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
102102

103103
- name: Set up Go 1.x
104-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
104+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
105105
with:
106106
go-version: ${{ env.GO_VERSION }}
107107
id: go
@@ -132,6 +132,34 @@ jobs:
132132
- name: Check out code into the Go module directory
133133
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
134134

135+
- name: Set up Go 1.x
136+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
137+
with:
138+
go-version: ${{ env.GO_VERSION }}
139+
id: go
140+
141+
- name: Benchmark tests
142+
run: |
143+
BENCHSTAT_OUTPUT_FILE=result.txt make test-benchmark-compare-main
144+
- run: |
145+
echo "Comparison against main branch" >> "$GITHUB_STEP_SUMMARY"
146+
echo "\`\`\`" >> "$GITHUB_STEP_SUMMARY"
147+
cat result.txt >> "$GITHUB_STEP_SUMMARY"
148+
echo "\`\`\`" >> "$GITHUB_STEP_SUMMARY"
149+
cat <<EOL >> "$GITHUB_STEP_SUMMARY"
150+
<hr />
151+
The table shows the median and 95% confidence interval (CI) summaries for each benchmark comparing the HEAD and the BASE, and an A/B comparison under "vs base". The last column shows the statistical p-value with ten runs (n=10).
152+
The last row has the Geometric Mean (geomean) for the given rows in the table.
153+
Refer to <a href="https://pkg.go.dev/golang.org/x/perf/cmd/benchstat">benchstat's documentation</a> for more help.
154+
EOL
155+
156+
ci-benchmark-tests-release:
157+
name: ci-benchmark-tests-releasebranch
158+
runs-on: ubuntu-latest
159+
steps:
160+
- name: Check out code into the Go module directory
161+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
162+
135163
- name: Set up Go 1.x
136164
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
137165
with:
@@ -140,8 +168,9 @@ jobs:
140168

141169
- name: Benchmark tests
142170
run: |
143-
BENCHSTAT_OUTPUT_FILE=result.txt make test-benchmark-compare
171+
BENCHSTAT_OUTPUT_FILE=result.txt make test-benchmark-compare-release
144172
- run: |
173+
echo "Comparison against release branch" >> "$GITHUB_STEP_SUMMARY"
145174
echo "\`\`\`" >> "$GITHUB_STEP_SUMMARY"
146175
cat result.txt >> "$GITHUB_STEP_SUMMARY"
147176
echo "\`\`\`" >> "$GITHUB_STEP_SUMMARY"
@@ -160,7 +189,7 @@ jobs:
160189
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
161190

162191
- name: Set up Go 1.x
163-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
192+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
164193
with:
165194
go-version: ${{ env.GO_VERSION }}
166195
id: go
@@ -177,7 +206,7 @@ jobs:
177206
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
178207

179208
- name: Set up Go 1.x
180-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
209+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
181210
with:
182211
go-version: ${{ env.GO_VERSION }}
183212
id: go

‎.github/workflows/govulncheck.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
1919
name: Checkout code
2020
- name: Set up Go 1.x
21-
uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
21+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
2222
with:
2323
go-version: ${{ env.GO_VERSION }}
2424
- name: Install govulncheck binary

‎Makefile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,15 @@ validate-template: generate-template
101101
# Runs benchmark tests on the current git ref and the last release and compares
102102
# the two.
103103
test-benchmark-compare:
104-
@git fetch
105-
./tests/compare_benchmarks.sh main 2
106-
./tests/compare_benchmarks.sh ${LATEST_RELEASE_BRANCH} 2
104+
$(MAKE) test-benchmark-compare-main test-benchmark-compare-release
105+
106+
test-benchmark-compare-main:
107+
@git fetch origin main
108+
./tests/compare_benchmarks.sh main 6
109+
110+
test-benchmark-compare-release:
111+
@git fetch origin ${LATEST_RELEASE_BRANCH}
112+
./tests/compare_benchmarks.sh ${LATEST_RELEASE_BRANCH} 6
107113

108114
all: all-container
109115

‎go.mod‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ require (
1111
github.com/gobuffalo/flect v1.0.3
1212
github.com/google/go-cmp v0.7.0
1313
github.com/oklog/run v1.2.0
14-
github.com/prometheus/client_golang v1.23.0
14+
github.com/prometheus/client_golang v1.23.2
1515
github.com/prometheus/client_model v0.6.2
16-
github.com/prometheus/common v0.65.0
17-
github.com/prometheus/exporter-toolkit v0.14.0
16+
github.com/prometheus/common v0.66.1
17+
github.com/prometheus/exporter-toolkit v0.14.1
1818
github.com/robfig/cron/v3 v3.0.1
19-
github.com/spf13/cobra v1.9.1
19+
github.com/spf13/cobra v1.10.1
2020
github.com/spf13/viper v1.20.1
2121
github.com/stretchr/testify v1.11.1
2222
k8s.io/api v0.33.4
@@ -93,7 +93,7 @@ require (
9393
github.com/cloudflare/circl v1.3.9 // indirect
9494
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
9595
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
96-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
96+
github.com/coreos/go-systemd/v22 v22.6.0 // indirect
9797
github.com/cyphar/filepath-securejoin v0.2.5 // indirect
9898
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9999
github.com/dustin/gojson v0.0.0-20160307161227-2e71ec9dd5ad // indirect
@@ -194,7 +194,7 @@ require (
194194
github.com/sourcegraph/conc v0.3.0 // indirect
195195
github.com/spf13/afero v1.12.0 // indirect
196196
github.com/spf13/cast v1.7.1 // indirect
197-
github.com/spf13/pflag v1.0.6 // indirect
197+
github.com/spf13/pflag v1.0.9 // indirect
198198
github.com/stoewer/go-strcase v1.3.0 // indirect
199199
github.com/subosito/gotenv v1.6.0 // indirect
200200
github.com/ugorji/go/codec v1.2.12 // indirect
@@ -220,16 +220,16 @@ require (
220220
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
221221
go4.org/unsafe/assume-no-moving-gc v0.0.0-20231121144256-b99613f794b6 // indirect
222222
gocloud.dev v0.40.0 // indirect
223-
golang.org/x/crypto v0.40.0 // indirect
223+
golang.org/x/crypto v0.41.0 // indirect
224224
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
225-
golang.org/x/mod v0.25.0 // indirect
226-
golang.org/x/net v0.41.0 // indirect
225+
golang.org/x/mod v0.26.0 // indirect
226+
golang.org/x/net v0.43.0 // indirect
227227
golang.org/x/oauth2 v0.30.0 // indirect
228228
golang.org/x/perf v0.0.0-20250214215153-c95ad7d5b636 // indirect
229229
golang.org/x/sync v0.16.0 // indirect
230-
golang.org/x/sys v0.34.0 // indirect
231-
golang.org/x/term v0.33.0 // indirect
232-
golang.org/x/text v0.27.0 // indirect
230+
golang.org/x/sys v0.35.0 // indirect
231+
golang.org/x/term v0.34.0 // indirect
232+
golang.org/x/text v0.28.0 // indirect
233233
golang.org/x/time v0.9.0 // indirect
234234
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
235235
google.golang.org/api v0.215.0 // indirect
@@ -238,7 +238,7 @@ require (
238238
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 // indirect
239239
google.golang.org/grpc v1.68.1 // indirect
240240
google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a // indirect
241-
google.golang.org/protobuf v1.36.6 // indirect
241+
google.golang.org/protobuf v1.36.8 // indirect
242242
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
243243
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
244244
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)