Skip to content

Commit

Permalink
Remove kustomize and associated make targets (#393)
Browse files Browse the repository at this point in the history
* Remove kustomize and associated make targets
* Remove leftover Operator SDK kustomize manifests
  • Loading branch information
Timofey Ilinykh authored Mar 22, 2021
1 parent 9b2fe9c commit 38171aa
Show file tree
Hide file tree
Showing 33 changed files with 1 addition and 594 deletions.
32 changes: 1 addition & 31 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ ifndef GOBIN
GOBIN=$(shell go env GOPATH)/bin
endif

KUSTOMIZE_PATH ?= $(shell which kustomize || echo $(NO_VALUE))

###############################
# TARGETS
###############################
Expand All @@ -94,12 +92,6 @@ demo-roundrobin: ## Execute round-robin demo
demo-failover: ## Execute failover demo
@$(call demo-host, "failover.cloud.example.com")

# Deploy controller in the configured Kubernetes cluster in ~/.kube/config
.PHONY: deploy
deploy:
$(call manifest)
cd config/manager && $(KUSTOMIZE_PATH) edit set image controller=$(IMG)
$(KUSTOMIZE_PATH) build config/default | kubectl apply -f -

# spin-up local environment
.PHONY: deploy-full-local-setup
Expand Down Expand Up @@ -215,8 +207,8 @@ infoblox-secret:
--from-literal=EXTERNAL_DNS_INFOBLOX_WAPI_USERNAME=$${WAPI_USERNAME} \
--from-literal=EXTERNAL_DNS_INFOBLOX_WAPI_PASSWORD=$${WAPI_PASSWORD}

.PHONY: license
# updates source code with license headers
.PHONY: license
license:
$(call golic,-t apache2)

Expand All @@ -226,11 +218,6 @@ ns1-secret:
kubectl -n k8gb create secret generic ns1 \
--from-literal=apiKey=$${NS1_APIKEY}

# install CRDs into a cluster
.PHONY: install
install:
$(call manifest)
kubectl apply -f chart/k8gb/templates/k8gb.absa.oss_gslbs.yaml

# run all linters from .golangci.yaml; see: https://golangci-lint.run/usage/install/#local-installation
.PHONY: lint
Expand Down Expand Up @@ -287,13 +274,6 @@ test-failover:
terratest: # Run terratest suite
cd terratest/test/ && go mod download && go test -v

# uninstall CRDs from a cluster
.PHONY: uninstall
uninstall:
$(call manifest)
$(call install-kustomize-if-not-exists)
$(KUSTOMIZE_PATH) build config/crd | kubectl delete -f -

.PHONY: version
version:
@echo $(VERSION)
Expand Down Expand Up @@ -425,16 +405,6 @@ define golic
$(GOBIN)/golic inject $1
endef

# installs kustomize and sets KUSTOMIZE_PATH if is not specified
define install-kustomize-if-not-exists
@$(if $(filter $(KUSTOMIZE_PATH),$(NO_VALUE)),$(call install-kustomize),)
endef

define install-kustomize
GO111MODULE=on go get sigs.k8s.io/kustomize/kustomize/v3@v3.8.6
$(eval KUSTOMIZE_PATH = $(GOBIN)/kustomize)
endef

define docker-build-arch
docker build --build-arg GOARCH=${1} . -t ${IMG}-${1}
endef
Expand Down
26 changes: 0 additions & 26 deletions config/certmanager/certificate.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions config/certmanager/kustomization.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions config/certmanager/kustomizeconfig.yaml

This file was deleted.

70 changes: 0 additions & 70 deletions config/default/kustomization.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions config/default/manager_auth_proxy_patch.yaml

This file was deleted.

23 changes: 0 additions & 23 deletions config/default/manager_webhook_patch.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions config/default/webhookcainjection_patch.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions config/manager/kustomization.yaml

This file was deleted.

39 changes: 0 additions & 39 deletions config/manager/manager.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions config/prometheus/kustomization.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions config/prometheus/monitor.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions config/rbac/auth_proxy_client_clusterrole.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions config/rbac/auth_proxy_role.yaml

This file was deleted.

12 changes: 0 additions & 12 deletions config/rbac/auth_proxy_role_binding.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions config/rbac/auth_proxy_service.yaml

This file was deleted.

24 changes: 0 additions & 24 deletions config/rbac/gslb_editor_role.yaml

This file was deleted.

Loading

0 comments on commit 38171aa

Please sign in to comment.