From b86f539959dc1e6a1f8730da35a45d40dc4a0649 Mon Sep 17 00:00:00 2001 From: Josh Cox Date: Sat, 11 May 2019 14:03:46 -0500 Subject: [PATCH 1/2] Templating out the secret yaml --- example/kubernetes/using-secrets/Makefile | 14 ++++++++++++++ ...nv.startup.yaml => my-env.startup.yaml.example} | 0 .../{my-env.yaml => my-env.yaml.example} | 0 example/kubernetes/using-secrets/ldap-secret.tpl | 11 +++++++++++ example/kubernetes/using-secrets/ldap-secret.yaml | 11 ----------- 5 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 example/kubernetes/using-secrets/Makefile rename example/kubernetes/using-secrets/environment/{my-env.startup.yaml => my-env.startup.yaml.example} (100%) rename example/kubernetes/using-secrets/environment/{my-env.yaml => my-env.yaml.example} (100%) create mode 100644 example/kubernetes/using-secrets/ldap-secret.tpl delete mode 100644 example/kubernetes/using-secrets/ldap-secret.yaml diff --git a/example/kubernetes/using-secrets/Makefile b/example/kubernetes/using-secrets/Makefile new file mode 100644 index 00000000..1f98aad7 --- /dev/null +++ b/example/kubernetes/using-secrets/Makefile @@ -0,0 +1,14 @@ +ldap-secret.yaml: example + $(eval PWD := $(shell pwd -P)) + $(eval ENV_DIR := $(shell echo ${PWD}/environment)) + ENV_YAML=$(shell ${ENV_DIR}/file-to-base64.sh ${ENV_DIR}/my-env.yaml) \ + ENV_STARTUP_YAML=$(shell ${ENV_DIR}/file-to-base64.sh ${ENV_DIR}/my-env.startup.yaml) \ + envsubst < ldap-secret.tpl > ldap-secret.yaml + +example: environment/my-env.startup.yaml environment/my-env.yaml + +environment/my-env.startup.yaml: + cd environment ; cp my-env.startup.yaml.example my-env.startup.yaml + +environment/my-env.yaml: + cd environment ; cp my-env.yaml.example my-env.yaml diff --git a/example/kubernetes/using-secrets/environment/my-env.startup.yaml b/example/kubernetes/using-secrets/environment/my-env.startup.yaml.example similarity index 100% rename from example/kubernetes/using-secrets/environment/my-env.startup.yaml rename to example/kubernetes/using-secrets/environment/my-env.startup.yaml.example diff --git a/example/kubernetes/using-secrets/environment/my-env.yaml b/example/kubernetes/using-secrets/environment/my-env.yaml.example similarity index 100% rename from example/kubernetes/using-secrets/environment/my-env.yaml rename to example/kubernetes/using-secrets/environment/my-env.yaml.example diff --git a/example/kubernetes/using-secrets/ldap-secret.tpl b/example/kubernetes/using-secrets/ldap-secret.tpl new file mode 100644 index 00000000..01f5acc2 --- /dev/null +++ b/example/kubernetes/using-secrets/ldap-secret.tpl @@ -0,0 +1,11 @@ +apiVersion: "v1" +kind: "List" +items: + - kind: "Secret" + apiVersion: "v1" + metadata: + name: "ldap-secret" + data: + # files in environment/* converted into base64 with file-to-base64.sh + env.yaml: "$ENV_YAML" + env.startup.yaml: "$ENV_STARTUP_YAML" diff --git a/example/kubernetes/using-secrets/ldap-secret.yaml b/example/kubernetes/using-secrets/ldap-secret.yaml deleted file mode 100644 index 85a62aa0..00000000 --- a/example/kubernetes/using-secrets/ldap-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: "v1" -kind: "List" -items: - - kind: "Secret" - apiVersion: "v1" - metadata: - name: "ldap-secret" - data: - # files in environment/* converted into base64 with file-to-base64.sh - env.yaml: "IyBUaGlzIGlzIHRoZSBkZWZhdWx0IGltYWdlIGNvbmZpZ3VyYXRpb24gZmlsZQojIFRoZXNlIHZhbHVlcyB3aWxsIHBlcnNpc3RzIGluIGNvbnRhaW5lciBlbnZpcm9ubWVudC4KCiPCoEFsbCBlbnZpcm9ubWVudCB2YXJpYWJsZXMgdXNlZCBhZnRlciB0aGUgY29udGFpbmVyIGZpcnN0IHN0YXJ0CiMgbXVzdCBiZSBkZWZpbmVkIGhlcmUuCiMgbW9yZSBpbmZvcm1hdGlvbiA6IGh0dHBzOi8vZ2l0aHViLmNvbS9vc2l4aWEvZG9ja2VyLWxpZ2h0LWJhc2VpbWFnZQoKIyBHZW5lcmFsIGNvbnRhaW5lciBjb25maWd1cmF0aW9uCiMgc2VlIHRhYmxlIDUuMSBpbiBodHRwOi8vd3d3Lm9wZW5sZGFwLm9yZy9kb2MvYWRtaW4yNC9zbGFwZGNvbmYyLmh0bWwgZm9yIHRoZSBhdmFpbGFibGUgbG9nIGxldmVscy4KTERBUF9MT0dfTEVWRUw6IDI1Ngo=" - env.startup.yaml: "IyBUaGlzIGlzIHRoZSBkZWZhdWx0IGltYWdlIHN0YXJ0dXAgY29uZmlndXJhdGlvbiBmaWxlCiMgdGhpcyBmaWxlIGRlZmluZSBlbnZpcm9ubWVudCB2YXJpYWJsZXMgdXNlZCBkdXJpbmcgdGhlIGNvbnRhaW5lciAqKmZpcnN0IHN0YXJ0KiogaW4gKipzdGFydHVwIGZpbGVzKiouCgojIFRoaXMgZmlsZSBpcyBkZWxldGVkIHJpZ2h0IGFmdGVyIHN0YXJ0dXAgZmlsZXMgYXJlIHByb2Nlc3NlZCBmb3IgdGhlIGZpcnN0IHRpbWUsCiMgYWZ0ZXIgdGhhdCBhbGwgdGhlc2UgdmFsdWVzIHdpbGwgbm90IGJlIGF2YWlsYWJsZSBpbiB0aGUgY29udGFpbmVyIGVudmlyb25tZW50LgojIFRoaXMgaGVscHMgdG8ga2VlcCB5b3VyIGNvbnRhaW5lciBjb25maWd1cmF0aW9uIHNlY3JldC4KIyBtb3JlIGluZm9ybWF0aW9uIDogaHR0cHM6Ly9naXRodWIuY29tL29zaXhpYS9kb2NrZXItbGlnaHQtYmFzZWltYWdlCgojIFJlcXVpcmVkIGFuZCB1c2VkIGZvciBuZXcgbGRhcCBzZXJ2ZXIgb25seQpMREFQX09SR0FOSVNBVElPTjogRXhhbXBsZSBJbmMuCkxEQVBfRE9NQUlOOiBleGFtcGxlLm9yZwpMREFQX0JBU0VfRE46ICNpZiBlbXB0eSBhdXRvbWF0aWNhbGx5IHNldCBmcm9tIExEQVBfRE9NQUlOCgpMREFQX0FETUlOX1BBU1NXT1JEOiBhZG1pbgpMREFQX0NPTkZJR19QQVNTV09SRDogY29uZmlnCgpMREFQX1JFQURPTkxZX1VTRVI6IGZhbHNlCkxEQVBfUkVBRE9OTFlfVVNFUl9VU0VSTkFNRTogcmVhZG9ubHkKTERBUF9SRUFET05MWV9VU0VSX1BBU1NXT1JEOiByZWFkb25seQoKIyBCYWNrZW5kCkxEQVBfQkFDS0VORDogaGRiCgojIFRscwpMREFQX1RMUzogdHJ1ZQpMREFQX1RMU19DUlRfRklMRU5BTUU6IGxkYXAuY3J0CkxEQVBfVExTX0tFWV9GSUxFTkFNRTogbGRhcC5rZXkKTERBUF9UTFNfQ0FfQ1JUX0ZJTEVOQU1FOiBjYS5jcnQKCkxEQVBfVExTX0VORk9SQ0U6IGZhbHNlCkxEQVBfVExTX0NJUEhFUl9TVUlURTogU0VDVVJFMjU2Oi1WRVJTLVNTTDMuMApMREFQX1RMU19QUk9UT0NPTF9NSU46IDMuMQpMREFQX1RMU19WRVJJRllfQ0xJRU5UOiBkZW1hbmQKCiMgUmVwbGljYXRpb24KTERBUF9SRVBMSUNBVElPTjogZmFsc2UKIyB2YXJpYWJsZXMgJExEQVBfQkFTRV9ETiwgJExEQVBfQURNSU5fUEFTU1dPUkQsICRMREFQX0NPTkZJR19QQVNTV09SRAojIGFyZSBhdXRvbWF0aWNhbHkgcmVwbGFjZWQgYXQgcnVuIHRpbWUKCiMgaWYgeW91IHdhbnQgdG8gYWRkIHJlcGxpY2F0aW9uIHRvIGFuIGV4aXN0aW5nIGxkYXAKIyBhZGFwdCBMREFQX1JFUExJQ0FUSU9OX0NPTkZJR19TWU5DUFJPViBhbmQgTERBUF9SRVBMSUNBVElPTl9EQl9TWU5DUFJPViB0byB5b3VyIGNvbmZpZ3VyYXRpb24KIyBhdm9pZCB1c2luZyAkTERBUF9CQVNFX0ROLCAkTERBUF9BRE1JTl9QQVNTV09SRCBhbmQgJExEQVBfQ09ORklHX1BBU1NXT1JEIHZhcmlhYmxlcwpMREFQX1JFUExJQ0FUSU9OX0NPTkZJR19TWU5DUFJPVjogYmluZGRuPSJjbj1hZG1pbixjbj1jb25maWciIGJpbmRtZXRob2Q9c2ltcGxlIGNyZWRlbnRpYWxzPSRMREFQX0NPTkZJR19QQVNTV09SRCBzZWFyY2hiYXNlPSJjbj1jb25maWciIHR5cGU9cmVmcmVzaEFuZFBlcnNpc3QgcmV0cnk9IjYwICsiIHRpbWVvdXQ9MSBzdGFydHRscz1jcml0aWNhbApMREFQX1JFUExJQ0FUSU9OX0RCX1NZTkNQUk9WOiBiaW5kZG49ImNuPWFkbWluLCRMREFQX0JBU0VfRE4iIGJpbmRtZXRob2Q9c2ltcGxlIGNyZWRlbnRpYWxzPSRMREFQX0FETUlOX1BBU1NXT1JEIHNlYXJjaGJhc2U9IiRMREFQX0JBU0VfRE4iIHR5cGU9cmVmcmVzaEFuZFBlcnNpc3QgaW50ZXJ2YWw9MDA6MDA6MDA6MTAgcmV0cnk9IjYwICsiIHRpbWVvdXQ9MSBzdGFydHRscz1jcml0aWNhbApMREFQX1JFUExJQ0FUSU9OX0hPU1RTOgogIC0gbGRhcDovL2xkYXAuZXhhbXBsZS5vcmcgIyBUaGUgb3JkZXIgbXVzdCBiZSB0aGUgc2FtZSBvbiBhbGwgbGRhcCBzZXJ2ZXJzCiAgLSBsZGFwOi8vbGRhcDIuZXhhbXBsZS5vcmcKCgojIFJlbW92ZSBjb25maWcgYWZ0ZXIgc2V0dXAKTERBUF9SRU1PVkVfQ09ORklHX0FGVEVSX1NFVFVQOiB0cnVlCgojIGNmc3NsIGVudmlyb25tZW50IHZhcmlhYmxlcyBwcmVmaXgKTERBUF9DRlNTTF9QUkVGSVg6IGxkYXAgIyBjZnNzbC1oZWxwZXIgZmlyc3Qgc2VhcmNoIGNvbmZpZyBmcm9tIExEQVBfQ0ZTU0xfKiB2YXJpYWJsZXMsIGJlZm9yZSBDRlNTTF8qIHZhcmlhYmxlcy4K" From ccfae0600033db49f2d7ec124cfdf0607c1fe0d8 Mon Sep 17 00:00:00 2001 From: Josh Cox Date: Sat, 11 May 2019 14:04:41 -0500 Subject: [PATCH 2/2] Adding readme and ignores --- example/kubernetes/using-secrets/.gitignore | 1 + example/kubernetes/using-secrets/README.md | 7 +++++++ example/kubernetes/using-secrets/environment/.gitignore | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 example/kubernetes/using-secrets/.gitignore create mode 100644 example/kubernetes/using-secrets/README.md create mode 100644 example/kubernetes/using-secrets/environment/.gitignore diff --git a/example/kubernetes/using-secrets/.gitignore b/example/kubernetes/using-secrets/.gitignore new file mode 100644 index 00000000..adc0755f --- /dev/null +++ b/example/kubernetes/using-secrets/.gitignore @@ -0,0 +1 @@ +ldap-secret.yaml diff --git a/example/kubernetes/using-secrets/README.md b/example/kubernetes/using-secrets/README.md new file mode 100644 index 00000000..a9e916e8 --- /dev/null +++ b/example/kubernetes/using-secrets/README.md @@ -0,0 +1,7 @@ +# Generating ldap-secret.yaml + +`make example` + +Then edit the yaml files in the environment directory to have the desired paraneters, and then make the secret file: + +`make ldap-secret.yaml` diff --git a/example/kubernetes/using-secrets/environment/.gitignore b/example/kubernetes/using-secrets/environment/.gitignore new file mode 100644 index 00000000..e33d172f --- /dev/null +++ b/example/kubernetes/using-secrets/environment/.gitignore @@ -0,0 +1,2 @@ +my-env.startup.yaml +my-env.yaml