Merge pull request #2574 from superseb/improve_validate

Improve validate

.gitignore

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

codegen/codegen.go

@@ -10,11 +10,11 @@ import (
 )
 
 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"
 )
 
-// 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() {
 	u := os.Getenv(metadata.RancherMetadataURLEnv)
 	if u == "" {

data/data.json

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

scripts/ci

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

scripts/validate

@@ -7,3 +7,18 @@ echo Running validation
 
 echo Running: golangci-lint
 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