Skip to content

Commit c8d39f5

Browse files
committed
[OSPRH-10186] Fix OpenStackVersion defaults setup
1 parent 8eb817a commit c8d39f5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

apis/core/v1beta1/openstackversion_webhook.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var versionWebhookClient goClient.Client
3737

3838
// OpenStackVersionDefaults -
3939
type OpenStackVersionDefaults struct {
40-
availableVersion string
40+
AvailableVersion string
4141
}
4242

4343
var openstackVersionDefaults OpenStackVersionDefaults
@@ -71,7 +71,7 @@ var _ webhook.Defaulter = &OpenStackVersion{}
7171
func (r *OpenStackVersion) Default() {
7272
openstackversionlog.Info("default", "name", r.Name)
7373
if r.Spec.TargetVersion == "" {
74-
r.Spec.TargetVersion = openstackVersionDefaults.availableVersion
74+
r.Spec.TargetVersion = openstackVersionDefaults.AvailableVersion
7575
}
7676

7777
// TODO(user): fill in your defaulting logic.
@@ -86,7 +86,7 @@ var _ webhook.Validator = &OpenStackVersion{}
8686
func (r *OpenStackVersion) ValidateCreate() (admission.Warnings, error) {
8787
openstackversionlog.Info("validate create", "name", r.Name)
8888

89-
if r.Spec.TargetVersion != openstackVersionDefaults.availableVersion {
89+
if r.Spec.TargetVersion != openstackVersionDefaults.AvailableVersion {
9090
return nil, apierrors.NewForbidden(
9191
schema.GroupResource{
9292
Group: GroupVersion.WithKind("OpenStackVersion").Group,
@@ -145,7 +145,7 @@ func (r *OpenStackVersion) ValidateUpdate(old runtime.Object) (admission.Warning
145145
openstackversionlog.Info("validate update", "name", r.Name)
146146

147147
_, ok := r.Status.ContainerImageVersionDefaults[r.Spec.TargetVersion]
148-
if r.Spec.TargetVersion != openstackVersionDefaults.availableVersion && !ok {
148+
if r.Spec.TargetVersion != openstackVersionDefaults.AvailableVersion && !ok {
149149
return nil, apierrors.NewForbidden(
150150
schema.GroupResource{
151151
Group: GroupVersion.WithKind("OpenStackVersion").Group,
@@ -173,7 +173,7 @@ func (r *OpenStackVersion) ValidateDelete() (admission.Warnings, error) {
173173
// SetupVersionDefaults -
174174
func SetupVersionDefaults() {
175175
openstackVersionDefaults := OpenStackVersionDefaults{
176-
availableVersion: util.GetEnvVar("OPENSTACK_RELEASE_VERSION", ""),
176+
AvailableVersion: util.GetEnvVar("OPENSTACK_RELEASE_VERSION", ""),
177177
}
178178

179179
SetupOpenStackVersionDefaults(openstackVersionDefaults)

0 commit comments

Comments
 (0)