externalize & improve source package

Signed-off-by: Bryce Palmer <[email protected]>

Makefile

@@ -76,6 +76,7 @@ generate: $(CONTROLLER_GEN) ## Generate code and manifests
 	$(Q)$(CONTROLLER_GEN) crd:crdVersions=v1,generateEmbeddedObjectMeta=true output:crd:dir=./manifests/apis/crds paths=./api/...
 	$(Q)$(CONTROLLER_GEN) webhook paths=./api/... paths=./internal/webhook/... output:stdout > ./manifests/apis/webhooks/resources/webhook.yaml
 	$(Q)$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./api/...
+	$(Q)$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./pkg/source/...
 	$(Q)$(CONTROLLER_GEN) rbac:roleName=core-admin \
 		paths=./internal/controllers/bundle/... \
 		paths=./internal/controllers/bundledeployment/... \

api/v1alpha1/bundle_types.go

@@ -17,24 +17,17 @@ limitations under the License.
 package v1alpha1
 
 import (
-	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/operator-framework/rukpak/pkg/source"
 )
 
 var (
 	BundleGVK  = SchemeBuilder.GroupVersion.WithKind("Bundle")
 	BundleKind = BundleGVK.Kind
 )
 
-type SourceType string
-
 const (
-	SourceTypeImage      SourceType = "image"
-	SourceTypeGit        SourceType = "git"
-	SourceTypeConfigMaps SourceType = "configMaps"
-	SourceTypeUpload     SourceType = "upload"
-	SourceTypeHTTP       SourceType = "http"
-
 	TypeUnpacked = "Unpacked"
 
 	ReasonUnpackPending             = "UnpackPending"
@@ -55,105 +48,15 @@ type BundleSpec struct {
 	// ProvisionerClassName sets the name of the provisioner that should reconcile this BundleDeployment.
 	ProvisionerClassName string `json:"provisionerClassName"`
 	// Source defines the configuration for the underlying Bundle content.
-	Source BundleSource `json:"source"`
-}
-
-type BundleSource struct {
-	// Type defines the kind of Bundle content being sourced.
-	Type SourceType `json:"type"`
-	// Image is the bundle image that backs the content of this bundle.
-	Image *ImageSource `json:"image,omitempty"`
-	// Git is the git repository that backs the content of this Bundle.
-	Git *GitSource `json:"git,omitempty"`
-	// ConfigMaps is a list of config map references and their relative
-	// directory paths that represent a bundle filesystem.
-	ConfigMaps []ConfigMapSource `json:"configMaps,omitempty"`
-	// Upload is a source that enables this Bundle's content to be uploaded
-	// via Rukpak's bundle upload service. This source type is primarily useful
-	// with bundle development workflows because it enables bundle developers
-	// to inject a local bundle directly into the cluster.
-	Upload *UploadSource `json:"upload,omitempty"`
-	//  HTTP is the remote location that backs the content of this Bundle.
-	HTTP *HTTPSource `json:"http,omitempty"`
-}
-
-type ImageSource struct {
-	// Ref contains the reference to a container image containing Bundle contents.
-	Ref string `json:"ref"`
-	// ImagePullSecretName contains the name of the image pull secret in the namespace that the provisioner is deployed.
-	ImagePullSecretName string `json:"pullSecret,omitempty"`
-}
-
-type GitSource struct {
-	// Repository is a URL link to the git repository containing the bundle.
-	// Repository is required and the URL should be parsable by a standard git tool.
-	Repository string `json:"repository"`
-	// Directory refers to the location of the bundle within the git repository.
-	// Directory is optional and if not set defaults to ./manifests.
-	Directory string `json:"directory,omitempty"`
-	// Ref configures the git source to clone a specific branch, tag, or commit
-	// from the specified repo. Ref is required, and exactly one field within Ref
-	// is required. Setting more than one field or zero fields will result in an
-	// error.
-	Ref GitRef `json:"ref"`
-	// Auth configures the authorization method if necessary.
-	Auth Authorization `json:"auth,omitempty"`
-}
-
-type ConfigMapSource struct {
-	// ConfigMap is a reference to a configmap in the rukpak system namespace
-	ConfigMap corev1.LocalObjectReference `json:"configMap"`
-	// Path is the relative directory path within the bundle where the files
-	// from the configmap will be present when the bundle is unpacked.
-	Path string `json:"path,omitempty"`
-}
-
-type HTTPSource struct {
-	// URL is where the bundle contents is.
-	URL string `json:"url"`
-	// Auth configures the authorization method if necessary.
-	Auth Authorization `json:"auth,omitempty"`
-}
-
-type ConfigMapRef struct {
-	Name      string `json:"name"`
-	Namespace string `json:"namespace"`
+	Source source.Source `json:"source"`
 }
 
-type GitRef struct {
-	// Branch refers to the branch to checkout from the repository.
-	// The Branch should contain the bundle manifests in the specified directory.
-	Branch string `json:"branch,omitempty"`
-	// Tag refers to the tag to checkout from the repository.
-	// The Tag should contain the bundle manifests in the specified directory.
-	Tag string `json:"tag,omitempty"`
-	// Commit refers to the commit to checkout from the repository.
-	// The Commit should contain the bundle manifests in the specified directory.
-	Commit string `json:"commit,omitempty"`
-}
-
-type Authorization struct {
-	// Secret contains reference to the secret that has authorization information and is in the namespace that the provisioner is deployed.
-	// The secret is expected to contain `data.username` and `data.password` for the username and password, respectively for http(s) scheme.
-	// Refer to https://kubernetes.io/docs/concepts/configuration/secret/#basic-authentication-secret
-	// For the ssh authorization of the GitSource, the secret is expected to contain `data.ssh-privatekey` and `data.ssh-knownhosts` for the ssh privatekey and the host entry in the known_hosts file respectively.
-	// Refer to https://kubernetes.io/docs/concepts/configuration/secret/#ssh-authentication-secrets
-	Secret corev1.LocalObjectReference `json:"secret,omitempty"`
-	// InsecureSkipVerify controls whether a client verifies the server's certificate chain and host name. If InsecureSkipVerify
-	// is true, the clone operation will accept any certificate presented by the server and any host name in that
-	// certificate. In this mode, TLS is susceptible to machine-in-the-middle attacks unless custom verification is
-	// used. This should be used only for testing.
-	InsecureSkipVerify bool `json:"insecureSkipVerify,omitempty"`
-}
-
-type UploadSource struct{}
-
 type ProvisionerID string
 
 // BundleStatus defines the observed state of Bundle
 type BundleStatus struct {
 	Phase              string             `json:"phase,omitempty"`
-	ResolvedSource     *BundleSource      `json:"resolvedSource,omitempty"`
+	ResolvedSource     *source.Source     `json:"resolvedSource,omitempty"`
 	ObservedGeneration int64              `json:"observedGeneration,omitempty"`
 	Conditions         []metav1.Condition `json:"conditions,omitempty"`
 	ContentURL         string             `json:"contentURL,omitempty"`