From f0b03a397f56b599ca8e81e8b3bf1d925d337a72 Mon Sep 17 00:00:00 2001 From: Gus Parvin Date: Fri, 1 Sep 2023 14:39:06 -0400 Subject: [PATCH] Use v1beta2 ManagedClusterSet API since v1beta1 is deprecated Need to switch to the new ManagedClusterSet and ManagedClusterSetBinding APIs since v1beta1 is deprecated. Moving to v1beta2 Signed-off-by: Gus Parvin (cherry picked from commit 79df77ae40d512c388a06326e5b6154deabc1074) --- .../CM-Configuration-Management/policy-idp-sample-github.yaml | 4 ++-- .../policy-managedclustersetbinding.yaml | 2 +- .../generateManagedClusterSetBindingblueteam-hub.yaml | 2 +- .../generateManagedClusterSetBindingredteam-hub.yaml | 2 +- .../input/generateall/generate-all-blueteam-spoke.yml | 2 +- .../input/generateall/generate-all-redteam-spoke.yml | 2 +- .../add-managedclustersetbinding-shared-sre-group.yaml | 4 ++-- .../openshift-plus-setup/managedclustersetbinding.yaml | 2 +- policygenerator/policy-sets/stable/acm-hardening/README.md | 4 ++-- policygenerator/policy-sets/stable/openshift-plus/README.md | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/community/CM-Configuration-Management/policy-idp-sample-github.yaml b/community/CM-Configuration-Management/policy-idp-sample-github.yaml index 90b9caecb..88ed883ec 100644 --- a/community/CM-Configuration-Management/policy-idp-sample-github.yaml +++ b/community/CM-Configuration-Management/policy-idp-sample-github.yaml @@ -33,7 +33,7 @@ spec: name: authrealm-sample-github-ns - complianceType: musthave objectDefinition: - apiVersion: cluster.open-cluster-management.io/v1beta1 + apiVersion: cluster.open-cluster-management.io/v1beta2 kind: ManagedClusterSet metadata: name: authrealm-sample-github-clusterset @@ -53,7 +53,7 @@ spec: authdeployment: sample-github - complianceType: musthave objectDefinition: - apiVersion: cluster.open-cluster-management.io/v1beta1 + apiVersion: cluster.open-cluster-management.io/v1beta2 kind: ManagedClusterSetBinding metadata: name: authrealm-sample-github-clusterset diff --git a/community/CM-Configuration-Management/policy-managedclustersetbinding.yaml b/community/CM-Configuration-Management/policy-managedclustersetbinding.yaml index c79d3d031..02147c769 100644 --- a/community/CM-Configuration-Management/policy-managedclustersetbinding.yaml +++ b/community/CM-Configuration-Management/policy-managedclustersetbinding.yaml @@ -29,7 +29,7 @@ spec: name: policies - complianceType: musthave objectDefinition: - apiVersion: cluster.open-cluster-management.io/v1beta1 + apiVersion: cluster.open-cluster-management.io/v1beta2 kind: ManagedClusterSetBinding metadata: namespace: policies diff --git a/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateManagedClusterSetBinding/generateManagedClusterSetBindingblueteam-hub.yaml b/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateManagedClusterSetBinding/generateManagedClusterSetBindingblueteam-hub.yaml index d420ad734..7a4219279 100644 --- a/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateManagedClusterSetBinding/generateManagedClusterSetBindingblueteam-hub.yaml +++ b/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateManagedClusterSetBinding/generateManagedClusterSetBindingblueteam-hub.yaml @@ -30,7 +30,7 @@ spec: - CREATE - UPDATE generate: - apiVersion: cluster.open-cluster-management.io/v1beta1 + apiVersion: cluster.open-cluster-management.io/v1beta2 kind: ManagedClusterSetBinding name: blueteam namespace: "{{request.object.metadata.name}}" diff --git a/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateManagedClusterSetBinding/generateManagedClusterSetBindingredteam-hub.yaml b/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateManagedClusterSetBinding/generateManagedClusterSetBindingredteam-hub.yaml index 0ac72e104..716a3bacc 100644 --- a/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateManagedClusterSetBinding/generateManagedClusterSetBindingredteam-hub.yaml +++ b/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateManagedClusterSetBinding/generateManagedClusterSetBindingredteam-hub.yaml @@ -29,7 +29,7 @@ spec: value: - CREATE generate: - apiVersion: cluster.open-cluster-management.io/v1beta1 + apiVersion: cluster.open-cluster-management.io/v1beta2 kind: ManagedClusterSetBinding name: redteam namespace: "{{request.object.metadata.name}}" diff --git a/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateall/generate-all-blueteam-spoke.yml b/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateall/generate-all-blueteam-spoke.yml index 8c81a81a9..f081f98b0 100644 --- a/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateall/generate-all-blueteam-spoke.yml +++ b/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateall/generate-all-blueteam-spoke.yml @@ -59,7 +59,7 @@ spec: - CREATE - UPDATE generate: - apiVersion: cluster.open-cluster-management.io/v1beta1 + apiVersion: cluster.open-cluster-management.io/v1beta2 kind: ManagedClusterSetBinding name: blueteam namespace: "{{request.object.metadata.name}}" diff --git a/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateall/generate-all-redteam-spoke.yml b/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateall/generate-all-redteam-spoke.yml index 36dc47de1..5f9288c2d 100644 --- a/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateall/generate-all-redteam-spoke.yml +++ b/policygenerator/policy-sets/community/kyverno/multitenancy/input/generateall/generate-all-redteam-spoke.yml @@ -59,7 +59,7 @@ spec: - CREATE - UPDATE generate: - apiVersion: cluster.open-cluster-management.io/v1beta1 + apiVersion: cluster.open-cluster-management.io/v1beta2 kind: ManagedClusterSetBinding name: redteam namespace: "{{request.object.metadata.name}}" diff --git a/policygenerator/policy-sets/community/kyverno/multitenancy/input/sharedresources/add-managedclustersetbinding-shared-sre-group.yaml b/policygenerator/policy-sets/community/kyverno/multitenancy/input/sharedresources/add-managedclustersetbinding-shared-sre-group.yaml index 02de3e434..3cda35551 100644 --- a/policygenerator/policy-sets/community/kyverno/multitenancy/input/sharedresources/add-managedclustersetbinding-shared-sre-group.yaml +++ b/policygenerator/policy-sets/community/kyverno/multitenancy/input/sharedresources/add-managedclustersetbinding-shared-sre-group.yaml @@ -35,7 +35,7 @@ spec: operator: AnyNotIn value: shared* generate: - apiVersion: cluster.open-cluster-management.io/v1beta1 + apiVersion: cluster.open-cluster-management.io/v1beta2 kind: ManagedClusterSetBinding name: blueteam namespace: "{{request.object.metadata.name}}" @@ -65,7 +65,7 @@ spec: operator: AnyNotIn value: shared* generate: - apiVersion: cluster.open-cluster-management.io/v1beta1 + apiVersion: cluster.open-cluster-management.io/v1beta2 kind: ManagedClusterSetBinding name: redteam namespace: "{{request.object.metadata.name}}" diff --git a/policygenerator/policy-sets/community/openshift-plus-setup/managedclustersetbinding.yaml b/policygenerator/policy-sets/community/openshift-plus-setup/managedclustersetbinding.yaml index 8a0e9eebd..1a6cd504a 100644 --- a/policygenerator/policy-sets/community/openshift-plus-setup/managedclustersetbinding.yaml +++ b/policygenerator/policy-sets/community/openshift-plus-setup/managedclustersetbinding.yaml @@ -1,4 +1,4 @@ -apiVersion: cluster.open-cluster-management.io/v1beta1 +apiVersion: cluster.open-cluster-management.io/v1beta2 kind: ManagedClusterSetBinding metadata: namespace: policies diff --git a/policygenerator/policy-sets/stable/acm-hardening/README.md b/policygenerator/policy-sets/stable/acm-hardening/README.md index ffc2acd9d..8b8182719 100644 --- a/policygenerator/policy-sets/stable/acm-hardening/README.md +++ b/policygenerator/policy-sets/stable/acm-hardening/README.md @@ -10,7 +10,7 @@ This `PolicySet` needs to be deployed only to the Advanced Cluster Management hu **Note**: The `PolicySet` uses cluster `Placement` and not the `PlacementRule` placement mechanism, so the namespace of the `Placement` must also be bound to a `ManagedClusterSet` using a `ManagedClusterSetBinding`. See the -[Placement](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.6/html-single/multicluster_engine/index#placement-overview) +[Placement](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#placement-overview) and -[ManagedClusterSetBinding](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.6/html-single/multicluster_engine/index#creating-a-managedclustersetbinding) +[ManagedClusterSetBinding](https://access.redhat.com/documentation/en-us/red_hat_advanced_cluster_management_for_kubernetes/2.8/html/clusters/cluster_mce_overview#creating-managedclustersetbinding) documentation. diff --git a/policygenerator/policy-sets/stable/openshift-plus/README.md b/policygenerator/policy-sets/stable/openshift-plus/README.md index ad3bb8077..17b08945a 100644 --- a/policygenerator/policy-sets/stable/openshift-plus/README.md +++ b/policygenerator/policy-sets/stable/openshift-plus/README.md @@ -18,7 +18,7 @@ Prior to applying the `PolicySet`, perform these steps: 2. Install the Policy generator Kustomize plugin by following the [installation instructions](https://github.com/stolostron/policy-generator-plugin#installation). It is recommended to use Kustomize v4.5+. 3. Policies are installed to the `policies` namespace. Make sure the placement bindings match this namespace for the hub and other managed clusters. Example yaml to apply a ManagedClusterSetBinding for the policies namespace. - ```apiVersion: cluster.open-cluster-management.io/v1beta1 + ```apiVersion: cluster.open-cluster-management.io/v1beta2 kind: ManagedClusterSetBinding metadata: name: default