Skip to content

Commit

Permalink
refactor: change organisation from kudobuilder to stackabletech
Browse files Browse the repository at this point in the history
  • Loading branch information
dervoeti committed Nov 6, 2024
1 parent 8018410 commit 35863c3
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 33 deletions.
4 changes: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
22 changes: 2 additions & 20 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -57,32 +57,14 @@ 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: [email protected]
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:
name_template: "{{ .Tag }}-next"

release:
github:
owner: kudobuilder
owner: stackabletech
name: kuttl
draft: false
prerelease: auto
Expand Down
4 changes: 2 additions & 2 deletions DOCKER.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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).
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
2 changes: 1 addition & 1 deletion hack/docker-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions hack/generate_krew.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion test/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 35863c3

Please sign in to comment.