feat: implement phase and columns

4T-24 · Oct 24, 2024 · 9c5029d · 9c5029d
1 parent 6588635
commit 9c5029d
Show file tree

Hide file tree

Showing 9 changed files with 124 additions and 4 deletions.
diff --git a/api/v1/challenge_types.go b/api/v1/challenge_types.go
@@ -130,12 +130,18 @@ type ChallengeSpec struct {
 
 // ChallengeStatus defines the observed state of Challenge
 type ChallengeStatus struct {
+	Phase string `json:"phase"`
 	Error string `json:"error"`
 }
 
 // Challenge is the Schema for the challenges API
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase"
+// +kubebuilder:printcolumn:name="Category",type="string",JSONPath=".spec.category"
+// +kubebuilder:printcolumn:name="Initial Value",type="integer",JSONPath=".spec.initial_value"
+// +kubebuilder:printcolumn:name="Min Value",type="integer",JSONPath=".spec.minimum_value"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 type Challenge struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/api/v1/globally_instanced_challenge_types.go b/api/v1/globally_instanced_challenge_types.go
@@ -38,6 +38,11 @@ type GloballyInstancedChallengeSpec struct {
 
 // GloballyInstancedChallenge is the Schema for the GlobalChallenges API
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase"
+// +kubebuilder:printcolumn:name="Category",type="string",JSONPath=".spec.category"
+// +kubebuilder:printcolumn:name="Initial Value",type="integer",JSONPath=".spec.initial_value"
+// +kubebuilder:printcolumn:name="Min Value",type="integer",JSONPath=".spec.minimum_value"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 type GloballyInstancedChallenge struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/api/v1/instanced_challenge_types.go b/api/v1/instanced_challenge_types.go
@@ -90,6 +90,11 @@ type InstancedChallengeSpec struct {
 
 // InstancedChallenge is the Schema for the challenges API
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase"
+// +kubebuilder:printcolumn:name="Category",type="string",JSONPath=".spec.category"
+// +kubebuilder:printcolumn:name="Initial Value",type="integer",JSONPath=".spec.initial_value"
+// +kubebuilder:printcolumn:name="Min Value",type="integer",JSONPath=".spec.minimum_value"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 type InstancedChallenge struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/api/v1/oracle_instanced_challenge_types.go b/api/v1/oracle_instanced_challenge_types.go
@@ -38,6 +38,11 @@ type OracleInstancedChallengeSpec struct {
 
 // OracleInstancedChallenge is the Schema for the oraclechallenges API
 // +kubebuilder:subresource:status
+// +kubebuilder:printcolumn:name="Phase",type="string",JSONPath=".status.phase"
+// +kubebuilder:printcolumn:name="Category",type="string",JSONPath=".spec.category"
+// +kubebuilder:printcolumn:name="Initial Value",type="integer",JSONPath=".spec.initial_value"
+// +kubebuilder:printcolumn:name="Min Value",type="integer",JSONPath=".spec.minimum_value"
+// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 type OracleInstancedChallenge struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

diff --git a/config/crd/bases/i.4ts.fr_challenges.yaml b/config/crd/bases/i.4ts.fr_challenges.yaml
@@ -14,7 +14,23 @@ spec:
     singular: challenge
   scope: Namespaced
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    - jsonPath: .spec.category
+      name: Category
+      type: string
+    - jsonPath: .spec.initial_value
+      name: Initial Value
+      type: integer
+    - jsonPath: .spec.minimum_value
+      name: Min Value
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
     schema:
       openAPIV3Schema:
         properties:
@@ -120,8 +136,11 @@ spec:
             properties:
               error:
                 type: string
+              phase:
+                type: string
             required:
             - error
+            - phase
             type: object
         type: object
     served: true

diff --git a/config/crd/bases/i.4ts.fr_globallyinstancedchallenges.yaml b/config/crd/bases/i.4ts.fr_globallyinstancedchallenges.yaml
@@ -14,7 +14,23 @@ spec:
     singular: globallyinstancedchallenge
   scope: Namespaced
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    - jsonPath: .spec.category
+      name: Category
+      type: string
+    - jsonPath: .spec.initial_value
+      name: Initial Value
+      type: integer
+    - jsonPath: .spec.minimum_value
+      name: Min Value
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
     schema:
       openAPIV3Schema:
         properties:
@@ -3767,8 +3783,11 @@ spec:
             properties:
               error:
                 type: string
+              phase:
+                type: string
             required:
             - error
+            - phase
             type: object
         type: object
     served: true

diff --git a/config/crd/bases/i.4ts.fr_instancedchallenges.yaml b/config/crd/bases/i.4ts.fr_instancedchallenges.yaml
@@ -14,7 +14,23 @@ spec:
     singular: instancedchallenge
   scope: Namespaced
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    - jsonPath: .spec.category
+      name: Category
+      type: string
+    - jsonPath: .spec.initial_value
+      name: Initial Value
+      type: integer
+    - jsonPath: .spec.minimum_value
+      name: Min Value
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
     schema:
       openAPIV3Schema:
         properties:
@@ -3750,8 +3766,11 @@ spec:
             properties:
               error:
                 type: string
+              phase:
+                type: string
             required:
             - error
+            - phase
             type: object
         type: object
     served: true

diff --git a/config/crd/bases/i.4ts.fr_oracleinstancedchallenges.yaml b/config/crd/bases/i.4ts.fr_oracleinstancedchallenges.yaml
@@ -14,7 +14,23 @@ spec:
     singular: oracleinstancedchallenge
   scope: Namespaced
   versions:
-  - name: v1
+  - additionalPrinterColumns:
+    - jsonPath: .status.phase
+      name: Phase
+      type: string
+    - jsonPath: .spec.category
+      name: Category
+      type: string
+    - jsonPath: .spec.initial_value
+      name: Initial Value
+      type: integer
+    - jsonPath: .spec.minimum_value
+      name: Min Value
+      type: integer
+    - jsonPath: .metadata.creationTimestamp
+      name: Age
+      type: date
+    name: v1
     schema:
       openAPIV3Schema:
         properties:
@@ -3767,8 +3783,11 @@ spec:
             properties:
               error:
                 type: string
+              phase:
+                type: string
             required:
             - error
+            - phase
             type: object
         type: object
     served: true

diff --git a/internal/controllers/k8s_controller.go b/internal/controllers/k8s_controller.go
@@ -83,6 +83,7 @@ func (r *InstancierReconciler) Register(ctx context.Context, req ctrl.Request) (
 			r.UnregisterChallenge(&challenge)
 			return ctrl.Result{}, nil
 		}
+		challenge.Status.Phase = "Syncing"
 		r.RegisterChallenge(&challenge)
 		return ctrl.Result{}, nil
 	}
@@ -95,6 +96,7 @@ func (r *InstancierReconciler) Register(ctx context.Context, req ctrl.Request) (
 			r.UnregisterChallenge(&instancedChallenge)
 			return ctrl.Result{}, nil
 		}
+		instancedChallenge.Status.Phase = "Syncing"
 		r.RegisterChallenge(&instancedChallenge)
 		return ctrl.Result{}, nil
 	}
@@ -106,10 +108,23 @@ func (r *InstancierReconciler) Register(ctx context.Context, req ctrl.Request) (
 			r.UnregisterChallenge(&oracleInstancedChallenge)
 			return ctrl.Result{}, nil
 		}
+		oracleInstancedChallenge.Status.Phase = "Syncing"
 		r.RegisterChallenge(&oracleInstancedChallenge)
 		return ctrl.Result{}, nil
 	}
 
+	var globallyInstancedChallenge v1.GloballyInstancedChallenge
+	err = r.Get(ctx, req.NamespacedName, &globallyInstancedChallenge)
+	if err == nil {
+		if globallyInstancedChallenge.DeletionTimestamp != nil {
+			r.UnregisterChallenge(&globallyInstancedChallenge)
+			return ctrl.Result{}, nil
+		}
+		globallyInstancedChallenge.Status.Phase = "Syncing"
+		r.RegisterChallenge(&globallyInstancedChallenge)
+		return ctrl.Result{}, nil
+	}
+
 	logrus.WithField("name", req.Name).Warn("Ressource deleted, rechecking")
 	r.Reinit()
 
@@ -133,8 +148,10 @@ func (r *InstancierReconciler) ReconcileCTFd() error {
 			}
 			r.Get(context.Background(), client.ObjectKeyFromObject(&obj), &obj)
 			obj.Status.Error = ""
+			obj.Status.Phase = "Synced"
 			if found {
 				obj.Status.Error = err.Error()
+				obj.Status.Phase = "Error"
 			}
 			r.Status().Update(context.Background(), &obj)
 		case *v1.InstancedChallenge:
@@ -143,8 +160,10 @@ func (r *InstancierReconciler) ReconcileCTFd() error {
 			}
 			r.Get(context.Background(), client.ObjectKeyFromObject(&obj), &obj)
 			obj.Status.Error = ""
+			obj.Status.Phase = "Synced"
 			if found {
 				obj.Status.Error = err.Error()
+				obj.Status.Phase = "Error"
 			}
 			r.Status().Update(context.Background(), &obj)
 		case *v1.GloballyInstancedChallenge:
@@ -153,8 +172,10 @@ func (r *InstancierReconciler) ReconcileCTFd() error {
 			}
 			r.Get(context.Background(), client.ObjectKeyFromObject(&obj), &obj)
 			obj.Status.Error = ""
+			obj.Status.Phase = "Synced"
 			if found {
 				obj.Status.Error = err.Error()
+				obj.Status.Phase = "Error"
 			}
 			r.Status().Update(context.Background(), &obj)
 		case *v1.OracleInstancedChallenge:
@@ -163,8 +184,10 @@ func (r *InstancierReconciler) ReconcileCTFd() error {
 			}
 			r.Get(context.Background(), client.ObjectKeyFromObject(&obj), &obj)
 			obj.Status.Error = ""
+			obj.Status.Phase = "Synced"
 			if found {
 				obj.Status.Error = err.Error()
+				obj.Status.Phase = "Error"
 			}
 			r.Status().Update(context.Background(), &obj)
 		}