Skip to content

Commit 779c5dd

Browse files
authored
drop use of deprecated knative.dev/networking/pkg (#1492)
1 parent 480e31d commit 779c5dd

File tree

11 files changed

+4
-809
lines changed

11 files changed

+4
-809
lines changed

pkg/reconciler/ingress/config/store.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package config
1919
import (
2020
"context"
2121

22-
network "knative.dev/networking/pkg"
2322
"knative.dev/networking/pkg/config"
2423
"knative.dev/pkg/configmap"
2524
)
@@ -65,7 +64,7 @@ func NewStore(logger configmap.Logger, onAfterStore ...func(name string, value i
6564
logger,
6665
configmap.Constructors{
6766
IstioConfigName: NewIstioFromConfigMap,
68-
config.ConfigMapName: network.NewConfigFromConfigMap,
67+
config.ConfigMapName: config.NewConfigFromConfigMap,
6968
},
7069
onAfterStore...,
7170
),

pkg/reconciler/ingress/config/store_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121
"testing"
2222

2323
"github.com/google/go-cmp/cmp"
24-
logtesting "knative.dev/pkg/logging/testing"
2524

26-
network "knative.dev/networking/pkg"
2725
netconfig "knative.dev/networking/pkg/config"
26+
logtesting "knative.dev/pkg/logging/testing"
27+
2828
. "knative.dev/pkg/configmap/testing"
2929
)
3030

@@ -42,7 +42,7 @@ func TestStoreLoadWithContext(t *testing.T) {
4242
t.Error("Unexpected istio config (-want, +got):", diff)
4343
}
4444

45-
expectNetworkConfig, _ := network.NewConfigFromConfigMap(networkConfig)
45+
expectNetworkConfig, _ := netconfig.NewConfigFromConfigMap(networkConfig)
4646
if diff := cmp.Diff(expectNetworkConfig, config.Network); diff != "" {
4747
t.Error("Unexpected TLS mode (-want, +got):", diff)
4848
}

vendor/knative.dev/networking/pkg/deprecated_config.go

Lines changed: 0 additions & 213 deletions
This file was deleted.

0 commit comments

Comments
 (0)