Merge pull request openstack-k8s-operators#842 from stuggi/osclient_i…

…mage Introduce OpenStackClientSpecCore
stuggi · Jun 12, 2024 · dc1db38 · dc1db38
2 parents ee07591 + 733c087
commit dc1db38
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 11 deletions.
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -11041,8 +11041,6 @@ spec:
                     properties:
                       caBundleSecretName:
                         type: string
-                      containerImage:
-                        type: string
                       nodeSelector:
                         additionalProperties:
                           type: string
@@ -11054,7 +11052,6 @@ spec:
                         default: openstack-config-secret
                         type: string
                     required:
-                    - containerImage
                     - openStackConfigMap
                     - openStackConfigSecret
                     type: object

diff --git a/apis/client/v1beta1/openstackclient_types.go b/apis/client/v1beta1/openstackclient_types.go
@@ -29,10 +29,15 @@ const (
 
 // OpenStackClientSpec defines the desired state of OpenStackClient
 type OpenStackClientSpec struct {
+	OpenStackClientSpecCore `json:",inline"`
+
 	// +kubebuilder:validation:Required
 	// ContainerImage for the the OpenstackClient container (will be set to environmental default if empty)
 	ContainerImage string `json:"containerImage"`
+}
 
+// OpenStackClientSpecCore defines the desired state of OpenStackClient
+type OpenStackClientSpecCore struct {
 	// +kubebuilder:validation:Required
 	// +kubebuilder:default=openstack-config
 	// OpenStackConfigMap is the name of the ConfigMap containing the clouds.yaml

diff --git a/apis/client/v1beta1/zz_generated.deepcopy.go b/apis/client/v1beta1/zz_generated.deepcopy.go
diff --git a/apis/core/v1beta1/openstackcontrolplane_types.go b/apis/core/v1beta1/openstackcontrolplane_types.go
@@ -748,7 +748,7 @@ type OpenStackClientSection struct {
 	// +kubebuilder:validation:Optional
 	//+operator-sdk:csv:customresourcedefinitions:type=spec
 	// Template - Overrides to use when creating the OpenStackClient Resource
-	Template v1beta1.OpenStackClientSpec `json:"template,omitempty"`
+	Template v1beta1.OpenStackClientSpecCore `json:"template,omitempty"`
 }
 
 // OpenStackControlPlaneStatus defines the observed state of OpenStackControlPlane

diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -11041,8 +11041,6 @@ spec:
                     properties:
                       caBundleSecretName:
                         type: string
-                      containerImage:
-                        type: string
                       nodeSelector:
                         additionalProperties:
                           type: string
@@ -11054,7 +11052,6 @@ spec:
                         default: openstack-config-secret
                         type: string
                     required:
-                    - containerImage
                     - openStackConfigMap
                     - openStackConfigSecret
                     type: object

diff --git a/pkg/openstack/openstackclient.go b/pkg/openstack/openstackclient.go
@@ -45,7 +45,7 @@ func ReconcileOpenStackClient(ctx context.Context, instance *corev1.OpenStackCon
 
 	Log.Info("Reconciling OpenStackClient", "OpenStackClient.Namespace", instance.Namespace, "OpenStackClient.Name", openstackclient.Name)
 	op, err := controllerutil.CreateOrPatch(ctx, helper.GetClient(), openstackclient, func() error {
-		instance.Spec.OpenStackClient.Template.DeepCopyInto(&openstackclient.Spec)
+		instance.Spec.OpenStackClient.Template.DeepCopyInto(&openstackclient.Spec.OpenStackClientSpecCore)
 
 		openstackclient.Spec.ContainerImage = *version.Status.ContainerImages.OpenstackClientImage