Skip to content
This repository was archived by the owner on May 17, 2024. It is now read-only.

Commit 51c90d1

Browse files
committed
Don't use google account secret if not exit
Signed-off-by: JoshVanL <[email protected]>
1 parent d272186 commit 51c90d1

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

demo/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ manifests_destroy: depend manifests/$(CLOUD)-config.json ## Use kubecfg to delet
7171

7272
.PHONY: manifests_backup_certificates
7373
manifests_backup_certificates: ## backup tls secrets
74-
export SECRETS="$(shell kubectl get secrets -n auth -o 'jsonpath={.items[*].metadata.name}' | tr " " "\n" | grep tls)"
75-
kubectl get -n auth secrets -o yaml $(SECRETS) > .backup-certificates-$(CLOUD).yaml.tmp
74+
kubectl get -n auth -o yaml $(shell kubectl get secrets -n auth -oname) > .backup-certificates-$(CLOUD).yaml.tmp
7675
mv .backup-certificates-$(CLOUD).yaml.tmp .backup-certificates-$(CLOUD).yaml
7776

7877
.PHONY: manifests_restore_certificates

demo/manifests/main.jsonnet

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ local apply_ca_issuer(ca_crt, ca_key, obj) =
6767
{};
6868

6969
local apply_google_secret(cert_manager) =
70-
if std.objectHas(cert_manager, 'service_account_credentials') then
70+
if std.objectHas(cert_manager, 'service_account_credentials') &&
71+
std.objectHas(cert_manager, 'metadata') then
7172
kube.Secret(cert_manager.p + 'clouddns-google-credentials') + cert_manager.metadata {
7273
data_+: {
7374
'credentials.json': cert_manager.service_account_credentials,

0 commit comments

Comments
 (0)