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
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Multicloud Gitops
# Layered Zero Trust

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

Expand All @@ -7,13 +7,11 @@
## Start Here

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

## Rationale

The goal for this pattern is to:

* Use a GitOps approach to manage hybrid and multi-cloud deployments across both public and private clouds.
* Enable cross-cluster governance and application lifecycle management.
* Securely manage secrets across the deployment.
* Demonstrate how Zero Trust principles and capabilities are applied within OpenShift
2 changes: 1 addition & 1 deletion ansible/site.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This is only needed for RHPDS
- name: MultiCloud-GitOps RHPDS bootstrap
- name: Layered Zero Trust RHPDS bootstrap
hosts: localhost
connection: local
tasks:
Expand Down
14 changes: 7 additions & 7 deletions pattern-metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# This goal of this metadata is mainly used as a source of truth for
# documentation and qe
metadata_version: "1.0"
name: multicloud-gitops
name: layered-zero-trust
pattern_version: "1.0"
display_name: Multicloud Gitops
repo_url: https://github.com/validatedpatterns/multicloud-gitops
display_name: Layered Zero Trust
repo_url: https://github.com/validatedpatterns/layered-zero-trust
docs_repo_url: https://github.com/validatedpatterns/docs
issues_url: https://github.com/validatedpatterns/multicloud-gitops/issues
docs_url: https://validatedpatterns.io/patterns/multicloud-gitops/
issues_url: https://github.com/validatedpatterns/layered-zero-trust/issues
docs_url: https://validatedpatterns.io/patterns/layered-zero-trust/
ci_url: https://validatedpatterns.io/ci/?pattern=mcgitops
# can be sandbox, tested or maintained
tier: maintained
owners: mbaldessari, darkdoc
tier: sandbox
owners: sabre1041, michaelepley
requirements:
hub: # Main cluster
compute:
Expand Down
6 changes: 3 additions & 3 deletions tests/interop/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

## Prerequisites

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

## Steps

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

Expand Down
4 changes: 2 additions & 2 deletions tests/interop/test_modify_web_content.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def test_modify_web_content(openshift_dyn_client):
if os.getenv("EXTERNAL_TEST") != "true":
chart = (
f"{os.environ['HOME']}"
+ "/validated_patterns/multicloud-gitops/charts/"
+ "/validated_patterns/layered-zero-trust/charts/"
+ "all/hello-world/templates/hello-world-cm.yaml"
)
else:
Expand All @@ -51,7 +51,7 @@ def test_modify_web_content(openshift_dyn_client):
)

logger.info("Merge the change")
patterns_repo = f"{os.environ['HOME']}/validated_patterns/multicloud-gitops"
patterns_repo = f"{os.environ['HOME']}/validated_patterns/layered-zero-trust"
if os.getenv("EXTERNAL_TEST") != "true":
subprocess.run(["git", "add", chart], cwd=f"{patterns_repo}")
subprocess.run(
Expand Down
2 changes: 1 addition & 1 deletion tests/interop/test_validate_hub_site_components.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def test_validate_argocd_reachable_hub_site(openshift_dyn_client):
@pytest.mark.validate_argocd_applications_health_hub_site
def test_validate_argocd_applications_health_hub_site(openshift_dyn_client):
logger.info("Get all applications deployed by argocd on hub site")
projects = ["openshift-gitops", "multicloud-gitops-hub"]
projects = ["openshift-gitops", "layered-zero-trust-hub"]
unhealthy_apps = application.get_argocd_application_status(
openshift_dyn_client, projects
)
Expand Down
2 changes: 1 addition & 1 deletion values-global.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
global:
pattern: multicloud-gitops
pattern: layered-zero-trust
options:
useCSV: false
syncPolicy: Automatic
Expand Down