From 1e8f31a160016a71c454507e529620e837efea78 Mon Sep 17 00:00:00 2001
From: Andrii Ostapenko <andrii.ostapenko@att.com>
Date: Tue, 15 Jun 2021 19:36:05 -0500
Subject: [PATCH] Decouple secret from other replacements in workers-capm3
Keeping secrets separately gives an ability to use other replacements
with alternative secret catalogues when current secret replacements are
not desired..
Change-Id: I981f14249874bab1547f91a64144ac909c0cc69e
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
---
.../generated-secrets.yaml | 0
.../workers-capm3/replacements-secrets/kustomization.yaml | 4 ++++
.../function/workers-capm3/replacements/kustomization.yaml | 1 -
.../test-site/target/workers/replacements/kustomization.yaml | 1 +
4 files changed, 5 insertions(+), 1 deletion(-)
rename manifests/function/workers-capm3/{replacements => replacements-secrets}/generated-secrets.yaml (100%)
create mode 100644 manifests/function/workers-capm3/replacements-secrets/kustomization.yaml
diff --git a/manifests/function/workers-capm3/replacements/generated-secrets.yaml b/manifests/function/workers-capm3/replacements-secrets/generated-secrets.yaml
similarity index 100%
rename from manifests/function/workers-capm3/replacements/generated-secrets.yaml
rename to manifests/function/workers-capm3/replacements-secrets/generated-secrets.yaml
diff --git a/manifests/function/workers-capm3/replacements-secrets/kustomization.yaml b/manifests/function/workers-capm3/replacements-secrets/kustomization.yaml
new file mode 100644
index 000000000..232d5bea7
--- /dev/null
+++ b/manifests/function/workers-capm3/replacements-secrets/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+ - generated-secrets.yaml
diff --git a/manifests/function/workers-capm3/replacements/kustomization.yaml b/manifests/function/workers-capm3/replacements/kustomization.yaml
index 2545553d8..1eb33e77c 100644
--- a/manifests/function/workers-capm3/replacements/kustomization.yaml
+++ b/manifests/function/workers-capm3/replacements/kustomization.yaml
@@ -2,6 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- workers-env-vars.yaml
- - generated-secrets.yaml
- networking.yaml
- metal3machinetemplate_vars.yaml
diff --git a/manifests/site/test-site/target/workers/replacements/kustomization.yaml b/manifests/site/test-site/target/workers/replacements/kustomization.yaml
index ea11f0164..c0b805813 100644
--- a/manifests/site/test-site/target/workers/replacements/kustomization.yaml
+++ b/manifests/site/test-site/target/workers/replacements/kustomization.yaml
@@ -2,3 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../../../../function/workers-capm3/replacements
+ - ../../../../function/workers-capm3/replacements-secrets