fix: remove rules requirement for ingress (#1791)

theSuess · web-flow · commit 84d2d24ce735 · 2024-12-13T08:11:46.000Z
This spec prevents our default rules from being used as a merge will always
override them.
diff --git a/controllers/reconcilers/grafana/ingress_reconciler.go b/controllers/reconcilers/grafana/ingress_reconciler.go
@@ -45,7 +45,7 @@ func (r *IngressReconciler) Reconcile(ctx context.Context, cr *v1beta1.Grafana,
 }
 
 func (r *IngressReconciler) reconcileIngress(ctx context.Context, cr *v1beta1.Grafana, status *v1beta1.GrafanaStatus, _ *v1beta1.OperatorReconcileVars, scheme *runtime.Scheme) (v1beta1.OperatorStageStatus, error) {
-	if cr.Spec.Ingress == nil || len(cr.Spec.Ingress.Spec.Rules) == 0 {
+	if cr.Spec.Ingress == nil {
 		return v1beta1.OperatorStageResultSuccess, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func (r IngressReconciler) Reconcile(ctx context.Context, cr v1beta1.Grafana,`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func (r IngressReconciler) reconcileIngress(ctx context.Context, cr v1beta1.Grafana, status v1beta1.GrafanaStatus, _ v1beta1.OperatorReconcileVars, scheme *runtime.Scheme) (v1beta1.OperatorStageStatus, error) {`
`48`		`- if cr.Spec.Ingress == nil \|\| len(cr.Spec.Ingress.Spec.Rules) == 0 {`
	`48`	`+ if cr.Spec.Ingress == nil {`
`49`	`49`	`return v1beta1.OperatorStageResultSuccess, nil`
`50`	`50`	`}`
`51`	`51`