From 72197115f118f73203d673ef01d0a4b4321b46dc Mon Sep 17 00:00:00 2001 From: dcplaya Date: Thu, 15 Apr 2021 13:56:27 -0700 Subject: [PATCH] [FIX] Move substitute files into a tmpl folder Cleans up `envsubst` command and allows command to be re-run --- README.md | 10 +++++----- .sops.yaml => tmpl/.sops.yaml | 0 {cluster/base => tmpl}/cluster-secrets.yaml | 0 {cluster/base => tmpl}/cluster-settings.yaml | 0 {cluster/base/flux-system => tmpl}/gotk-sync.yaml | 0 .../cert-manager => tmpl}/secret.enc.yaml | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename .sops.yaml => tmpl/.sops.yaml (100%) rename {cluster/base => tmpl}/cluster-secrets.yaml (100%) rename {cluster/base => tmpl}/cluster-settings.yaml (100%) rename {cluster/base/flux-system => tmpl}/gotk-sync.yaml (100%) rename {cluster/core/infrastructure/cert-manager => tmpl}/secret.enc.yaml (100%) diff --git a/README.md b/README.md index 85d61300..c142f4ab 100644 --- a/README.md +++ b/README.md @@ -162,11 +162,11 @@ export BOOTSTRAP_DOMAIN_CERT="k8s-at-home" export BOOTSTRAP_CLOUDFLARE_TOKEN="dsKq41iLAbXE37GV" export BOOTSTRAP_INGRESS_NGINX_LB="169.254.1.10" -envsubst < ./.sops.yaml -envsubst < ./cluster/cluster-secrets.yaml -envsubst < ./cluster/cluster-settings.yaml -envsubst < ./cluster/base/flux-system/gotk-sync.yaml -envsubst < ./cluster/core/infrastructure/cert-manager/secret.enc.yaml +envsubst < ./tmpl/.sops.yaml > ./.sops.yaml +envsubst < ./tmpl/cluster-secrets.yaml > ./cluster/cluster-secrets.yaml +envsubst < ./tmpl/cluster-settings.yaml > ./cluster/cluster-settings.yaml +envsubst < ./tmpl/gotk-sync.yaml > ./cluster/base/flux-system/gotk-sync.yaml +envsubst < ./tmpl/secret.enc.yaml > ./cluster/core/infrastructure/cert-manager/secret.enc.yaml ``` 4. **Verify** all the above files have the correct information present diff --git a/.sops.yaml b/tmpl/.sops.yaml similarity index 100% rename from .sops.yaml rename to tmpl/.sops.yaml diff --git a/cluster/base/cluster-secrets.yaml b/tmpl/cluster-secrets.yaml similarity index 100% rename from cluster/base/cluster-secrets.yaml rename to tmpl/cluster-secrets.yaml diff --git a/cluster/base/cluster-settings.yaml b/tmpl/cluster-settings.yaml similarity index 100% rename from cluster/base/cluster-settings.yaml rename to tmpl/cluster-settings.yaml diff --git a/cluster/base/flux-system/gotk-sync.yaml b/tmpl/gotk-sync.yaml similarity index 100% rename from cluster/base/flux-system/gotk-sync.yaml rename to tmpl/gotk-sync.yaml diff --git a/cluster/core/infrastructure/cert-manager/secret.enc.yaml b/tmpl/secret.enc.yaml similarity index 100% rename from cluster/core/infrastructure/cert-manager/secret.enc.yaml rename to tmpl/secret.enc.yaml