diff --git a/Makefile b/Makefile index 70370bcd9..da63a790d 100644 --- a/Makefile +++ b/Makefile @@ -151,5 +151,5 @@ else endif crd-code-gen: - docker run --name crdcodegen -v $(PWD):/go/src/github.com/F5Networks/k8s-bigip-ctlr quay.io/f5networks/ciscrdcodegen:latest + docker run --name crdcodegen -v $(PWD):/go/src/github.com/F5Networks/k8s-bigip-ctlr/v2 quay.io/f5networks/ciscrdcodegen:latest docker rm crdcodegen diff --git a/build-tools/crdcodegen.Dockerfile b/build-tools/crdcodegen.Dockerfile index 642b36057..2255456a9 100644 --- a/build-tools/crdcodegen.Dockerfile +++ b/build-tools/crdcodegen.Dockerfile @@ -2,13 +2,13 @@ FROM golang:1.17 ENV GO111MODULE on -ENV PKGPATH /go/src/github.com/F5Networks/k8s-bigip-ctlr +ENV PKGPATH /go/src/github.com/F5Networks/k8s-bigip-ctlr/v2 RUN mkdir -p ${GOPATH}/src/github.com/F5Networks \ && mkdir -p ${GOPATH}/src/k8s.io \ - && go get k8s.io/code-generator@v0.20.4 \ - && go get k8s.io/apimachinery \ - && go get k8s.io/apiextensions-apiserver \ + && go get -d k8s.io/code-generator@v0.20.4 \ + && go get -d k8s.io/apimachinery \ + && go get -d k8s.io/apiextensions-apiserver \ && cp -r ${GOPATH}/pkg/mod/k8s.io/api@* ${GOPATH}/src/k8s.io/api \ && cp -r ${GOPATH}/pkg/mod/k8s.io/apiextensions-apiserver@* ${GOPATH}/src/k8s.io/apiextensions-apiserver \ && cp -r ${GOPATH}/pkg/mod/k8s.io/apimachinery@* ${GOPATH}/src/k8s.io/apimachinery \ @@ -22,4 +22,4 @@ RUN mkdir -p ${GOPATH}/src/github.com/F5Networks \ WORKDIR ${PKGPATH} -ENTRYPOINT $GOPATH/src/k8s.io/code-generator/generate-groups-extra.sh allcustom "github.com/F5Networks/k8s-bigip-ctlr/config/client" "github.com/F5Networks/k8s-bigip-ctlr/config/apis" cis:v1 +ENTRYPOINT $GOPATH/src/k8s.io/code-generator/generate-groups-extra.sh allcustom "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client" "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis" cis:v1 diff --git a/cmd/k8s-bigip-ctlr/main.go b/cmd/k8s-bigip-ctlr/main.go index 3ddaaa302..0e45c05fd 100644 --- a/cmd/k8s-bigip-ctlr/main.go +++ b/cmd/k8s-bigip-ctlr/main.go @@ -23,14 +23,14 @@ import ( configclient "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1" "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" @@ -46,13 +46,13 @@ 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" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" //"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/spf13/pflag" diff --git a/cmd/k8s-bigip-ctlr/main_test.go b/cmd/k8s-bigip-ctlr/main_test.go index e5f5baac6..720bbe870 100644 --- a/cmd/k8s-bigip-ctlr/main_test.go +++ b/cmd/k8s-bigip-ctlr/main_test.go @@ -26,8 +26,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/cmd/k8s-bigip-ctlr/pythonDriver.go b/cmd/k8s-bigip-ctlr/pythonDriver.go index 8f171ac24..194bce056 100644 --- a/cmd/k8s-bigip-ctlr/pythonDriver.go +++ b/cmd/k8s-bigip-ctlr/pythonDriver.go @@ -24,9 +24,9 @@ import ( "syscall" "time" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/writer" + "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/config/apis/cis/v1/zz_generated.deepcopy.go b/config/apis/cis/v1/zz_generated.deepcopy.go index 1905f8ca9..daad9a16d 100644 --- a/config/apis/cis/v1/zz_generated.deepcopy.go +++ b/config/apis/cis/v1/zz_generated.deepcopy.go @@ -237,6 +237,16 @@ func (in *IngressLinkStatus) DeepCopy() *IngressLinkStatus { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *L3PolicySpec) DeepCopyInto(out *L3PolicySpec) { *out = *in + if in.AllowSourceRange != nil { + in, out := &in.AllowSourceRange, &out.AllowSourceRange + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.AllowVlans != nil { + in, out := &in.AllowVlans, &out.AllowVlans + *out = make([]string, len(*in)) + copy(*out, *in) + } return } @@ -362,7 +372,7 @@ func (in *PolicyList) DeepCopyObject() runtime.Object { func (in *PolicySpec) DeepCopyInto(out *PolicySpec) { *out = *in out.L7Policies = in.L7Policies - out.L3Policies = in.L3Policies + in.L3Policies.DeepCopyInto(&out.L3Policies) out.LtmPolicies = in.LtmPolicies out.IRules = in.IRules in.Profiles.DeepCopyInto(&out.Profiles) @@ -383,6 +393,11 @@ func (in *PolicySpec) DeepCopy() *PolicySpec { func (in *Pool) DeepCopyInto(out *Pool) { *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 } @@ -399,6 +414,7 @@ func (in *Pool) DeepCopy() *Pool { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ProfileSpec) DeepCopyInto(out *ProfileSpec) { *out = *in + out.TCP = in.TCP if in.LogProfiles != nil { in, out := &in.LogProfiles, &out.LogProfiles *out = make([]string, len(*in)) @@ -417,6 +433,22 @@ func (in *ProfileSpec) DeepCopy() *ProfileSpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ProfileTCP) DeepCopyInto(out *ProfileTCP) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ProfileTCP. +func (in *ProfileTCP) DeepCopy() *ProfileTCP { + if in == nil { + return nil + } + out := new(ProfileTCP) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ServiceAddress) DeepCopyInto(out *ServiceAddress) { *out = *in @@ -436,6 +468,16 @@ func (in *ServiceAddress) DeepCopy() *ServiceAddress { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TLS) DeepCopyInto(out *TLS) { *out = *in + if in.ClientSSLs != nil { + in, out := &in.ClientSSLs, &out.ClientSSLs + *out = make([]string, len(*in)) + copy(*out, *in) + } + if in.ServerSSLs != nil { + in, out := &in.ServerSSLs, &out.ServerSSLs + *out = make([]string, len(*in)) + copy(*out, *in) + } return } @@ -517,7 +559,7 @@ func (in *TLSProfileSpec) DeepCopyInto(out *TLSProfileSpec) { *out = make([]string, len(*in)) copy(*out, *in) } - out.TLS = in.TLS + in.TLS.DeepCopyInto(&out.TLS) return } @@ -595,7 +637,7 @@ func (in *TransportServerList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *TransportServerSpec) DeepCopyInto(out *TransportServerSpec) { *out = *in - out.Pool = in.Pool + in.Pool.DeepCopyInto(&out.Pool) if in.AllowVLANs != nil { in, out := &in.AllowVLANs, &out.AllowVLANs *out = make([]string, len(*in)) @@ -611,6 +653,7 @@ func (in *TransportServerSpec) DeepCopyInto(out *TransportServerSpec) { *out = make([]string, len(*in)) copy(*out, *in) } + in.Profiles.DeepCopyInto(&out.Profiles) return } @@ -707,7 +750,9 @@ func (in *VirtualServerSpec) DeepCopyInto(out *VirtualServerSpec) { if in.Pools != nil { in, out := &in.Pools, &out.Pools *out = make([]Pool, len(*in)) - copy(*out, *in) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } } if in.AllowVLANs != nil { in, out := &in.AllowVLANs, &out.AllowVLANs @@ -724,6 +769,12 @@ func (in *VirtualServerSpec) DeepCopyInto(out *VirtualServerSpec) { *out = make([]ServiceAddress, len(*in)) copy(*out, *in) } + in.Profiles.DeepCopyInto(&out.Profiles) + if in.AllowSourceRange != nil { + in, out := &in.AllowSourceRange, &out.AllowSourceRange + *out = make([]string, len(*in)) + copy(*out, *in) + } return } diff --git a/config/client/clientset/versioned/clientset.go b/config/client/clientset/versioned/clientset.go index a4f9a78a9..4f7ab1e80 100644 --- a/config/client/clientset/versioned/clientset.go +++ b/config/client/clientset/versioned/clientset.go @@ -21,7 +21,7 @@ package versioned import ( "fmt" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/typed/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/typed/cis/v1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" diff --git a/config/client/clientset/versioned/fake/clientset_generated.go b/config/client/clientset/versioned/fake/clientset_generated.go index 568bd25ce..a027b4cfb 100644 --- a/config/client/clientset/versioned/fake/clientset_generated.go +++ b/config/client/clientset/versioned/fake/clientset_generated.go @@ -19,9 +19,9 @@ limitations under the License. package fake import ( - clientset "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/typed/cis/v1" - fakecisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/typed/cis/v1/fake" + clientset "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/typed/cis/v1" + fakecisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/typed/cis/v1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/config/client/clientset/versioned/fake/register.go b/config/client/clientset/versioned/fake/register.go index 4ef573f84..905c1082b 100644 --- a/config/client/clientset/versioned/fake/register.go +++ b/config/client/clientset/versioned/fake/register.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/config/client/clientset/versioned/scheme/register.go b/config/client/clientset/versioned/scheme/register.go index 1cc265d35..795a7e264 100644 --- a/config/client/clientset/versioned/scheme/register.go +++ b/config/client/clientset/versioned/scheme/register.go @@ -19,7 +19,7 @@ limitations under the License. package scheme import ( - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/config/client/clientset/versioned/typed/cis/v1/cis_client.go b/config/client/clientset/versioned/typed/cis/v1/cis_client.go index fbc1a16ba..a93e4348f 100644 --- a/config/client/clientset/versioned/typed/cis/v1/cis_client.go +++ b/config/client/clientset/versioned/typed/cis/v1/cis_client.go @@ -19,8 +19,8 @@ limitations under the License. package v1 import ( - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/scheme" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/config/client/clientset/versioned/typed/cis/v1/externaldns.go b/config/client/clientset/versioned/typed/cis/v1/externaldns.go index ee021e8bf..37c222011 100644 --- a/config/client/clientset/versioned/typed/cis/v1/externaldns.go +++ b/config/client/clientset/versioned/typed/cis/v1/externaldns.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - scheme "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/scheme" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + scheme "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/clientset/versioned/typed/cis/v1/fake/fake_cis_client.go b/config/client/clientset/versioned/typed/cis/v1/fake/fake_cis_client.go index 2acd7c47f..af82a37d4 100644 --- a/config/client/clientset/versioned/typed/cis/v1/fake/fake_cis_client.go +++ b/config/client/clientset/versioned/typed/cis/v1/fake/fake_cis_client.go @@ -19,7 +19,7 @@ limitations under the License. package fake import ( - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/typed/cis/v1" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/typed/cis/v1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/config/client/clientset/versioned/typed/cis/v1/fake/fake_externaldns.go b/config/client/clientset/versioned/typed/cis/v1/fake/fake_externaldns.go index e8640f0de..5411593d5 100644 --- a/config/client/clientset/versioned/typed/cis/v1/fake/fake_externaldns.go +++ b/config/client/clientset/versioned/typed/cis/v1/fake/fake_externaldns.go @@ -21,7 +21,7 @@ package fake import ( "context" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/config/client/clientset/versioned/typed/cis/v1/fake/fake_ingresslink.go b/config/client/clientset/versioned/typed/cis/v1/fake/fake_ingresslink.go index 871d06fdb..3065a8371 100644 --- a/config/client/clientset/versioned/typed/cis/v1/fake/fake_ingresslink.go +++ b/config/client/clientset/versioned/typed/cis/v1/fake/fake_ingresslink.go @@ -21,7 +21,7 @@ package fake import ( "context" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/config/client/clientset/versioned/typed/cis/v1/fake/fake_policy.go b/config/client/clientset/versioned/typed/cis/v1/fake/fake_policy.go index b082beff9..97105a930 100644 --- a/config/client/clientset/versioned/typed/cis/v1/fake/fake_policy.go +++ b/config/client/clientset/versioned/typed/cis/v1/fake/fake_policy.go @@ -21,7 +21,7 @@ package fake import ( "context" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/config/client/clientset/versioned/typed/cis/v1/fake/fake_tlsprofile.go b/config/client/clientset/versioned/typed/cis/v1/fake/fake_tlsprofile.go index c26f3869d..78ce9c934 100644 --- a/config/client/clientset/versioned/typed/cis/v1/fake/fake_tlsprofile.go +++ b/config/client/clientset/versioned/typed/cis/v1/fake/fake_tlsprofile.go @@ -21,7 +21,7 @@ package fake import ( "context" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/config/client/clientset/versioned/typed/cis/v1/fake/fake_transportserver.go b/config/client/clientset/versioned/typed/cis/v1/fake/fake_transportserver.go index dccb3c724..16ee930b6 100644 --- a/config/client/clientset/versioned/typed/cis/v1/fake/fake_transportserver.go +++ b/config/client/clientset/versioned/typed/cis/v1/fake/fake_transportserver.go @@ -21,7 +21,7 @@ package fake import ( "context" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/config/client/clientset/versioned/typed/cis/v1/fake/fake_virtualserver.go b/config/client/clientset/versioned/typed/cis/v1/fake/fake_virtualserver.go index 004321ac4..66a0d8756 100644 --- a/config/client/clientset/versioned/typed/cis/v1/fake/fake_virtualserver.go +++ b/config/client/clientset/versioned/typed/cis/v1/fake/fake_virtualserver.go @@ -21,7 +21,7 @@ package fake import ( "context" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/config/client/clientset/versioned/typed/cis/v1/ingresslink.go b/config/client/clientset/versioned/typed/cis/v1/ingresslink.go index e3bbf00a3..d9b30bb88 100644 --- a/config/client/clientset/versioned/typed/cis/v1/ingresslink.go +++ b/config/client/clientset/versioned/typed/cis/v1/ingresslink.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - scheme "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/scheme" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + scheme "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/clientset/versioned/typed/cis/v1/policy.go b/config/client/clientset/versioned/typed/cis/v1/policy.go index 8ccb79358..f67c981dd 100644 --- a/config/client/clientset/versioned/typed/cis/v1/policy.go +++ b/config/client/clientset/versioned/typed/cis/v1/policy.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - scheme "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/scheme" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + scheme "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/clientset/versioned/typed/cis/v1/tlsprofile.go b/config/client/clientset/versioned/typed/cis/v1/tlsprofile.go index 957a1d4da..33ed12f45 100644 --- a/config/client/clientset/versioned/typed/cis/v1/tlsprofile.go +++ b/config/client/clientset/versioned/typed/cis/v1/tlsprofile.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - scheme "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/scheme" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + scheme "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/clientset/versioned/typed/cis/v1/transportserver.go b/config/client/clientset/versioned/typed/cis/v1/transportserver.go index 7b096d012..c0c4bbb6e 100644 --- a/config/client/clientset/versioned/typed/cis/v1/transportserver.go +++ b/config/client/clientset/versioned/typed/cis/v1/transportserver.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - scheme "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/scheme" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + scheme "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/clientset/versioned/typed/cis/v1/virtualserver.go b/config/client/clientset/versioned/typed/cis/v1/virtualserver.go index b7e5cf215..03e8bd0f6 100644 --- a/config/client/clientset/versioned/typed/cis/v1/virtualserver.go +++ b/config/client/clientset/versioned/typed/cis/v1/virtualserver.go @@ -22,8 +22,8 @@ import ( "context" "time" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - scheme "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned/scheme" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + scheme "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/informers/externalversions/cis/interface.go b/config/client/informers/externalversions/cis/interface.go index 73dc6ac7b..011766169 100644 --- a/config/client/informers/externalversions/cis/interface.go +++ b/config/client/informers/externalversions/cis/interface.go @@ -19,8 +19,8 @@ limitations under the License. package cis import ( - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/cis/v1" - internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/internalinterfaces" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/cis/v1" + internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/config/client/informers/externalversions/cis/v1/externaldns.go b/config/client/informers/externalversions/cis/v1/externaldns.go index c78334cc0..0aa30c357 100644 --- a/config/client/informers/externalversions/cis/v1/externaldns.go +++ b/config/client/informers/externalversions/cis/v1/externaldns.go @@ -22,10 +22,10 @@ import ( "context" time "time" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - versioned "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned" - internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/internalinterfaces" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/listers/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + versioned "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned" + internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/internalinterfaces" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/listers/cis/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/informers/externalversions/cis/v1/ingresslink.go b/config/client/informers/externalversions/cis/v1/ingresslink.go index 58e00dfae..0d5ed81ae 100644 --- a/config/client/informers/externalversions/cis/v1/ingresslink.go +++ b/config/client/informers/externalversions/cis/v1/ingresslink.go @@ -22,10 +22,10 @@ import ( "context" time "time" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - versioned "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned" - internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/internalinterfaces" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/listers/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + versioned "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned" + internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/internalinterfaces" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/listers/cis/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/informers/externalversions/cis/v1/interface.go b/config/client/informers/externalversions/cis/v1/interface.go index d4e233516..567b99aff 100644 --- a/config/client/informers/externalversions/cis/v1/interface.go +++ b/config/client/informers/externalversions/cis/v1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/config/client/informers/externalversions/cis/v1/policy.go b/config/client/informers/externalversions/cis/v1/policy.go index cda24d1fc..d7516707c 100644 --- a/config/client/informers/externalversions/cis/v1/policy.go +++ b/config/client/informers/externalversions/cis/v1/policy.go @@ -22,10 +22,10 @@ import ( "context" time "time" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - versioned "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned" - internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/internalinterfaces" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/listers/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + versioned "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned" + internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/internalinterfaces" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/listers/cis/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/informers/externalversions/cis/v1/tlsprofile.go b/config/client/informers/externalversions/cis/v1/tlsprofile.go index 5b27aea5e..da6bb878d 100644 --- a/config/client/informers/externalversions/cis/v1/tlsprofile.go +++ b/config/client/informers/externalversions/cis/v1/tlsprofile.go @@ -22,10 +22,10 @@ import ( "context" time "time" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - versioned "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned" - internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/internalinterfaces" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/listers/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + versioned "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned" + internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/internalinterfaces" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/listers/cis/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/informers/externalversions/cis/v1/transportserver.go b/config/client/informers/externalversions/cis/v1/transportserver.go index 10a48db1a..79ac54644 100644 --- a/config/client/informers/externalversions/cis/v1/transportserver.go +++ b/config/client/informers/externalversions/cis/v1/transportserver.go @@ -22,10 +22,10 @@ import ( "context" time "time" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - versioned "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned" - internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/internalinterfaces" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/listers/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + versioned "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned" + internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/internalinterfaces" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/listers/cis/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/informers/externalversions/cis/v1/virtualserver.go b/config/client/informers/externalversions/cis/v1/virtualserver.go index 35d3beac5..59b602b16 100644 --- a/config/client/informers/externalversions/cis/v1/virtualserver.go +++ b/config/client/informers/externalversions/cis/v1/virtualserver.go @@ -22,10 +22,10 @@ import ( "context" time "time" - cisv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - versioned "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned" - internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/internalinterfaces" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/client/listers/cis/v1" + cisv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + versioned "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned" + internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/internalinterfaces" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/listers/cis/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/config/client/informers/externalversions/factory.go b/config/client/informers/externalversions/factory.go index 882973cc2..53b4aaf36 100644 --- a/config/client/informers/externalversions/factory.go +++ b/config/client/informers/externalversions/factory.go @@ -23,9 +23,9 @@ import ( sync "sync" time "time" - versioned "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned" - cis "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/cis" - internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/config/client/informers/externalversions/internalinterfaces" + versioned "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned" + cis "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/cis" + internalinterfaces "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/internalinterfaces" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/config/client/informers/externalversions/generic.go b/config/client/informers/externalversions/generic.go index bd253bfe6..98b80cb9b 100644 --- a/config/client/informers/externalversions/generic.go +++ b/config/client/informers/externalversions/generic.go @@ -21,7 +21,7 @@ package externalversions import ( "fmt" - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/config/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/config/client/informers/externalversions/internalinterfaces/factory_interfaces.go index a095dce2e..b18303138 100644 --- a/config/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/config/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,7 +21,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/F5Networks/k8s-bigip-ctlr/config/client/clientset/versioned" + versioned "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/config/client/listers/cis/v1/externaldns.go b/config/client/listers/cis/v1/externaldns.go index 7f8c42757..1bd5c797b 100644 --- a/config/client/listers/cis/v1/externaldns.go +++ b/config/client/listers/cis/v1/externaldns.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/config/client/listers/cis/v1/ingresslink.go b/config/client/listers/cis/v1/ingresslink.go index e3c16e1d6..0f21b791b 100644 --- a/config/client/listers/cis/v1/ingresslink.go +++ b/config/client/listers/cis/v1/ingresslink.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/config/client/listers/cis/v1/policy.go b/config/client/listers/cis/v1/policy.go index 92ed664cb..46156ba7c 100644 --- a/config/client/listers/cis/v1/policy.go +++ b/config/client/listers/cis/v1/policy.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/config/client/listers/cis/v1/tlsprofile.go b/config/client/listers/cis/v1/tlsprofile.go index c0691532e..067fa2b04 100644 --- a/config/client/listers/cis/v1/tlsprofile.go +++ b/config/client/listers/cis/v1/tlsprofile.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/config/client/listers/cis/v1/transportserver.go b/config/client/listers/cis/v1/transportserver.go index 156546ef9..31f06a7dd 100644 --- a/config/client/listers/cis/v1/transportserver.go +++ b/config/client/listers/cis/v1/transportserver.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/config/client/listers/cis/v1/virtualserver.go b/config/client/listers/cis/v1/virtualserver.go index 3bd8ea0e3..743bcadda 100644 --- a/config/client/listers/cis/v1/virtualserver.go +++ b/config/client/listers/cis/v1/virtualserver.go @@ -19,7 +19,7 @@ limitations under the License. package v1 import ( - v1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + v1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/docs/RELEASE-NOTES.rst b/docs/RELEASE-NOTES.rst index db3974cc4..43a545269 100644 --- a/docs/RELEASE-NOTES.rst +++ b/docs/RELEASE-NOTES.rst @@ -12,6 +12,7 @@ Bug Fixes ```````````` * Fix to remove unused ingress health monitors * Add pattern definition in CR schema to align with F5 BIGIP Object Naming convention +* :issues:`2153` Update go.mod to v2 2.11.0 ------------- diff --git a/go.mod b/go.mod index 7feae3b9f..df977d7fa 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 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 114e6ddcc..5d515eb4c 100644 --- a/pkg/agent/as3/as3Common.go +++ b/pkg/agent/as3/as3Common.go @@ -23,8 +23,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/as3Common_test.go b/pkg/agent/as3/as3Common_test.go index 0ab045166..439362ce4 100644 --- a/pkg/agent/as3/as3Common_test.go +++ b/pkg/agent/as3/as3Common_test.go @@ -1,7 +1,7 @@ package as3 import ( - . "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/as3ConfigMap.go b/pkg/agent/as3/as3ConfigMap.go index 7fda6c8a9..f5038cab5 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 ba67df2c5..1ba917b9d 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 c0927c7a4..3226974f0 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 220f0cd98..4dc15a9d1 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 f7c86afbf..affe791b4 100644 --- a/pkg/agent/as3/as3Utils.go +++ b/pkg/agent/as3/as3Utils.go @@ -23,8 +23,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 2a5754c52..99abe1523 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 8ac4455c4..2976f7452 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 52eb4efa6..24f039203 100644 --- a/pkg/appmanager/agentResponseHandler.go +++ b/pkg/appmanager/agentResponseHandler.go @@ -19,8 +19,8 @@ package appmanager import ( "context" "fmt" - "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" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/appmanager/appManager.go b/pkg/appmanager/appManager.go index 96e6e416c..6d7e28c92 100644 --- a/pkg/appmanager/appManager.go +++ b/pkg/appmanager/appManager.go @@ -29,14 +29,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 ab29cacea..e413a6506 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" diff --git a/pkg/appmanager/eventNotifier_test.go b/pkg/appmanager/eventNotifier_test.go index b67085a4f..76d8f4f87 100644 --- a/pkg/appmanager/eventNotifier_test.go +++ b/pkg/appmanager/eventNotifier_test.go @@ -22,11 +22,11 @@ import ( 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 0ac0062dd..1b89fa527 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 4c8edc9e7..46cbbd610 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 7cc76f175..294563b1e 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 48984e64f..97dc16069 100644 --- a/pkg/appmanager/ingress_test.go +++ b/pkg/appmanager/ingress_test.go @@ -18,10 +18,10 @@ 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..bdb3b1e23 100644 --- a/pkg/appmanager/profiles.go +++ b/pkg/appmanager/profiles.go @@ -23,8 +23,8 @@ import ( netv1 "k8s.io/api/networking/v1" "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" v1 "k8s.io/api/core/v1" diff --git a/pkg/appmanager/profiles_test.go b/pkg/appmanager/profiles_test.go index 3b9de3640..8f98a63f1 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 486b574c0..9e38e499a 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 7029e5b75..25fe0d1e6 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 aade894b9..308486d25 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 6f2176d98..00d1a0a49 100644 --- a/pkg/appmanager/validateResources.go +++ b/pkg/appmanager/validateResources.go @@ -22,8 +22,8 @@ import ( "encoding/json" "fmt" - . "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 6d9f87f86..877eb8b1e 100644 --- a/pkg/controller/backend.go +++ b/pkg/controller/backend.go @@ -27,9 +27,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 48c785059..c64e943ba 100644 --- a/pkg/controller/backend_test.go +++ b/pkg/controller/backend_test.go @@ -3,7 +3,7 @@ package controller import ( "encoding/json" - "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 86757533f..48a824e39 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -26,9 +26,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" routeclient "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1" v1 "k8s.io/api/core/v1" extClient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset" diff --git a/pkg/controller/controller_suit_test.go b/pkg/controller/controller_suit_test.go index d0bda0351..5a129dbc4 100644 --- a/pkg/controller/controller_suit_test.go +++ b/pkg/controller/controller_suit_test.go @@ -3,8 +3,8 @@ package controller import ( "bytes" "fmt" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/writer" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/writer" mockhc "github.com/f5devcentral/mockhttpclient" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go index 94c28822e..15cbcda2e 100644 --- a/pkg/controller/controller_test.go +++ b/pkg/controller/controller_test.go @@ -1,8 +1,8 @@ package controller import ( - "github.com/F5Networks/k8s-bigip-ctlr/pkg/teem" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/test" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/teem" + "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/informers.go b/pkg/controller/informers.go index 0cf16b0ab..17e099f99 100644 --- a/pkg/controller/informers.go +++ b/pkg/controller/informers.go @@ -27,9 +27,9 @@ import ( "k8s.io/apimachinery/pkg/watch" 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/client-go/tools/cache" diff --git a/pkg/controller/informers_test.go b/pkg/controller/informers_test.go index a726ac83f..bf8b20139 100644 --- a/pkg/controller/informers_test.go +++ b/pkg/controller/informers_test.go @@ -3,10 +3,10 @@ package controller import ( "container/list" 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/teem" - "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/teem" + "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/controller/nativeResourceWorker.go b/pkg/controller/nativeResourceWorker.go index 19ace4b9c..7533aa29e 100644 --- a/pkg/controller/nativeResourceWorker.go +++ b/pkg/controller/nativeResourceWorker.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" "fmt" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" "k8s.io/apimachinery/pkg/util/intstr" "os" "sort" @@ -13,14 +13,14 @@ import ( "sync" "time" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" routeapi "github.com/openshift/api/route/v1" "reflect" - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" "gopkg.in/yaml.v2" v1 "k8s.io/api/core/v1" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/nativeResourceWorker_test.go b/pkg/controller/nativeResourceWorker_test.go index 8a3d115c5..aa30abd1b 100644 --- a/pkg/controller/nativeResourceWorker_test.go +++ b/pkg/controller/nativeResourceWorker_test.go @@ -2,10 +2,10 @@ package controller import ( "fmt" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/teem" - "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/resource" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/teem" + "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/controller/node_poll_handler.go b/pkg/controller/node_poll_handler.go index 70142bce6..42f07e891 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 8bdd11c35..c2faf4852 100644 --- a/pkg/controller/node_poll_handler_test.go +++ b/pkg/controller/node_poll_handler_test.go @@ -1,10 +1,10 @@ package controller import ( - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" - 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" - "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" + cisinfv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/client/informers/externalversions/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/controller/postManager.go b/pkg/controller/postManager.go index ccf5031e6..9554e2d79 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 8b6c81bf5..cca709ce7 100644 --- a/pkg/controller/pythonDriver.go +++ b/pkg/controller/pythonDriver.go @@ -26,13 +26,13 @@ import ( "syscall" "time" - bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/pkg/prometheus" + bigIPPrometheus "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/health" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/writer" + "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 99f8840dd..e19e174e3 100644 --- a/pkg/controller/pythonDriver_test.go +++ b/pkg/controller/pythonDriver_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" "sync" diff --git a/pkg/controller/resourceConfig.go b/pkg/controller/resourceConfig.go index 591dc8f3c..982ce8798 100644 --- a/pkg/controller/resourceConfig.go +++ b/pkg/controller/resourceConfig.go @@ -19,7 +19,7 @@ package controller import ( "encoding/json" "fmt" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource" "net" "reflect" @@ -34,8 +34,8 @@ import ( routeapi "github.com/openshift/api/route/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" ) diff --git a/pkg/controller/resourceConfig_test.go b/pkg/controller/resourceConfig_test.go index 5105177d1..6b088730c 100644 --- a/pkg/controller/resourceConfig_test.go +++ b/pkg/controller/resourceConfig_test.go @@ -4,9 +4,9 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" "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 64562a714..2f0f4ed11 100644 --- a/pkg/controller/responseHandler.go +++ b/pkg/controller/responseHandler.go @@ -5,10 +5,10 @@ import ( "strings" "sync" - 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" - cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/config/apis/cis/v1" + cisapiv1 "github.com/F5Networks/k8s-bigip-ctlr/v2/config/apis/cis/v1" ) func (ctlr *Controller) enqueueReq(config ResourceConfigRequest) int { diff --git a/pkg/controller/routing.go b/pkg/controller/routing.go index 4e557c974..60a42e749 100644 --- a/pkg/controller/routing.go +++ b/pkg/controller/routing.go @@ -28,10 +28,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 510617623..78e2b6119 100644 --- a/pkg/controller/types.go +++ b/pkg/controller/types.go @@ -28,13 +28,13 @@ import ( routeclient "github.com/openshift/client-go/route/clientset/versioned/typed/route/v1" - "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" diff --git a/pkg/controller/validate.go b/pkg/controller/validate.go index 3c441b795..e2a981661 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 15417e56e..0e2adf1d5 100644 --- a/pkg/controller/worker.go +++ b/pkg/controller/worker.go @@ -29,8 +29,8 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" 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" routeapi "github.com/openshift/api/route/v1" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/worker_test.go b/pkg/controller/worker_test.go index 64251193f..a4da94fd4 100644 --- a/pkg/controller/worker_test.go +++ b/pkg/controller/worker_test.go @@ -4,8 +4,8 @@ import ( "container/list" "context" "encoding/json" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/resource" - "github.com/F5Networks/k8s-bigip-ctlr/pkg/teem" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/resource" + "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/teem" routeapi "github.com/openshift/api/route/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/client-go/util/workqueue" @@ -17,14 +17,14 @@ 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" + 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" 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 c6ea85c75..c9df49607 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 78b82f10b..8024812b8 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/resource/routeDomain.go b/pkg/resource/routeDomain.go index 0d1f703d0..dd7985332 100644 --- a/pkg/resource/routeDomain.go +++ b/pkg/resource/routeDomain.go @@ -17,7 +17,7 @@ package resource import ( - log "github.com/F5Networks/k8s-bigip-ctlr/pkg/vlogger" + log "github.com/F5Networks/k8s-bigip-ctlr/v2/pkg/vlogger" "net" "strconv" "strings" diff --git a/pkg/teem/teem.go b/pkg/teem/teem.go index 55e900ed4..d9e9f246a 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 24a588c0d..940d735dd 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 1c2a2c08e..48df0cfb2 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/vxlan/vxlanMgr.go b/pkg/vxlan/vxlanMgr.go index 6d2338380..07083a3cb 100644 --- a/pkg/vxlan/vxlanMgr.go +++ b/pkg/vxlan/vxlanMgr.go @@ -23,9 +23,9 @@ 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" 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 {