Skip to content

Commit

Permalink
[50] Remove crd from chart, discussed to manage it from the controlle…
Browse files Browse the repository at this point in the history
…r itself
  • Loading branch information
hiddenmarten committed Mar 24, 2024
1 parent 681c89c commit 959d130
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 521 deletions.
11 changes: 0 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,6 @@ docker-build: ## Build docker image with the manager.
docker-push: ## Push docker image with the manager.
$(CONTAINER_TOOL) push ${IMG}

.PHONY: crd-to-helm
crd-to-helm: kustomize yq ## Generate CRD, merge it with helm-hook annotations and put it to the helm-chart
$(KUSTOMIZE) build config/crd | $(YQ) '. *= load("helm/internal/crd-helm-annotations.yaml")' - > helm/etcd-operator/templates/crd.yaml

# PLATFORMS defines the target platforms for the manager image be built to provide support to multiple
# architectures. (i.e. make docker-buildx IMG=myregistry/mypoperator:0.0.1). To use this option you need to:
# - be able to use docker buildx. More info: https://docs.docker.com/build/buildx/
Expand Down Expand Up @@ -165,14 +161,12 @@ KUSTOMIZE ?= $(LOCALBIN)/kustomize
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
ENVTEST ?= $(LOCALBIN)/setup-envtest
GOLANGCI_LINT = $(LOCALBIN)/golangci-lint
YQ = $(LOCALBIN)/yq

## Tool Versions
KUSTOMIZE_VERSION ?= v5.3.0
CONTROLLER_TOOLS_VERSION ?= v0.14.0
ENVTEST_VERSION ?= latest
GOLANGCI_LINT_VERSION ?= v1.54.2
YQ_VERSION ?= v4.42.1

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"

Expand All @@ -196,8 +190,3 @@ envtest: $(LOCALBIN)
golangci-lint: $(LOCALBIN)
@test -x $(GOLANGCI_LINT) && $(GOLANGCI_LINT) version | grep -q $(GOLANGCI_LINT_VERSION) || \
GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)

.PHONY: yq
yq: $(LOCALBIN)
@test -x $(YQ) && $(YQ) version | grep -q $(YQ_VERSION) || \
GOBIN=$(LOCALBIN) go install github.com/mikefarah/yq/v4@$(YQ_VERSION)
Loading

0 comments on commit 959d130

Please sign in to comment.