omit snapshot 3

api/v1alpha1/condition_types.go

@@ -54,8 +54,8 @@ const (
 	// MarshalFailedReason is used when we fail to marshal a struct.
 	MarshalFailedReason = "MarshalFailed"
 
-	// YamlToJsonDecodeFailedReason is used when we fail to decode yaml to json.
-	YamlToJsonDecodeFailedReason = "YamlToJsonDecodeFailed"
+	// YamlToJSONDecodeFailedReason is used when we fail to decode yaml to json.
+	YamlToJSONDecodeFailedReason = "YamlToJsonDecodeFailed"
 
 	// CreateOCIRepositoryNameFailedReason is used when we fail to create an OCI repository name.
 	CreateOCIRepositoryNameFailedReason = "CreateOCIRepositoryNameFailed"
@@ -105,14 +105,14 @@ const (
 	// CreateTGZFailedReason is used when a TGZ creation failed.
 	CreateTGZFailedReason = "CreateTGZFailed"
 
-	// LocalizationRuleGenerationFailedReason is used when the controller failed to localize an snapshot.
+	// LocalizationRuleGenerationFailedReason is used when the controller failed to localize an OCI artifact.
 	LocalizationRuleGenerationFailedReason = "LocalizationRuleGenerationFailed"
 
 	// LocalizationIsNotReadyReason is used when a controller is waiting to get the localization result.
 	LocalizationIsNotReadyReason = "LocalizationIsNotReady"
 
-	// UniqueIDGenerationFailedReason is used when the controller failed to generate a unique identifier for a pending snapshot.
-	// This can happen if the snapshot is based on multiple other sources but these sources could not be used
+	// UniqueIDGenerationFailedReason is used when the controller failed to generate a unique identifier for a pending OCI artifact.
+	// This can happen if the OCI artifact is based on multiple other sources but these sources could not be used
 	// to determine a unique identifier.
 	UniqueIDGenerationFailedReason = "UniqueIDGenerationFailed"
 

api/v1alpha1/configuredresource_types.go

@@ -85,6 +85,28 @@ func (in *ConfiguredResource) SetTarget(v *ConfigurationReference) {
 	v.DeepCopyInto(&in.Spec.Target)
 }
 
+func (in *ConfiguredResource) GetOCIArtifact() *OCIArtifactInfo {
+	return in.Status.OCIArtifact
+}
+
+// GetOCIRepository returns the name of the OCI repository of the OCI artifact in which the component
+// descriptors are stored.
+func (in *ConfiguredResource) GetOCIRepository() string {
+	return in.Status.OCIArtifact.Repository
+}
+
+// GetManifestDigest returns the manifest digest of the OCI artifact, in which the component descriptors
+// are stored.
+func (in *ConfiguredResource) GetManifestDigest() string {
+	return in.Status.OCIArtifact.Digest
+}
+
+// GetBlobDigest returns the blob digest of the OCI artifact, in which the component descriptors
+// are stored.
+func (in *ConfiguredResource) GetBlobDigest() string {
+	return in.Status.OCIArtifact.Blob.Digest
+}
+
 // ConfiguredResourceStatus defines the observed state of ConfiguredResource.
 type ConfiguredResourceStatus struct {
 	ObservedGeneration int64              `json:"observedGeneration,omitempty"`

api/v1alpha1/localizedresource_types.go

@@ -73,6 +73,28 @@ func (in *LocalizedResource) SetTarget(v *ConfigurationReference) {
 	v.DeepCopyInto(&in.Spec.Target)
 }
 
+func (in *LocalizedResource) GetOCIArtifact() *OCIArtifactInfo {
+	return in.Status.OCIArtifact
+}
+
+// GetOCIRepository returns the name of the OCI repository of the OCI artifact in which the component
+// descriptors are stored.
+func (in *LocalizedResource) GetOCIRepository() string {
+	return in.Status.OCIArtifact.Repository
+}
+
+// GetManifestDigest returns the manifest digest of the OCI artifact, in which the component descriptors
+// are stored.
+func (in *LocalizedResource) GetManifestDigest() string {
+	return in.Status.OCIArtifact.Digest
+}
+
+// GetBlobDigest returns the blob digest of the OCI artifact, in which the component descriptors
+// are stored.
+func (in *LocalizedResource) GetBlobDigest() string {
+	return in.Status.OCIArtifact.Blob.Digest
+}
+
 type LocalizedResourceSpec struct {
 	// Target that is to be localized
 	Target ConfigurationReference `json:"target"`

cmd/main.go

@@ -47,8 +47,7 @@ import (
 	"github.com/open-component-model/ocm-k8s-toolkit/internal/controller/ocmrepository"
 	"github.com/open-component-model/ocm-k8s-toolkit/internal/controller/replication"
 	"github.com/open-component-model/ocm-k8s-toolkit/internal/controller/resource"
-	"github.com/open-component-model/ocm-k8s-toolkit/internal/controller/snapshot"
-	snapshotRegistry "github.com/open-component-model/ocm-k8s-toolkit/pkg/ociartifact"
+	"github.com/open-component-model/ocm-k8s-toolkit/pkg/ociartifact"
 	"github.com/open-component-model/ocm-k8s-toolkit/pkg/ocm"
 )
 
@@ -162,7 +161,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	registry, err := snapshotRegistry.NewRegistry(registryAddr)
+	registry, err := ociartifact.NewRegistry(registryAddr)
 	registry.PlainHTTP = true
 	if err != nil {
 		setupLog.Error(err, "unable to initialize registry object")
@@ -235,18 +234,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	if err = (&snapshot.Reconciler{
-		BaseReconciler: &ocm.BaseReconciler{
-			Client:        mgr.GetClient(),
-			Scheme:        mgr.GetScheme(),
-			EventRecorder: eventsRecorder,
-		},
-		Registry: registry,
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "Snapshot")
-		os.Exit(1)
-	}
-
 	// +kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {

config/crd/kustomization.yaml

@@ -10,10 +10,9 @@ resources:
 - bases/delivery.ocm.software_localizedresources.yaml
 - bases/delivery.ocm.software_configuredresources.yaml
 - bases/delivery.ocm.software_resourceconfigs.yaml
-- bases/delivery.ocm.software_snapshots.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
-patches:
+# patches:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
 # +kubebuilder:scaffold:crdkustomizewebhookpatch

config/rbac/kustomization.yaml

@@ -13,8 +13,6 @@ resources:
 # default, aiding admins in cluster management. Those roles are
 # not used by the Project itself. You can comment the following lines
 # if you do not want those helpers be installed with your Project.
-- snapshot_editor_role.yaml
-- snapshot_viewer_role.yaml
 - replication_editor_role.yaml
 - replication_viewer_role.yaml
 - configuredresource_editor_role.yaml

config/rbac/role.yaml

@@ -36,7 +36,6 @@ rules:
   - ocmrepositories
   - replications
   - resources
-  - snapshots
   verbs:
   - create
   - delete
@@ -53,7 +52,6 @@ rules:
   - localizedresources/finalizers
   - ocmrepositories/finalizers
   - replications/finalizers
-  - snapshots/finalizers
   verbs:
   - update
 - apiGroups:
@@ -65,7 +63,6 @@ rules:
   - ocmrepositories/status
   - replications/status
   - resources/status
-  - snapshots/status
   verbs:
   - get
   - patch

config/samples/kustomization.yaml

@@ -4,5 +4,4 @@ resources:
 - delivery_v1alpha1_component.yaml
 - delivery_v1alpha1_resource.yaml
 - delivery_v1alpha1_replication.yaml
-- delivery_v1alpha1_snapshot.yaml
 # +kubebuilder:scaffold:manifestskustomizesamples

internal/controller/component/component_controller.go

@@ -156,6 +156,7 @@ func (r *Reconciler) reconcileExists(ctx context.Context, component *v1alpha1.Co
 		}
 
 		logger.Info("component is being deleted and cannot be used", "name", component.Name)
+
 		return ctrl.Result{Requeue: true}, nil
 	}