Adapt to o2ims group changes

Update test plugin to align with the following PRs: openshift-kni/oran-o2ims#206 openshift-kni/oran-o2ims#209 Signed-off-by: Don Penney <[email protected]>
donpenney · Sep 18, 2024 · 75c51e9 · 75c51e9
1 parent cf034b1
commit 75c51e9
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -62,10 +62,10 @@ $ ./configmap/generator.sh \
 configmap/nodelist created
 
 $ oc create -f examples/np1.yaml
-nodepool.hardwaremanagement.oran.openshift.io/np1 created
+nodepool.o2ims-hardwaremanagement.oran.openshift.io/np1 created
 
-$ oc get nodepools.hardwaremanagement.oran.openshift.io -n oran-hwmgr-plugin-test np1 -o yaml
-apiVersion: hardwaremanagement.oran.openshift.io/v1alpha1
+$ oc get nodepools.o2ims-hardwaremanagement.oran.openshift.io -n oran-hwmgr-plugin-test np1 -o yaml
+apiVersion: o2ims-hardwaremanagement.oran.openshift.io/v1alpha1
 kind: NodePool
 metadata:
   creationTimestamp: "2024-09-18T17:29:00Z"
@@ -98,8 +98,8 @@ status:
     nodeNames:
     - dummy-sp-64g-1
 
-$ oc get nodes.hardwaremanagement.oran.openshift.io -n oran-hwmgr-plugin-test dummy-sp-64g-1 -o yaml
-apiVersion: hardwaremanagement.oran.openshift.io/v1alpha1
+$ oc get nodes.o2ims-hardwaremanagement.oran.openshift.io -n oran-hwmgr-plugin-test dummy-sp-64g-1 -o yaml
+apiVersion: o2ims-hardwaremanagement.oran.openshift.io/v1alpha1
 kind: Node
 metadata:
   creationTimestamp: "2024-09-18T17:29:11Z"

diff --git a/bundle/manifests/oran-hwmgr-plugin-test.clusterserviceversion.yaml b/bundle/manifests/oran-hwmgr-plugin-test.clusterserviceversion.yaml
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -28,7 +28,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - hardwaremanagement.oran.openshift.io
+  - o2ims-hardwaremanagement.oran.openshift.io
   resources:
   - nodepools
   verbs:
@@ -38,21 +38,21 @@ rules:
   - update
   - watch
 - apiGroups:
-  - hardwaremanagement.oran.openshift.io
+  - o2ims-hardwaremanagement.oran.openshift.io
   resources:
   - nodepools/finalizers
   verbs:
   - update
 - apiGroups:
-  - hardwaremanagement.oran.openshift.io
+  - o2ims-hardwaremanagement.oran.openshift.io
   resources:
   - nodepools/status
   verbs:
   - get
   - patch
   - update
 - apiGroups:
-  - hardwaremanagement.oran.openshift.io
+  - o2ims-hardwaremanagement.oran.openshift.io
   resources:
   - nodes
   verbs:
@@ -64,13 +64,13 @@ rules:
   - update
   - watch
 - apiGroups:
-  - hardwaremanagement.oran.openshift.io
+  - o2ims-hardwaremanagement.oran.openshift.io
   resources:
   - nodes/finalizers
   verbs:
   - update
 - apiGroups:
-  - hardwaremanagement.oran.openshift.io
+  - o2ims-hardwaremanagement.oran.openshift.io
   resources:
   - nodes/status
   verbs:

diff --git a/examples/np1.yaml b/examples/np1.yaml
@@ -1,4 +1,4 @@
-apiVersion: hardwaremanagement.oran.openshift.io/v1alpha1
+apiVersion: o2ims-hardwaremanagement.oran.openshift.io/v1alpha1
 kind: NodePool
 metadata:
   name: np1

diff --git a/examples/np2.yaml b/examples/np2.yaml
@@ -1,4 +1,4 @@
-apiVersion: hardwaremanagement.oran.openshift.io/v1alpha1
+apiVersion: o2ims-hardwaremanagement.oran.openshift.io/v1alpha1
 kind: NodePool
 metadata:
   name: np2

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ toolchain go1.22.5
 require (
 	github.com/onsi/ginkgo/v2 v2.11.0
 	github.com/onsi/gomega v1.27.10
-	github.com/openshift-kni/oran-o2ims/api/hardwaremanagement v0.0.0-20240918174245-ac8a45e122a5
+	github.com/openshift-kni/oran-o2ims/api/hardwaremanagement v0.0.0-20240918195443-604ab4391d40
 	k8s.io/api v0.28.3
 	k8s.io/apimachinery v0.28.4
 	k8s.io/client-go v0.28.3

diff --git a/go.sum b/go.sum
@@ -88,8 +88,8 @@ github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU
 github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
 github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
-github.com/openshift-kni/oran-o2ims/api/hardwaremanagement v0.0.0-20240918174245-ac8a45e122a5 h1:gff7gL/cgi8CVQGYKCxac56vki4NUZzRV6Eov65RP58=
-github.com/openshift-kni/oran-o2ims/api/hardwaremanagement v0.0.0-20240918174245-ac8a45e122a5/go.mod h1:owBMlvtNeWmBGKEdusRCmtIxdxBIFinYlCpaVRfYSoo=
+github.com/openshift-kni/oran-o2ims/api/hardwaremanagement v0.0.0-20240918195443-604ab4391d40 h1:cJZ0uejWtsli0QVEJvS7RKTS1rGH06LtV/PwOtZge7U=
+github.com/openshift-kni/oran-o2ims/api/hardwaremanagement v0.0.0-20240918195443-604ab4391d40/go.mod h1:owBMlvtNeWmBGKEdusRCmtIxdxBIFinYlCpaVRfYSoo=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

diff --git a/internal/controller/hardwaremanagement/nodepool_controller.go b/internal/controller/hardwaremanagement/nodepool_controller.go
@@ -71,12 +71,12 @@ func requeueWithCustomInterval(interval time.Duration) ctrl.Result { // nolint:u
 	return ctrl.Result{RequeueAfter: interval}
 }
 
-//+kubebuilder:rbac:groups=hardwaremanagement.oran.openshift.io,resources=nodepools,verbs=get;list;watch;update;patch
-//+kubebuilder:rbac:groups=hardwaremanagement.oran.openshift.io,resources=nodepools/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=hardwaremanagement.oran.openshift.io,resources=nodepools/finalizers,verbs=update
-//+kubebuilder:rbac:groups=hardwaremanagement.oran.openshift.io,resources=nodes,verbs=get;create;list;watch;update;patch;delete
-//+kubebuilder:rbac:groups=hardwaremanagement.oran.openshift.io,resources=nodes/status,verbs=get;update;patch
-//+kubebuilder:rbac:groups=hardwaremanagement.oran.openshift.io,resources=nodes/finalizers,verbs=update
+//+kubebuilder:rbac:groups=o2ims-hardwaremanagement.oran.openshift.io,resources=nodepools,verbs=get;list;watch;update;patch
+//+kubebuilder:rbac:groups=o2ims-hardwaremanagement.oran.openshift.io,resources=nodepools/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=o2ims-hardwaremanagement.oran.openshift.io,resources=nodepools/finalizers,verbs=update
+//+kubebuilder:rbac:groups=o2ims-hardwaremanagement.oran.openshift.io,resources=nodes,verbs=get;create;list;watch;update;patch;delete
+//+kubebuilder:rbac:groups=o2ims-hardwaremanagement.oran.openshift.io,resources=nodes/status,verbs=get;update;patch
+//+kubebuilder:rbac:groups=o2ims-hardwaremanagement.oran.openshift.io,resources=nodes/finalizers,verbs=update
 //+kubebuilder:rbac:groups="",resources=configmaps,verbs=get;list;create;update;patch;watch
 //+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;create;update;patch;watch;delete
 

diff --git a/vendor/modules.txt b/vendor/modules.txt