Merge pull request #3 from sabre1041/remove-acm

Removed ACM from Pattern

Author: mhjacks

common/scripts/preview-all.sh

@@ -4,7 +4,7 @@ REPO=$1; shift;
 TARGET_BRANCH=$1; shift
 
 HUB=$( yq ".main.clusterGroupName" values-global.yaml )
-MANAGED_CLUSTERS=$( yq ".clusterGroup.managedClusterGroups.[].name" values-$HUB.yaml )
+MANAGED_CLUSTERS=$( yq '.clusterGroup.managedClusterGroups.[].name // ""' values-$HUB.yaml )
 ALL_CLUSTERS=( $HUB $MANAGED_CLUSTERS )
 
 CLUSTER_INFO_OUT=$(oc cluster-info 2>&1)

tests/interop/README.md

@@ -11,7 +11,6 @@
 
 * 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 layered-zero-trust/tests/interop

tests/interop/run_tests.sh

@@ -9,11 +9,6 @@ if [ -z "${KUBECONFIG}" ]; then
     exit 1
 fi
 
-if [ -z "${KUBECONFIG_EDGE}" ]; then
-    echo "No kubeconfig file set for edge cluster"
-    exit 1
-fi
-
 if [ -z "${INFRA_PROVIDER}" ]; then
     echo "INFRA_PROVIDER is not defined"
     exit 1

tests/interop/test_subscription_status_edge.py

@@ -13,8 +13,6 @@ def test_subscription_status_hub(openshift_dyn_client):
     # These are the operator subscriptions and their associated namespaces
     expected_subs = {
         "openshift-gitops-operator": ["openshift-operators"],
-        "advanced-cluster-management": ["open-cluster-management"],
-        "multicluster-engine": ["multicluster-engine"],
     }
 
     err_msg = subscription.subscription_status(

tests/interop/test_subscription_status_hub.py

@@ -42,8 +42,6 @@ def test_check_pod_status(openshift_dyn_client):
     logger.info("Checking pod status")
     projects = [
         "openshift-operators",
-        "open-cluster-management",
-        "open-cluster-management-hub",
         "openshift-gitops",
         "vault",
     ]
@@ -55,20 +53,6 @@ def test_check_pod_status(openshift_dyn_client):
         logger.info("PASS: Pod status check succeeded.")
 
 
-@pytest.mark.validate_acm_self_registration_managed_clusters
-def test_validate_acm_self_registration_managed_clusters(openshift_dyn_client):
-    logger.info("Check ACM self registration for edge site")
-    kubefiles = [os.getenv("KUBECONFIG_EDGE")]
-    err_msg = components.validate_acm_self_registration_managed_clusters(
-        openshift_dyn_client, kubefiles
-    )
-    if err_msg:
-        logger.error(f"FAIL: {err_msg}")
-        assert False, err_msg
-    else:
-        logger.info("PASS: Edge site is self registered")
-
-
 @pytest.mark.validate_argocd_reachable_hub_site
 def test_validate_argocd_reachable_hub_site(openshift_dyn_client):
     logger.info("Check if argocd route/url on hub site is reachable")

tests/interop/test_validate_edge_site_components.py

@@ -1,6 +1,2 @@
 clusterGroup:
-  subscriptions:
-    acm:
-      name: advanced-cluster-management
-      namespace: open-cluster-management
-      channel: release-2.12
+  subscriptions: {}

tests/interop/test_validate_hub_site_components.py

@@ -1,6 +1,2 @@
 clusterGroup:
-  subscriptions:
-    acm:
-      name: advanced-cluster-management
-      namespace: open-cluster-management
-      channel: release-2.12
+  subscriptions: {}

values-4.18-hub.yaml

@@ -5,12 +5,7 @@ clusterGroup:
     - open-cluster-management
     - vault
     - golang-external-secrets
-  subscriptions:
-    acm:
-      name: advanced-cluster-management
-      namespace: open-cluster-management
-      channel: release-2.11
-      #csv: advanced-cluster-management.v2.6.1
+  subscriptions: {}
   projects:
     - hub
   # Explicitly mention the cluster-state based overrides we plan to use for this pattern.
@@ -34,17 +29,6 @@ clusterGroup:
   #   - '/overrides/values-{{ $.Values.global.hubClusterDomain }}.yaml'
   #   - '/overrides/values-{{ $.Values.global.localClusterDomain }}.yaml'
   applications:
-    acm:
-      name: acm
-      namespace: open-cluster-management
-      project: hub
-      chart: acm
-      chartVersion: 0.1.*
-      ignoreDifferences:
-        - group: internal.open-cluster-management.io
-          kind: ManagedClusterInfo
-          jsonPointers:
-            - /spec/loggingCA
     vault:
       name: vault
       namespace: vault
@@ -65,15 +49,15 @@ clusterGroup:
     # For additional overrides that apply to the jobs, please refer to
     # https://hybrid-cloud-patterns.io/imperative-actions/#additional-job-customizations
     jobs: []
-  managedClusterGroups:
-    exampleRegion:
-      name: group-one
-      acmlabels:
-        - name: clusterGroup
-          value: group-one
-      helmOverrides:
-        - name: clusterGroup.isHubCluster
-          value: false
+  managedClusterGroups: {}
+    # exampleRegion:
+    #   name: group-one
+    #   acmlabels:
+    #     - name: clusterGroup
+    #       value: group-one
+    #   helmOverrides:
+    #     - name: clusterGroup.isHubCluster
+    #       value: false
           # Before enabling cluster provisioning, ensure AWS and/or Azure
           #   credentials and OCP pull secrets are defined in Vault.
           #   See values-secret.yaml.template