Skip to content

Commit e6abcf2

Browse files
authored
Merge pull request #1 from sabre1041/pattern-migrate
Base refactor of multi cluster gitops -> ZT
2 parents 7d4c001 + a8860e9 commit e6abcf2

7 files changed

Lines changed: 18 additions & 20 deletions

File tree

README.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Multicloud Gitops
1+
# Layered Zero Trust
22

33
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
44

@@ -7,13 +7,11 @@
77
## Start Here
88

99
If you've followed a link to this repository, but are not really sure what it contains
10-
or how to use it, head over to [Multicloud GitOps](https://validatedpatterns.io/patterns/multicloud-gitops/)
10+
or how to use it, head over to [Layered Zero Trust Pattern](https://validatedpatterns.io/patterns/layered-zero-trust/)
1111
for additional context and installation instructions
1212

1313
## Rationale
1414

1515
The goal for this pattern is to:
1616

17-
* Use a GitOps approach to manage hybrid and multi-cloud deployments across both public and private clouds.
18-
* Enable cross-cluster governance and application lifecycle management.
19-
* Securely manage secrets across the deployment.
17+
* Demonstrate how Zero Trust principles and capabilities are applied within OpenShift

ansible/site.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This is only needed for RHPDS
2-
- name: MultiCloud-GitOps RHPDS bootstrap
2+
- name: Layered Zero Trust RHPDS bootstrap
33
hosts: localhost
44
connection: local
55
tasks:

pattern-metadata.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# This goal of this metadata is mainly used as a source of truth for
22
# documentation and qe
33
metadata_version: "1.0"
4-
name: multicloud-gitops
4+
name: layered-zero-trust
55
pattern_version: "1.0"
6-
display_name: Multicloud Gitops
7-
repo_url: https://github.com/validatedpatterns/multicloud-gitops
6+
display_name: Layered Zero Trust
7+
repo_url: https://github.com/validatedpatterns/layered-zero-trust
88
docs_repo_url: https://github.com/validatedpatterns/docs
9-
issues_url: https://github.com/validatedpatterns/multicloud-gitops/issues
10-
docs_url: https://validatedpatterns.io/patterns/multicloud-gitops/
9+
issues_url: https://github.com/validatedpatterns/layered-zero-trust/issues
10+
docs_url: https://validatedpatterns.io/patterns/layered-zero-trust/
1111
ci_url: https://validatedpatterns.io/ci/?pattern=mcgitops
1212
# can be sandbox, tested or maintained
13-
tier: maintained
14-
owners: mbaldessari, darkdoc
13+
tier: sandbox
14+
owners: sabre1041, michaelepley
1515
requirements:
1616
hub: # Main cluster
1717
compute:

tests/interop/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
## Prerequisites
44

5-
* Openshift clusters with multicloud-gitops pattern installed
5+
* Openshift clusters with layered-zero-trust pattern installed
66
* factory cluster is managed via rhacm
77
* kubeconfig files for Openshift clusters
88
* oc client installed at ~/oc_client/oc
99

1010
## Steps
1111

12-
* create python3 venv, clone multicloud-gitops repository
12+
* create python3 venv, clone layered-zero-trust repository
1313
* export KUBECONFIG=\<path to hub kubeconfig file>
1414
* export KUBECONFIG_EDGE=\<path to edge kubeconfig file>
1515
* export INFRA_PROVIDER=\<infra platform description>
1616
* (optional) export WORKSPACE=\<dir to save test results to> (defaults to /tmp)
17-
* cd multicloud-gitops/tests/interop
17+
* cd layered-zero-trust/tests/interop
1818
* pip install -r requirements.txt
1919
* ./run_tests.sh
2020

tests/interop/test_modify_web_content.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def test_modify_web_content(openshift_dyn_client):
3737
if os.getenv("EXTERNAL_TEST") != "true":
3838
chart = (
3939
f"{os.environ['HOME']}"
40-
+ "/validated_patterns/multicloud-gitops/charts/"
40+
+ "/validated_patterns/layered-zero-trust/charts/"
4141
+ "all/hello-world/templates/hello-world-cm.yaml"
4242
)
4343
else:
@@ -51,7 +51,7 @@ def test_modify_web_content(openshift_dyn_client):
5151
)
5252

5353
logger.info("Merge the change")
54-
patterns_repo = f"{os.environ['HOME']}/validated_patterns/multicloud-gitops"
54+
patterns_repo = f"{os.environ['HOME']}/validated_patterns/layered-zero-trust"
5555
if os.getenv("EXTERNAL_TEST") != "true":
5656
subprocess.run(["git", "add", chart], cwd=f"{patterns_repo}")
5757
subprocess.run(

tests/interop/test_validate_hub_site_components.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def test_validate_argocd_reachable_hub_site(openshift_dyn_client):
8383
@pytest.mark.validate_argocd_applications_health_hub_site
8484
def test_validate_argocd_applications_health_hub_site(openshift_dyn_client):
8585
logger.info("Get all applications deployed by argocd on hub site")
86-
projects = ["openshift-gitops", "multicloud-gitops-hub"]
86+
projects = ["openshift-gitops", "layered-zero-trust-hub"]
8787
unhealthy_apps = application.get_argocd_application_status(
8888
openshift_dyn_client, projects
8989
)

values-global.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
global:
3-
pattern: multicloud-gitops
3+
pattern: layered-zero-trust
44
options:
55
useCSV: false
66
syncPolicy: Automatic

0 commit comments

Comments
 (0)