Skip to content

Commit

Permalink
Change go module name to make it importable
Browse files Browse the repository at this point in the history
  • Loading branch information
barney-s committed Jul 1, 2024
1 parent b78a457 commit 2d9a934
Show file tree
Hide file tree
Showing 31 changed files with 53 additions and 53 deletions.
14 changes: 7 additions & 7 deletions experiments/compositions/composition/PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ domain: google.com
layout:
- go.kubebuilder.io/v4
projectName: composition
repo: google.com/composition
repo: github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition
resources:
- api:
crdVersion: v1alpha1
Expand All @@ -15,7 +15,7 @@ resources:
domain: google.com
group: composition
kind: Composition
path: google.com/composition/api/v1alpha1
path: github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1alpha1
Expand All @@ -24,7 +24,7 @@ resources:
domain: google.com
group: composition
kind: Context
path: google.com/composition/api/v1alpha1
path: github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1alpha1
Expand All @@ -33,7 +33,7 @@ resources:
domain: google.com
group: composition
kind: Plan
path: google.com/composition/api/v1alpha1
path: github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
Expand All @@ -42,7 +42,7 @@ resources:
domain: google.com
group: composition
kind: Facade
path: google.com/composition/api/v1alpha1
path: github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
Expand All @@ -51,7 +51,7 @@ resources:
domain: google.com
group: composition
kind: ExpanderVersion
path: google.com/composition/api/v1alpha1
path: github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1
version: v1alpha1
- api:
crdVersion: v1
Expand All @@ -60,6 +60,6 @@ resources:
domain: google.com
group: composition
kind: GetterConfiguration
path: google.com/composition/api/v1alpha1
path: github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1
version: v1alpha1
version: "3"
4 changes: 2 additions & 2 deletions experiments/compositions/composition/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log/zap"
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
"google.com/composition/internal/controller"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/internal/controller"
//+kubebuilder:scaffold:imports
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"log"
"time"

pb "google.com/composition/proto"
pb "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)
Expand Down
4 changes: 2 additions & 2 deletions experiments/compositions/composition/expanders/getter/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"net"
"strings"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
pb "google.com/composition/proto"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
pb "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/proto"
"google.golang.org/grpc"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"testing"
"time"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
pb "google.com/composition/proto"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
pb "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"os/exec"
"path/filepath"

pb "google.com/composition/proto"
pb "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/proto"
"google.golang.org/grpc"
"tailscale.com/atomicfile"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"testing"
"time"

pb "google.com/composition/proto"
pb "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)
Expand Down
2 changes: 1 addition & 1 deletion experiments/compositions/composition/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module google.com/composition
module github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition

go 1.22.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"strings"
"sync"

compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
pb "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/proto"
"github.com/go-logr/logr"
compositionv1alpha1 "google.com/composition/api/v1alpha1"
pb "google.com/composition/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
corev1 "k8s.io/api/core/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
)

// ContextReconciler reconciles a Context object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

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

compositionv1alpha1 "google.com/composition/api/v1alpha1"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
)

var _ = Describe("Context Controller", func() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (
"strings"
"time"

compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/pkg/applier"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/pkg/containerexecutor/jobcontainerexecutor"
pb "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/proto"
"github.com/go-logr/logr"
"golang.org/x/time/rate"
compositionv1alpha1 "google.com/composition/api/v1alpha1"
"google.com/composition/pkg/applier"
"google.com/composition/pkg/containerexecutor/jobcontainerexecutor"
pb "google.com/composition/proto"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
)

// ExpanderVersionReconciler reconciles a ExpanderVersion object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

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

compositionv1alpha1 "google.com/composition/api/v1alpha1"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
)

var _ = Describe("ExpanderVersion Controller", func() {
Expand Down
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/log"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
"google.com/composition/pkg/crds"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/pkg/crds"
)

// FacadeReconciler reconciles a Facade object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

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

compositionv1alpha1 "google.com/composition/api/v1alpha1"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
)

var _ = Describe("Facade Controller", func() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
)

// GetterConfigurationReconciler reconciles a GetterConfiguration object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

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

compositionv1alpha1 "google.com/composition/api/v1alpha1"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
)

var _ = Describe("GetterConfiguration Controller", func() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
)

// PlanReconciler reconciles a Plan object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
)

var _ = Describe("Plan Controller", func() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
//+kubebuilder:scaffold:imports
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"context"
"fmt"

compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
"github.com/go-logr/logr"
compositionv1alpha1 "google.com/composition/api/v1alpha1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/dynamic"
Expand Down
2 changes: 1 addition & 1 deletion experiments/compositions/composition/proto/expander.proto
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ syntax = "proto3";

package expander_grpc;

option go_package = "google.com/composition/proto/expander";
option go_package = "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/proto/expander";


enum Status {
Expand Down
4 changes: 2 additions & 2 deletions experiments/compositions/composition/tests/cluster/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"testing"
"time"

"google.com/composition/tests/cluster/configcontroller"
"google.com/composition/tests/cluster/kind"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/cluster/configcontroller"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/cluster/kind"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/rest"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"strings"
"time"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
"google.com/composition/tests/utils"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/utils"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"testing"
"time"

"google.com/composition/tests/cluster"
"google.com/composition/tests/testclient"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/cluster"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/testclient"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/rest"
"sigs.k8s.io/kubebuilder-declarative-pattern/pkg/patterns/declarative/pkg/manifest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"

"google.com/composition/tests/scenario"
"google.com/composition/tests/testclient"
"google.com/composition/tests/utils"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/scenario"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/testclient"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/utils"
"k8s.io/apimachinery/pkg/util/rand"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"testing"
"time"

"google.com/composition/tests/cluster"
"google.com/composition/tests/cluster/kind"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/cluster"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/cluster/kind"
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"testing"
"time"

"google.com/composition/tests/scenario"
"google.com/composition/tests/utils"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/scenario"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/tests/utils"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"testing"
"time"

compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
"github.com/google/go-cmp/cmp"
compositionv1alpha1 "google.com/composition/api/v1alpha1"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions experiments/compositions/composition/tests/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"fmt"
"time"

compositionv1alpha1 "google.com/composition/api/v1alpha1"
"google.com/composition/internal/controller"
compositionv1alpha1 "github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/api/v1alpha1"
"github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition/internal/controller"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
Expand Down

0 comments on commit 2d9a934

Please sign in to comment.