diff --git a/BUILDING.md b/BUILDING.md index 1969b0fcd8c..ed33e4afc81 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -8,12 +8,6 @@ Before getting started, bear in mind that this repository includes all of Kubern git clone --depth 1 https://github.com/k3s-io/k3s.git ``` -The k3s build process requires some autogenerated code and remote artifacts that are not checked in to version control. To prepare these resources for your build environment, run: - -```bash -mkdir -p build/data && make download && make generate -``` - To build the full release binary, you may now run `make`, which will create `./dist/artifacts/k3s`. To build the binaries using `make` without running linting (i.e.: if you have uncommitted changes): diff --git a/Makefile b/Makefile index 0f19de68c9e..b6e7752ff17 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ TARGETS := $(shell ls scripts | grep -v \\.sh) -GO_FILES ?= $$(find . -name '*.go' | grep -v generated) +GO_FILES ?= $$(find . -name '*.go') SHELL := /bin/bash @@ -77,4 +77,4 @@ local-airgap: ./scripts/package-airgap .PHONY: local-ci -local-ci: local-binary local-image local-airgap \ No newline at end of file +local-ci: local-binary local-image local-airgap diff --git a/scripts/generate b/scripts/generate deleted file mode 100755 index ebdaf31cc53..00000000000 --- a/scripts/generate +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -cd $(dirname $0)/.. - -rm -rf build/data -mkdir -p build/data - -GO=${GO-go} - -echo Running: "${GO}" generate -"${GO}" generate diff --git a/scripts/validate b/scripts/validate index de33f5f5290..b879db309d0 100755 --- a/scripts/validate +++ b/scripts/validate @@ -14,9 +14,6 @@ sha256sum -c install.sh.sha256sum echo Running: go mod tidy go mod tidy -echo Running: go generate -GOOS=linux CC=gcc CXX=g++ go generate - echo Running validation . ./scripts/version.sh diff --git a/updatecli/scripts/run-go-generate.sh b/updatecli/scripts/run-go-generate.sh deleted file mode 100755 index c230f57c93c..00000000000 --- a/updatecli/scripts/run-go-generate.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -set -eux - -./scripts/download >&2 -go generate >&2 -git diff - -exit 0 - diff --git a/updatecli/updatecli.d/coredns.yaml b/updatecli/updatecli.d/coredns.yaml index c5ec7da7585..cf4925bcbb8 100644 --- a/updatecli/updatecli.d/coredns.yaml +++ b/updatecli/updatecli.d/coredns.yaml @@ -76,13 +76,3 @@ targets: - "scripts/airgap/image-list.txt" matchpattern: 'docker.io/rancher/mirrored-coredns-coredns:\S+' replacepattern: 'docker.io/rancher/mirrored-coredns-coredns:{{ source "coredns-docker-image" }}' - - go-generate: - name: "Run go generate" - kind: "shell" - sourceid: "get-pwd" - spec: - command: '{{ source "get-pwd" }}/updatecli/scripts/run-go-generate.sh' - environments: - - name: PATH - - name: HOME diff --git a/updatecli/updatecli.d/local-path-provisioner.yaml b/updatecli/updatecli.d/local-path-provisioner.yaml index 1cd2d6808a0..97766b78eb3 100644 --- a/updatecli/updatecli.d/local-path-provisioner.yaml +++ b/updatecli/updatecli.d/local-path-provisioner.yaml @@ -76,16 +76,3 @@ targets: - "scripts/airgap/image-list.txt" matchpattern: 'rancher/local-path-provisioner:v\d+\.\d+\.\d+(-\w+)?' replacepattern: 'rancher/local-path-provisioner:{{ source `local-path-provisioner` }}' - go-generate: - name: "Run go generate" - kind: "shell" - scmid: "k3s" - dependson: - - "local-path-provisioner" - disablesourceinput: true - spec: - command: '{{ source "get-pwd" }}/updatecli/scripts/run-go-generate.sh' - environments: - - name: PATH - - name: HOME -