diff --git a/README.md b/README.md index 4e63b76..b9f8f81 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,6 @@ ### Usefull links -* [Get me to my Namespace](https://console-openshift-console.apps.${CLUSTER_NAME}.kvant.cloud/k8s/cluster/projects/${REPO_NAME}-ns) +* [Get me to my Namespace](https://console-openshift-console.apps.production.kvant.cloud/k8s/cluster/projects/tenant-tpl) * [WIKI](https://git.kvant.cloud/phoenix/tenant-tpl/wiki/Tenant--Wiki) diff --git a/vars/tenant_name/.gitkeep b/vars/tenant-tpl/.gitkeep similarity index 100% rename from vars/tenant_name/.gitkeep rename to vars/tenant-tpl/.gitkeep diff --git a/vars/tenant_name/.sops.yaml b/vars/tenant-tpl/.sops.yaml similarity index 82% rename from vars/tenant_name/.sops.yaml rename to vars/tenant-tpl/.sops.yaml index 4cbfec9..1303372 100644 --- a/vars/tenant_name/.sops.yaml +++ b/vars/tenant-tpl/.sops.yaml @@ -6,14 +6,14 @@ # for a more complex example. keys: age: - - &cluster_age_key age13jnzxrtrghlh8zvc9q3d8yd2a9xdp8jset72l8dwz6pept3j3c0qkmxd47 + - &tenant_age_key age13jnzxrtrghlh8zvc9q3d8yd2a9xdp8jset72l8dwz6pept3j3c0qkmxd47 creation_rules: - path_regex: .+secret(\.sops)?\.ya?ml input_type: yaml encrypted_regex: ^(data|stringData)$ key_groups: - age: &key_groups - - *cluster_age_key + - *tenant_age_key - path_regex: .+secret(\.sops)?\.env input_type: env key_groups: diff --git a/vars/tenant-tpl/README.md b/vars/tenant-tpl/README.md new file mode 100644 index 0000000..46a73b7 --- /dev/null +++ b/vars/tenant-tpl/README.md @@ -0,0 +1,11 @@ +# Settings and Secrets + +Add here settings that depend on the tenant name. This is needed when you +include this git ${REPO_NAME} into multiple tenants. You need to ensure this +folder is called the same way as the kvant tenant you got. + +You can add Config Maps and secrets to this folder. The secrets should be +encripted using SOPS (see +[WIKI](https://git.kvant.cloud/phoenix/tenant-tpl/wiki/Tenant--Wiki)). Please +do not forget adding your own key to the [.sops.yaml](.sops.yaml) before +encrypting your secrets if you want to be able to edit them afterwards. diff --git a/vars/tenant_name/cluster-settings.yaml b/vars/tenant-tpl/cluster-settings.yaml similarity index 100% rename from vars/tenant_name/cluster-settings.yaml rename to vars/tenant-tpl/cluster-settings.yaml diff --git a/vars/tenant_name/README.md b/vars/tenant_name/README.md deleted file mode 100644 index dc7f457..0000000 --- a/vars/tenant_name/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Settings and Secrets - -Add here settings that depend on the tenant name. This is needed when you include this git ${REPO_NAME} into multiple tenants. You need to ensure this folder is called the same way as the kvant tenant you got. - -You can add Config Maps and secrets to this folder. The secrets should be encripted using SOPS (see [WIKI](https://git.kvant.cloud/phoenix/tenant-tpl/wiki/Tenant--Wiki)). Please do not forget adding your own key to the [.sops.yaml](.sops.yaml) before encrypting your secrets if you want to be able to edit them afterwards.