Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
czeslavo committed Jan 30, 2023
1 parent f7b25f7 commit aa91bae
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 15 deletions.
23 changes: 15 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -487,12 +487,15 @@ debug: install _ensure-namespace
debug.connect:
XDG_CONFIG_HOME="$(PROJECT_DIR)/.config" $(DLV) connect localhost:40000

SKAFFOLD_DEBUG_PROFILE ?= debug

# This will port-forward 40000 from KIC's debugger to localhost. Connect to that
# port with debugger/IDE of your choice
.PHONY: debug.skaffold
debug.skaffold: skaffold
TAG=$(TAG)-debug REPO_INFO=$(REPO_INFO) COMMIT=$(COMMIT) \
$(SKAFFOLD) debug --port-forward=pods --profile=debug $(SKAFFOLD_FLAGS)
CMD=debug SKAFFOLD_PROFILE=$(SKAFFOLD_DEBUG_PROFILE) \
$(MAKE) _skaffold

# This will port-forward 40000 from KIC's debugger to localhost. Connect to that
# port with debugger/IDE of your choice.
Expand All @@ -501,10 +504,9 @@ debug.skaffold: skaffold
# * `konnect.env` with CONTROLLER_KONNECT_RUNTIME_GROUP env variable set
# to the UUID of a Runtime Group you have created in Konnect.
# * `tls.crt` and `tls.key` with TLS client cerificate and its key (generated by Konnect).
.PHONY: debug.konnect.skaffold
debug.konnect.skaffold: skaffold
TAG=$(TAG)-debug REPO_INFO=$(REPO_INFO) COMMIT=$(COMMIT) \
$(SKAFFOLD) debug --port-forward=pods --profile=debug-konnect $(SKAFFOLD_FLAGS)
.PHONY: debug.skaffold.konnect
debug.skaffold.konnect: skaffold
SKAFFOLD_DEBUG_PROFILE=debug-konnect $(MAKE) debug.skaffold

# This will port-forward 40000 from KIC's debugger to localhost. Connect to that
# port with debugger/IDE of your choice
Expand All @@ -513,9 +515,14 @@ debug.skaffold.sync: skaffold
@$(MAKE) debug.skaffold SKAFFOLD_FLAGS="--auto-build --auto-deploy --auto-sync"

.PHONY: run.skaffold
run.skaffold: skaffold
TAG=$(TAG)-debug REPO_INFO=$(REPO_INFO) COMMIT=$(COMMIT) \
$(SKAFFOLD) dev --port-forward=pods --profile=dev
run.skaffold:
TAG=$(TAG) REPO_INFO=$(REPO_INFO) COMMIT=$(COMMIT) \
CMD=dev SKAFFOLD_PROFILE=$(SKAFFOLD_RUN_PROFILE) \
$(MAKE) _skaffold

.PHONY: _skaffold
_skaffold: skaffold
$(SKAFFOLD) $(CMD) --port-forward=pods --profile=$(SKAFFOLD_PROFILE) $(SKAFFOLD_FLAGS)

.PHONY: run
run: install _ensure-namespace
Expand Down
14 changes: 7 additions & 7 deletions deploy/single/all-in-one-dbless-konnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
controller-gen.kubebuilder.io/version: v0.11.2
creationTimestamp: null
name: ingressclassparameterses.configuration.konghq.com
spec:
Expand Down Expand Up @@ -60,7 +60,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
controller-gen.kubebuilder.io/version: v0.11.2
creationTimestamp: null
name: kongclusterplugins.configuration.konghq.com
spec:
Expand Down Expand Up @@ -219,7 +219,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
controller-gen.kubebuilder.io/version: v0.11.2
creationTimestamp: null
name: kongconsumers.configuration.konghq.com
spec:
Expand Down Expand Up @@ -284,7 +284,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
controller-gen.kubebuilder.io/version: v0.11.2
creationTimestamp: null
name: kongingresses.configuration.konghq.com
spec:
Expand Down Expand Up @@ -633,7 +633,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
controller-gen.kubebuilder.io/version: v0.11.2
creationTimestamp: null
name: kongplugins.configuration.konghq.com
spec:
Expand Down Expand Up @@ -788,7 +788,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
controller-gen.kubebuilder.io/version: v0.11.2
creationTimestamp: null
name: tcpingresses.configuration.konghq.com
spec:
Expand Down Expand Up @@ -975,7 +975,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
controller-gen.kubebuilder.io/version: v0.11.2
creationTimestamp: null
name: udpingresses.configuration.konghq.com
spec:
Expand Down

0 comments on commit aa91bae

Please sign in to comment.