From 77e0bdca6a1ad79cd189df9273804374a837cff9 Mon Sep 17 00:00:00 2001 From: Sravya P Date: Fri, 8 Apr 2022 16:57:27 +0530 Subject: [PATCH] Update go.mod to v2 (#2351) --- cmd/k8s-bigip-ctlr/main.go | 32 ++++++++++----------- cmd/k8s-bigip-ctlr/main_test.go | 4 +-- config/apis/cis/v1/zz_generated.deepcopy.go | 9 +++++- go.mod | 5 ++-- go.sum | 13 ++++++--- pkg/agent/agentAS3.go | 6 ++-- pkg/agent/agentCCCL.go | 6 ++-- pkg/agent/as3/as3Common.go | 4 +-- pkg/agent/as3/as3ConfigMap.go | 4 +-- pkg/agent/as3/as3Manager.go | 6 ++-- pkg/agent/as3/as3Manager_test.go | 2 +- pkg/agent/as3/as3Resource.go | 4 +-- pkg/agent/as3/as3Types.go | 2 +- pkg/agent/as3/as3Utils.go | 4 +-- pkg/agent/as3/l2l3agent.go | 6 ++-- pkg/agent/as3/postManager.go | 2 +- pkg/agent/cccl/ccclManager.go | 6 ++-- pkg/agent/cccl/outputConfig.go | 4 +-- pkg/appmanager/agentRequestHandler.go | 4 +-- pkg/appmanager/agentResponseHandler.go | 7 +++-- pkg/appmanager/appManager.go | 10 +++---- pkg/appmanager/appManager_test.go | 12 ++++---- pkg/appmanager/eventNotifier_test.go | 9 +++--- pkg/appmanager/healthMonitors.go | 4 +-- pkg/appmanager/healthMonitors_test.go | 8 +++--- pkg/appmanager/ingress.go | 4 +-- pkg/appmanager/ingress_test.go | 9 +++--- pkg/appmanager/profiles.go | 7 +++-- pkg/appmanager/profiles_test.go | 8 +++--- pkg/appmanager/resourceConfig.go | 4 +-- pkg/appmanager/resourceConfig_test.go | 8 +++--- pkg/appmanager/routing.go | 4 +-- pkg/appmanager/routing_test.go | 6 ++-- pkg/appmanager/schema.go | 2 +- pkg/appmanager/validateResources.go | 4 +-- pkg/controller/backend.go | 6 ++-- pkg/controller/backend_test.go | 2 +- pkg/controller/controller.go | 6 ++-- pkg/controller/controller_suit_test.go | 9 +++--- pkg/controller/informers.go | 6 ++-- pkg/controller/informers_test.go | 6 ++-- pkg/controller/node_poll_handler.go | 8 +++--- pkg/controller/node_poll_handler_test.go | 2 +- pkg/controller/postManager.go | 2 +- pkg/controller/pythonDriver.go | 11 +++---- pkg/controller/pythonDriver_test.go | 5 ++-- pkg/controller/resourceConfig.go | 7 +++-- pkg/controller/resourceConfig_test.go | 6 ++-- pkg/controller/responseHandler.go | 15 +++++----- pkg/controller/routing.go | 6 ++-- pkg/controller/types.go | 24 ++++++++-------- pkg/controller/validate.go | 4 +-- pkg/controller/worker.go | 11 +++---- pkg/controller/worker_test.go | 12 ++++---- pkg/health/health.go | 2 +- pkg/pollers/nodePoller.go | 4 +-- pkg/prometheus/prometheus.go | 2 +- pkg/resource/resourceConfig.go | 4 +-- pkg/resource/resourceConfig_test.go | 2 +- pkg/teem/teem.go | 2 +- pkg/test/crd_utils.go | 2 +- pkg/test/utils.go | 2 +- pkg/vlogger/README.md | 6 ++-- pkg/vlogger/doc.go | 4 +-- pkg/vxlan/vxlanMgr.go | 7 +++-- pkg/vxlan/vxlanMgr_test.go | 4 +-- pkg/writer/configWriter.go | 2 +- 67 files changed, 222 insertions(+), 198 deletions(-) diff --git a/cmd/k8s-bigip-ctlr/main.go b/cmd/k8s-bigip-ctlr/main.go index 05d0fee39..83c508532 100644 --- a/cmd/k8s-bigip-ctlr/main.go +++ b/cmd/k8s-bigip-ctlr/main.go @@ -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" @@ -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" diff --git a/cmd/k8s-bigip-ctlr/main_test.go b/cmd/k8s-bigip-ctlr/main_test.go index 11e99a27b..a4a721b5f 100644 --- a/cmd/k8s-bigip-ctlr/main_test.go +++ b/cmd/k8s-bigip-ctlr/main_test.go @@ -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" diff --git a/config/apis/cis/v1/zz_generated.deepcopy.go b/config/apis/cis/v1/zz_generated.deepcopy.go index 8e522a564..169476987 100644 --- a/config/apis/cis/v1/zz_generated.deepcopy.go +++ b/config/apis/cis/v1/zz_generated.deepcopy.go @@ -29,6 +29,11 @@ import ( func (in *DNSPool) DeepCopyInto(out *DNSPool) { *out = *in out.Monitor = in.Monitor + if in.Monitors != nil { + in, out := &in.Monitors, &out.Monitors + *out = make([]Monitor, len(*in)) + copy(*out, *in) + } return } @@ -108,7 +113,9 @@ func (in *ExternalDNSSpec) DeepCopyInto(out *ExternalDNSSpec) { if in.Pools != nil { in, out := &in.Pools, &out.Pools *out = make([]DNSPool, len(*in)) - copy(*out, *in) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } } return } diff --git a/go.mod b/go.mod index 93ecd9f53..28cf8c068 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/F5Networks/k8s-bigip-ctlr +module github.com/F5Networks/k8s-bigip-ctlr/v2 go 1.16 @@ -6,13 +6,14 @@ 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 diff --git a/go.sum b/go.sum index 23d5b6bee..b22948664 100644 --- a/go.sum +++ b/go.sum @@ -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= @@ -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= @@ -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= @@ -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= @@ -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= diff --git a/pkg/agent/agentAS3.go b/pkg/agent/agentAS3.go index f2c41933c..3159e6d33 100644 --- a/pkg/agent/agentAS3.go +++ b/pkg/agent/agentAS3.go @@ -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 { diff --git a/pkg/agent/agentCCCL.go b/pkg/agent/agentCCCL.go index 81da87193..7c02ceada 100644 --- a/pkg/agent/agentCCCL.go +++ b/pkg/agent/agentCCCL.go @@ -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 { diff --git a/pkg/agent/as3/as3Common.go b/pkg/agent/as3/as3Common.go index 43c7a4cd0..8d2dac334 100644 --- a/pkg/agent/as3/as3Common.go +++ b/pkg/agent/as3/as3Common.go @@ -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" ) diff --git a/pkg/agent/as3/as3ConfigMap.go b/pkg/agent/as3/as3ConfigMap.go index 7971f70c6..429a57c1e 100644 --- a/pkg/agent/as3/as3ConfigMap.go +++ b/pkg/agent/as3/as3ConfigMap.go @@ -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 diff --git a/pkg/agent/as3/as3Manager.go b/pkg/agent/as3/as3Manager.go index dbd5f3ab5..38b26963f 100644 --- a/pkg/agent/as3/as3Manager.go +++ b/pkg/agent/as3/as3Manager.go @@ -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 ( diff --git a/pkg/agent/as3/as3Manager_test.go b/pkg/agent/as3/as3Manager_test.go index 8d962c112..378c96dda 100644 --- a/pkg/agent/as3/as3Manager_test.go +++ b/pkg/agent/as3/as3Manager_test.go @@ -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" ) diff --git a/pkg/agent/as3/as3Resource.go b/pkg/agent/as3/as3Resource.go index 659f01b5d..b37a8d190 100644 --- a/pkg/agent/as3/as3Resource.go +++ b/pkg/agent/as3/as3Resource.go @@ -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 { diff --git a/pkg/agent/as3/as3Types.go b/pkg/agent/as3/as3Types.go index ea9738870..bc1b5fa94 100644 --- a/pkg/agent/as3/as3Types.go +++ b/pkg/agent/as3/as3Types.go @@ -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 ( diff --git a/pkg/agent/as3/as3Utils.go b/pkg/agent/as3/as3Utils.go index 13bc8e883..f74f5326c 100644 --- a/pkg/agent/as3/as3Utils.go +++ b/pkg/agent/as3/as3Utils.go @@ -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 { diff --git a/pkg/agent/as3/l2l3agent.go b/pkg/agent/as3/l2l3agent.go index 4f2767a60..645b029d7 100644 --- a/pkg/agent/as3/l2l3agent.go +++ b/pkg/agent/as3/l2l3agent.go @@ -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 { diff --git a/pkg/agent/as3/postManager.go b/pkg/agent/as3/postManager.go index b847e77d3..27571634b 100644 --- a/pkg/agent/as3/postManager.go +++ b/pkg/agent/as3/postManager.go @@ -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" ) diff --git a/pkg/agent/cccl/ccclManager.go b/pkg/agent/cccl/ccclManager.go index 0a831a7e6..cffc284e1 100644 --- a/pkg/agent/cccl/ccclManager.go +++ b/pkg/agent/cccl/ccclManager.go @@ -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 diff --git a/pkg/agent/cccl/outputConfig.go b/pkg/agent/cccl/outputConfig.go index 3ae802cd8..c14619f74 100644 --- a/pkg/agent/cccl/outputConfig.go +++ b/pkg/agent/cccl/outputConfig.go @@ -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 diff --git a/pkg/appmanager/agentRequestHandler.go b/pkg/appmanager/agentRequestHandler.go index 22dff0928..bad0eceb3 100644 --- a/pkg/appmanager/agentRequestHandler.go +++ b/pkg/appmanager/agentRequestHandler.go @@ -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 diff --git a/pkg/appmanager/agentResponseHandler.go b/pkg/appmanager/agentResponseHandler.go index bbda690ec..f7e297333 100644 --- a/pkg/appmanager/agentResponseHandler.go +++ b/pkg/appmanager/agentResponseHandler.go @@ -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 ( diff --git a/pkg/appmanager/appManager.go b/pkg/appmanager/appManager.go index 5e188b010..97c7a0636 100644 --- a/pkg/appmanager/appManager.go +++ b/pkg/appmanager/appManager.go @@ -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" diff --git a/pkg/appmanager/appManager_test.go b/pkg/appmanager/appManager_test.go index 69a228bc9..87348f479 100644 --- a/pkg/appmanager/appManager_test.go +++ b/pkg/appmanager/appManager_test.go @@ -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" @@ -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", diff --git a/pkg/appmanager/eventNotifier_test.go b/pkg/appmanager/eventNotifier_test.go index b67085a4f..d810913f0 100644 --- a/pkg/appmanager/eventNotifier_test.go +++ b/pkg/appmanager/eventNotifier_test.go @@ -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" diff --git a/pkg/appmanager/healthMonitors.go b/pkg/appmanager/healthMonitors.go index 326586772..8c3f49fce 100644 --- a/pkg/appmanager/healthMonitors.go +++ b/pkg/appmanager/healthMonitors.go @@ -22,8 +22,8 @@ import ( "fmt" "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" "k8s.io/api/extensions/v1beta1" ) diff --git a/pkg/appmanager/healthMonitors_test.go b/pkg/appmanager/healthMonitors_test.go index a65c35882..1627d05f7 100644 --- a/pkg/appmanager/healthMonitors_test.go +++ b/pkg/appmanager/healthMonitors_test.go @@ -17,10 +17,10 @@ package appmanager import ( - "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent/cccl" - . "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/agent/cccl" + . "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/onsi/gomega/gstruct" diff --git a/pkg/appmanager/ingress.go b/pkg/appmanager/ingress.go index 2291906a4..954adde89 100644 --- a/pkg/appmanager/ingress.go +++ b/pkg/appmanager/ingress.go @@ -10,8 +10,8 @@ import ( "strings" "sync" - . "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/miekg/dns" v1 "k8s.io/api/core/v1" netv1 "k8s.io/api/networking/v1" diff --git a/pkg/appmanager/ingress_test.go b/pkg/appmanager/ingress_test.go index fbb7d910c..9d42d2b51 100644 --- a/pkg/appmanager/ingress_test.go +++ b/pkg/appmanager/ingress_test.go @@ -18,10 +18,11 @@ package appmanager import ( "context" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent/cccl" - . "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/agent/cccl" + . "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" fakeRouteClient "github.com/openshift/client-go/route/clientset/versioned/fake" diff --git a/pkg/appmanager/profiles.go b/pkg/appmanager/profiles.go index 2863562e3..fc816a4bb 100644 --- a/pkg/appmanager/profiles.go +++ b/pkg/appmanager/profiles.go @@ -20,11 +20,12 @@ import ( "encoding/json" "fmt" "io/ioutil" - netv1 "k8s.io/api/networking/v1" "strings" - . "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + netv1 "k8s.io/api/networking/v1" + + . "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" diff --git a/pkg/appmanager/profiles_test.go b/pkg/appmanager/profiles_test.go index 5b012800f..364ea4f8a 100644 --- a/pkg/appmanager/profiles_test.go +++ b/pkg/appmanager/profiles_test.go @@ -21,11 +21,11 @@ import ( "fmt" "sort" - "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" diff --git a/pkg/appmanager/resourceConfig.go b/pkg/appmanager/resourceConfig.go index 3ed12a83d..81855db53 100644 --- a/pkg/appmanager/resourceConfig.go +++ b/pkg/appmanager/resourceConfig.go @@ -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" routeapi "github.com/openshift/api/route/v1" "k8s.io/api/extensions/v1beta1" diff --git a/pkg/appmanager/resourceConfig_test.go b/pkg/appmanager/resourceConfig_test.go index dabc7220e..b8fad7c26 100644 --- a/pkg/appmanager/resourceConfig_test.go +++ b/pkg/appmanager/resourceConfig_test.go @@ -17,10 +17,10 @@ package appmanager import ( - "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent/cccl" - . "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/agent/cccl" + . "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" diff --git a/pkg/appmanager/routing.go b/pkg/appmanager/routing.go index 5795097fc..e8126a5eb 100644 --- a/pkg/appmanager/routing.go +++ b/pkg/appmanager/routing.go @@ -29,8 +29,8 @@ import ( "strings" "sync" - . "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" routeapi "github.com/openshift/api/route/v1" "k8s.io/api/extensions/v1beta1" diff --git a/pkg/appmanager/routing_test.go b/pkg/appmanager/routing_test.go index d226db0d7..13362bf83 100644 --- a/pkg/appmanager/routing_test.go +++ b/pkg/appmanager/routing_test.go @@ -19,9 +19,9 @@ package appmanager import ( "fmt" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/agent/cccl" - "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/agent/cccl" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/test" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" routeapi "github.com/openshift/api/route/v1" diff --git a/pkg/appmanager/schema.go b/pkg/appmanager/schema.go index 237d5fde1..af6f7fc4c 100644 --- a/pkg/appmanager/schema.go +++ b/pkg/appmanager/schema.go @@ -22,7 +22,7 @@ import ( "github.com/xeipuuv/gojsonschema" - . "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource" + . "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource" ) // Big-IP ipv4/ipv6 checkers diff --git a/pkg/appmanager/validateResources.go b/pkg/appmanager/validateResources.go index 0bc566d9d..19c5bef99 100644 --- a/pkg/appmanager/validateResources.go +++ b/pkg/appmanager/validateResources.go @@ -21,8 +21,8 @@ import ( "crypto/x509" "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" routeapi "github.com/openshift/api/route/v1" v1 "k8s.io/api/core/v1" "k8s.io/api/extensions/v1beta1" diff --git a/pkg/controller/backend.go b/pkg/controller/backend.go index 4bd2627cb..2991f8778 100644 --- a/pkg/controller/backend.go +++ b/pkg/controller/backend.go @@ -25,9 +25,9 @@ import ( "strings" "time" - rsc "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" + rsc "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" ) const ( diff --git a/pkg/controller/backend_test.go b/pkg/controller/backend_test.go index 49df02c9b..a3fd3fd4e 100644 --- a/pkg/controller/backend_test.go +++ b/pkg/controller/backend_test.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/F5Networks/k8s-bigip-ctlr/pkg/test" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/test" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index 65bc2f7f6..e06a7a67e 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -25,9 +25,9 @@ import ( ficV1 "github.com/F5Networks/f5-ipam-controller/pkg/ipamapis/apis/fic/v1" "github.com/F5Networks/f5-ipam-controller/pkg/ipammachinery" - "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned" - apm "github.com/F5Networks/k8s-bigip-ctlr/pkg/appmanager" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned" + apm "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/appmanager" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" v1 "k8s.io/api/core/v1" extClient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/controller_suit_test.go b/pkg/controller/controller_suit_test.go index 0caf3b5ee..9467f23b8 100644 --- a/pkg/controller/controller_suit_test.go +++ b/pkg/controller/controller_suit_test.go @@ -3,13 +3,14 @@ package controller import ( "bytes" "fmt" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/writer" - mockhc "github.com/f5devcentral/mockhttpclient" - . "github.com/onsi/ginkgo" - . "github.com/onsi/gomega" "io/ioutil" "net/http" "testing" + + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/writer" + mockhc "github.com/f5devcentral/mockhttpclient" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" ) func TestController(t *testing.T) { diff --git a/pkg/controller/informers.go b/pkg/controller/informers.go index dd9d64fd7..3c43a7afa 100644 --- a/pkg/controller/informers.go +++ b/pkg/controller/informers.go @@ -23,9 +23,9 @@ import ( "time" ficV1 "github.com/F5Networks/f5-ipam-controller/pkg/ipamapis/apis/fic/v1" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - cisinfv1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/cis/v1" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + cisinfv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/cis/v1" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" diff --git a/pkg/controller/informers_test.go b/pkg/controller/informers_test.go index fd47449b2..01cf9d280 100644 --- a/pkg/controller/informers_test.go +++ b/pkg/controller/informers_test.go @@ -2,9 +2,9 @@ package controller import ( ficV1 "github.com/F5Networks/f5-ipam-controller/pkg/ipamapis/apis/fic/v1" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - crdfake "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/fake" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/test" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + crdfake "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/fake" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/test" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/pkg/controller/node_poll_handler.go b/pkg/controller/node_poll_handler.go index 1fbd372b1..9a6f886ba 100644 --- a/pkg/controller/node_poll_handler.go +++ b/pkg/controller/node_poll_handler.go @@ -6,12 +6,12 @@ import ( "strings" "time" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/pollers" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/vxlan" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/pollers" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vxlan" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/node_poll_handler_test.go b/pkg/controller/node_poll_handler_test.go index 78e2720de..204150486 100644 --- a/pkg/controller/node_poll_handler_test.go +++ b/pkg/controller/node_poll_handler_test.go @@ -1,7 +1,7 @@ package controller import ( - "github.com/F5Networks/k8s-bigip-ctlr/pkg/test" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/test" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/pkg/controller/postManager.go b/pkg/controller/postManager.go index 3b20b905e..fee390639 100644 --- a/pkg/controller/postManager.go +++ b/pkg/controller/postManager.go @@ -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" ) const ( diff --git a/pkg/controller/pythonDriver.go b/pkg/controller/pythonDriver.go index 69f307e57..cca709ce7 100644 --- a/pkg/controller/pythonDriver.go +++ b/pkg/controller/pythonDriver.go @@ -19,8 +19,6 @@ package controller import ( "bufio" "fmt" - bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/pkg/prometheus" - "github.com/prometheus/client_golang/prometheus/promhttp" "net/http" "os" "os/exec" @@ -28,10 +26,13 @@ import ( "syscall" "time" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/health" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/writer" + bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" + + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/health" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/writer" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" ) func initializeDriverConfig( diff --git a/pkg/controller/pythonDriver_test.go b/pkg/controller/pythonDriver_test.go index bcd31f3c5..c3dc50128 100644 --- a/pkg/controller/pythonDriver_test.go +++ b/pkg/controller/pythonDriver_test.go @@ -1,10 +1,11 @@ package controller import ( - "github.com/F5Networks/k8s-bigip-ctlr/pkg/test" + "sync" + + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/test" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - "sync" ) var _ = Describe("Python Driver Tests", func() { diff --git a/pkg/controller/resourceConfig.go b/pkg/controller/resourceConfig.go index 71e43af60..bcb50be58 100644 --- a/pkg/controller/resourceConfig.go +++ b/pkg/controller/resourceConfig.go @@ -20,14 +20,15 @@ import ( "context" "encoding/json" "fmt" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "net" "sort" "strconv" "strings" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/controller/resourceConfig_test.go b/pkg/controller/resourceConfig_test.go index 085c40333..f16bdc8f9 100644 --- a/pkg/controller/resourceConfig_test.go +++ b/pkg/controller/resourceConfig_test.go @@ -3,9 +3,9 @@ package controller import ( "sort" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - crdfake "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/fake" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/test" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + crdfake "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/fake" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/test" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/pkg/controller/responseHandler.go b/pkg/controller/responseHandler.go index efbce3af6..c099aa876 100644 --- a/pkg/controller/responseHandler.go +++ b/pkg/controller/responseHandler.go @@ -2,10 +2,11 @@ package controller import ( "container/list" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" "sync" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" + + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" ) func (ctlr *Controller) enqueueReq(config ResourceConfigRequest) int { @@ -19,7 +20,7 @@ func (ctlr *Controller) enqueueReq(config ResourceConfigRequest) int { } for _, cfg := range config.rsCfgs { - for key,_ := range cfg.MetaData.baseResources { + for key, _ := range cfg.MetaData.baseResources { rm.meta[key] = cfg.MetaData } } @@ -53,7 +54,7 @@ func (ctlr *Controller) responseHandler(respChan chan int) { } obj, exist, err := crInf.vsInformer.GetIndexer().GetByKey(rscKey) if err != nil { - log.Debugf("Could not fetch VirtualServer: %v: %v",rscKey, err) + log.Debugf("Could not fetch VirtualServer: %v: %v", rscKey, err) continue } if !exist { @@ -61,7 +62,7 @@ func (ctlr *Controller) responseHandler(respChan chan int) { continue } virtual := obj.(*cisapiv1.VirtualServer) - if virtual.Namespace + "/" + virtual.Name == rscKey { + if virtual.Namespace+"/"+virtual.Name == rscKey { ctlr.updateVirtualServerStatus(virtual, virtual.Status.VSAddress, "Ok") } case TransportServer: @@ -73,7 +74,7 @@ func (ctlr *Controller) responseHandler(respChan chan int) { } obj, exist, err := crInf.tsInformer.GetIndexer().GetByKey(rscKey) if err != nil { - log.Debugf("Could not fetch TransportServer: %v: %v",rscKey, err) + log.Debugf("Could not fetch TransportServer: %v: %v", rscKey, err) continue } if !exist { @@ -81,7 +82,7 @@ func (ctlr *Controller) responseHandler(respChan chan int) { continue } virtual := obj.(*cisapiv1.TransportServer) - if virtual.Namespace + "/" + virtual.Name == rscKey { + if virtual.Namespace+"/"+virtual.Name == rscKey { ctlr.updateTransportServerStatus(virtual, virtual.Status.VSAddress, "Ok") } diff --git a/pkg/controller/routing.go b/pkg/controller/routing.go index 77bea5f5d..c7a61d540 100644 --- a/pkg/controller/routing.go +++ b/pkg/controller/routing.go @@ -24,10 +24,10 @@ import ( "strings" "sync" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" ) // prepareVirtualServerRules prepares LTM Policy rules for VirtualServer diff --git a/pkg/controller/types.go b/pkg/controller/types.go index 1f2ce8b99..8095a758f 100644 --- a/pkg/controller/types.go +++ b/pkg/controller/types.go @@ -21,13 +21,13 @@ import ( "net/http" "sync" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/teem" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/teem" "github.com/F5Networks/f5-ipam-controller/pkg/ipammachinery" - "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned" - apm "github.com/F5Networks/k8s-bigip-ctlr/pkg/appmanager" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/pollers" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/writer" + "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned" + apm "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/appmanager" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/pollers" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/writer" v1 "k8s.io/api/core/v1" extClient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" "k8s.io/apimachinery/pkg/labels" @@ -115,13 +115,13 @@ type ( } metaData struct { - Active bool - ResourceType string - baseResources map[string]bool - namespace string - hosts []string - Protocol string - httpTraffic string + Active bool + ResourceType string + baseResources map[string]bool + namespace string + hosts []string + Protocol string + httpTraffic string } // Virtual Server Key - unique server is Name + Port diff --git a/pkg/controller/validate.go b/pkg/controller/validate.go index 7e477e407..402dc9c97 100644 --- a/pkg/controller/validate.go +++ b/pkg/controller/validate.go @@ -19,8 +19,8 @@ package controller import ( "fmt" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" ) func (ctlr *Controller) checkValidVirtualServer( diff --git a/pkg/controller/worker.go b/pkg/controller/worker.go index e05531e42..e6d7359d3 100644 --- a/pkg/controller/worker.go +++ b/pkg/controller/worker.go @@ -22,15 +22,16 @@ import ( "crypto/x509" "encoding/json" "fmt" - "k8s.io/apimachinery/pkg/labels" "reflect" "sort" "strings" "time" + "k8s.io/apimachinery/pkg/labels" + ficV1 "github.com/F5Networks/f5-ipam-controller/pkg/ipamapis/apis/fic/v1" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" utilruntime "k8s.io/apimachinery/pkg/util/runtime" @@ -933,7 +934,7 @@ func (ctlr *Controller) processVirtualServers( for _, vrt := range virtuals { log.Debugf("Processing Virtual Server %s for port %v", vrt.ObjectMeta.Name, portStruct.port) - rsCfg.MetaData.baseResources[vrt.Namespace + "/" + vrt.Name] = true + rsCfg.MetaData.baseResources[vrt.Namespace+"/"+vrt.Name] = true err := ctlr.prepareRSConfigFromVirtualServer( rsCfg, vrt, @@ -1680,7 +1681,7 @@ func (ctlr *Controller) processTransportServers( for _, vrt := range virtuals { log.Debugf("Processing Transport Server %s for port %v", vrt.ObjectMeta.Name, vrt.Spec.VirtualServerPort) - rsCfg.MetaData.baseResources[vrt.Namespace + "/" + vrt.Name] = true + rsCfg.MetaData.baseResources[vrt.Namespace+"/"+vrt.Name] = true err := ctlr.prepareRSConfigFromTransportServer( rsCfg, vrt, diff --git a/pkg/controller/worker_test.go b/pkg/controller/worker_test.go index 9619c8b5a..c51f10e40 100644 --- a/pkg/controller/worker_test.go +++ b/pkg/controller/worker_test.go @@ -9,15 +9,15 @@ import ( ficV1 "github.com/F5Networks/f5-ipam-controller/pkg/ipamapis/apis/fic/v1" "github.com/F5Networks/f5-ipam-controller/pkg/ipammachinery" - crdfake "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/fake" - cisinfv1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/cis/v1" - apm "github.com/F5Networks/k8s-bigip-ctlr/pkg/appmanager" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/teem" + crdfake "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/fake" + cisinfv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/cis/v1" + apm "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/appmanager" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/teem" k8sfake "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/tools/cache" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/test" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/test" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/pkg/health/health.go b/pkg/health/health.go index 4663e8f90..59fc1c1f1 100644 --- a/pkg/health/health.go +++ b/pkg/health/health.go @@ -4,7 +4,7 @@ import ( "net/http" "os" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" ) type HealthChecker struct { diff --git a/pkg/pollers/nodePoller.go b/pkg/pollers/nodePoller.go index 8f60eb768..3f534c9b4 100644 --- a/pkg/pollers/nodePoller.go +++ b/pkg/pollers/nodePoller.go @@ -22,13 +22,13 @@ import ( "sync" "time" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/pkg/prometheus" + bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/prometheus" ) type pollData struct { diff --git a/pkg/prometheus/prometheus.go b/pkg/prometheus/prometheus.go index 78a125325..6592ec131 100644 --- a/pkg/prometheus/prometheus.go +++ b/pkg/prometheus/prometheus.go @@ -1,7 +1,7 @@ package prometheus import ( - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/resource/resourceConfig.go b/pkg/resource/resourceConfig.go index 7d580d023..ba0653e77 100644 --- a/pkg/resource/resourceConfig.go +++ b/pkg/resource/resourceConfig.go @@ -31,8 +31,8 @@ import ( netv1 "k8s.io/api/networking/v1" - bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/pkg/prometheus" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/prometheus" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" routeapi "github.com/openshift/api/route/v1" "github.com/xeipuuv/gojsonschema" diff --git a/pkg/resource/resourceConfig_test.go b/pkg/resource/resourceConfig_test.go index cada5a619..95f47d66d 100644 --- a/pkg/resource/resourceConfig_test.go +++ b/pkg/resource/resourceConfig_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sort" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/test" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/test" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/teem/teem.go b/pkg/teem/teem.go index bbfb5b21e..173201d31 100644 --- a/pkg/teem/teem.go +++ b/pkg/teem/teem.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" "github.com/f5devcentral/go-bigip/f5teem" "github.com/google/uuid" ) diff --git a/pkg/test/crd_utils.go b/pkg/test/crd_utils.go index ca2b56121..e78ae3970 100644 --- a/pkg/test/crd_utils.go +++ b/pkg/test/crd_utils.go @@ -2,7 +2,7 @@ package test import ( ficV1 "github.com/F5Networks/f5-ipam-controller/pkg/ipamapis/apis/fic/v1" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/pkg/test/utils.go b/pkg/test/utils.go index c35bdb5ad..74faeda95 100644 --- a/pkg/test/utils.go +++ b/pkg/test/utils.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/pollers" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/pollers" routeapi "github.com/openshift/api/route/v1" v1 "k8s.io/api/core/v1" diff --git a/pkg/vlogger/README.md b/pkg/vlogger/README.md index a17204626..c547960d3 100644 --- a/pkg/vlogger/README.md +++ b/pkg/vlogger/README.md @@ -1,6 +1,6 @@ # vlogger - import "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + import "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" Package vlogger implements an interface around basic logging features so that end-user and library writers can code to the interface without worrying about @@ -115,8 +115,8 @@ statements to the console: package main import ( - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger/console" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger/console" func init() { // Log all messages to the user's console diff --git a/pkg/vlogger/doc.go b/pkg/vlogger/doc.go index 3c6186772..812f8ce73 100644 --- a/pkg/vlogger/doc.go +++ b/pkg/vlogger/doc.go @@ -118,8 +118,8 @@ to the console: package main import ( - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger/console" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger/console" func init() { // Log all messages to the user's console diff --git a/pkg/vxlan/vxlanMgr.go b/pkg/vxlan/vxlanMgr.go index 5c77b21f4..eadf65435 100644 --- a/pkg/vxlan/vxlanMgr.go +++ b/pkg/vxlan/vxlanMgr.go @@ -23,11 +23,12 @@ 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/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" "encoding/json" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/pkg/vxlan/vxlanMgr_test.go b/pkg/vxlan/vxlanMgr_test.go index 20be6f9e7..09162a953 100644 --- a/pkg/vxlan/vxlanMgr_test.go +++ b/pkg/vxlan/vxlanMgr_test.go @@ -21,8 +21,8 @@ import ( "fmt" // appManager is only used because we need the Member type (can't mock it) - "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/test" + "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" diff --git a/pkg/writer/configWriter.go b/pkg/writer/configWriter.go index aa2d91944..0ee586845 100644 --- a/pkg/writer/configWriter.go +++ b/pkg/writer/configWriter.go @@ -25,7 +25,7 @@ import ( "syscall" "time" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" ) type Writer interface {