Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 0 additions & 67 deletions .github/workflows/pr.yaml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/release.yaml

This file was deleted.

20 changes: 4 additions & 16 deletions .github/workflows/ci.yaml → .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Tests
name: Verify Go

on:
- push
Expand All @@ -12,7 +12,7 @@ permissions:
checks: write

jobs:
test-and-verify:
verify:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
Expand All @@ -22,7 +22,7 @@ jobs:
- name: Set up Go
uses: actions/[email protected]
with:
go-version: '1.24.0'
go-version: '1.24.2'
cache-dependency-path: |
${{ env.GOPATH}}/src/k8s.io/autoscaler/cluster-autoscaler/go.sum
${{ env.GOPATH}}/src/k8s.io/autoscaler/vertical-pod-autoscaler/go.sum
Expand All @@ -41,16 +41,4 @@ jobs:
working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler
run: hack/verify-all.sh -v
env:
GO111MODULE: auto

- name: golangci-lint - vertical-pod-autoscaler
uses: golangci/golangci-lint-action@v8
with:
args: --timeout=30m
working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler/vertical-pod-autoscaler

- name: Test
working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler
run: hack/for-go-proj.sh test
env:
GO111MODULE: auto
GO111MODULE: auto
42 changes: 42 additions & 0 deletions .github/workflows/vpa-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Vertical Pod Autoscaler

on:
push:
paths:
- 'vertical-pod-autoscaler/**'
pull_request:
paths:
- 'vertical-pod-autoscaler/**'

env:
GOPATH: ${{ github.workspace }}/go

permissions:
contents: read
checks: write

jobs:
test:
name: test
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
path: ${{ env.GOPATH }}/src/k8s.io/autoscaler

- name: Set up Go
uses: actions/[email protected]
with:
go-version: '1.24.2'
cache-dependency-path: |
${{ env.GOPATH}}/src/k8s.io/autoscaler/vertical-pod-autoscaler/go.sum
${{ env.GOPATH}}/src/k8s.io/autoscaler/vertical-pod-autoscaler/e2e/go.sum
- name: Apt-get
run: sudo apt-get install libseccomp-dev -qq

- name: Test
working-directory: ${{ env.GOPATH }}/src/k8s.io/autoscaler
run: hack/for-go-proj.sh vertical-pod-autoscaler
env:
GO111MODULE: auto
PROJECT_NAMES: ""
67 changes: 24 additions & 43 deletions hack/for-go-proj.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,58 +19,39 @@ set -o pipefail
set -o nounset

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

if [[ $# -ne 1 ]]; then
echo "missing subcommand: [build|install|test]"
echo "missing subcommand: [cluster-autoscaler|vertical-pod-autoscaler|addon-resizer]"
exit 1
fi

CMD="${1}"

case "${CMD}" in
"build")
PROJECT="${1}"

case "${PROJECT}" in
"cluster-autoscaler")
pushd ${CONTRIB_ROOT}/cluster-autoscaler/
# TODO: #8127 - Use default analyzers set by `go test` to include `printf` analyzer.
# Default analyzers that go test runs according to https://github.com/golang/go/blob/52624e533fe52329da5ba6ebb9c37712048168e0/src/cmd/go/internal/test/test.go#L649
# This doesn't include the `printf` analyzer until cluster-autoscaler libraries are updated.
ANALYZERS="atomic,bool,buildtags,directive,errorsas,ifaceassert,nilfunc,slog,stringintconv,tests"
go test -count=1 ./... -vet="${ANALYZERS}"
popd
;;
"install")
"vertical-pod-autoscaler")
pushd ${CONTRIB_ROOT}/vertical-pod-autoscaler
go test -count=1 -race $(go list ./... | grep -v /vendor/ | grep -v vertical-pod-autoscaler/e2e | grep -v cluster-autoscaler/apis)
popd
pushd ${CONTRIB_ROOT}/vertical-pod-autoscaler/e2e
go test -run=None ./...
popd
;;
"test")
"addon-resizer")
pushd ${CONTRIB_ROOT}/addon-resizer
godep go test -race $(go list ./... | grep -v /vendor/ | grep -v vertical-pod-autoscaler/e2e)
popd
;;
*)
echo "invalid subcommand: ${CMD}"
exit 1
;;
esac

for project_name in ${PROJECT_NAMES[*]}; do
(
export GO111MODULE=auto
project=${CONTRIB_ROOT}/${project_name}
echo "${CMD}ing ${project}"
cd "${project}"
case "${CMD}" in
"test")
if [[ -n $(find . -name "Godeps.json") ]]; then
godep go test -race $(go list ./... | grep -v /vendor/ | grep -v vertical-pod-autoscaler/e2e)
else
go test -count=1 -race $(go list ./... | grep -v /vendor/ | grep -v vertical-pod-autoscaler/e2e | grep -v cluster-autoscaler/apis)
fi
;;
*)
godep go "${CMD}" ./...
;;
esac
)
done;

if [ "${CMD}" = "build" ] || [ "${CMD}" == "test" ]; then
pushd ${CONTRIB_ROOT}/vertical-pod-autoscaler/e2e
go test -run=None ./...
popd
pushd ${CONTRIB_ROOT}/cluster-autoscaler/
# TODO: #8127 - Use default analyzers set by `go test` to include `printf` analyzer.
# Default analyzers that go test runs according to https://github.com/golang/go/blob/52624e533fe52329da5ba6ebb9c37712048168e0/src/cmd/go/internal/test/test.go#L649
# This doesn't include the `printf` analyzer until cluster-autoscaler libraries are updated.
ANALYZERS="atomic,bool,buildtags,directive,errorsas,ifaceassert,nilfunc,slog,stringintconv,tests"
go test -count=1 ./... -vet="${ANALYZERS}"
popd
fi
esac
5 changes: 1 addition & 4 deletions hack/verify-golint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,12 @@ cd "${KUBE_ROOT}"

GOLINT=${GOLINT:-"golint"}
excluded_packages=(
'/vendor/'
'vertical-pod-autoscaler/pkg/client'
'cluster-autoscaler/cloudprovider/aws/aws-sdk-go'
'cluster-autoscaler/cloudprovider/magnum/gophercloud'
'cluster-autoscaler/cloudprovider/digitalocean/godo'
'cluster-autoscaler/cloudprovider/bizflycloud/gobizfly'
'cluster-autoscaler/cloudprovider/brightbox/gobrightbox'
'cluster-autoscaler/cloudprovider/brightbox/k8ssdk'
'cluster-autoscaler/cloudprovider/brightbox/linkheader'
'cluster-autoscaler/cloudprovider/brightbox/go-cache'
'cluster-autoscaler/cloudprovider/externalgrpc/protos'
'cluster-autoscaler/cloudprovider/exoscale/internal'
Expand All @@ -45,7 +42,7 @@ excluded_packages=(
'cluster-autoscaler/cloudprovider/volcengine/volcengine-go-sdk'
)

FIND_PACKAGES='go list ./... '
FIND_PACKAGES='go list ./... 2> /dev/null '
for package in "${excluded_packages[@]}"; do
FIND_PACKAGES+="| grep -v ${package} "
done
Expand Down
1 change: 1 addition & 0 deletions vertical-pod-autoscaler/pkg/updater/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ const (
defaultRetryPeriod = 2 * time.Second
)

// defaultLeaderElectionConfiguration provides default leader election
func defaultLeaderElectionConfiguration() componentbaseconfig.LeaderElectionConfiguration {
return componentbaseconfig.LeaderElectionConfiguration{
LeaderElect: false,
Expand Down