Add support for customizing additional provider deployments

api/v1alpha1/provider_conversion.go

@@ -46,6 +46,11 @@ func (src *BootstrapProvider) ConvertTo(dstRaw conversion.Hub) error {
  }
 
  dst.Spec.ManifestPatches = restored.Spec.ManifestPatches
+ dst.Spec.AdditionalDeployments = restored.Spec.AdditionalDeployments
+
+ if restored.Spec.Manager != nil {
+ dst.Spec.Manager.CRDPattern = restored.Spec.Manager.CRDPattern
+ }
 
  return nil
 }
@@ -107,6 +112,11 @@ func (src *ControlPlaneProvider) ConvertTo(dstRaw conversion.Hub) error {
  }
 
  dst.Spec.ManifestPatches = restored.Spec.ManifestPatches
+ dst.Spec.AdditionalDeployments = restored.Spec.AdditionalDeployments
+
+ if restored.Spec.Manager != nil {
+ dst.Spec.Manager.CRDPattern = restored.Spec.Manager.CRDPattern
+ }
 
  return nil
 }
@@ -168,6 +178,11 @@ func (src *CoreProvider) ConvertTo(dstRaw conversion.Hub) error {
  }
 
  dst.Spec.ManifestPatches = restored.Spec.ManifestPatches
+ dst.Spec.AdditionalDeployments = restored.Spec.AdditionalDeployments
+
+ if restored.Spec.Manager != nil {
+ dst.Spec.Manager.CRDPattern = restored.Spec.Manager.CRDPattern
+ }
 
  return nil
 }
@@ -229,6 +244,11 @@ func (src *InfrastructureProvider) ConvertTo(dstRaw conversion.Hub) error {
  }
 
  dst.Spec.ManifestPatches = restored.Spec.ManifestPatches
+ dst.Spec.AdditionalDeployments = restored.Spec.AdditionalDeployments
+
+ if restored.Spec.Manager != nil {
+ dst.Spec.Manager.CRDPattern = restored.Spec.Manager.CRDPattern
+ }
 
  return nil
 }

api/v1alpha2/provider_types.go

@@ -73,6 +73,24 @@ type ProviderSpec struct {
  // This should be an inline yaml blob-string https://datatracker.ietf.org/doc/html/rfc7396
  // +optional
  ManifestPatches []string `json:"manifestPatches,omitempty"`
+
+ // AdditionalDeployments is a map of additional deployments that the provider
+ // should manage. The key is the name of the deployment and the value is the
+ // DeploymentSpec.
+ // +optional
+ AdditionalDeployments map[string]AdditionalProviderCustomization `json:"additionalDeployments,omitempty"`
+}
+
+// AdditionalProviderCustomization defines the properties that can be enabled on the controller
+// manager and deployment for the provider if the provider is managing additional deployments.
+type AdditionalProviderCustomization struct {
+ // Manager defines the properties that can be enabled on the controller manager for the additional provider deployment.
+ // +optional
+ Manager *ManagerSpec `json:"manager,omitempty"`
+
+ // Deployment defines the properties that can be enabled on the deployment for the additional provider deployment.
+ // +optional
+ Deployment *DeploymentSpec `json:"deployment,omitempty"`
 }
 
 // ConfigmapReference contains enough information to locate the configmap.
@@ -123,6 +141,11 @@ type ManagerSpec struct {
  // in as container args to the provider's controller manager.
  // Controller Manager flag is --feature-gates.
  FeatureGates map[string]bool `json:"featureGates,omitempty"`
+
+ // CRDPattern is a regular expression that matches the CRDs that the provider
+ // is expected to manage.
+ // +optional
+ CRDPattern *string `json:"crdPattern,omitempty"`
 }
 
 // DeploymentSpec defines the properties that can be enabled on the Deployment for the provider.