Skip to content

update all dependencies #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 1, 2023
Merged

update all dependencies #92

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
503b300
update all dependencies
gambtho Aug 31, 2023
6db57fa
import order
gambtho Aug 31, 2023
982e525
add explanation for dockerfile
gambtho Aug 31, 2023
3f8bbe3
remove redundant test
gambtho Aug 31, 2023
a7b5854
Merge branch 'main' into thgamble/depbump2
gambtho Aug 31, 2023
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
Prev Previous commit
Next Next commit
import order
  • Loading branch information
@gambtho
gambtho committed Aug 31, 2023
commit 6db57faadc31d13d9b478cf209cc7ab3a17870e7
2 changes: 1 addition & 1 deletion pkg/controller/common/resource_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package common

import (
"context"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
"testing"
"time"

Expand All @@ -17,6 +16,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
)

func TestResourceReconcilerEmpty(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions pkg/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ package controller
import (
"context"
"net/http"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/Azure/aks-app-routing-operator/pkg/controller/dns"
"github.com/Azure/aks-app-routing-operator/pkg/controller/ingress"
"github.com/Azure/aks-app-routing-operator/pkg/controller/nginx"
"github.com/go-logr/logr"
cfgv1alpha2 "github.com/openservicemesh/osm/pkg/apis/config/v1alpha2"
policyv1alpha1 "github.com/openservicemesh/osm/pkg/apis/policy/v1alpha1"
Expand All @@ -26,10 +22,14 @@ import (
"k8s.io/klog/v2"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
secv1 "sigs.k8s.io/secrets-store-csi-driver/apis/v1"

"github.com/Azure/aks-app-routing-operator/pkg/config"
"github.com/Azure/aks-app-routing-operator/pkg/controller/dns"
"github.com/Azure/aks-app-routing-operator/pkg/controller/ingress"
"github.com/Azure/aks-app-routing-operator/pkg/controller/keyvault"
"github.com/Azure/aks-app-routing-operator/pkg/controller/nginx"
"github.com/Azure/aks-app-routing-operator/pkg/controller/osm"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/dns/external_dns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package dns
import (
"os"
"reflect"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
"testing"

"github.com/Azure/aks-app-routing-operator/pkg/config"
Expand All @@ -19,6 +18,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/envtest"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/ingress/concurrency_watchdog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"io"
"time"

"github.com/Azure/aks-app-routing-operator/pkg/controller/controllername"
"github.com/go-logr/logr"
"github.com/hashicorp/go-multierror"
prommodel "github.com/prometheus/client_model/go"
Expand All @@ -26,6 +25,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/Azure/aks-app-routing-operator/pkg/config"
"github.com/Azure/aks-app-routing-operator/pkg/controller/controllername"
"github.com/Azure/aks-app-routing-operator/pkg/controller/metrics"
"github.com/Azure/aks-app-routing-operator/pkg/util"
)
Expand Down
7 changes: 3 additions & 4 deletions pkg/controller/ingress/concurrency_watchdog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,10 @@ import (
"net/http/httptest"
"net/url"
"os"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
"strings"
"testing"
"time"

"github.com/Azure/aks-app-routing-operator/pkg/controller/metrics"
"github.com/Azure/aks-app-routing-operator/pkg/controller/testutils"

"github.com/go-logr/logr"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand All @@ -33,8 +29,11 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/envtest"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/Azure/aks-app-routing-operator/pkg/config"
"github.com/Azure/aks-app-routing-operator/pkg/controller/metrics"
"github.com/Azure/aks-app-routing-operator/pkg/controller/testutils"
"github.com/Azure/aks-app-routing-operator/pkg/manifests"
)

Expand Down
5 changes: 2 additions & 3 deletions pkg/controller/keyvault/placeholder_pod_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ package keyvault

import (
"context"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
"testing"

"github.com/Azure/aks-app-routing-operator/pkg/config"
"github.com/Azure/aks-app-routing-operator/pkg/controller/metrics"
"github.com/Azure/aks-app-routing-operator/pkg/controller/testutils"

"github.com/Azure/aks-app-routing-operator/pkg/config"
"github.com/Azure/aks-app-routing-operator/pkg/manifests"
"github.com/Azure/aks-app-routing-operator/pkg/util"
"github.com/go-logr/logr"
Expand All @@ -28,6 +26,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
secv1 "sigs.k8s.io/secrets-store-csi-driver/apis/v1"
)

Expand Down
9 changes: 4 additions & 5 deletions pkg/controller/osm/ingress_backend_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,8 @@ package osm
import (
"context"
"os"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
"testing"

"github.com/Azure/aks-app-routing-operator/pkg/controller/metrics"
"github.com/Azure/aks-app-routing-operator/pkg/controller/testutils"

"github.com/Azure/aks-app-routing-operator/pkg/util"
"github.com/go-logr/logr"
policyv1alpha1 "github.com/openservicemesh/osm/pkg/apis/policy/v1alpha1"
"github.com/stretchr/testify/assert"
Expand All @@ -27,8 +22,12 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client/fake"
"sigs.k8s.io/controller-runtime/pkg/envtest"
"sigs.k8s.io/controller-runtime/pkg/manager"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

"github.com/Azure/aks-app-routing-operator/pkg/config"
"github.com/Azure/aks-app-routing-operator/pkg/controller/metrics"
"github.com/Azure/aks-app-routing-operator/pkg/controller/testutils"
"github.com/Azure/aks-app-routing-operator/pkg/util"
)

var (
Expand Down