Remove the tech preview compliance history API integration

Relates: https://issues.redhat.com/browse/ACM-15291 Signed-off-by: mprahl <[email protected]>
open-cluster-management-io · Nov 5, 2024 · 1112539 · 1112539
1 parent d2db573
commit 1112539
Show file tree

Hide file tree

Showing 18 changed files with 30 additions and 516 deletions.
diff --git a/Makefile b/Makefile
@@ -163,8 +163,6 @@ $(KIND_KUBECONFIG):
 	kind get kubeconfig --name $(KIND_NAME) --internal > $(KIND_KUBECONFIG_INTERNAL)
 	KUBECONFIG=$(KIND_KUBECONFIG) kubectl apply -f \
 		https://raw.githubusercontent.com/prometheus-operator/prometheus-operator/v0.64.1/example/prometheus-operator-crd-full/monitoring.coreos.com_servicemonitors.yaml
-	KUBECONFIG=$(KIND_KUBECONFIG) kubectl create -f \
-		https://raw.githubusercontent.com/openshift/api/release-4.17/route/v1/zz_generated.crd-manifests/routes-Default.crd.yaml
 
 .PHONY: kind-delete-cluster
 kind-delete-cluster: ## Delete a kind cluster.

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -5,16 +5,38 @@ metadata:
   name: governance-policy-addon-controller
 rules:
 - apiGroups:
-  - addon.open-cluster-management.io
+  - ""
   resources:
-  - addondeploymentconfigs
+  - events
+  verbs:
+  - create
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resourceNames:
+  - policy-encryption-key
+  resources:
+  - secrets
   verbs:
   - get
   - list
   - watch
 - apiGroups:
   - addon.open-cluster-management.io
   resources:
+  - addondeploymentconfigs
   - clustermanagementaddons
   verbs:
   - get
@@ -27,6 +49,7 @@ rules:
   - governance-policy-framework
   resources:
   - clustermanagementaddons/finalizers
+  - managedclusteraddons/finalizers
   verbs:
   - update
 - apiGroups:
@@ -36,6 +59,7 @@ rules:
   - governance-policy-framework
   resources:
   - clustermanagementaddons/status
+  - managedclusteraddons/status
   verbs:
   - patch
   - update
@@ -58,25 +82,6 @@ rules:
   - managedclusteraddons
   verbs:
   - delete
-- apiGroups:
-  - addon.open-cluster-management.io
-  resourceNames:
-  - config-policy-controller
-  - governance-policy-framework
-  resources:
-  - managedclusteraddons/finalizers
-  verbs:
-  - update
-- apiGroups:
-  - addon.open-cluster-management.io
-  resourceNames:
-  - config-policy-controller
-  - governance-policy-framework
-  resources:
-  - managedclusteraddons/status
-  verbs:
-  - patch
-  - update
 - apiGroups:
   - authorization.k8s.io
   resources:
@@ -144,72 +149,6 @@ rules:
   - patch
   - update
   - watch
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - create
-- apiGroups:
-  - ""
-  resourceNames:
-  - governance-policy-database
-  - policy-encryption-key
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - ""
-  resourceNames:
-  - open-cluster-management-compliance-history-api-recorder
-  resources:
-  - secrets
-  verbs:
-  - delete
-  - get
-  - list
-  - patch
-  - update
-  - watch
-- apiGroups:
-  - ""
-  resources:
-  - serviceaccounts
-  verbs:
-  - create
-- apiGroups:
-  - ""
-  resourceNames:
-  - open-cluster-management-compliance-history-api-recorder
-  resources:
-  - serviceaccounts
-  verbs:
-  - delete
-  - get
-  - patch
-  - update
 - apiGroups:
   - policy.open-cluster-management.io
   resources:
@@ -240,58 +179,22 @@ rules:
   - rbac.authorization.k8s.io
   resources:
   - clusterroles
-  verbs:
-  - create
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resourceNames:
-  - open-cluster-management:compliance-history-api-recorder
-  - open-cluster-management:config-policy-controller-hub
-  - open-cluster-management:policy-framework-hub
-  resources:
-  - clusterroles
-  verbs:
-  - delete
-  - get
-  - patch
-  - update
-- apiGroups:
-  - rbac.authorization.k8s.io
-  resources:
   - rolebindings
   verbs:
   - create
 - apiGroups:
   - rbac.authorization.k8s.io
   resourceNames:
-  - open-cluster-management:compliance-history-api-recorder
   - open-cluster-management:config-policy-controller-hub
   - open-cluster-management:policy-framework-hub
   resources:
+  - clusterroles
   - rolebindings
   verbs:
   - delete
   - get
   - patch
   - update
-- apiGroups:
-  - route.openshift.io
-  resources:
-  - routes
-  verbs:
-  - create
-- apiGroups:
-  - route.openshift.io
-  resourceNames:
-  - governance-history-api
-  resources:
-  - routes
-  verbs:
-  - delete
-  - get
-  - list
-  - update
-  - watch
 - apiGroups:
   - work.open-cluster-management.io
   resources:

diff --git a/go.mod b/go.mod
@@ -10,7 +10,6 @@ require (
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
-	github.com/stolostron/kubernetes-dependency-watches v0.7.0
 	k8s.io/apimachinery v0.29.5
 	k8s.io/client-go v0.29.5
 	k8s.io/component-base v0.29.5
@@ -129,7 +128,6 @@ require (
 	k8s.io/api v0.29.5 // indirect
 	k8s.io/apiextensions-apiserver v0.29.5 // indirect
 	k8s.io/apiserver v0.29.5 // indirect
-	k8s.io/klog v1.0.0 // indirect
 	k8s.io/kms v0.29.5 // indirect
 	k8s.io/kube-aggregator v0.29.5 // indirect
 	k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect

diff --git a/go.sum b/go.sum
@@ -55,7 +55,6 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -197,8 +196,6 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
 github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
-github.com/stolostron/kubernetes-dependency-watches v0.7.0 h1:aiJSZUusiPtWEz1CIdFperRgS9ibA0Gr8Hu3K8bpN/o=
-github.com/stolostron/kubernetes-dependency-watches v0.7.0/go.mod h1:6v54aX8Bxx1m9YETZUxNGUrSHcRIArM/YnOqnUbIB/g=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
@@ -372,8 +369,6 @@ k8s.io/client-go v0.29.5 h1:nlASXmPQy190qTteaVP31g3c/wi2kycznkTP7Sv1zPc=
 k8s.io/client-go v0.29.5/go.mod h1:aY5CnqUUvXYccJhm47XHoPcRyX6vouHdIBHaKZGTbK4=
 k8s.io/component-base v0.29.5 h1:Ptj8AzG+p8c2a839XriHwxakDpZH9uvIgYz+o1agjg8=
 k8s.io/component-base v0.29.5/go.mod h1:9nBUoPxW/yimISIgAG7sJDrUGJlu7t8HnDafIrOdU8Q=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
 k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
 k8s.io/kms v0.29.5 h1:DcR0hBeEcuLmKTpriezu7kyR4sJcHeeYle/WGdQWi2o=