Skip to content

Commit

Permalink
Update kustomize version. (#271)
Browse files Browse the repository at this point in the history
Version 4.5.2 is not affected by kubernetes-sigs/kustomize#3618.
  • Loading branch information
paulosjca authored Feb 14, 2022
1 parent 0e23396 commit cf1b09c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 13 deletions.
14 changes: 5 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -214,19 +214,15 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config.
$(KUSTOMIZE) build config/default | kubectl delete -f -

##@ Tools

CONTROLLER_GEN = $(PROJECT_DIR)/bin/controller-gen
controller-gen: ## Download controller-gen locally if necessary.
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1)

# Downloading kustomize with go get is deprecated, and go install is currently
# failing. The definition below can be uncommented once this issue is fixed:
# https://github.com/kubernetes-sigs/kustomize/issues/3618
# KUSTOMIZE = $(PROJECT_DIR)/bin/kustomize
# kustomize: ## Download kustomize locally if necessary.
# $(call go-install-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7)
KUSTOMIZE = kustomize
kustomize:
@[ -f "$(shell which $@)" ] || (echo "tool not found: $@"; exit 1)
KUSTOMIZE = $(PROJECT_DIR)/bin/kustomize
kustomize: ## Download kustomize locally if necessary.
$(call go-install-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v4.5.2)

# go-install-tool will 'go install' any package $2 and install it to $1.
define go-install-tool
Expand Down
2 changes: 1 addition & 1 deletion config/default/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ bases:
- ../crd
- ../rbac
- ../manager
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
# [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix including the one in
# crd/kustomization.yaml
#- ../webhook
# [CERTMANAGER] To enable cert-manager, uncomment all sections with 'CERTMANAGER'. 'WEBHOOK' components are required.
Expand Down
4 changes: 2 additions & 2 deletions config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
images:
- name: controller
newName: gcr.io/grpc-testing/e2etest/runtime/controller
newTag: v0.7.2-kb3.3
newName: controller
newTag: v1.x.x
1 change: 0 additions & 1 deletion config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ spec:
spec:
nodeSelector:
default-system-pool: "true"
containers:
# securityContext:
# runAsNonRoot: true
containers:
Expand Down

0 comments on commit cf1b09c

Please sign in to comment.