diff --git a/cmd/bootstrap-post/main.go b/cmd/bootstrap-post/main.go index 2b0bfef..00a5bdd 100644 --- a/cmd/bootstrap-post/main.go +++ b/cmd/bootstrap-post/main.go @@ -3,11 +3,11 @@ package main import ( "crypto/tls" "fmt" + "github.com/TykTechnologies/tyk-k8s-bootstrap/data" + "github.com/TykTechnologies/tyk-k8s-bootstrap/helpers" + "github.com/TykTechnologies/tyk-k8s-bootstrap/readiness" "net/http" "os" - "tyk/tyk/bootstrap/data" - "tyk/tyk/bootstrap/helpers" - "tyk/tyk/bootstrap/readiness" ) func main() { diff --git a/cmd/bootstrap-pre-delete/main.go b/cmd/bootstrap-pre-delete/main.go index ce461e2..9e4be0f 100644 --- a/cmd/bootstrap-pre-delete/main.go +++ b/cmd/bootstrap-pre-delete/main.go @@ -2,9 +2,9 @@ package main import ( "fmt" + "github.com/TykTechnologies/tyk-k8s-bootstrap/data" + "github.com/TykTechnologies/tyk-k8s-bootstrap/predelete" "os" - "tyk/tyk/bootstrap/data" - "tyk/tyk/bootstrap/predelete" ) func main() { diff --git a/cmd/bootstrap-pre-install/main.go b/cmd/bootstrap-pre-install/main.go index 093a69b..15fd880 100644 --- a/cmd/bootstrap-pre-install/main.go +++ b/cmd/bootstrap-pre-install/main.go @@ -2,8 +2,8 @@ package main import ( "fmt" + "github.com/TykTechnologies/tyk-k8s-bootstrap/preinstallation" "os" - "tyk/tyk/bootstrap/preinstallation" ) func main() { diff --git a/data/app.go b/data/app.go index b21ab94..5e777cb 100644 --- a/data/app.go +++ b/data/app.go @@ -3,13 +3,13 @@ package data import ( "context" "fmt" + "github.com/TykTechnologies/tyk-k8s-bootstrap/constants" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "os" "strconv" - "tyk/tyk/bootstrap/constants" ) type AppArguments struct { diff --git a/go.mod b/go.mod index 6f4ef36..c62a423 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,10 @@ -module tyk/tyk/bootstrap +module github.com/TykTechnologies/tyk-k8s-bootstrap go 1.17 require ( github.com/golang-jwt/jwt v3.2.2+incompatible + k8s.io/api v0.24.3 k8s.io/apimachinery v0.24.3 k8s.io/client-go v0.24.3 ) @@ -42,7 +43,6 @@ require ( gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect - k8s.io/api v0.24.3 // indirect k8s.io/klog/v2 v2.60.1 // indirect k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect diff --git a/helpers/operator.go b/helpers/operator.go index 22479cc..48f40f9 100644 --- a/helpers/operator.go +++ b/helpers/operator.go @@ -3,11 +3,11 @@ package helpers import ( "context" "fmt" + "github.com/TykTechnologies/tyk-k8s-bootstrap/data" v12 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "tyk/tyk/bootstrap/data" ) func BootstrapTykOperatorSecret() error { diff --git a/helpers/organisation.go b/helpers/organisation.go index cf40472..d0e9530 100644 --- a/helpers/organisation.go +++ b/helpers/organisation.go @@ -4,9 +4,9 @@ import ( "bytes" "errors" "fmt" + "github.com/TykTechnologies/tyk-k8s-bootstrap/data" "io" "net/http" - "tyk/tyk/bootstrap/data" "k8s.io/apimachinery/pkg/util/json" ) diff --git a/helpers/portal.go b/helpers/portal.go index 42cad11..4654045 100644 --- a/helpers/portal.go +++ b/helpers/portal.go @@ -7,6 +7,8 @@ import ( "fmt" "io" + "github.com/TykTechnologies/tyk-k8s-bootstrap/constants" + "github.com/TykTechnologies/tyk-k8s-bootstrap/data" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/types" @@ -15,8 +17,6 @@ import ( "k8s.io/client-go/rest" "net/http" "time" - "tyk/tyk/bootstrap/constants" - "tyk/tyk/bootstrap/data" ) func BoostrapPortal(client http.Client) error { diff --git a/helpers/user.go b/helpers/user.go index f70c664..5fa1e52 100644 --- a/helpers/user.go +++ b/helpers/user.go @@ -4,10 +4,10 @@ import ( "bytes" "errors" "fmt" + "github.com/TykTechnologies/tyk-k8s-bootstrap/data" "io" "net/http" "time" - "tyk/tyk/bootstrap/data" "k8s.io/apimachinery/pkg/util/json" ) diff --git a/license/license.go b/license/license.go index b47fbc1..d0d784c 100644 --- a/license/license.go +++ b/license/license.go @@ -3,12 +3,12 @@ package license import ( "errors" "fmt" + "github.com/TykTechnologies/tyk-k8s-bootstrap/constants" "github.com/golang-jwt/jwt" "os" "strconv" "strings" "time" - "tyk/tyk/bootstrap/constants" ) func GetDashboardLicense() (string, error) { diff --git a/predelete/predelete.go b/predelete/predelete.go index 640caa7..2b2a25c 100644 --- a/predelete/predelete.go +++ b/predelete/predelete.go @@ -3,9 +3,9 @@ package predelete import ( "context" "fmt" + "github.com/TykTechnologies/tyk-k8s-bootstrap/constants" + "github.com/TykTechnologies/tyk-k8s-bootstrap/data" "os" - "tyk/tyk/bootstrap/constants" - "tyk/tyk/bootstrap/data" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/preinstallation/preinstallation.go b/preinstallation/preinstallation.go index b184063..449e8b0 100644 --- a/preinstallation/preinstallation.go +++ b/preinstallation/preinstallation.go @@ -5,7 +5,7 @@ package preinstallation import ( "errors" - "tyk/tyk/bootstrap/license" + "github.com/TykTechnologies/tyk-k8s-bootstrap/license" ) // PreHookInstall runs all required license validation operations that are required in pre-install hook. diff --git a/readiness/readiness.go b/readiness/readiness.go index 2c453ac..e899868 100644 --- a/readiness/readiness.go +++ b/readiness/readiness.go @@ -4,10 +4,10 @@ import ( "context" "errors" "fmt" + "github.com/TykTechnologies/tyk-k8s-bootstrap/data" v1 "k8s.io/api/core/v1" "strings" "time" - "tyk/tyk/bootstrap/data" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes"