Skip to content

Commit

Permalink
make linter happy
Browse files Browse the repository at this point in the history
  • Loading branch information
wmuizelaar committed May 31, 2024
1 parent e64d01d commit 54a2ab8
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 9 deletions.
3 changes: 2 additions & 1 deletion rollout/trafficrouting/alb/alb.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ package alb
import (
"context"
"fmt"
appvs1 "k8s.io/api/apps/v1"
"strconv"
"strings"

appvs1 "k8s.io/api/apps/v1"

rolloututil "github.com/argoproj/argo-rollouts/utils/rollout"

"github.com/sirupsen/logrus"
Expand Down
3 changes: 2 additions & 1 deletion rollout/trafficrouting/ambassador/ambassador.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ import (
"context"
"errors"
"fmt"
appvs1 "k8s.io/api/apps/v1"
"strconv"
"strings"
"sync"
"time"

appvs1 "k8s.io/api/apps/v1"

"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
3 changes: 2 additions & 1 deletion rollout/trafficrouting/apisix/apisix.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package apisix
import (
"context"
"fmt"
appvs1 "k8s.io/api/apps/v1"
"time"

appvs1 "k8s.io/api/apps/v1"

"github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
"github.com/argoproj/argo-rollouts/utils/record"
"github.com/pkg/errors"
Expand Down
1 change: 1 addition & 0 deletions rollout/trafficrouting/appmesh/appmesh.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"errors"
"fmt"

appvs1 "k8s.io/api/apps/v1"

"github.com/sirupsen/logrus"
Expand Down
4 changes: 2 additions & 2 deletions rollout/trafficrouting/istio/istio.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"context"
"encoding/json"
"fmt"
"strings"

replicasetutil "github.com/argoproj/argo-rollouts/utils/replicaset"
"k8s.io/client-go/dynamic/dynamiclister"
"strings"

"github.com/argoproj/argo-rollouts/rollout/trafficrouting"

Expand Down Expand Up @@ -316,7 +317,6 @@ func (r *Reconciler) reconcileVirtualService(obj *unstructured.Unstructured, vsv
}

func (r *Reconciler) UpdateHash(canaryHash, stableHash string, replicaSets []*appvs1.ReplicaSet, additionalDestinations ...v1alpha1.WeightDestination) error {

// We need to check if the replicasets are ready here as well if we didn't define any services in the rollout
// See: https://github.com/argoproj/argo-rollouts/issues/2507
if r.rollout.Spec.Strategy.Canary.CanaryService == "" && r.rollout.Spec.Strategy.Canary.StableService == "" {
Expand Down
3 changes: 2 additions & 1 deletion rollout/trafficrouting/istio/istio_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"context"
"encoding/json"
"fmt"
"testing"

appsv1 "k8s.io/api/apps/v1"
"k8s.io/apimachinery/pkg/util/uuid"
"testing"

"github.com/stretchr/testify/assert"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
3 changes: 2 additions & 1 deletion rollout/trafficrouting/nginx/nginx.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import (
"context"
"errors"
"fmt"
appvs1 "k8s.io/api/apps/v1"
"strings"

appvs1 "k8s.io/api/apps/v1"

"github.com/sirupsen/logrus"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
networkingv1 "k8s.io/api/networking/v1"
Expand Down
1 change: 1 addition & 0 deletions rollout/trafficrouting/plugin/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package plugin

import (
"fmt"

appvs1 "k8s.io/api/apps/v1"

"github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1"
Expand Down
1 change: 1 addition & 0 deletions rollout/trafficrouting/smi/smi.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package smi
import (
"context"
"fmt"

appvs1 "k8s.io/api/apps/v1"

smiv1alpha1 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha1"
Expand Down
3 changes: 2 additions & 1 deletion rollout/trafficrouting/traefik/traefik.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package traefik
import (
"context"
"fmt"
appvs1 "k8s.io/api/apps/v1"
"strings"

appvs1 "k8s.io/api/apps/v1"

"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
3 changes: 2 additions & 1 deletion rollout/trafficrouting_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ package rollout
import (
"errors"
"fmt"
appsv1 "k8s.io/api/apps/v1"
"strconv"
"testing"
"time"

appsv1 "k8s.io/api/apps/v1"

"github.com/argoproj/argo-rollouts/rollout/trafficrouting/apisix"

"github.com/stretchr/testify/assert"
Expand Down

0 comments on commit 54a2ab8

Please sign in to comment.