1
0
mirror of https://github.com/rancher/rke.git synced 2025-08-09 10:48:10 +00:00

Merge pull request #2574 from superseb/improve_validate

Improve validate
This commit is contained in:
Sebastiaan van Steenis 2021-06-18 18:07:43 +02:00 committed by GitHub
commit 0bad4db7b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 7 deletions

1
.gitignore vendored
View File

@ -7,6 +7,7 @@
/trash.lock /trash.lock
kube_config* kube_config*
/rke /rke
/build/bin
.vscode .vscode
cluster.rkestate cluster.rkestate
cluster.yml cluster.yml

View File

View File

@ -10,11 +10,11 @@ import (
) )
const ( const (
defaultURL = "https://releases.rancher.com/kontainer-driver-metadata/dev-v2.5/data.json" defaultURL = "https://releases.rancher.com/kontainer-driver-metadata/dev-v2.6/data.json"
dataFile = "data/data.json" dataFile = "data/data.json"
) )
// Codegen fetch data.json from https://releases.rancher.com/kontainer-driver-metadata/dev-v2.5/data.json and generates bindata // Codegen fetch data.json from https://releases.rancher.com/kontainer-driver-metadata/dev-v2.6/data.json and generates bindata
func main() { func main() {
u := os.Getenv(metadata.RancherMetadataURLEnv) u := os.Getenv(metadata.RancherMetadataURLEnv)
if u == "" { if u == "" {

File diff suppressed because one or more lines are too long

View File

@ -9304,7 +9304,7 @@
"version": "2.11.100-build2021022300" "version": "2.11.100-build2021022300"
}, },
"rke2-multus": { "rke2-multus": {
"repo": "rancher-charts", "repo": "rancher-rke2-charts",
"version": "v3.7.1-build2021041602" "version": "v3.7.1-build2021041602"
} }
}, },
@ -9366,7 +9366,7 @@
"type": "array" "type": "array"
} }
}, },
"version": "v1.21.1-rc2+rke2r1" "version": "v1.21.1-rc3+rke2r1"
} }
] ]
} }

View File

@ -3,8 +3,8 @@ set -e
cd $(dirname $0) cd $(dirname $0)
./validate
./build ./build
./test ./test
./validate
./integration ./integration
./package ./package

View File

@ -7,3 +7,18 @@ echo Running validation
echo Running: golangci-lint echo Running: golangci-lint
golangci-lint run golangci-lint run
echo Tidying up modules
go mod tidy
echo Verifying modules
go mod verify
echo Generating files
go generate
if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
echo "Encountered dirty repo!"
git status --porcelain --untracked-files=no
exit 1
fi