diff --git a/common/Makefile b/common/Makefile index 785e5307..3caba1fe 100644 --- a/common/Makefile +++ b/common/Makefile @@ -221,7 +221,7 @@ test: ## run helm tests helmlint: ## run helm lint @for t in $(CHARTS); do common/scripts/lint.sh $$t $(TEST_OPTS); if [ $$? != 0 ]; then exit 1; fi; done -API_URL ?= https://raw.githubusercontent.com/hybrid-cloud-patterns/ocp-schemas/main/openshift/4.10/ +API_URL ?= https://raw.githubusercontent.com/validatedpatterns/ocp-schemas/main/openshift/4.10/ KUBECONFORM_SKIP ?= -skip 'CustomResourceDefinition,ClusterIssuer,CertManager,Certificate,ArgoCD' # We need to skip 'CustomResourceDefinition' as openapi2jsonschema seems to be unable to generate them ATM diff --git a/common/ansible/roles/find_vp_secrets/tasks/main.yml b/common/ansible/roles/find_vp_secrets/tasks/main.yml index ce847a01..99fa87c0 100644 --- a/common/ansible/roles/find_vp_secrets/tasks/main.yml +++ b/common/ansible/roles/find_vp_secrets/tasks/main.yml @@ -29,7 +29,7 @@ found_file: "{{ lookup('ansible.builtin.first_found', findme) }}" vars: findme: - - "~/.config/hybrid-cloud-patterns/values-secret-{{ pattern_name }}.yaml" + - "~/.config/validatedpatterns/values-secret-{{ pattern_name }}.yaml" - "~/.config/validated-patterns/values-secret-{{ pattern_name }}.yaml" - "~/values-secret-{{ pattern_name }}.yaml" - "~/values-secret.yaml" diff --git a/common/ansible/roles/iib_ci/meta/main.yml b/common/ansible/roles/iib_ci/meta/main.yml index c9d7005d..9075c3c7 100644 --- a/common/ansible/roles/iib_ci/meta/main.yml +++ b/common/ansible/roles/iib_ci/meta/main.yml @@ -1,8 +1,8 @@ galaxy_info: - author: Validated Patterns Team https://github.com/hybrid-cloud-patterns/ + author: Validated Patterns Team https://github.com/validatedpatterns/ description: Internal module to work with IIBs (Image Index Bundles) - issue_tracker_url: https://github.com/hybrid-cloud-patterns/common/issues + issue_tracker_url: https://github.com/validatedpatterns/common/issues license: Apache-2.0 min_ansible_version: "2.1" diff --git a/common/ansible/roles/vault_utils/README.md b/common/ansible/roles/vault_utils/README.md index ba26c702..184e629f 100644 --- a/common/ansible/roles/vault_utils/README.md +++ b/common/ansible/roles/vault_utils/README.md @@ -59,7 +59,7 @@ 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-.yaml`, then +`~/.config/validatedpatterns/values-secret-.yaml`, then `~/.config/validated-patterns/values-secret-.yaml`, `~/values-secret-.yaml` and should that not exist it will look for `~/values-secret.yaml`. diff --git a/common/ansible/roles/vault_utils/meta/main.yml b/common/ansible/roles/vault_utils/meta/main.yml index c99eb3a9..543d945e 100644 --- a/common/ansible/roles/vault_utils/meta/main.yml +++ b/common/ansible/roles/vault_utils/meta/main.yml @@ -1,8 +1,8 @@ galaxy_info: - author: Validated Patterns Team https://github.com/hybrid-cloud-patterns/ + author: Validated Patterns Team https://github.com/validatedpatterns/ description: Utilities to manage vault in kubernetes (init, unseal, etc) - issue_tracker_url: https://github.com/hybrid-cloud-patterns/common/issues + issue_tracker_url: https://github.com/validatedpatterns/common/issues license: Apache-2.0 min_ansible_version: "2.1" diff --git a/common/ansible/roles/vault_utils/tasks/push_secrets.yaml b/common/ansible/roles/vault_utils/tasks/push_secrets.yaml index 7954dc47..e2a50739 100644 --- a/common/ansible/roles/vault_utils/tasks/push_secrets.yaml +++ b/common/ansible/roles/vault_utils/tasks/push_secrets.yaml @@ -65,7 +65,7 @@ found_file: "{{ lookup('ansible.builtin.first_found', findme) }}" vars: findme: - - "~/.config/hybrid-cloud-patterns/values-secret-{{ pattern_name }}.yaml" + - "~/.config/validatedpatterns/values-secret-{{ pattern_name }}.yaml" - "~/.config/validated-patterns/values-secret-{{ pattern_name }}.yaml" - "~/values-secret-{{ pattern_name }}.yaml" - "~/values-secret.yaml" diff --git a/common/clustergroup/values.schema.json b/common/clustergroup/values.schema.json index 2fbe3421..6ee4fb00 100644 --- a/common/clustergroup/values.schema.json +++ b/common/clustergroup/values.schema.json @@ -220,7 +220,7 @@ }, "account": { "type": "string", - "description": "The account for the Git provider. Accounts allow you to organize and control access to that code. There are three types of accounts on GitHub. Personal accounts Organization accounts Enterprise accounts e.g. hybrid-cloud-patterns or claudiol" + "description": "The account for the Git provider. Accounts allow you to organize and control access to that code. There are three types of accounts on GitHub. Personal accounts Organization accounts Enterprise accounts e.g. validatedpatterns or claudiol" }, "email": { "type": "string", diff --git a/common/examples/values-example.yaml b/common/examples/values-example.yaml index 1b5dc655..27f2d7ee 100644 --- a/common/examples/values-example.yaml +++ b/common/examples/values-example.yaml @@ -130,7 +130,7 @@ clusterGroup: managedClusterGroups: - name: acm-edge # Optional - Point to a different repo - # repoURL: https://github.com/hybrid-cloud-patterns/mySite.git + # repoURL: https://github.com/validatedpatterns/mySite.git # Must contain values-{clustergroupname}.yaml at the top level targetRevision: main helmOverrides: diff --git a/common/reference-output.yaml b/common/reference-output.yaml index 1eef9745..bf6c1bad 100644 --- a/common/reference-output.yaml +++ b/common/reference-output.yaml @@ -49,7 +49,7 @@ metadata: namespace: manuela-ci annotations: # Tekton magic, see https://tekton.dev/vault/pipelines-v0.15.2/auth/ - tekton.dev/git-0: https://github.com/hybrid-cloud-patterns + tekton.dev/git-0: https://github.com/validatedpatterns type: kubernetes.io/basic-auth stringData: username: STRING diff --git a/common/scripts/make_common_subtree.sh b/common/scripts/make_common_subtree.sh index a5e406d8..5429887f 100755 --- a/common/scripts/make_common_subtree.sh +++ b/common/scripts/make_common_subtree.sh @@ -7,7 +7,7 @@ if [ "$1" = "-h" ]; then echo "$0 " echo echo "Run without arguments, the script would run as if these arguments had been passed:" - echo "$0 https://github.com/hybrid-cloud-patterns/common.git main common-subtree" + echo "$0 https://github.com/validatedpatterns/common.git main common-subtree" echo echo "Please ensure the git subtree command is available. On RHEL/Fedora, the git subtree command" echo "is in a separate package called git-subtree" @@ -41,7 +41,7 @@ fi if [ "$1" ]; then subtree_repo=$1 else - subtree_repo=https://github.com/hybrid-cloud-patterns/common.git + subtree_repo=https://github.com/validatedpatterns/common.git fi if [ "$2" ]; then diff --git a/common/tests/clustergroup-industrial-edge-factory.expected.yaml b/common/tests/clustergroup-industrial-edge-factory.expected.yaml index 65344a57..264b7b11 100644 --- a/common/tests/clustergroup-industrial-edge-factory.expected.yaml +++ b/common/tests/clustergroup-industrial-edge-factory.expected.yaml @@ -210,7 +210,7 @@ data: clusterVersion: "4.12" extraValueFiles: [] git: - account: hybrid-cloud-patterns + account: validatedpatterns dev_revision: main email: someone@somewhere.com hostname: github.com diff --git a/common/tests/clustergroup-industrial-edge-hub.expected.yaml b/common/tests/clustergroup-industrial-edge-hub.expected.yaml index 1038e54a..166bb507 100644 --- a/common/tests/clustergroup-industrial-edge-hub.expected.yaml +++ b/common/tests/clustergroup-industrial-edge-hub.expected.yaml @@ -371,7 +371,7 @@ data: clusterVersion: "4.12" extraValueFiles: [] git: - account: hybrid-cloud-patterns + account: validatedpatterns dev_revision: main email: someone@somewhere.com hostname: github.com diff --git a/common/tests/clustergroup-medical-diagnosis-hub.expected.yaml b/common/tests/clustergroup-medical-diagnosis-hub.expected.yaml index 51bff564..f5727971 100644 --- a/common/tests/clustergroup-medical-diagnosis-hub.expected.yaml +++ b/common/tests/clustergroup-medical-diagnosis-hub.expected.yaml @@ -330,7 +330,7 @@ data: clusterVersion: "4.12" extraValueFiles: [] git: - account: hybrid-cloud-patterns + account: validatedpatterns dev_revision: main email: someone@somewhere.com hostname: github.com diff --git a/common/tests/clustergroup-normal.expected.yaml b/common/tests/clustergroup-normal.expected.yaml index b038286e..7251036c 100644 --- a/common/tests/clustergroup-normal.expected.yaml +++ b/common/tests/clustergroup-normal.expected.yaml @@ -319,7 +319,7 @@ data: clusterVersion: "4.12" extraValueFiles: [] git: - account: hybrid-cloud-patterns + account: validatedpatterns dev_revision: main email: someone@somewhere.com hostname: github.com diff --git a/common/values-global.yaml b/common/values-global.yaml index 684f89f2..bdd0ea91 100644 --- a/common/values-global.yaml +++ b/common/values-global.yaml @@ -8,7 +8,7 @@ global: git: hostname: github.com # Account is the user or organization under which the pattern repos lives - account: hybrid-cloud-patterns + account: validatedpatterns email: someone@somewhere.com dev_revision: main diff --git a/scripts/make_common_subtree.sh b/scripts/make_common_subtree.sh index 675753bd..28eb8322 100755 --- a/scripts/make_common_subtree.sh +++ b/scripts/make_common_subtree.sh @@ -7,7 +7,7 @@ if [ "$1" = "-h" ]; then echo "$0 " echo echo "Run without arguments, the script would run as if these arguments had been passed:" - echo "$0 https://github.com/hybrid-cloud-patterns/common.git main common-subtree" + echo "$0 https://github.com/validatedpatterns/common.git main common-subtree" echo echo "Please ensure the git subtree command is available. On RHEL/Fedora, the git subtree command" echo "is in a separate package called git-subtree" @@ -41,7 +41,7 @@ fi if [ "$1" ]; then subtree_repo=$1 else - subtree_repo=https://github.com/hybrid-cloud-patterns/common.git + subtree_repo=https://github.com/validatedpatterns/common.git fi if [ "$2" ]; then