diff --git a/.golangci.yml b/.golangci.yml index dbbc66f..60a8dbd 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -57,8 +57,8 @@ linters-settings: dupl: threshold: 400 goimports: - # Don't use 'github.com/kudobuilder/kuttl', it'll result in unreliable output! - local-prefixes: github.com/kudobuilder + # Don't use 'github.com/stackabletech/kuttl', it'll result in unreliable output! + local-prefixes: github.com/stackabletech issues: # ignore errchecks for test files exclude-rules: diff --git a/.goreleaser.yml b/.goreleaser.yml index 20d0919..6d60204 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -12,7 +12,7 @@ builds: binary: kubectl-kuttl main: cmd/kubectl-kuttl/main.go ldflags: - - -s -w -X github.com/kudobuilder/kuttl/pkg/version.gitVersion={{ .Version }} -X github.com/kudobuilder/kuttl/pkg/version.gitCommit={{ .ShortCommit }} -X github.com/kudobuilder/kuttl/pkg/version.buildDate={{ .Date }} + - -s -w -X github.com/stackabletech/kuttl/pkg/version.gitVersion={{ .Version }} -X github.com/stackabletech/kuttl/pkg/version.gitCommit={{ .ShortCommit }} -X github.com/stackabletech/kuttl/pkg/version.buildDate={{ .Date }} goos: - linux - darwin @@ -57,24 +57,6 @@ archives: {{- with .Mips }}_{{ . }}{{ end }} {{- if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }} format: binary -brews: - - name: kuttl-cli - ids: - - kubectl-kuttl-tarball - repository: - owner: kudobuilder - name: homebrew-tap - commit_author: - name: kudoreleasebot - email: release@kudo.dev - skip_upload: auto - folder: Formula - homepage: https://kuttl.dev - description: Interact with KUTTL via the kubectl plugin - dependencies: - - kubernetes-cli - install: | - bin.install "kubectl-kuttl" checksum: name_template: "checksums.txt" snapshot: @@ -82,7 +64,7 @@ snapshot: release: github: - owner: kudobuilder + owner: stackabletech name: kuttl draft: false prerelease: auto diff --git a/DOCKER.md b/DOCKER.md index 7c6dd8b..8d4455d 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -7,7 +7,7 @@ There is strong interest in the community to support a number of architectures w * linux/ppc64le * linux/s390x -In order to support this, we are using the new and experimental docker [buildx](https://docs.docker.com/engine/reference/commandline/buildx/). This allows for building and pushing of several architectures to the same docker repository allowing for the client platform to determine preferred architecture for its pull request. +In order to support this, we are using the new and experimental docker [buildx](https://docs.docker.com/engine/reference/commandline/buildx/). This allows for building and pushing of several architectures to the same docker repository allowing for the client platform to determine preferred architecture for its pull request. In addition to using `buildx` there are two more requirements to make this work: @@ -22,6 +22,6 @@ You will need to `enable` docker CLI experimental features for this to work. To build and push manually the following is necessary: `make docker-release` This will result in a command similar to the following with the version tag replaced with the current version: -`docker buildx build . -t kudobuilder/kuttl:v0.6.1 --platform linux/amd64,linux/arm64,linux/ppc64le --push` +`docker buildx build . -t stackabletech/kuttl:v0.6.1 --platform linux/amd64,linux/arm64,linux/ppc64le --push` Updates for platform builds are maintained in [hack/docker-release.sh](hack/docker-release.sh). diff --git a/Dockerfile b/Dockerfile index c0c25d1..369f028 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,7 +26,7 @@ RUN make cli # release image with kubectl + kuttl FROM registry.access.redhat.com/ubi8/ubi-minimal:latest -LABEL org.opencontainers.image.source="https://github.com/kudobuilder/kuttl" +LABEL org.opencontainers.image.source="https://github.com/stackabletech/kuttl" RUN microdnf install vim tar gzip RUN echo 'alias vi=vim' >> ~/.bashrc diff --git a/Makefile b/Makefile index 98899e1..8da3896 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ SHELL=bash -o pipefail CLI := kubectl-kuttl -GIT_VERSION_PATH := github.com/kudobuilder/kuttl/pkg/version.gitVersion +GIT_VERSION_PATH := github.com/stackabletech/kuttl/pkg/version.gitVersion GIT_VERSION := $(shell git describe --abbrev=0 --tags | cut -b 2-) -GIT_COMMIT_PATH := github.com/kudobuilder/kuttl/pkg/version.gitCommit +GIT_COMMIT_PATH := github.com/stackabletech/kuttl/pkg/version.gitCommit GIT_COMMIT := $(shell git rev-parse HEAD | cut -b -8) SOURCE_DATE_EPOCH := $(shell git show -s --format=format:%ct HEAD) -BUILD_DATE_PATH := github.com/kudobuilder/kuttl/pkg/version.buildDate +BUILD_DATE_PATH := github.com/stackabletech/kuttl/pkg/version.buildDate DATE_FMT := "%Y-%m-%dT%H:%M:%SZ" BUILD_DATE := $(shell date -u -d "@$SOURCE_DATE_EPOCH" "+${DATE_FMT}" 2>/dev/null || date -u -r "${SOURCE_DATE_EPOCH}" "+${DATE_FMT}" 2>/dev/null || date -u "+${DATE_FMT}") LDFLAGS := -X ${GIT_VERSION_PATH}=${GIT_VERSION} -X ${GIT_COMMIT_PATH}=${GIT_COMMIT} -X ${BUILD_DATE_PATH}=${BUILD_DATE} diff --git a/hack/docker-release.sh b/hack/docker-release.sh index 4e84785..7d95459 100755 --- a/hack/docker-release.sh +++ b/hack/docker-release.sh @@ -22,7 +22,7 @@ if [[ ${RETVAL} != 0 ]]; then exit 1 fi -docker buildx build . -t "kudobuilder/kuttl:v$GIT_VERSION" --platform linux/amd64,linux/arm64,linux/ppc64le --push +docker buildx build . -t "stackabletech/kuttl:v$GIT_VERSION" --platform linux/amd64,linux/arm64,linux/ppc64le --push RETVAL=$? if [[ ${RETVAL} != 0 ]]; then diff --git a/hack/generate_krew.sh b/hack/generate_krew.sh index 8ebb66d..8450a1a 100755 --- a/hack/generate_krew.sh +++ b/hack/generate_krew.sh @@ -20,7 +20,7 @@ function generate_platform { ARCH=i386 fi - URL="https://github.com/kudobuilder/kuttl/releases/download/v${VERSION}/kuttl_${VERSION}_${1}_${ARCH}.tar.gz" + URL="https://github.com/stackabletech/kuttl/releases/download/v${VERSION}/kuttl_${VERSION}_${1}_${ARCH}.tar.gz" # check file exists first! if ! curl --output /dev/null --silent --head --fail "$URL"; then >&2 echo "URL does not exist: $URL" @@ -40,7 +40,7 @@ function generate_platform { matchLabels: os: "${1}" arch: "${2}" - uri: https://github.com/kudobuilder/kuttl/releases/download/v${VERSION}/kuttl_${VERSION}_${1}_${ARCH}.tar.gz + uri: https://github.com/stackabletech/kuttl/releases/download/v${VERSION}/kuttl_${VERSION}_${1}_${ARCH}.tar.gz sha256: "${sha}" bin: "${3}" EOF diff --git a/test/Dockerfile b/test/Dockerfile index 8e3240d..f50ce33 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -1,6 +1,6 @@ FROM kudobuilder/golang:1.21 -WORKDIR $GOPATH/src/github.com/kudobuilder/kuttl +WORKDIR $GOPATH/src/github.com/stackabletech/kuttl # install docker RUN apt-get update && apt-get install -y \ diff --git a/test/run_tests.sh b/test/run_tests.sh index 9c8e44f..2577c37 100755 --- a/test/run_tests.sh +++ b/test/run_tests.sh @@ -36,7 +36,7 @@ fi if docker build -f test/Dockerfile -t kuttl-test .; then if docker run -e INTEGRATION_OUTPUT_JUNIT --net=host -it --rm -m 4g \ -v /var/run/docker.sock:/var/run/docker.sock \ - -v "$(pwd)"/reports:/go/src/github.com/kudobuilder/kuttl/reports \ + -v "$(pwd)"/reports:/go/src/github.com/stackabletech/kuttl/reports \ -v "$(pwd)"/kind-logs:/tmp/kuttl-e2e-test \ kuttl-test bash -c "make $TARGET; ret=\$?; chmod a+r -R /tmp/kuttl-e2e-test; exit \$ret" then