Skip to content

Commit

Permalink
Remove kubectl-delivery (#494)
Browse files Browse the repository at this point in the history
Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>

Signed-off-by: Yuki Iwai <yuki.iwai.tz@gmail.com>
  • Loading branch information
tenzen-y committed Jan 6, 2023
1 parent c131315 commit 6079247
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 1,787 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
# project uses a compiled language

- run: |
make mpi-operator.v2 kubectl-delivery
make mpi-operator.v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
6 changes: 5 additions & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ jobs:
with:
version: v1.50.1
args: --timeout=5m
only-new-issues: true
# To avoid the following errors, we comment out.
# Error: options working-directory and only-new-issues aren't compatible, Error: options working-directory and only-new-issues aren't compatible
# TODO: Once we move the v2 directory to the top of the repository, we need to uncomment the following.
# only-new-issues: true
working-directory: v2
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: go mod tidy
run: make tidy
- name: Build
run: make mpi-operator.v2 kubectl-delivery
run: make mpi-operator.v2
- name: Run tests
run: make test
e2e:
Expand Down
18 changes: 3 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,33 +27,23 @@ CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"

build: all

all: ${BIN_DIR} fmt tidy lint test mpi-operator.v2 kubectl-delivery
all: ${BIN_DIR} fmt tidy lint test mpi-operator.v2

.PHONY: mpi-operator.v2
mpi-operator.v2:
cd v2 && \
go build -ldflags ${LD_FLAGS_V2} -o ../${BIN_DIR}/mpi-operator.v2 ./cmd/mpi-operator/

.PHONY: kubectl-delivery
kubectl-delivery:
go build -ldflags ${LD_FLAGS} -o ${BIN_DIR}/kubectl-delivery ./cmd/kubectl-delivery/

${BIN_DIR}:
mkdir -p ${BIN_DIR}

.PHONY: fmt
fmt:
go fmt ./...
cd v2 && go fmt ./...

.PHONY: test
test:
go test -covermode atomic -coverprofile=profile.cov ./...
@make test_v2

.PHONY: test_v2
test_v2: export KUBEBUILDER_ASSETS = ${KUBEBUILDER_ASSETS_PATH}
test_v2: bin/kubebuilder
test: export KUBEBUILDER_ASSETS = ${KUBEBUILDER_ASSETS_PATH}
test: bin/kubebuilder
cd v2 && go test -covermode atomic -coverprofile=profile.cov ./...

# Only works with CONTROLLER_VERSION=v2
Expand Down Expand Up @@ -94,7 +84,6 @@ test_images:

.PHONY: tidy
tidy:
go mod tidy -compat 1.17
cd v2 && go mod tidy -compat 1.17

GOLANGCI_LINT = ./bin/golangci-lint
Expand All @@ -117,7 +106,6 @@ bin/kubectl:

.PHONY: lint
lint: bin/golangci-lint ## Run golangci-lint linter
$(GOLANGCI_LINT) run --new-from-rev=origin/master
cd v2 && ../$(GOLANGCI_LINT) run --new-from-rev=origin/master

.PHONY: kind
Expand Down
17 changes: 0 additions & 17 deletions cmd/kubectl-delivery/Dockerfile

This file was deleted.

54 changes: 0 additions & 54 deletions cmd/kubectl-delivery/app/options/options.go

This file was deleted.

140 changes: 0 additions & 140 deletions cmd/kubectl-delivery/app/server.go

This file was deleted.

36 changes: 0 additions & 36 deletions cmd/kubectl-delivery/main.go

This file was deleted.

62 changes: 0 additions & 62 deletions go.mod

This file was deleted.

Loading

0 comments on commit 6079247

Please sign in to comment.