Skip to content

Commit

Permalink
Update go.mod to v2 (F5Networks#2351)
Browse files Browse the repository at this point in the history
  • Loading branch information
sravyap135 authored Apr 8, 2022
1 parent 87bec46 commit 77e0bdc
Show file tree
Hide file tree
Showing 67 changed files with 222 additions and 198 deletions.
32 changes: 16 additions & 16 deletions cmd/k8s-bigip-ctlr/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ import (
"fmt"
"net/http"

"github.com/F5Networks/k8s-bigip-ctlr/pkg/teem"

"github.com/F5Networks/k8s-bigip-ctlr/pkg/controller"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/health"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/pollers"
bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/pkg/prometheus"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/vxlan"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/writer"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/teem"

"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/controller"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/health"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/pollers"
bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/prometheus"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vxlan"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/writer"
"github.com/prometheus/client_golang/prometheus/promhttp"

//"github.com/F5Networks/k8s-bigip-ctlr/pkg/agent/cccl"
//"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent/cccl"
"io/ioutil"

v1 "k8s.io/api/core/v1"
Expand All @@ -45,14 +45,14 @@ import (
"syscall"
"time"

cisAgent "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/agent/as3"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/agent/cccl"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/appmanager"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
cisAgent "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent/as3"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent/cccl"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/appmanager"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"

log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
clog "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger/console"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
clog "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger/console"

//"github.com/prometheus/client_golang/prometheus/promhttp"

Expand Down
4 changes: 2 additions & 2 deletions cmd/k8s-bigip-ctlr/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"strconv"
"time"

"github.com/F5Networks/k8s-bigip-ctlr/pkg/appmanager"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/test"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/appmanager"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/test"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
. "github.com/onsi/gomega/gexec"
Expand Down
9 changes: 8 additions & 1 deletion config/apis/cis/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
module github.com/F5Networks/k8s-bigip-ctlr
module github.com/F5Networks/k8s-bigip-ctlr/v2

go 1.16

require (
github.com/F5Networks/f5-ipam-controller v0.1.6-0.20211217134627-c2be8b459270
github.com/f5devcentral/go-bigip/f5teem v0.0.0-20210918163638-28fdd0579913
github.com/f5devcentral/mockhttpclient v0.0.0-20210630101009-cc12e8b81051
github.com/google/go-github/v21 v21.0.1 // indirect
github.com/google/uuid v1.3.0
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/miekg/dns v1.1.42
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.16.0
github.com/openshift/api v0.0.0-20210315202829-4b79815405ec
github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47
github.com/openshift/client-go v3.9.0+incompatible
github.com/prometheus/client_golang v1.7.1
github.com/spf13/pflag v1.0.5
github.com/xeipuuv/gojsonpointer v0.0.0-20151027082146-e0fe6f683076 // indirect
Expand Down
13 changes: 9 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/F5Networks/f5-ipam-controller v0.1.6-0.20211130120610-2c17f16226f4 h1:/v96hLuCmvomisAQLcIcAacdmdlWJyjh61FHFBWEm2I=
github.com/F5Networks/f5-ipam-controller v0.1.6-0.20211130120610-2c17f16226f4/go.mod h1:XBOjYUVRKG8q8atIpNmil/XF6RAGVekqfbeNQludcV4=
github.com/F5Networks/f5-ipam-controller v0.1.6-0.20211213121023-410e5df250de h1:uj7KI3iGhh7AP7ettwskXp7L2XGOvvX5imuCwvGXxr8=
github.com/F5Networks/f5-ipam-controller v0.1.6-0.20211213121023-410e5df250de/go.mod h1:XBOjYUVRKG8q8atIpNmil/XF6RAGVekqfbeNQludcV4=
github.com/F5Networks/f5-ipam-controller v0.1.6-0.20211217134627-c2be8b459270 h1:C43pAoSDy/58jslylXsE8O67EKk64RNWlLw+8iStMCc=
github.com/F5Networks/f5-ipam-controller v0.1.6-0.20211217134627-c2be8b459270/go.mod h1:XBOjYUVRKG8q8atIpNmil/XF6RAGVekqfbeNQludcV4=
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
Expand Down Expand Up @@ -176,6 +172,11 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
github.com/google/go-github/v21 v21.0.1 h1:2pLOj+rs4UtoZmk5didluF5zZ6Z0kfs0z1FLa/j+4b8=
github.com/google/go-github/v21 v21.0.1/go.mod h1:RNbKQQDOg+lBuuu5l/v0joCrygzKEexxDEwaleXEHxA=
github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
Expand Down Expand Up @@ -318,6 +319,8 @@ github.com/openshift/api v0.0.0-20210315202829-4b79815405ec/go.mod h1:aqU5Cq+kqK
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47 h1:+TEY29DK0XhqB7HFC9OfV8qf3wffSyi7MWv3AP28DGQ=
github.com/openshift/client-go v0.0.0-20210112165513-ebc401615f47/go.mod h1:u7NRAjtYVAKokiI9LouzTv4mhds8P4S1TwdVAfbjKSk=
github.com/openshift/client-go v3.9.0+incompatible h1:13k3Ok0B7TA2hA3bQW2aFqn6y04JaJWdk7ITTyg+Ek0=
github.com/openshift/client-go v3.9.0+incompatible/go.mod h1:6rzn+JTr7+WYS2E1TExP4gByoABxMznR6y2SnUIkmxk=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
Expand Down Expand Up @@ -412,6 +415,7 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
Expand Down Expand Up @@ -507,6 +511,7 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180824143301-4910a1d54f87/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Expand Down
6 changes: 3 additions & 3 deletions pkg/agent/agentAS3.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package agent

import (
. "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent/as3"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent/as3"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
)

type agentAS3 struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/agent/agentCCCL.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package agent

import (
. "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent/cccl"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent/cccl"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
)

type agentCCCL struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/as3/as3Common.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"strconv"
"strings"

. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
"github.com/xeipuuv/gojsonschema"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/as3/as3ConfigMap.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package as3
import (
"encoding/json"

. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
)

// cfgMap States
Expand Down
6 changes: 3 additions & 3 deletions pkg/agent/as3/as3Manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"strings"
"time"

"github.com/F5Networks/k8s-bigip-ctlr/pkg/writer"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/writer"

. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/as3/as3Manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package as3
import (
"encoding/json"

. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/as3/as3Resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"sort"

. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
)

func (am *AS3Manager) prepareAS3ResourceConfig() as3ADC {
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/as3/as3Types.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package as3

import (
. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
)

type (
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/as3/as3Utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"strconv"
"strings"

. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
)

func ValidateJSONStringAndFetchObject(jsonData string, jsonObj *map[string]interface{}) error {
Expand Down
6 changes: 3 additions & 3 deletions pkg/agent/as3/l2l3agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package as3
import (
"time"

. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/writer"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/writer"
)

type L2L3Agent struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/as3/postManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"strings"
"time"

log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
routeclient "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/agent/cccl/ccclManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"net/http"
"time"

. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/writer"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/writer"
)

// AS3AS3Manager holds all the AS3 orchestration specific config
Expand Down
4 changes: 2 additions & 2 deletions pkg/agent/cccl/outputConfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"strings"
"time"

. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
)

// Dump out the Virtual Server configs to a file
Expand Down
4 changes: 2 additions & 2 deletions pkg/appmanager/agentRequestHandler.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package appmanager

import (
cisAgent "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent"
. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
cisAgent "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
)

// Method to deploy resources on configured agent
Expand Down
7 changes: 4 additions & 3 deletions pkg/appmanager/agentResponseHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ package appmanager

import (
"context"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
"strings"

"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
routeapi "github.com/openshift/api/route/v1"
v1 "k8s.io/api/core/v1"
metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"strings"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions pkg/appmanager/appManager.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ import (
"sync"
"time"

"github.com/F5Networks/k8s-bigip-ctlr/pkg/teem"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/teem"

netv1 "k8s.io/api/networking/v1"

cisAgent "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent"
bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/pkg/prometheus"
. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger"
cisAgent "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent"
bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/prometheus"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger"
"github.com/miekg/dns"
routeapi "github.com/openshift/api/route/v1"
routeclient "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1"
Expand Down
12 changes: 6 additions & 6 deletions pkg/appmanager/appManager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ import (
"sync"
"time"

"github.com/F5Networks/k8s-bigip-ctlr/pkg/teem"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/teem"

"github.com/F5Networks/k8s-bigip-ctlr/pkg/agent"
. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/test"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/test"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

"github.com/F5Networks/k8s-bigip-ctlr/pkg/agent/cccl"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent/cccl"
routeapi "github.com/openshift/api/route/v1"
fakeRouteClient "github.com/openshift/client-go/route/clientset/versioned/fake"
v1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -2631,7 +2631,7 @@ var _ = Describe("AppManager Tests", func() {
// Expect(len(events)).To(Equal(2))

// Shouldn't process Ingress with non-F5 class
// https://github.com/F5Networks/k8s-bigip-ctlr/issues/311
// https://github.com/F5Networks/k8s-bigip-ctlr/v2/issues/311
ingressNotf5 := test.NewIngress("ingress-bad", "1", namespace, ingressConfig,
map[string]string{
K8sIngressClass: "notf5",
Expand Down
9 changes: 5 additions & 4 deletions pkg/appmanager/eventNotifier_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ package appmanager
import (
"context"
"fmt"

netv1 "k8s.io/api/networking/v1"
"k8s.io/klog/v2"

"github.com/F5Networks/k8s-bigip-ctlr/pkg/agent/cccl"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent/cccl"

"github.com/F5Networks/k8s-bigip-ctlr/pkg/agent"
. "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource"
"github.com/F5Networks/k8s-bigip-ctlr/pkg/test"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/agent"
. "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource"
"github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/test"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"

Expand Down
Loading

0 comments on commit 77e0bdc

Please sign in to comment.