Skip to content

Commit

Permalink
Update go.mod to v2 (F5Networks#2669)
Browse files Browse the repository at this point in the history
  • Loading branch information
arzzon authored Dec 14, 2022
1 parent f904c69 commit 37633df
Show file tree
Hide file tree
Showing 108 changed files with 308 additions and 256 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions build-tools/crdcodegen.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/[email protected] \
&& go get k8s.io/apimachinery \
&& go get k8s.io/apiextensions-apiserver \
&& go get -d k8s.io/[email protected] \
&& 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 \
Expand All @@ -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
28 changes: 14 additions & 14 deletions cmd/k8s-bigip-ctlr/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/k8s-bigip-ctlr/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions cmd/k8s-bigip-ctlr/pythonDriver.go
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
59 changes: 55 additions & 4 deletions config/apis/cis/v1/zz_generated.deepcopy.go

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

2 changes: 1 addition & 1 deletion config/client/clientset/versioned/clientset.go

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

6 changes: 3 additions & 3 deletions config/client/clientset/versioned/fake/clientset_generated.go

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

2 changes: 1 addition & 1 deletion config/client/clientset/versioned/fake/register.go

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

2 changes: 1 addition & 1 deletion config/client/clientset/versioned/scheme/register.go

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

4 changes: 2 additions & 2 deletions config/client/clientset/versioned/typed/cis/v1/cis_client.go

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

4 changes: 2 additions & 2 deletions config/client/clientset/versioned/typed/cis/v1/externaldns.go

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

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

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

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

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

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

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

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

4 changes: 2 additions & 2 deletions config/client/clientset/versioned/typed/cis/v1/ingresslink.go

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

4 changes: 2 additions & 2 deletions config/client/clientset/versioned/typed/cis/v1/policy.go

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

4 changes: 2 additions & 2 deletions config/client/clientset/versioned/typed/cis/v1/tlsprofile.go

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

Loading

0 comments on commit 37633df

Please sign in to comment.