Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added subhelp for make help.kube targets #64

Open
wants to merge 3 commits into
base: release/2.x
Choose a base branch
from
Open

Added subhelp for make help.kube targets #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e456e14
Added subhelp for make help.kube targets
ken-roberts Feb 23, 2023
43ee813
Fixed outfile conversion regex
ken-roberts Mar 3, 2023
37df7ec
Added comment
ken-roberts Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions makefiles/kube.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,28 @@ kube_tools := $(SHIPKIT_BIN)/kube_tools
help.kube:
$(MAKE) help HELP_REGEX="^kube.+.*"

# ===== SUBHELP TARGETS ==========
# Trying to cut clutter in kube targets by categorizing them.
# Note that the help regex for these targets is not the same as the target!

## Show the available subhelp categories for help.kube
help.kube.subhelp:
$(MAKE) help HELP_REGEX="^subhelp.kube.+.*"

# kube.deploy targets apply full deployments or cronjobs to k8s
subhelp.kube.deploy:
$(MAKE) help HELP_REGEX="^kube.deploy.+.*"

# kube.kustomize targets apply kustomization directories to the cluster.
subhelp.kube.kustomize:
$(MAKE) help HELP_REGEX="^kube.kustomize.+.*"

# kube.set targets apply secrets and configmaps outside of a deployment.
subhelp.kube.set:
$(MAKE) help HELP_REGEX="^kube.set.+.*"

# ===== END SUBHELP TARGETS ==========

# removes everything with the app=$(APP_KEY) under $(APP_KUBE_NAMESPACE)
kube.clean: | _verify_APP_KUBE_NAMESPACE
$(kube_tools) ctl delete deployment,svc,configmap,ingress --selector="app=$(APP_KEY)" --namespace="$(APP_KUBE_NAMESPACE)"
Expand Down
4 changes: 2 additions & 2 deletions makefiles/vault.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ vault.decrypt: $(VAULT_DIR)
$(VAULT_DIR): | $(SOP_SH) vault.gpg.import-private-key vault.clone
cd $(VAULT_DIR)
for vfile in $(VAULT_FILES); do
outFile="$${vfile/.enc./.}" # remove .enc.
outFile="$${outFile/.encrypted./.}" # remove .encrypted.
# Remove any .enc or .encrypted limited by literal dot and word boundary at end
outFile="$$(sed -E s/\.\(encrypted\|enc\)\\b//g <<< $$vfile )"
$(logr) "$$vfile > $$outFile"
$(SOP_SH) -d $$vfile > $$outFile
done
Expand Down