Skip to content

Deprecate AdminPassword and AdminUsername in HorizonTest CR #473

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

Merged
openshift-merge-bot merged 1 commit into from
Jul 28, 2026
+34 −30
Merged

Deprecate AdminPassword and AdminUsername in HorizonTest CR #473

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
22 changes: 12 additions & 10 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 @@ -54,18 +54,22 @@ spec:
operator.
type: string
adminPassword:
default: admin
description: AdminPassword is the password for the OpenStack admin
user.
default: ""
description: |-
WARNING: This parameter will be deprecated!
Please set the password in the OpenStackConfigSecret (secure.yaml) instead.
When this parameter is empty the value is read from the secure.yaml.
AdminPassword is the password for the OpenStack admin user.
maxLength: 253
minLength: 1
type: string
adminUsername:
default: admin
description: AdminUsername is the username for the OpenStack admin
user.
default: ""
description: |-
WARNING: This parameter will be deprecated!
Please set the username in the OpenStackConfigMap (clouds.yaml) instead.
When this parameter is empty the value is read from the clouds.yaml.
AdminUsername is the username for the OpenStack admin user.
maxLength: 253
minLength: 1
type: string
authUrl:
description: AuthUrl is the authentication URL for OpenStack.
Expand Down Expand Up @@ -1457,8 +1461,6 @@ spec:
maxLength: 253
type: string
required:
- adminPassword
- adminUsername
- authUrl
- dashboardUrl
- horizonRepoBranch
Expand Down
16 changes: 10 additions & 6 deletions api/v1beta1/horizontest_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,23 @@ type HorizonTestSpec struct {
// on the u/s or d/s theme
ProjectTextXpath string `json:"projectTextXpath"`

// +kubebuilder:validation:Required
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:Optional
// +kubebuilder:validation:MaxLength=253
// +operator-sdk:csv:customresourcedefinitions:type=spec
// +kubebuilder:default:="admin"
// +kubebuilder:default:=""
// WARNING: This parameter will be deprecated!
// Please set the username in the OpenStackConfigMap (clouds.yaml) instead.
// When this parameter is empty the value is read from the clouds.yaml.
// AdminUsername is the username for the OpenStack admin user.
AdminUsername string `json:"adminUsername"`

// +kubebuilder:validation:Required
// +kubebuilder:validation:MinLength=1
// +kubebuilder:validation:Optional
// +kubebuilder:validation:MaxLength=253
// +operator-sdk:csv:customresourcedefinitions:type=spec
// +kubebuilder:default:="admin"
// +kubebuilder:default:=""
// WARNING: This parameter will be deprecated!
// Please set the password in the OpenStackConfigSecret (secure.yaml) instead.
// When this parameter is empty the value is read from the secure.yaml.
// AdminPassword is the password for the OpenStack admin user.
AdminPassword string `json:"adminPassword"`

Expand Down
22 changes: 12 additions & 10 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 @@ -54,18 +54,22 @@ spec:
operator.
type: string
adminPassword:
default: admin
description: AdminPassword is the password for the OpenStack admin
user.
default: ""
description: |-
WARNING: This parameter will be deprecated!
Please set the password in the OpenStackConfigSecret (secure.yaml) instead.
When this parameter is empty the value is read from the secure.yaml.
AdminPassword is the password for the OpenStack admin user.
maxLength: 253
minLength: 1
type: string
adminUsername:
default: admin
description: AdminUsername is the username for the OpenStack admin
user.
default: ""
description: |-
WARNING: This parameter will be deprecated!
Please set the username in the OpenStackConfigMap (clouds.yaml) instead.
When this parameter is empty the value is read from the clouds.yaml.
AdminUsername is the username for the OpenStack admin user.
maxLength: 253
minLength: 1
type: string
authUrl:
description: AuthUrl is the authentication URL for OpenStack.
Expand Down Expand Up @@ -1457,8 +1461,6 @@ spec:
maxLength: 253
type: string
required:
- adminPassword
- adminUsername
- authUrl
- dashboardUrl
- horizonRepoBranch
Expand Down
4 changes: 0 additions & 4 deletions config/samples/test_v1beta1_horizontest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ spec:
# debug: false
storageClass: "local-storage"

# OpenStack admin credentials
adminUsername: "admin"
adminPassword: "12345678"

# The URL of the Horizon dashboard
dashboardUrl: "https://horizon-openstack.apps.ocp.openstack.lab/"

Expand Down