label selector is no longer supported in ManagedClusterSet

Signed-off-by: Xiangjing Li <[email protected]>

Makefile

@@ -40,6 +40,9 @@ GOHOSTARCH ?= $(shell go env GOHOSTARCH)
 KB_TOOLS_ARCHIVE_NAME :=kubebuilder-tools-$(K8S_VERSION)-$(GOHOSTOS)-$(GOHOSTARCH).tar.gz
 KB_TOOLS_ARCHIVE_PATH := $(TEST_TMP)/$(KB_TOOLS_ARCHIVE_NAME)
 
+# specify the tag for ocm foundation images used in e2e test
+OCM_IMAGE_TAG ?= v0.13.0
+
 .PHONY: build
 
 build:
@@ -113,7 +116,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
 
 .PHONY: deploy-ocm
 deploy-ocm:
-	deploy/ocm/install.sh
+	IMAGE_TAG=$(OCM_IMAGE_TAG) deploy/ocm/install.sh
 
 .PHONY: test-e2e
 test-e2e: deploy-ocm

examples/managedclustersetbinding.yaml

@@ -3,7 +3,7 @@
 apiVersion: cluster.open-cluster-management.io/v1beta2
 kind: ManagedClusterSetBinding
 metadata:
-  name: all-openshift-clusters
+  name: global
   namespace: openshift-gitops
 spec:
-  clusterSet: all-openshift-clusters # Important: in newer releases use the 'global' or 'default' for clusterSet value instead.
+  clusterSet: global

examples/openshift-gitops/README.md

@@ -10,7 +10,7 @@ with the `vendor: OpenShift` label into OpenShift GitOps (Argo CD).
 ## Configure
 * Apply the following:
    ```shell
-   kubectl apply -f .
+   kubectl apply -f ./openshift-gitops
    ```
 * Any OpenShift clusters with the correct label will be imported into the Argo CD provisioned by OpenShift GitOps.
 * Check the Openshift GitOps (Argo CD) Configuration tab, to see the list of clusters

examples/openshift-gitops/managedclustersetbinding.yaml

@@ -3,7 +3,7 @@
 apiVersion: cluster.open-cluster-management.io/v1beta2
 kind: ManagedClusterSetBinding
 metadata:
-  name: all-openshift-clusters
+  name: global
   namespace: openshift-gitops
 spec:
-  clusterSet: all-openshift-clusters
+  clusterSet: global