Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/bootstrap-post/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/bootstrap-pre-delete/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/bootstrap-pre-install/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package main

import (
"fmt"
"github.com/TykTechnologies/tyk-k8s-bootstrap/preinstallation"
"os"
"tyk/tyk/bootstrap/preinstallation"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion data/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -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
)
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion helpers/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion helpers/organisation.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
4 changes: 2 additions & 2 deletions helpers/portal.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion helpers/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion license/license.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions predelete/predelete.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion preinstallation/preinstallation.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion readiness/readiness.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down