Merge pull request #39 from openshift-cherrypick-robot/cherry-pick-34…

…-to-release-0.1 [release-0.1] CRDs are namespaced
medik8s · Apr 18, 2023 · 5c15368 · 5c15368
2 parents 783dcaa + 9632a6c
commit 5c15368
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/api/v1alpha1/fenceagentsremediation_types.go b/api/v1alpha1/fenceagentsremediation_types.go
@@ -49,7 +49,7 @@ type FenceAgentsRemediationStatus struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
-//+kubebuilder:resource:scope=Cluster,shortName=far
+//+kubebuilder:resource:shortName=far
 
 // +operator-sdk:csv:customresourcedefinitions:resources={{"FenceAgentsRemediation","v1alpha1","fenceagentsremediations"}}
 // FenceAgentsRemediation is the Schema for the fenceagentsremediations API

diff --git a/api/v1alpha1/fenceagentsremediationtemplate_types.go b/api/v1alpha1/fenceagentsremediationtemplate_types.go
@@ -45,7 +45,7 @@ type FenceAgentsRemediationTemplateStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-//+kubebuilder:resource:scope=Cluster,shortName=fart
+//+kubebuilder:resource:shortName=fart
 
 // FenceAgentsRemediationTemplate is the Schema for the fenceagentsremediationtemplates API
 // +operator-sdk:csv:customresourcedefinitions:resources={{"FenceAgentsRemediationTemplate","v1alpha1","fenceagentsremediationtemplates"}}

diff --git a/bundle/manifests/fence-agents-remediation.medik8s.io_fenceagentsremediations.yaml b/bundle/manifests/fence-agents-remediation.medik8s.io_fenceagentsremediations.yaml
@@ -16,7 +16,7 @@ spec:
     shortNames:
     - far
     singular: fenceagentsremediation
-  scope: Cluster
+  scope: Namespaced
   versions:
   - name: v1alpha1
     schema:

diff --git a/bundle/manifests/fence-agents-remediation.medik8s.io_fenceagentsremediationtemplates.yaml b/bundle/manifests/fence-agents-remediation.medik8s.io_fenceagentsremediationtemplates.yaml
@@ -16,7 +16,7 @@ spec:
     shortNames:
     - fart
     singular: fenceagentsremediationtemplate
-  scope: Cluster
+  scope: Namespaced
   versions:
   - name: v1alpha1
     schema:

diff --git a/config/crd/bases/fence-agents-remediation.medik8s.io_fenceagentsremediations.yaml b/config/crd/bases/fence-agents-remediation.medik8s.io_fenceagentsremediations.yaml
@@ -15,7 +15,7 @@ spec:
     shortNames:
     - far
     singular: fenceagentsremediation
-  scope: Cluster
+  scope: Namespaced
   versions:
   - name: v1alpha1
     schema:

diff --git a/config/crd/bases/fence-agents-remediation.medik8s.io_fenceagentsremediationtemplates.yaml b/config/crd/bases/fence-agents-remediation.medik8s.io_fenceagentsremediationtemplates.yaml
@@ -15,7 +15,7 @@ spec:
     shortNames:
     - fart
     singular: fenceagentsremediationtemplate
-  scope: Cluster
+  scope: Namespaced
   versions:
   - name: v1alpha1
     schema:

diff --git a/test/e2e/far_e2e_test.go b/test/e2e/far_e2e_test.go
@@ -14,7 +14,10 @@ import (
 	"github.com/medik8s/fence-agents-remediation/api/v1alpha1"
 )
 
-const fenceAgentDummyName = "echo"
+const (
+	fenceAgentDummyName = "echo"
+	testNamespace       = "openshift-operators"
+)
 
 var _ = Describe("FAR E2e", func() {
 	Context("fence agent - dummy", func() {
@@ -41,7 +44,7 @@ var _ = Describe("FAR E2e", func() {
 // createFAR assigns the input to FenceAgentsRemediation object, creates CR with offset, and returns the CR object
 func createFAR(nodeName string, agent string, sharedParameters map[v1alpha1.ParameterName]string, nodeParameters map[v1alpha1.ParameterName]map[v1alpha1.NodeName]string) *v1alpha1.FenceAgentsRemediation {
 	far := &v1alpha1.FenceAgentsRemediation{
-		ObjectMeta: metav1.ObjectMeta{Name: nodeName},
+		ObjectMeta: metav1.ObjectMeta{Name: nodeName, Namespace: testNamespace},
 		Spec: v1alpha1.FenceAgentsRemediationSpec{
 			Agent:            agent,
 			SharedParameters: sharedParameters,