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

[release-0.1] CRDs are namespaced #39

Merged
merged 2 commits into from
Apr 18, 2023
Merged

[release-0.1] CRDs are namespaced #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc4a09c
CRDS are namespaced
razo7 Apr 16, 2023
9632a6c
Add test namespace
razo7 Apr 17, 2023
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
2 changes: 1 addition & 1 deletion api/v1alpha1/fenceagentsremediation_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/fenceagentsremediationtemplate_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"}}
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/fence-agents-remediation.medik8s.io_fenceagentsremediations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
shortNames:
- far
singular: fenceagentsremediation
scope: Cluster
scope: Namespaced
versions:
- name: v1alpha1
schema:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/fence-agents-remediation.medik8s.io_fenceagentsremediationtemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
shortNames:
- fart
singular: fenceagentsremediationtemplate
scope: Cluster
scope: Namespaced
versions:
- name: v1alpha1
schema:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/fence-agents-remediation.medik8s.io_fenceagentsremediations.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
shortNames:
- far
singular: fenceagentsremediation
scope: Cluster
scope: Namespaced
versions:
- name: v1alpha1
schema:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/fence-agents-remediation.medik8s.io_fenceagentsremediationtemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
shortNames:
- fart
singular: fenceagentsremediationtemplate
scope: Cluster
scope: Namespaced
versions:
- name: v1alpha1
schema:
Expand Down
7 changes: 5 additions & 2 deletions test/e2e/far_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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,
Expand Down