Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🤖 Sync from open-cluster-management-io/multicloud-integrations: #99 #167

Merged
merged 1 commit into from
May 3, 2024
Merged

🤖 Sync from open-cluster-management-io/multicloud-integrations: #99 #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
16 changes: 0 additions & 16 deletions examples/managedclusterset.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions examples/managedclustersetbinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion examples/openshift-gitops/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions examples/openshift-gitops/managedclusterset.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions examples/openshift-gitops/managedclustersetbinding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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