Merge pull request openstack-k8s-operators#384 from dprince/core_api

Add KeystoneAPISpecCore struct

Author: openshift-merge-bot[bot]

api/bases/keystone.openstack.org_keystoneapis.yaml

@@ -46,7 +46,6 @@ spec:
           metadata:
             type: object
           spec:
-            description: KeystoneAPISpec defines the desired state of KeystoneAPI
             properties:
               adminProject:
                 default: admin

api/test/helpers/crd.go

@@ -110,10 +110,12 @@ func (th *TestHelper) CreateKeystoneAPIWithFixture(
 			Namespace: namespace,
 		},
 		Spec: keystonev1.KeystoneAPISpec{
-			Secret:    n + "-secret",
-			AdminUser: "admin",
-			PasswordSelectors: keystonev1.PasswordSelector{
-				Admin: "admin-password",
+			KeystoneAPISpecCore: keystonev1.KeystoneAPISpecCore{
+				Secret:    n + "-secret",
+				AdminUser: "admin",
+				PasswordSelectors: keystonev1.PasswordSelector{
+					Admin: "admin-password",
+				},
 			},
 		},
 	}

api/v1beta1/keystoneapi_types.go

@@ -47,8 +47,16 @@ const (
 	KeystoneAPIContainerImage = "quay.io/podified-antelope-centos9/openstack-keystone:current-podified"
 )
 
-// KeystoneAPISpec defines the desired state of KeystoneAPI
 type KeystoneAPISpec struct {
+	KeystoneAPISpecCore `json:",inline"`
+
+	// +kubebuilder:validation:Required
+	// Keystone Container Image URL (will be set to environmental default if empty)
+	ContainerImage string `json:"containerImage"`
+}
+
+// KeystoneAPISpec defines the desired state of KeystoneAPI
+type KeystoneAPISpecCore struct {
 	// +kubebuilder:validation:Required
 	// MariaDB instance name
 	// Right now required by the maridb-operator to get the credentials from the instance to create the DB
@@ -81,10 +89,6 @@ type KeystoneAPISpec struct {
 	// AdminUser - admin user name
 	AdminUser string `json:"adminUser"`
 
-	// +kubebuilder:validation:Required
-	// Keystone Container Image URL (will be set to environmental default if empty)
-	ContainerImage string `json:"containerImage"`
-
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=1
 	// +kubebuilder:validation:Maximum=32

api/v1beta1/keystoneapi_webhook.go

@@ -61,14 +61,22 @@ var _ webhook.Defaulter = &KeystoneAPI{}
 func (r *KeystoneAPI) Default() {
 	keystoneapilog.Info("default", "name", r.Name)
 
+	if r.Spec.ContainerImage == "" {
+		r.Spec.ContainerImage = keystoneAPIDefaults.ContainerImageURL
+	}
 	r.Spec.Default()
 }
 
 // Default - set defaults for this KeystoneAPI spec
 func (spec *KeystoneAPISpec) Default() {
-	if spec.ContainerImage == "" {
-		spec.ContainerImage = keystoneAPIDefaults.ContainerImageURL
-	}
+	// no defaults to set yet
+	spec.KeystoneAPISpecCore.Default()
+}
+
+// Default - set defaults for this KeystoneAPI core spec
+// NOTE: only this version is used by OpenStackOperators webhook
+func (spec *KeystoneAPISpecCore) Default() {
+	// no defaults to set yet
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.

api/v1beta1/zz_generated.deepcopy.go

@@ -46,7 +46,6 @@ spec:
           metadata:
             type: object
           spec:
-            description: KeystoneAPISpec defines the desired state of KeystoneAPI
             properties:
               adminProject:
                 default: admin