Skip to content

Commit

Permalink
Merge pull request #4412 from sedefsavas/4407
Browse files Browse the repository at this point in the history
🌱 Remove CAPD hack/tools directory and run ensure-kustomize script
  • Loading branch information
k8s-ci-robot authored Mar 31, 2021
2 parents 885daea + d90492c commit fec46e4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 902 deletions.
16 changes: 10 additions & 6 deletions test/infrastructure/docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export DOCKER_CLI_EXPERIMENTAL := enabled

# Directories.
ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
TOOLS_DIR := hack/tools
TOOLS_DIR := $(ROOT)/hack/tools
TOOLS_BIN_DIR := $(TOOLS_DIR)/bin
BIN_DIR := bin
EXP_DIR := exp
Expand All @@ -45,9 +45,13 @@ ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/sigs.k8s.io/cluster-api
endif

# Binaries.
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/controller-gen
CONVERSION_GEN := $(TOOLS_BIN_DIR)/conversion-gen
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/golangci-lint
CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/controller-gen)
CONVERSION_GEN := $(abspath $(TOOLS_BIN_DIR)/conversion-gen)
GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/golangci-lint)
KUSTOMIZE := $(abspath $(TOOLS_BIN_DIR)/kustomize)

$(KUSTOMIZE): # Build kustomize from tools folder.
$(MAKE) -C $(ROOT) kustomize

# Define Docker related variables. Releases should modify and double check these vars.
REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
Expand Down Expand Up @@ -220,8 +224,8 @@ manifest-modification: # Set the manifest images to the staging/production bucke
PULL_POLICY=IfNotPresent $(MAKE) set-manifest-pull-policy

.PHONY: release-manifests
release-manifests: $(RELEASE_DIR) ## Builds the manifests to publish with a release
kustomize build config/default > $(RELEASE_DIR)/infrastructure-components.yaml
release-manifests: $(RELEASE_DIR) $(KUSTOMIZE)## Builds the manifests to publish with a release
$(KUSTOMIZE) build config/default > $(RELEASE_DIR)/infrastructure-components.yaml

.PHONY: release-staging
release-staging: ## Builds and push container images to the staging bucket.
Expand Down
11 changes: 0 additions & 11 deletions test/infrastructure/docker/hack/tools/go.mod

This file was deleted.

Loading

0 comments on commit fec46e4

Please sign in to comment.