Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion common/ansible/roles/find_vp_secrets/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions common/ansible/roles/iib_ci/meta/main.yml
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion common/ansible/roles/vault_utils/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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-<patternname>.yaml`, then
`~/.config/validatedpatterns/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`.
Expand Down
4 changes: 2 additions & 2 deletions common/ansible/roles/vault_utils/meta/main.yml
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
2 changes: 1 addition & 1 deletion common/ansible/roles/vault_utils/tasks/push_secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion common/clustergroup/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,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",
Expand Down
2 changes: 1 addition & 1 deletion common/examples/values-example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion common/reference-output.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions common/scripts/make_common_subtree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ if [ "$1" = "-h" ]; then
echo "$0 <subtree_repo> <subtree_branch> <subtree_remote_name>"
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"
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion common/tests/clustergroup-normal.expected.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion common/values-global.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ spec:
spec:
containers:
- name: homeoffice-ingress
image: quay.io/hybrid-cloud-patterns-demo/homeoffice-ingress:latest
image: quay.io/validatedpatterns-demo/homeoffice-ingress:latest
imagePullPolicy: Always
env:
- name: KAFKA_BOOTSTRAP_URLS
Expand Down Expand Up @@ -123,7 +123,7 @@ spec:
spec:
containers:
- name: homeoffice-ui
image: quay.io/hybrid-cloud-patterns-demo/quarkuscoffeeshop-homeoffice-ui:latest
image: quay.io/validatedpatterns-demo/quarkuscoffeeshop-homeoffice-ui:latest
imagePullPolicy: Always
env:
- name: REACT_APP_GRAPHQL_ENDPOINT
Expand Down Expand Up @@ -157,7 +157,7 @@ spec:
spec:
containers:
- name: homeoffice-backend
image: quay.io/hybrid-cloud-patterns-demo/homeoffice-backend:latest
image: quay.io/validatedpatterns-demo/homeoffice-backend:latest
imagePullPolicy: Always
env:
- name: KAFKA_BOOTSTRAP_URLS
Expand Down
6 changes: 3 additions & 3 deletions tests/hub-quarkuscoffeeshop-homeoffice-charts.expected.diff
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
spec:
containers:
- name: homeoffice-ingress
- image: quay.io/hybrid-cloud-patterns-demo/homeoffice-ingress:latest
- image: quay.io/validatedpatterns-demo/homeoffice-ingress:latest
+ image: quay.io/hybridcloudpatterns/homeoffice-ingress:latest
imagePullPolicy: Always
env:
Expand All @@ -13,7 +13,7 @@
spec:
containers:
- name: homeoffice-ui
- image: quay.io/hybrid-cloud-patterns-demo/quarkuscoffeeshop-homeoffice-ui:latest
- image: quay.io/validatedpatterns-demo/quarkuscoffeeshop-homeoffice-ui:latest
+ image: quay.io/hybridcloudpatterns/quarkuscoffeeshop-homeoffice-ui:latest
imagePullPolicy: Always
env:
Expand All @@ -22,7 +22,7 @@
spec:
containers:
- name: homeoffice-backend
- image: quay.io/hybrid-cloud-patterns-demo/homeoffice-backend:latest
- image: quay.io/validatedpatterns-demo/homeoffice-backend:latest
+ image: quay.io/hybridcloudpatterns/homeoffice-backend:latest
imagePullPolicy: Always
env:
Expand Down
Loading