Skip to content

Commit

Permalink
Merge pull request #3101 from Mufengzhe/feature_k8s1.27_cherry-pick
Browse files Browse the repository at this point in the history
[cherry-pick for release 1.8]volcano adapt  k8s v1.27
  • Loading branch information
volcano-sh-bot authored Sep 6, 2023
2 parents 326caaf + c13f38b commit dd579a8
Show file tree
Hide file tree
Showing 48 changed files with 5,716 additions and 1,200 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/code_verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Checkout code
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e_parallel_jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install musl
run: |
Expand All @@ -31,7 +31,7 @@ jobs:

- name: Install dependences
run: |
GO111MODULE="on" go install sigs.k8s.io/kind@v0.11.0
GO111MODULE="on" go install sigs.k8s.io/kind@v0.15.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
- name: Checkout code
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e_scheduling_actions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install musl
run: |
Expand All @@ -31,7 +31,7 @@ jobs:

- name: Install dependences
run: |
GO111MODULE="on" go install sigs.k8s.io/kind@v0.11.0
GO111MODULE="on" go install sigs.k8s.io/kind@v0.15.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
- name: Checkout code
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e_scheduling_basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install musl
run: |
Expand All @@ -31,7 +31,7 @@ jobs:

- name: Install dependences
run: |
GO111MODULE="on" go install sigs.k8s.io/kind@v0.11.0
GO111MODULE="on" go install sigs.k8s.io/kind@v0.15.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
- name: Checkout code
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e_sequence.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install musl
run: |
Expand All @@ -31,7 +31,7 @@ jobs:

- name: Install dependences
run: |
GO111MODULE="on" go install sigs.k8s.io/kind@v0.11.0
GO111MODULE="on" go install sigs.k8s.io/kind@v0.15.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
- name: Checkout code
uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e_spark.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: 1.20.x
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
Expand All @@ -65,7 +65,7 @@ jobs:
make TAG=v1.8.0 images
docker images | grep volcano
cat ./installer/volcano-development.yaml | grep image:
minikube kubectl -- apply -f ./installer/volcano-development.yaml
minikube kubectl -- replace --force -f ./installer/volcano-development.yaml
- name: Show all K8S pods and nodes
run: |
# Use minikube kubectl
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e_vcctl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install musl
run: |
Expand All @@ -31,7 +31,7 @@ jobs:

- name: Install dependences
run: |
GO111MODULE="on" go install sigs.k8s.io/kind@v0.11.0
GO111MODULE="on" go install sigs.k8s.io/kind@v0.15.0
curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/linux/amd64/kubectl && sudo install kubectl /usr/local/bin/kubectl
- name: Checkout code
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v4
with:
go-version: "^1.19.x"
go-version: "^1.20.x"
- run: go version
# Runs a set of commands to initialize and analyze with FOSSA
- name: run FOSSA analysis
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.19.x
go-version: 1.20.x

- name: Install musl
run: |
Expand Down
6 changes: 5 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,15 @@ linters:
- varcheck
# other linters supported by golangci-lint.
#- gosec
- revive
#- revive
- whitespace

linters-settings:
goimports:
local-prefixes: volcano.sh
staticcheck:
checks:
- "all"
- "-SA1019" # TODO(fix) Using a deprecated function, variable, constant or field


4 changes: 3 additions & 1 deletion config/crd/jobflow/bases/flow.volcano.sh_jobflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ spec:
to be used in HTTP probes
properties:
name:
description: The header field name
description: The header field name. This will
be canonicalized upon output, so case-variant
names will be understood as the same header.
type: string
value:
description: The header field value
Expand Down
Loading

0 comments on commit dd579a8

Please sign in to comment.