Skip to content

Remove unused fields from HorizonTest CR #474

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

Open
kstrenkova wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove unused fields from HorizonTest CR #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 0 additions & 17 deletions api/bases/test.openstack.org_horizontests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,12 +1298,6 @@ spec:
default: false
description: Parallel
type: boolean
password:
default: horizontest
description: Password is the password for the user running the Horizon
tests.
maxLength: 253
type: string
privileged:
default: false
description: |-
Expand All @@ -1315,11 +1309,6 @@ spec:
needed for certain test-operator functionalities to work properly (e.g.:
extraRPMs in Tempest CR, or a certain set of tobiko tests).
type: boolean
projectName:
default: horizontest
description: ProjectName is the name of the OpenStack project for
Horizon tests.
type: string
projectNameXpath:
description: |-
ProjectNameXpath is the xpath to select project name
Expand Down Expand Up @@ -1450,12 +1439,6 @@ spec:
type: string
type: object
type: array
user:
default: horizontest
description: User is the username under which the Horizon tests will
run.
maxLength: 253
type: string
required:
- adminPassword
- adminUsername
Expand Down
20 changes: 0 additions & 20 deletions api/v1beta1/horizontest_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,26 +107,6 @@ type HorizonTestSpec struct {
// ImageUrl is the URL to download the Cirros image.
ImageUrl string `json:"imageUrl"`

// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// +kubebuilder:default:="horizontest"
// ProjectName is the name of the OpenStack project for Horizon tests.
ProjectName string `json:"projectName"`

// +kubebuilder:validation:Optional
// +kubebuilder:validation:MaxLength=253
// +operator-sdk:csv:customresourcedefinitions:type=spec
// +kubebuilder:default:="horizontest"
// User is the username under which the Horizon tests will run.
User string `json:"user"`

// +kubebuilder:validation:Optional
// +kubebuilder:validation:MaxLength=253
// +operator-sdk:csv:customresourcedefinitions:type=spec
// +kubebuilder:default:="horizontest"
// Password is the password for the user running the Horizon tests.
Password string `json:"password"`

// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// +kubebuilder:default:="m1.tiny"
Expand Down
17 changes: 0 additions & 17 deletions config/crd/bases/test.openstack.org_horizontests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,12 +1298,6 @@ spec:
default: false
description: Parallel
type: boolean
password:
default: horizontest
description: Password is the password for the user running the Horizon
tests.
maxLength: 253
type: string
privileged:
default: false
description: |-
Expand All @@ -1315,11 +1309,6 @@ spec:
needed for certain test-operator functionalities to work properly (e.g.:
extraRPMs in Tempest CR, or a certain set of tobiko tests).
type: boolean
projectName:
default: horizontest
description: ProjectName is the name of the OpenStack project for
Horizon tests.
type: string
projectNameXpath:
description: |-
ProjectNameXpath is the xpath to select project name
Expand Down Expand Up @@ -1450,12 +1439,6 @@ spec:
type: string
type: object
type: array
user:
default: horizontest
description: User is the username under which the Horizon tests will
run.
maxLength: 253
type: string
required:
- adminPassword
- adminUsername
Expand Down
9 changes: 0 additions & 9 deletions config/samples/test_v1beta1_horizontest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,6 @@ spec:
# The URL to download the Cirros image (optional)
imageUrl: "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img"

# The name of the OpenStack project for Horizon tests (optional)
projectName: "horizontest"

# The username under which Horizon tests will run (optional)
user: "horizontest"

# The password for the user running the Horizon tests (optional)
password: "horizontest"

# The name of the OpenStack flavor to create for Horizon tests (optional)
flavorName: "m1.tiny"

Expand Down
3 changes: 0 additions & 3 deletions internal/controller/horizontest_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,6 @@ func (r *HorizonTestReconciler) PrepareHorizonTestEnvVars(
"IMAGE_FILE": "/var/lib/horizontest/cirros-0.6.2-x86_64-disk.img",
"IMAGE_FILE_NAME": "cirros-0.6.2-x86_64-disk",
"IMAGE_URL": "http://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img",
"PROJECT_NAME": "horizontest",
"USER_NAME": "horizontest",
"PASSWORD": "horizontest",
"FLAVOR_NAME": "m1.tiny",
"HORIZON_KEYS_FOLDER": "/etc/test_operator",
"EXTRA_FLAG": instance.Spec.ExtraFlag,
Expand Down