Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions internal/controller/v2/challenge_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,6 @@ var log = logr.Log.WithName("ChallengeController")
type ChallengeReconciler struct {
client.Client
Scheme *runtime.Scheme

// KafkaClient is the Kafka producer client
// 중요한 메세지를 Kafka를 통해 보낸다.
// KafkaClient *kafka.KafkaProducer
}

// +kubebuilder:rbac:groups=apps.hexactf.io,resources=challenges,verbs=get;list;watch;create;update;patch;delete
Expand Down
30 changes: 0 additions & 30 deletions internal/controller/v2/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ func (r *ChallengeReconciler) initializeChallenge(ctx context.Context, challenge
return fmt.Errorf("failed to initialize status: %w", err)
}

// if err := r.KafkaClient.SendStatusChange(challenge.Labels["apps.hexactf.io/userId"], challenge.Labels["apps.hexactf.io/challengeId"], "Pending"); err != nil {
// return fmt.Errorf("failed to send status change: %w", err)
// }

return nil
}

Expand All @@ -54,16 +50,6 @@ func (r *ChallengeReconciler) handlePendingState(ctx context.Context, challenge
log.Error(err, "Failed to update Challenge status", "challenge", challenge.Name)
}

// Convert endpoint to string
// endpoint := ""
// if challenge.Status.Endpoint != 0 {
// endpoint = fmt.Sprintf("%d", challenge.Status.Endpoint)
// }

// Send Message
// if err := r.KafkaClient.SendStatusChangeWithEndpoint(challenge.Labels["apps.hexactf.io/userId"], challenge.Labels["apps.hexactf.io/challengeId"], "Running", endpoint); err != nil {
// log.Error(err, "Failed to send status change: %w", err)
// }
}

return ctrl.Result{RequeueAfter: requeueInterval}, nil
Expand Down Expand Up @@ -117,13 +103,6 @@ func (r *ChallengeReconciler) handleDeletion(ctx context.Context, challenge *hex
return ctrl.Result{RequeueAfter: time.Second * 5}, err
}

// Send message to queue
// sendErr := r.KafkaClient.SendStatusChange(challenge.Labels["apps.hexactf.io/userId"], challenge.Labels["apps.hexactf.io/challengeId"], "Deleted")
// if sendErr != nil {
// log.Error(sendErr, "Failed to send status change message")
// return ctrl.Result{}, sendErr
// }

}

log.Info("Successfully completed deletion process")
Expand All @@ -144,15 +123,6 @@ func (r *ChallengeReconciler) handleError(ctx context.Context, req ctrl.Request,
return ctrl.Result{}, err
}

// crStatusMetric.WithLabelValues(challenge.Labels["apps.hexactf.io/challengeId"], challenge.Name, challenge.Labels["apps.hexactf.io/user"], challenge.Namespace).Set(3)

// Send message to queue
// sendErr := r.KafkaClient.SendStatusChange(challenge.Labels["apps.hexactf.io/userId"], challenge.Labels["apps.hexactf.io/challengeId"], "Error")
// if sendErr != nil {
// log.Error(sendErr, "Failed to send status change message")
// return ctrl.Result{}, sendErr
// }

// 에러 발생 시 challenge 삭제
if deleteErr := r.Delete(ctx, challenge); deleteErr != nil {
log.Error(deleteErr, "Failed to delete Challenge")
Expand Down
107 changes: 0 additions & 107 deletions internal/kafka/kafka.go

This file was deleted.

Loading