Merge pull request #363 from mbaldessari/vp-paths

Add support for ~/.config/validated-patterns/pattern-uuid

Author: mbaldessari

Makefile

@@ -19,8 +19,17 @@ TARGET_REPO=$(shell git ls-remote --get-url --symref $(TARGET_ORIGIN) | sed -e '
 # git branch --show-current is also available as of git 2.22, but we will use this for compatibility
 TARGET_BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
 
+UUID_FILE ?= ~/.config/validated-patterns/pattern-uuid
+UUID_HELM_OPTS ?=
+
 # --set values always take precedence over the contents of -f
-HELM_OPTS=-f values-global.yaml --set main.git.repoURL="$(TARGET_REPO)" --set main.git.revision=$(TARGET_BRANCH) $(TARGET_SITE_OPT) $(EXTRA_HELM_OPTS)
+ifneq ("$(wildcard $(UUID_FILE))","")
+	UUID := $(shell cat $(UUID_FILE))
+	UUID_HELM_OPTS := --set main.analyticsUUID=$(UUID)
+endif
+
+HELM_OPTS=-f values-global.yaml --set main.git.repoURL="$(TARGET_REPO)" --set main.git.revision=$(TARGET_BRANCH) $(TARGET_SITE_OPT) $(UUID_HELM_OPTS) $(EXTRA_HELM_OPTS)
+
 
 ##@ Pattern Common Tasks
 

README.md

@@ -6,17 +6,17 @@
 
 This repository is never used as standalone. It is usually imported in each pattern as a subtree.
 In order to import the common/ the very first time you can use
-`https://github.com/hybrid-cloud-patterns/multicloud-gitops/blob/main/common/scripts/make_common_subtree.sh`
+`https://github.com/validatedpatterns/multicloud-gitops/blob/main/common/scripts/make_common_subtree.sh`
 
 In order to update your common subtree inside your pattern repository you can either use
-`https://github.com/hybrid-cloud-patterns/utilities/blob/main/scripts/update-common-everywhere.sh` or
+`https://github.com/validatedpatterns/utilities/blob/main/scripts/update-common-everywhere.sh` or
 do it manually by doing the following:
 
 ```sh
-git remote add -f upstream-common https://github.com/hybrid-cloud-patterns/common.git
+git remote add -f upstream-common https://github.com/validatedpatterns/common.git
 git merge -s subtree -Xtheirs -Xsubtree=common upstream-common/ha-vault
 ```
 
 ## Secrets
 
-There are two different secret formats parsed by the ansible bits. Both are documented [here](https://github.com/hybrid-cloud-patterns/common/tree/main/ansible/roles/vault_utils/README.md)
+There are two different secret formats parsed by the ansible bits. Both are documented [here](https://github.com/validatedpatterns/common/tree/main/ansible/roles/vault_utils/README.md)

ansible/roles/vault_utils/README.md

@@ -42,10 +42,16 @@ This relies on [kubernetes.core](https://docs.ansible.com/ansible/latest/collect
 
 ## Values secret file format
 
-Currently this role supports two formats: version 1.0 (which is the assumed default when not specified) and version 2.0.
-The latter is more fatureful and supports generating secrets directly into the vault and also prompting the user for a secret.
-By default, the first file that will looked up is `~/.config/hybrid-cloud-patterns/values-secret-<patternname>.yaml`, then
-`~/values-secret-<patternname>.yaml` and should that not exist it will look for `~/values-secret.yaml`.
+Currently this role supports two formats: version 1.0 (which is the assumed
+default when not specified) and version 2.0. The latter is more fatureful and
+supports generating secrets directly into the vault and also prompting the user
+for a secret.
+
+By default, the first file that will looked up is
+`~/.config/hybrid-cloud-patterns/values-secret-<patternname>.yaml`, then
+`~/.config/validated-patterns/values-secret-<patternname>.yaml`,
+`~/values-secret-<patternname>.yaml` and should that not exist it will look for
+`~/values-secret.yaml`.
 The paths can be overridden by setting the environment variable `VALUES_SECRET` to the path of the
 secret file.
 

ansible/roles/vault_utils/tasks/push_secrets.yaml

@@ -66,6 +66,7 @@
   vars:
     findme:
       - "~/.config/hybrid-cloud-patterns/values-secret-{{ pattern_name }}.yaml"
+      - "~/.config/validated-patterns/values-secret-{{ pattern_name }}.yaml"
       - "~/values-secret-{{ pattern_name }}.yaml"
       - "~/values-secret.yaml"
       - "{{ pattern_dir }}/values-secret.yaml.template"