!feat: migrate module manager to declarative v2 (#203)

* !feat: migrate module manager to declarative v2

* !feat: migrate module manager to declarative v2 / remove declarative v1

* !feat: migrate module manager to declarative v2 / remove declarative v1

* !feat: migrate module manager to declarative v2 / remove declarative v1

* chore: fixup ci rate limit

* chore: remaining tests and removal of todos

* chore: enable periodic consistency check

* chore: cleanup & dep updates

* chore: add configurable log level to mm

* chore: apply QPS/Burts from KCP clients into SKR

* chore: make status fields optional

* chore: move crd get after prerequisite connection check

* chore: fixup always setting conditions to false in initialize

* feat: introduce parsing cache

* feat: manifest custom ready check

* chore: avoid chart loading when not handlin prerequisites

* !!feat: crazy async syncs

* Revert "!!feat: crazy async syncs"

This reverts commit 2322bbe.

* chore: add omitempty in favor of optional

Author: jakobmoellerdev

.github/workflows/ci.yml

@@ -93,12 +93,15 @@ jobs:
       - name: Override Kustomize Controller Image TAG in Pull Request to PR Image
         if: github.event_name == 'pull_request'
         run: |
-          wget -qO - "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
+          wget --header="Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+            -qO - "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" | bash
           mv kustomize /usr/local/bin/
           cd $(go env GOPATH)/src/github.com/${{ github.repository }}/config/manager
           kustomize edit set image controller="*:PR-${{ github.event.pull_request.number }}"
       - name: Set up k3d
-        run: wget -qO - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=$K3D_VERSION bash
+        run: |
+          wget --header="Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
+            -qO - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=$K3D_VERSION bash
       - id: kyma
         uses: jakobmoellersap/[email protected]
         with:

Dockerfile

@@ -13,7 +13,7 @@ RUN go mod download
 COPY main.go main.go
 COPY api api/
 COPY pkg pkg/
-COPY internal/pkg internal/pkg/
+COPY internal internal/
 COPY controllers controllers/
 
 # Build

api/v1alpha1/manifest_types.go

@@ -17,6 +17,9 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"fmt"
+
+	declarative "github.com/kyma-project/module-manager/pkg/declarative/v2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -26,15 +29,6 @@ import (
 
 const ManifestKind = "Manifest"
 
-func (m *Manifest) SetObservedGeneration() *Manifest {
-	m.Status.ObservedGeneration = m.Generation
-	return m
-}
-
-func (m *Manifest) IsSpecUpdated() bool {
-	return m.Status.ObservedGeneration != m.Generation
-}
-
 // InstallInfo defines installation information.
 type InstallInfo struct {
 	// Source can either be described as ImageSpec, HelmChartSpec or KustomizeSpec
@@ -48,59 +42,26 @@ type InstallInfo struct {
 // ManifestSpec defines the specification of Manifest.
 type ManifestSpec struct {
 	// Remote indicates if Manifest should be installed on a remote cluster
-	// +kubebuilder:validation:Optional
 	// +kubebuilder:default:=true
-	Remote bool `json:"remote"`
+	Remote bool `json:"remote,omitempty"`
 
 	// Config specifies OCI image configuration for Manifest
-	// +kubebuilder:validation:Optional
-	Config types.ImageSpec `json:"config"`
+	Config types.ImageSpec `json:"config,omitempty"`
 
 	// Installs specifies a list of installations for Manifest
 	Installs []InstallInfo `json:"installs"`
 
 	//+kubebuilder:pruning:PreserveUnknownFields
-	// +kubebuilder:validation:Optional
+	//+kubebuilder:validation:XEmbeddedResource
 	// Resource specifies a resource to be watched for state updates
-	Resource unstructured.Unstructured `json:"resource"`
+	Resource unstructured.Unstructured `json:"resource,omitempty"`
 
 	// CRDs specifies the custom resource definitions' ImageSpec
-	// +kubebuilder:validation:Optional
-	CRDs types.ImageSpec `json:"crds"`
+	CRDs types.ImageSpec `json:"crds,omitempty"`
 }
 
-// +kubebuilder:validation:Enum=Processing;Deleting;Ready;Error
-type ManifestState string
-
-// Valid Helm States.
-const (
-	// ManifestStateReady signifies Manifest is ready.
-	ManifestStateReady ManifestState = "Ready"
-
-	// ManifestStateProcessing signifies Manifest is reconciling.
-	ManifestStateProcessing ManifestState = "Processing"
-
-	// ManifestStateError signifies an error for Manifest.
-	ManifestStateError ManifestState = "Error"
-
-	// ManifestStateDeleting signifies Manifest is being deleted.
-	ManifestStateDeleting ManifestState = "Deleting"
-)
-
 // ManifestStatus defines the observed state of Manifest.
-type ManifestStatus struct {
-	// State signifies current state of Manifest
-	// +kubebuilder:validation:Enum=Ready;Processing;Error;Deleting;
-	State ManifestState `json:"state"`
-
-	// Conditions is a list of status conditions to indicate the status of Manifest
-	// +kubebuilder:validation:Optional
-	Conditions []ManifestCondition `json:"conditions"`
-
-	// ObservedGeneration
-	// +kubebuilder:validation:Optional
-	ObservedGeneration int64 `json:"observedGeneration"`
-}
+type ManifestStatus declarative.Status
 
 // InstallItem describes install information for ManifestCondition.
 type InstallItem struct {
@@ -117,53 +78,6 @@ type InstallItem struct {
 	Overrides string `json:"overrides"`
 }
 
-// ManifestCondition describes condition information for Manifest.
-type ManifestCondition struct {
-	// Type of ManifestCondition
-	Type ManifestConditionType `json:"type"`
-
-	// Status of the ManifestCondition
-	// +kubebuilder:validation:Enum=True;False;Unknown
-	Status ManifestConditionStatus `json:"status"`
-
-	// Human-readable message indicating details about the last status transition.
-	// +kubebuilder:validation:Optional
-	Message string `json:"message"`
-
-	// Machine-readable text indicating the reason for the condition's last transition.
-	// +kubebuilder:validation:Optional
-	Reason string `json:"reason"`
-
-	// Timestamp for when Manifest last transitioned from one status to another.
-	// +kubebuilder:validation:Optional
-	LastTransitionTime *metav1.Time `json:"lastTransitionTime"`
-
-	// InstallInfo contains a list of installations for Manifest
-	// +kubebuilder:validation:Optional
-	InstallInfo InstallItem `json:"installInfo"`
-}
-
-type ManifestConditionType string
-
-const (
-	// ConditionTypeReady represents ManifestConditionType Ready.
-	ConditionTypeReady ManifestConditionType = "Ready"
-)
-
-type ManifestConditionStatus string
-
-// Valid ManifestCondition Status.
-const (
-	// ConditionStatusTrue signifies ManifestConditionStatus true.
-	ConditionStatusTrue ManifestConditionStatus = "True"
-
-	// ConditionStatusFalse signifies ManifestConditionStatus false.
-	ConditionStatusFalse ManifestConditionStatus = "False"
-
-	// ConditionStatusUnknown signifies ManifestConditionStatus unknown.
-	ConditionStatusUnknown ManifestConditionStatus = "Unknown"
-)
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 //+kubebuilder:printcolumn:name="State",type=string,JSONPath=".status.state"
@@ -172,14 +86,26 @@ const (
 // Manifest is the Schema for the manifests API.
 type Manifest struct {
 	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// Spec specifies the content and configuration for Manifest
-	Spec ManifestSpec `json:"spec"`
+	Spec ManifestSpec `json:"spec,omitempty"`
 
 	// Status signifies the current status of the Manifest
 	// +kubebuilder:validation:Optional
-	Status ManifestStatus `json:"status"`
+	Status ManifestStatus `json:"status,omitempty"`
+}
+
+func (m *Manifest) ComponentName() string {
+	return fmt.Sprintf("manifest-%s", m.Name)
+}
+
+func (m *Manifest) GetStatus() declarative.Status {
+	return declarative.Status(m.Status)
+}
+
+func (m *Manifest) SetStatus(status declarative.Status) {
+	m.Status = ManifestStatus(status)
 }
 
 //+kubebuilder:object:root=true