Skip to content

Commit 2721769

Browse files
committed
prep v0.0.5 release
1 parent 7913b65 commit 2721769

File tree

5 files changed

+632
-635
lines changed

5 files changed

+632
-635
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ bin/
2424
testbin/
2525
vendor/
2626
dist/
27-
pkg/cmd/manifest.yaml

Makefile

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ endif
1818
SHELL = /usr/bin/env bash -o pipefail
1919
.SHELLFLAGS = -ec
2020

21-
embed-bundle:
22-
cp config/bundle/manifest.yaml pkg/cmd/manifest.yaml
23-
2421
all: build
2522

2623
##@ General
@@ -41,10 +38,10 @@ help: ## Display this help.
4138

4239
##@ Development
4340

44-
manifests: embed-bundle controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
41+
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
4542
$(CONTROLLER_GEN) $(CRD_OPTIONS) rbac:roleName=manager-role webhook paths="./..." output:crd:artifacts:config=config/crd/bases
4643

47-
generate: embed-bundle controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
44+
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
4845
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
4946

5047
fmt: ## Run go fmt against code.
@@ -54,7 +51,7 @@ vet: ## Run go vet against code.
5451
go vet ./...
5552

5653
ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
57-
test: embed-bundle manifests generate fmt vet ## Run tests.
54+
test: manifests generate fmt vet ## Run tests.
5855
mkdir -p ${ENVTEST_ASSETS_DIR}
5956
test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.8.3/hack/setup-envtest.sh
6057
source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
@@ -64,7 +61,7 @@ GOLANGCI_VERSION ?= v1.40.1
6461
$(GOLANGCI_LINT):
6562
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(PWD)/bin" $(GOLANGCI_VERSION)
6663

67-
lint: $(GOLANGCI_LINT) embed-bundle ## Run linting.
64+
lint: $(GOLANGCI_LINT) ## Run linting.
6865
"$(GOLANGCI_LINT)" run -v
6966

7067
##@ Build
@@ -75,7 +72,7 @@ build: generate fmt vet ## Build manager binary.
7572
run: manifests generate fmt vet ## Run a controller from your host.
7673
go run ./main.go
7774

78-
docker-build: test embed-bundle ## Build docker image with the manager.
75+
docker-build: test ## Build docker image with the manager.
7976
docker build -t ${IMG} .
8077

8178
docker-push: ## Push docker image with the manager.
@@ -91,7 +88,7 @@ api-docs: $(REFDOCS) ## Generate API documentation
9188

9289
bundle: ## Generate the bundle manifest
9390
$(KUBECFG) show --tla-str version=$(VERSION) \
94-
config/jsonnet/jsonnet-controller.jsonnet > config/bundle/manifest.yaml
91+
config/jsonnet/jsonnet-controller.jsonnet > pkg/cmd/manifest.yaml
9592

9693
##@ Deployment
9794

@@ -201,7 +198,7 @@ delete-cluster: $(K3D) ## Delete the k3d cluster.
201198

202199
LDFLAGS ?= -s -w
203200

204-
build-konfig: embed-bundle ## Build the CLI to your GOBIN
201+
build-konfig: ## Build the CLI to your GOBIN
205202
cd cmd/konfig && \
206203
CGO_ENABLED=0 go build -ldflags="$(LDFLAGS)" -o $(GOBIN)/konfig .
207204

@@ -212,7 +209,7 @@ $(GOX):
212209
DIST ?= $(CURDIR)/dist
213210
COMPILE_TARGETS ?= "darwin/amd64 linux/amd64 linux/arm linux/arm64 windows/amd64"
214211
COMPILE_OUTPUT ?= "$(DIST)/{{.Dir}}_{{.OS}}_{{.Arch}}"
215-
dist-konfig: embed-bundle $(GOX) ## Build release artifacts for the CLI
212+
dist-konfig: $(GOX) ## Build release artifacts for the CLI
216213
mkdir -p dist
217214
cd cmd/konfig && \
218215
CGO_ENABLED=0 $(GOX) -osarch=$(COMPILE_TARGETS) -output=$(COMPILE_OUTPUT) -ldflags="$(LDFLAGS)"

0 commit comments

Comments
 (0)