Skip to content

Commit

Permalink
fixed merge conflicts
Browse files Browse the repository at this point in the history 
Signed-off-by: Abhishek Bansal <abhibansal@abhisheks-mbp-8.corp.adobe.com>
  • Loading branch information
Abhishek Bansal committed Feb 5, 2025
1 parent 6108edd commit a16701f
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions rollout/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
"github.com/argoproj/argo-rollouts/pkg/apis/rollouts"

"github.com/argoproj/argo-rollouts/controller/metrics"

register "github.com/argoproj/argo-rollouts/pkg/apis/rollouts"
"github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
"github.com/argoproj/argo-rollouts/pkg/apis/rollouts/validation"
Expand All @@ -52,6 +53,7 @@ import (
"github.com/argoproj/argo-rollouts/utils/conditions"
controllerutil "github.com/argoproj/argo-rollouts/utils/controller"
"github.com/argoproj/argo-rollouts/utils/defaults"
"github.com/argoproj/argo-rollouts/utils/diff"
experimentutil "github.com/argoproj/argo-rollouts/utils/experiment"
ingressutil "github.com/argoproj/argo-rollouts/utils/ingress"
istioutil "github.com/argoproj/argo-rollouts/utils/istio"
Expand All @@ -62,6 +64,8 @@ import (
serviceutil "github.com/argoproj/argo-rollouts/utils/service"
timeutil "github.com/argoproj/argo-rollouts/utils/time"
unstructuredutil "github.com/argoproj/argo-rollouts/utils/unstructured"

patchtypes "k8s.io/apimachinery/pkg/types"
)

type TemplateRefResolver interface {
Expand Down

0 comments on commit a16701f

Please sign in to comment.