Skip to content

Commit 25ccbc8

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #8772 from jackfrancis/ci-vpa-1.5
[vpa-release-1.5] GHA config
2 parents f74d604 + 92e2800 commit 25ccbc8

File tree

7 files changed

+72
-164
lines changed

7 files changed

+72
-164
lines changed

‎.github/workflows/pr.yaml‎

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

‎.github/workflows/release.yaml‎

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

‎.github/workflows/ci.yaml‎ renamed to ‎.github/workflows/verify.yaml‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Tests
1+
name: Verify Go
22

33
on:
44
- push
@@ -12,7 +12,7 @@ permissions:
1212
checks: write
1313

1414
jobs:
15-
test-and-verify:
15+
verify:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4.2.2
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v5.5.0
2424
with:
25-
go-version: '1.24.0'
25+
go-version: '1.24.2'
2626
cache-dependency-path: |
2727
${{ env.GOPATH}}/src/k8s.io/autoscaler/cluster-autoscaler/go.sum
2828
${{ env.GOPATH}}/src/k8s.io/autoscaler/vertical-pod-autoscaler/go.sum
@@ -41,16 +41,4 @@ jobs:
4141
working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler
4242
run: hack/verify-all.sh -v
4343
env:
44-
GO111MODULE: auto
45-
46-
- name: golangci-lint - vertical-pod-autoscaler
47-
uses: golangci/golangci-lint-action@v8
48-
with:
49-
args: --timeout=30m
50-
working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler/vertical-pod-autoscaler
51-
52-
- name: Test
53-
working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler
54-
run: hack/for-go-proj.sh test
55-
env:
56-
GO111MODULE: auto
44+
GO111MODULE: auto

‎.github/workflows/vpa-test.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Vertical Pod Autoscaler
2+
3+
on:
4+
push:
5+
paths:
6+
- 'vertical-pod-autoscaler/**'
7+
pull_request:
8+
paths:
9+
- 'vertical-pod-autoscaler/**'
10+
11+
env:
12+
GOPATH: ${{ github.workspace }}/go
13+
14+
permissions:
15+
contents: read
16+
checks: write
17+
18+
jobs:
19+
test:
20+
name: test
21+
runs-on: ubuntu-latest
22+
steps:
23+
- uses: actions/checkout@v4.2.2
24+
with:
25+
path: ${{ env.GOPATH }}/src/k8s.io/autoscaler
26+
27+
- name: Set up Go
28+
uses: actions/setup-go@v5.5.0
29+
with:
30+
go-version: '1.24.2'
31+
cache-dependency-path: |
32+
${{ env.GOPATH}}/src/k8s.io/autoscaler/vertical-pod-autoscaler/go.sum
33+
${{ env.GOPATH}}/src/k8s.io/autoscaler/vertical-pod-autoscaler/e2e/go.sum
34+
- name: Apt-get
35+
run: sudo apt-get install libseccomp-dev -qq
36+
37+
- name: Test
38+
working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler
39+
run: hack/for-go-proj.sh vertical-pod-autoscaler
40+
env:
41+
GO111MODULE: auto
42+
PROJECT_NAMES: ""

‎hack/for-go-proj.sh‎

Lines changed: 24 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -19,58 +19,39 @@ set -o pipefail
1919
set -o nounset
2020

2121
CONTRIB_ROOT="$(dirname ${BASH_SOURCE})/.."
22-
PROJECT_NAMES=(addon-resizer vertical-pod-autoscaler)
2322

2423
if [[ $# -ne 1 ]]; then
25-
echo "missing subcommand: [build|install|test]"
24+
echo "missing subcommand: [cluster-autoscaler|vertical-pod-autoscaler|addon-resizer]"
2625
exit 1
2726
fi
2827

29-
CMD="${1}"
30-
31-
case "${CMD}" in
32-
"build")
28+
PROJECT="${1}"
29+
30+
case "${PROJECT}" in
31+
"cluster-autoscaler")
32+
pushd ${CONTRIB_ROOT}/cluster-autoscaler/
33+
# TODO: #8127 - Use default analyzers set by `go test` to include `printf` analyzer.
34+
# Default analyzers that go test runs according to https://github.com/golang/go/blob/52624e533fe52329da5ba6ebb9c37712048168e0/src/cmd/go/internal/test/test.go#L649
35+
# This doesn't include the `printf` analyzer until cluster-autoscaler libraries are updated.
36+
ANALYZERS="atomic,bool,buildtags,directive,errorsas,ifaceassert,nilfunc,slog,stringintconv,tests"
37+
go test -count=1 ./... -vet="${ANALYZERS}"
38+
popd
3339
;;
34-
"install")
40+
"vertical-pod-autoscaler")
41+
pushd ${CONTRIB_ROOT}/vertical-pod-autoscaler
42+
go test -count=1 -race $(go list ./... | grep -v /vendor/ | grep -v vertical-pod-autoscaler/e2e | grep -v cluster-autoscaler/apis)
43+
popd
44+
pushd ${CONTRIB_ROOT}/vertical-pod-autoscaler/e2e
45+
go test -run=None ./...
46+
popd
3547
;;
36-
"test")
48+
"addon-resizer")
49+
pushd ${CONTRIB_ROOT}/addon-resizer
50+
godep go test -race $(go list ./... | grep -v /vendor/ | grep -v vertical-pod-autoscaler/e2e)
51+
popd
3752
;;
3853
*)
3954
echo "invalid subcommand: ${CMD}"
4055
exit 1
4156
;;
42-
esac
43-
44-
for project_name in ${PROJECT_NAMES[*]}; do
45-
(
46-
export GO111MODULE=auto
47-
project=${CONTRIB_ROOT}/${project_name}
48-
echo "${CMD}ing ${project}"
49-
cd "${project}"
50-
case "${CMD}" in
51-
"test")
52-
if [[ -n $(find . -name "Godeps.json") ]]; then
53-
godep go test -race $(go list ./... | grep -v /vendor/ | grep -v vertical-pod-autoscaler/e2e)
54-
else
55-
go test -count=1 -race $(go list ./... | grep -v /vendor/ | grep -v vertical-pod-autoscaler/e2e | grep -v cluster-autoscaler/apis)
56-
fi
57-
;;
58-
*)
59-
godep go "${CMD}" ./...
60-
;;
61-
esac
62-
)
63-
done;
64-
65-
if [ "${CMD}" = "build" ] || [ "${CMD}" == "test" ]; then
66-
pushd ${CONTRIB_ROOT}/vertical-pod-autoscaler/e2e
67-
go test -run=None ./...
68-
popd
69-
pushd ${CONTRIB_ROOT}/cluster-autoscaler/
70-
# TODO: #8127 - Use default analyzers set by `go test` to include `printf` analyzer.
71-
# Default analyzers that go test runs according to https://github.com/golang/go/blob/52624e533fe52329da5ba6ebb9c37712048168e0/src/cmd/go/internal/test/test.go#L649
72-
# This doesn't include the `printf` analyzer until cluster-autoscaler libraries are updated.
73-
ANALYZERS="atomic,bool,buildtags,directive,errorsas,ifaceassert,nilfunc,slog,stringintconv,tests"
74-
go test -count=1 ./... -vet="${ANALYZERS}"
75-
popd
76-
fi
57+
esac

‎hack/verify-golint.sh‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,12 @@ cd "${KUBE_ROOT}"
2323

2424
GOLINT=${GOLINT:-"golint"}
2525
excluded_packages=(
26-
'/vendor/'
27-
'vertical-pod-autoscaler/pkg/client'
2826
'cluster-autoscaler/cloudprovider/aws/aws-sdk-go'
2927
'cluster-autoscaler/cloudprovider/magnum/gophercloud'
3028
'cluster-autoscaler/cloudprovider/digitalocean/godo'
3129
'cluster-autoscaler/cloudprovider/bizflycloud/gobizfly'
3230
'cluster-autoscaler/cloudprovider/brightbox/gobrightbox'
3331
'cluster-autoscaler/cloudprovider/brightbox/k8ssdk'
34-
'cluster-autoscaler/cloudprovider/brightbox/linkheader'
3532
'cluster-autoscaler/cloudprovider/brightbox/go-cache'
3633
'cluster-autoscaler/cloudprovider/externalgrpc/protos'
3734
'cluster-autoscaler/cloudprovider/exoscale/internal'
@@ -45,7 +42,7 @@ excluded_packages=(
4542
'cluster-autoscaler/cloudprovider/volcengine/volcengine-go-sdk'
4643
)
4744

48-
FIND_PACKAGES='go list ./... '
45+
FIND_PACKAGES='go list ./... 2> /dev/null '
4946
for package in "${excluded_packages[@]}"; do
5047
FIND_PACKAGES+="| grep -v ${package} "
5148
done

‎vertical-pod-autoscaler/pkg/updater/main.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ const (
160160
defaultRetryPeriod = 2 * time.Second
161161
)
162162

163+
// defaultLeaderElectionConfiguration provides default leader election
163164
func defaultLeaderElectionConfiguration() componentbaseconfig.LeaderElectionConfiguration {
164165
return componentbaseconfig.LeaderElectionConfiguration{
165166
LeaderElect: false,

0 commit comments

Comments
 (0)