Skip to content
This repository has been archived by the owner on Mar 6, 2024. It is now read-only.

Commit

Permalink
Use vanity import k8c.io/kubecarrier (#528)
Browse files Browse the repository at this point in the history
  • Loading branch information
aborilov authored Jul 30, 2020
1 parent eb58785 commit acd3183
Show file tree
Hide file tree
Showing 162 changed files with 314 additions and 314 deletions.
8 changes: 4 additions & 4 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ builds:
main: cmd/kubectl-kubecarrier/main.go
ldflags: >
-s -w
-X github.com/kubermatic/kubecarrier/pkg/internal/version.Version={{.Tag}}
-X github.com/kubermatic/kubecarrier/pkg/internal/version.Branch={{.Tag}}
-X github.com/kubermatic/kubecarrier/pkg/internal/version.Commit={{.ShortCommit}}
-X github.com/kubermatic/kubecarrier/pkg/internal/version.BuildDate={{.Timestamp}}
-X k8c.io/kubecarrier/pkg/internal/version.Version={{.Tag}}
-X k8c.io/kubecarrier/pkg/internal/version.Branch={{.Tag}}
-X k8c.io/kubecarrier/pkg/internal/version.Commit={{.ShortCommit}}
-X k8c.io/kubecarrier/pkg/internal/version.BuildDate={{.Timestamp}}
- &build
<<: *build-cli
id: manager
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SHORT_SHA=$(shell git rev-parse --short HEAD)
VERSION?=${BRANCH}-${SHORT_SHA}
BUILD_DATE=$(shell date +%s)
IMAGE_ORG?=quay.io/kubecarrier
MODULE=github.com/kubermatic/kubecarrier
MODULE=k8c.io/kubecarrier
LD_FLAGS=-X $(MODULE)/pkg/internal/version.Version=$(VERSION) -X $(MODULE)/pkg/internal/version.Branch=$(BRANCH) -X $(MODULE)/pkg/internal/version.Commit=$(SHORT_SHA) -X $(MODULE)/pkg/internal/version.BuildDate=$(BUILD_DATE)
KIND_CLUSTER?=kubecarrier
COMPONENTS = operator manager ferry catapult elevator apiserver
Expand Down
2 changes: 1 addition & 1 deletion cmd/apiserver/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package main
import (
"os"

"github.com/kubermatic/kubecarrier/pkg/apiserver"
"k8c.io/kubecarrier/pkg/apiserver"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/catapult/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package main
import (
"os"

"github.com/kubermatic/kubecarrier/pkg/catapult"
"k8c.io/kubecarrier/pkg/catapult"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/elevator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package main
import (
"os"

"github.com/kubermatic/kubecarrier/pkg/elevator"
"k8c.io/kubecarrier/pkg/elevator"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/fake-operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"os"

"github.com/kubermatic/kubecarrier/pkg/fakeoperator"
"k8c.io/kubecarrier/pkg/fakeoperator"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/ferry/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

ctrl "sigs.k8s.io/controller-runtime"

"github.com/kubermatic/kubecarrier/pkg/ferry"
"k8c.io/kubecarrier/pkg/ferry"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubectl-kubecarrier/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"os"

"github.com/kubermatic/kubecarrier/pkg/cli"
"k8c.io/kubecarrier/pkg/cli"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package main
import (
"os"

"github.com/kubermatic/kubecarrier/pkg/manager"
"k8c.io/kubecarrier/pkg/manager"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/operator/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package main
import (
"os"

"github.com/kubermatic/kubecarrier/pkg/operator"
"k8c.io/kubecarrier/pkg/operator"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/kubermatic/kubecarrier
module k8c.io/kubecarrier

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion hack/gen-tasks.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"os"
"path"

"github.com/kubermatic/kubecarrier/pkg/ide"
"k8c.io/kubecarrier/pkg/ide"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/catalog/v1alpha1/catalogentryset_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1alpha1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/core/v1alpha1"
corev1alpha1 "k8c.io/kubecarrier/pkg/apis/core/v1alpha1"
)

// CatalogEntrySetSpec defines the desired state of CatalogEntrySet.
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/catalog/v1alpha1/region_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1alpha1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/core/v1alpha1"
corev1alpha1 "k8c.io/kubecarrier/pkg/apis/core/v1alpha1"
)

// RegionSpec defines the desired state of Region
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/fake/v1alpha1/db_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"sigs.k8s.io/controller-runtime/pkg/conversion"

v1 "github.com/kubermatic/kubecarrier/pkg/apis/fake/v1"
v1 "k8c.io/kubecarrier/pkg/apis/fake/v1"
)

var _ conversion.Convertible = (*DB)(nil)
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/operator/v1alpha1/apiserver_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/kubermatic/kubecarrier/pkg/apiserver/auth"
"k8c.io/kubecarrier/pkg/apiserver/auth"
)

type Authentication []AuthenticationConfig
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/operator/v1alpha1/catapult_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1alpha1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

corev1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/core/v1alpha1"
corev1alpha1 "k8c.io/kubecarrier/pkg/apis/core/v1alpha1"
)

// CatapultSpec defines the desired state of Catapult.
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/operator/v1alpha1/kubecarrier_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/kubermatic/kubecarrier/pkg/apiserver/auth"
"k8c.io/kubecarrier/pkg/apiserver/auth"
)

func TestKubeCarrierValidation(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/api/v1/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1
import (
"k8s.io/apimachinery/pkg/runtime/schema"

"github.com/kubermatic/kubecarrier/pkg/apiserver/authorizer"
"k8c.io/kubecarrier/pkg/apiserver/authorizer"
)

var (
Expand Down
18 changes: 9 additions & 9 deletions pkg/apiserver/apiserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ import (

"github.com/kubermatic/utils/pkg/util"

catalogv1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/catalog/v1alpha1"
apiserverv1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
"github.com/kubermatic/kubecarrier/pkg/apiserver/auth"
_ "github.com/kubermatic/kubecarrier/pkg/apiserver/internal/auth/anonymous"
_ "github.com/kubermatic/kubecarrier/pkg/apiserver/internal/auth/htpasswd"
_ "github.com/kubermatic/kubecarrier/pkg/apiserver/internal/auth/oidc"
_ "github.com/kubermatic/kubecarrier/pkg/apiserver/internal/auth/token"
"github.com/kubermatic/kubecarrier/pkg/apiserver/internal/authorizer"
v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/internal/v1"
catalogv1alpha1 "k8c.io/kubecarrier/pkg/apis/catalog/v1alpha1"
apiserverv1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
"k8c.io/kubecarrier/pkg/apiserver/auth"
_ "k8c.io/kubecarrier/pkg/apiserver/internal/auth/anonymous"
_ "k8c.io/kubecarrier/pkg/apiserver/internal/auth/htpasswd"
_ "k8c.io/kubecarrier/pkg/apiserver/internal/auth/oidc"
_ "k8c.io/kubecarrier/pkg/apiserver/internal/auth/token"
"k8c.io/kubecarrier/pkg/apiserver/internal/authorizer"
v1 "k8c.io/kubecarrier/pkg/apiserver/internal/v1"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/internal/auth/anonymous/anonymous.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/spf13/pflag"
"k8s.io/apiserver/pkg/authentication/user"

"github.com/kubermatic/kubecarrier/pkg/apiserver/auth"
"k8c.io/kubecarrier/pkg/apiserver/auth"
)

type Auth struct{}
Expand Down
4 changes: 2 additions & 2 deletions pkg/apiserver/internal/auth/htpasswd/htpasswd.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/runtime/inject"

"github.com/kubermatic/kubecarrier/pkg/apiserver/auth"
"github.com/kubermatic/kubecarrier/pkg/internal/constants"
"k8c.io/kubecarrier/pkg/apiserver/auth"
"k8c.io/kubecarrier/pkg/internal/constants"
)

type HtpasswdAuthenticator struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/internal/auth/oidc/oidc.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
cliflag "k8s.io/component-base/cli/flag"
"sigs.k8s.io/controller-runtime/pkg/runtime/inject"

"github.com/kubermatic/kubecarrier/pkg/apiserver/auth"
"k8c.io/kubecarrier/pkg/apiserver/auth"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/internal/auth/token/token.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/runtime/inject"

"github.com/kubermatic/kubecarrier/pkg/apiserver/auth"
"k8c.io/kubecarrier/pkg/apiserver/auth"
)

type Auth struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apiserver/internal/authorizer/authorizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/kubermatic/kubecarrier/pkg/apiserver/auth"
"github.com/kubermatic/kubecarrier/pkg/apiserver/authorizer"
"k8c.io/kubecarrier/pkg/apiserver/auth"
"k8c.io/kubecarrier/pkg/apiserver/authorizer"
)

type Authorizer struct {
Expand Down
8 changes: 4 additions & 4 deletions pkg/apiserver/internal/v1/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/controller-runtime/pkg/client"

catalogv1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
"github.com/kubermatic/kubecarrier/pkg/apiserver/auth"
"github.com/kubermatic/kubecarrier/pkg/apiserver/internal/util"
catalogv1alpha1 "k8c.io/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
"k8c.io/kubecarrier/pkg/apiserver/auth"
"k8c.io/kubecarrier/pkg/apiserver/internal/util"
)

type accountServer struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apiserver/internal/v1/account_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"

catalogv1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
catalogv1alpha1 "k8c.io/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
)

func TestListAccount(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/internal/v1/apiserver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
clientgoscheme "k8s.io/client-go/kubernetes/scheme"

catalogv1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/catalog/v1alpha1"
catalogv1alpha1 "k8c.io/kubecarrier/pkg/apis/catalog/v1alpha1"
)

var testScheme = runtime.NewScheme()
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/internal/v1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
)

type docServer struct{}
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/internal/v1/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"github.com/golang/protobuf/ptypes/any"
"github.com/golang/protobuf/ptypes/empty"

v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
)

type instanceServer struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/internal/v1/instance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"

v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions pkg/apiserver/internal/v1/kubecarrier.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"github.com/golang/protobuf/ptypes/empty"
"github.com/golang/protobuf/ptypes/timestamp"

v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
"github.com/kubermatic/kubecarrier/pkg/apiserver/auth"
"github.com/kubermatic/kubecarrier/pkg/internal/version"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
"k8c.io/kubecarrier/pkg/apiserver/auth"
"k8c.io/kubecarrier/pkg/internal/version"
)

type KubeCarrierServer struct{}
Expand Down
4 changes: 2 additions & 2 deletions pkg/apiserver/internal/v1/offering.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"

catalogv1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
catalogv1alpha1 "k8c.io/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
)

type offeringServer struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apiserver/internal/v1/offering_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"

catalogv1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
catalogv1alpha1 "k8c.io/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
)

func TestListOffering(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apiserver/internal/v1/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"

catalogv1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
catalogv1alpha1 "k8c.io/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
)

type providerServer struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apiserver/internal/v1/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"

catalogv1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
catalogv1alpha1 "k8c.io/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
)

func TestListProvider(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apiserver/internal/v1/region.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"

catalogv1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
catalogv1alpha1 "k8c.io/kubecarrier/pkg/apis/catalog/v1alpha1"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
)

type regionServer struct {
Expand Down
6 changes: 3 additions & 3 deletions pkg/apiserver/internal/v1/region_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"

catalogv1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/catalog/v1alpha1"
corev1alpha1 "github.com/kubermatic/kubecarrier/pkg/apis/core/v1alpha1"
v1 "github.com/kubermatic/kubecarrier/pkg/apiserver/api/v1"
catalogv1alpha1 "k8c.io/kubecarrier/pkg/apis/catalog/v1alpha1"
corev1alpha1 "k8c.io/kubecarrier/pkg/apis/core/v1alpha1"
v1 "k8c.io/kubecarrier/pkg/apiserver/api/v1"
)

func TestListRegion(t *testing.T) {
Expand Down
Loading

0 comments on commit acd3183

Please sign in to comment.