From 3ee3ecb3ac874c6adf15e7968b59fbc8ef94a5ce Mon Sep 17 00:00:00 2001 From: Luther Monson Date: Tue, 21 Dec 2021 15:57:38 -0700 Subject: [PATCH] package rename wasnt approved yet, backing out cruft that snuck into last pr Signed-off-by: Luther Monson --- scripts/build | 2 +- scripts/build-tests-sonobuoy | 4 ++-- scripts/package-cli | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/build b/scripts/build index 05cac70322..139fb68746 100755 --- a/scripts/build +++ b/scripts/build @@ -7,7 +7,7 @@ cd $(dirname $0)/.. GO=${GO-go} -PKG="github.com/k3s-io/k3s" +PKG="github.com/rancher/k3s" PKG_CONTAINERD="github.com/containerd/containerd" PKG_K3S_CONTAINERD="github.com/k3s-io/containerd" PKG_CRICTL="github.com/kubernetes-sigs/cri-tools/pkg" diff --git a/scripts/build-tests-sonobuoy b/scripts/build-tests-sonobuoy index 6312e57b7d..430dc8356e 100755 --- a/scripts/build-tests-sonobuoy +++ b/scripts/build-tests-sonobuoy @@ -14,7 +14,7 @@ PKG_TO_TEST=$(find ./pkg/ -type f -name "*_int_test.go" | sed -r 's|/[^/]+$||' | for i in $PKG_TO_TEST; do name=$(echo "${i##*/}") echo $name - go test -c -v -ldflags "-X 'github.com/k3s-io/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration + go test -c -v -ldflags "-X 'github.com/rancher/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration done # Integration tests under /tests @@ -22,7 +22,7 @@ PKG_TO_TEST=$(find ./tests/integration -type f -name "*_int_test.go" | sed -r 's for i in $PKG_TO_TEST; do name=$(echo "${i##*/}") echo $name - go test -c -v -ldflags "-X 'github.com/k3s-io/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration + go test -c -v -ldflags "-X 'github.com/rancher/k3s/tests/util.existingServer=True'" -o dist/artifacts/k3s-integration-$name.test $i -run Integration done docker build -f ./tests/integration/Dockerfile.test -t $REPO . docker save $REPO -o ./dist/artifacts/$REPO.tar diff --git a/scripts/package-cli b/scripts/package-cli index e65aa43dbc..6c36922c28 100755 --- a/scripts/package-cli +++ b/scripts/package-cli @@ -52,8 +52,8 @@ CMD_NAME=dist/artifacts/k3s${BIN_SUFFIX} "${GO}" generate LDFLAGS=" - -X github.com/k3s-io/k3s/pkg/version.Version=$VERSION - -X github.com/k3s-io/k3s/pkg/version.GitCommit=${COMMIT:0:8} + -X github.com/rancher/k3s/pkg/version.Version=$VERSION + -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} -w -s " STATIC="-extldflags '-static'"