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
22 changes: 0 additions & 22 deletions api/v1alpha1/monitoring_types.go

This file was deleted.

8 changes: 1 addition & 7 deletions api/v1alpha1/seinodedeployment_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type SeiNodeDeploymentSpec struct {
Template SeiNodeTemplate `json:"template"`

// DeletionPolicy controls what happens to child SeiNodes and managed
// networking/monitoring resources when the SeiNodeDeployment is deleted.
// networking resources when the SeiNodeDeployment is deleted.
// "Delete" (default) cascades deletion. "Retain" orphans children
// and networking resources so they continue running independently.
// +optional
Expand All @@ -39,11 +39,6 @@ type SeiNodeDeploymentSpec struct {
// +optional
Networking *NetworkingConfig `json:"networking,omitempty"`

// Monitoring configures observability resources shared across
// all replicas.
// +optional
Monitoring *MonitoringConfig `json:"monitoring,omitempty"`

// UpdateStrategy controls how changes to the template are rolled out
// to child SeiNodes. Every deployment must declare an explicit strategy.
UpdateStrategy UpdateStrategy `json:"updateStrategy"`
Expand Down Expand Up @@ -400,7 +395,6 @@ type RolloutStatus struct {
const (
ConditionNodesReady = "NodesReady"
ConditionRouteReady = "RouteReady"
ConditionServiceMonitorReady = "ServiceMonitorReady"
ConditionGenesisCeremonyComplete = "GenesisCeremonyComplete"
ConditionPlanInProgress = "PlanInProgress"
ConditionGenesisCeremonyNeeded = "GenesisCeremonyNeeded"
Expand Down
47 changes: 0 additions & 47 deletions api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 1 addition & 23 deletions config/crd/sei.io_seinodedeployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ spec:
default: Delete
description: |-
DeletionPolicy controls what happens to child SeiNodes and managed
networking/monitoring resources when the SeiNodeDeployment is deleted.
networking resources when the SeiNodeDeployment is deleted.
"Delete" (default) cascades deletion. "Retain" orphans children
and networking resources so they continue running independently.
enum:
Expand Down Expand Up @@ -127,28 +127,6 @@ spec:
required:
- chainId
type: object
monitoring:
description: |-
Monitoring configures observability resources shared across
all replicas.
properties:
serviceMonitor:
description: |-
ServiceMonitor creates a monitoring.coreos.com/v1 ServiceMonitor.
Presence (non-nil) enables it; set to nil to disable.
properties:
interval:
default: 30s
description: Interval is the Prometheus scrape interval.
pattern: ^[0-9]+(ms|s|m|h)$
type: string
labels:
additionalProperties:
type: string
description: Labels are added to the ServiceMonitor metadata.
type: object
type: object
type: object
networking:
description: |-
Networking enables public networking for the deployment.
Expand Down
12 changes: 0 additions & 12 deletions config/rbac/role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -90,18 +90,6 @@ rules:
- patch
- update
- watch
- apiGroups:
- monitoring.coreos.com
resources:
- servicemonitors
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- sei.io
resources:
Expand Down
8 changes: 1 addition & 7 deletions internal/controller/nodedeployment/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ type SeiNodeDeploymentReconciler struct {
// +kubebuilder:rbac:groups="",resources=services,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
// +kubebuilder:rbac:groups=gateway.networking.k8s.io,resources=httproutes,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors,verbs=get;list;watch;create;update;patch;delete

func (r *SeiNodeDeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
logger := log.FromContext(ctx)
Expand All @@ -76,7 +75,7 @@ func (r *SeiNodeDeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Re
}

// Snapshot the status before any reconciliation mutates it in memory.
// Conditions set during networking/monitoring reconciliation are captured
// Conditions set during networking reconciliation are captured
// in the diff when updateStatus patches against this base.
statusBase := client.MergeFromWithOptions(group.DeepCopy(), client.MergeFromWithOptimisticLock{})
ns, name := group.Namespace, group.Name
Expand Down Expand Up @@ -117,11 +116,6 @@ func (r *SeiNodeDeploymentReconciler) Reconcile(ctx context.Context, req ctrl.Re
return planResult, nil
}

if err := r.reconcileMonitoring(ctx, group); err != nil {
logger.Error(err, "reconciling monitoring")
return ctrl.Result{}, fmt.Errorf("reconciling monitoring: %w", err)
}

if err := r.updateStatus(ctx, group, statusBase); err != nil {
return ctrl.Result{}, fmt.Errorf("updating status: %w", err)
}
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/nodedeployment/labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ func externalServiceName(group *seiv1alpha1.SeiNodeDeployment) string {
}

// groupSelector returns the label selector used by the shared external
// Service, HTTPRoutes, and ServiceMonitor. During an active
// deployment, it includes the revision label to pin traffic to the
// active set. At steady state, it selects by group membership only.
// Service and HTTPRoutes. During an active deployment, it includes the
// revision label to pin traffic to the active set. At steady state, it
// selects by group membership only.
func groupSelector(group *seiv1alpha1.SeiNodeDeployment) map[string]string {
if group.Status.Rollout != nil {
return map[string]string{
Expand Down
153 changes: 0 additions & 153 deletions internal/controller/nodedeployment/monitoring.go

This file was deleted.

Loading
Loading