Merge pull request #538 from willie-yao/upstream-install-aso-crds

✨ Add support for customizing additional provider deployments

Author: k8s-ci-robot

api/v1alpha1/provider_conversion.go

@@ -46,6 +46,7 @@ func (src *BootstrapProvider) ConvertTo(dstRaw conversion.Hub) error {
 	}
 
 	dst.Spec.ManifestPatches = restored.Spec.ManifestPatches
+	dst.Spec.AdditionalDeployments = restored.Spec.AdditionalDeployments
 
 	return nil
 }
@@ -107,6 +108,7 @@ func (src *ControlPlaneProvider) ConvertTo(dstRaw conversion.Hub) error {
 	}
 
 	dst.Spec.ManifestPatches = restored.Spec.ManifestPatches
+	dst.Spec.AdditionalDeployments = restored.Spec.AdditionalDeployments
 
 	return nil
 }
@@ -168,6 +170,7 @@ func (src *CoreProvider) ConvertTo(dstRaw conversion.Hub) error {
 	}
 
 	dst.Spec.ManifestPatches = restored.Spec.ManifestPatches
+	dst.Spec.AdditionalDeployments = restored.Spec.AdditionalDeployments
 
 	return nil
 }
@@ -229,6 +232,7 @@ func (src *InfrastructureProvider) ConvertTo(dstRaw conversion.Hub) error {
 	}
 
 	dst.Spec.ManifestPatches = restored.Spec.ManifestPatches
+	dst.Spec.AdditionalDeployments = restored.Spec.AdditionalDeployments
 
 	return nil
 }

api/v1alpha1/zz_generated.conversion.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]AdditionalDeployments `json:"additionalDeployments,omitempty"`
+}
+
+// AdditionalDeployments defines the properties that can be enabled on the controller
+// manager and deployment for the provider if the provider is managing additional deployments.
+type AdditionalDeployments 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.