Skip to content

Commit d9682c9

Browse files
committed
chore: remove excecive defensive checks
Signed-off-by: Oleksii Kurinnyi <[email protected]>
1 parent 88e0d3c commit d9682c9

File tree

5 files changed

+1
-79
lines changed

5 files changed

+1
-79
lines changed

controllers/controller/devworkspacerouting/devworkspacerouting_controller.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,10 +215,6 @@ func (r *DevWorkspaceRoutingReconciler) Reconcile(ctx context.Context, req ctrl.
215215
if errors.As(err, &failError) {
216216
return reconcile.Result{}, r.markRoutingFailed(instance, err.Error())
217217
}
218-
conflictErr := &solvers.HostnameConflictError{}
219-
if errors.As(err, &conflictErr) {
220-
return reconcile.Result{}, r.markRoutingFailed(instance, conflictErr.Error())
221-
}
222218
reqLogger.Error(err, "Error syncing routes")
223219
return reconcile.Result{Requeue: true}, r.reconcileStatus(instance, nil, nil, false, "Preparing routes")
224220
} else if !routesInSync {
@@ -233,10 +229,6 @@ func (r *DevWorkspaceRoutingReconciler) Reconcile(ctx context.Context, req ctrl.
233229
if errors.As(err, &failError) {
234230
return reconcile.Result{}, r.markRoutingFailed(instance, err.Error())
235231
}
236-
conflictErr := &solvers.HostnameConflictError{}
237-
if errors.As(err, &conflictErr) {
238-
return reconcile.Result{}, r.markRoutingFailed(instance, conflictErr.Error())
239-
}
240232
reqLogger.Error(err, "Error syncing ingresses")
241233
return reconcile.Result{Requeue: true}, r.reconcileStatus(instance, nil, nil, false, "Preparing ingresses")
242234
} else if !ingressesInSync {

controllers/controller/devworkspacerouting/solvers/errors.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,6 @@ import (
2121
)
2222

2323
var _ error = (*RoutingNotReady)(nil)
24-
25-
// HostnameConflictError is an error returned when a hostname required by a DevWorkspace is already in use
26-
// by another resource on the cluster.
27-
type HostnameConflictError struct {
28-
// Reason provides a textual summary of the conflict
29-
Reason string
30-
}
31-
32-
func (e *HostnameConflictError) Error() string {
33-
return e.Reason
34-
}
35-
3624
var _ error = (*RoutingInvalid)(nil)
3725
var _ error = (*ServiceConflictError)(nil)
3826

controllers/controller/devworkspacerouting/solvers/solver.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func (_ *SolverGetter) HasSolver(routingClass controllerv1alpha1.DevWorkspaceRou
103103

104104
func (_ *SolverGetter) GetSolver(client client.Client, logger logr.Logger, routingClass controllerv1alpha1.DevWorkspaceRoutingClass) (RoutingSolver, error) {
105105
isOpenShift := infrastructure.IsOpenShift()
106-
106+
107107
switch routingClass {
108108
case controllerv1alpha1.DevWorkspaceRoutingBasic:
109109
return NewBasicSolver(client, logger), nil

controllers/controller/devworkspacerouting/sync_ingresses.go

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"context"
2020
"fmt"
2121

22-
"github.com/devfile/devworkspace-operator/controllers/controller/devworkspacerouting/solvers"
2322
"github.com/devfile/devworkspace-operator/pkg/constants"
2423
"github.com/devfile/devworkspace-operator/pkg/provision/sync"
2524

@@ -33,14 +32,6 @@ import (
3332
func (r *DevWorkspaceRoutingReconciler) syncIngresses(routing *controllerv1alpha1.DevWorkspaceRouting, specIngresses []networkingv1.Ingress) (ok bool, clusterIngresses []networkingv1.Ingress, err error) {
3433
ingressesInSync := true
3534

36-
for _, ingress := range specIngresses {
37-
for _, rule := range ingress.Spec.Rules {
38-
if err := r.checkForIngressConflict(rule.Host, routing); err != nil {
39-
return false, nil, err
40-
}
41-
}
42-
}
43-
4435
clusterIngresses, err = r.getClusterIngresses(routing)
4536
if err != nil {
4637
return false, nil, err
@@ -99,28 +90,6 @@ func (r *DevWorkspaceRoutingReconciler) getClusterIngresses(routing *controllerv
9990
return found.Items, nil
10091
}
10192

102-
func (r *DevWorkspaceRoutingReconciler) checkForIngressConflict(hostname string, owner *controllerv1alpha1.DevWorkspaceRouting) error {
103-
ingresses := &networkingv1.IngressList{}
104-
if err := r.List(context.TODO(), ingresses, client.InNamespace(owner.Namespace)); err != nil {
105-
return err
106-
}
107-
for _, ingress := range ingresses.Items {
108-
for _, rule := range ingress.Spec.Rules {
109-
if rule.Host == hostname {
110-
for _, ownerRef := range ingress.GetOwnerReferences() {
111-
if ownerRef.UID == owner.UID {
112-
return nil
113-
}
114-
}
115-
return &solvers.HostnameConflictError{
116-
Reason: fmt.Sprintf("hostname %s is already in use by ingress %s", hostname, ingress.Name),
117-
}
118-
}
119-
}
120-
}
121-
return nil
122-
}
123-
12493
func getIngressesToDelete(clusterIngresses, specIngresses []networkingv1.Ingress) []networkingv1.Ingress {
12594
var toDelete []networkingv1.Ingress
12695
for _, clusterIngress := range clusterIngresses {

controllers/controller/devworkspacerouting/sync_routes.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"context"
2020
"fmt"
2121

22-
"github.com/devfile/devworkspace-operator/controllers/controller/devworkspacerouting/solvers"
2322
"github.com/devfile/devworkspace-operator/pkg/constants"
2423
"github.com/devfile/devworkspace-operator/pkg/provision/sync"
2524
routeV1 "github.com/openshift/api/route/v1"
@@ -32,12 +31,6 @@ import (
3231
func (r *DevWorkspaceRoutingReconciler) syncRoutes(routing *controllerv1alpha1.DevWorkspaceRouting, specRoutes []routeV1.Route) (ok bool, clusterRoutes []routeV1.Route, err error) {
3332
routesInSync := true
3433

35-
for _, route := range specRoutes {
36-
if err := r.checkForRouteConflict(route.Spec.Host, routing); err != nil {
37-
return false, nil, err
38-
}
39-
}
40-
4134
clusterRoutes, err = r.getClusterRoutes(routing)
4235
if err != nil {
4336
return false, nil, err
@@ -107,26 +100,6 @@ func (r *DevWorkspaceRoutingReconciler) getClusterRoutes(routing *controllerv1al
107100
return routes, nil
108101
}
109102

110-
func (r *DevWorkspaceRoutingReconciler) checkForRouteConflict(hostname string, owner *controllerv1alpha1.DevWorkspaceRouting) error {
111-
routes := &routeV1.RouteList{}
112-
if err := r.List(context.TODO(), routes, client.InNamespace(owner.Namespace)); err != nil {
113-
return err
114-
}
115-
for _, route := range routes.Items {
116-
if route.Spec.Host == hostname {
117-
for _, ownerRef := range route.GetOwnerReferences() {
118-
if ownerRef.UID == owner.UID {
119-
return nil
120-
}
121-
}
122-
return &solvers.HostnameConflictError{
123-
Reason: fmt.Sprintf("hostname %s is already in use by route %s", hostname, route.Name),
124-
}
125-
}
126-
}
127-
return nil
128-
}
129-
130103
func getRoutesToDelete(clusterRoutes, specRoutes []routeV1.Route) []routeV1.Route {
131104
var toDelete []routeV1.Route
132105
for _, clusterRoute := range clusterRoutes {

0 commit comments

Comments
 (0)