Merge pull request GoogleCloudPlatform#2206 from barney-s/remod

Change go module name to make it importable
gemmahou · Jul 1, 2024 · 3e7d6de · 3e7d6de
2 parents c9317f5 + 2d9a934
commit 3e7d6de
Show file tree

Hide file tree

Showing 31 changed files with 53 additions and 53 deletions.
diff --git a/experiments/compositions/composition/PROJECT b/experiments/compositions/composition/PROJECT
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
diff --git a/experiments/compositions/composition/cmd/main.go b/experiments/compositions/composition/cmd/main.go
@@ -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
 )
 

diff --git a/experiments/compositions/composition/expanders/expand/main.go b/experiments/compositions/composition/expanders/expand/main.go
@@ -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"
 )

diff --git a/experiments/compositions/composition/expanders/getter/main.go b/experiments/compositions/composition/expanders/getter/main.go
@@ -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"

diff --git a/experiments/compositions/composition/expanders/getter/main_test.go b/experiments/compositions/composition/expanders/getter/main_test.go
@@ -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"

diff --git a/experiments/compositions/composition/expanders/jinja2/main.go b/experiments/compositions/composition/expanders/jinja2/main.go
@@ -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"
 )

diff --git a/experiments/compositions/composition/expanders/jinja2/main_test.go b/experiments/compositions/composition/expanders/jinja2/main_test.go
@@ -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"
 )

diff --git a/experiments/compositions/composition/go.mod b/experiments/compositions/composition/go.mod
@@ -1,4 +1,4 @@
-module google.com/composition
+module github.com/GoogleCloudPlatform/k8s-config-connector/experiments/compositions/composition
 
 go 1.22.0
 

diff --git a/experiments/compositions/composition/internal/controller/composition_controller.go b/experiments/compositions/composition/internal/controller/composition_controller.go
@@ -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"

diff --git a/experiments/compositions/composition/internal/controller/context_controller.go b/experiments/compositions/composition/internal/controller/context_controller.go
@@ -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

diff --git a/experiments/compositions/composition/internal/controller/context_controller_test.go b/experiments/compositions/composition/internal/controller/context_controller_test.go
@@ -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() {

diff --git a/experiments/compositions/composition/internal/controller/expander_reconciler.go b/experiments/compositions/composition/internal/controller/expander_reconciler.go
@@ -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"

diff --git a/experiments/compositions/composition/internal/controller/expanderversion_controller.go b/experiments/compositions/composition/internal/controller/expanderversion_controller.go
@@ -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

diff --git a/experiments/compositions/composition/internal/controller/expanderversion_controller_test.go b/experiments/compositions/composition/internal/controller/expanderversion_controller_test.go
@@ -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() {

diff --git a/experiments/compositions/composition/internal/controller/facade_controller.go b/experiments/compositions/composition/internal/controller/facade_controller.go
@@ -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

diff --git a/experiments/compositions/composition/internal/controller/facade_controller_test.go b/experiments/compositions/composition/internal/controller/facade_controller_test.go
@@ -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() {

diff --git a/experiments/compositions/composition/internal/controller/getter_controller.go b/experiments/compositions/composition/internal/controller/getter_controller.go
@@ -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

diff --git a/experiments/compositions/composition/internal/controller/getter_controller_test.go b/experiments/compositions/composition/internal/controller/getter_controller_test.go
@@ -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() {

diff --git a/experiments/compositions/composition/internal/controller/plan_controller.go b/experiments/compositions/composition/internal/controller/plan_controller.go
@@ -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

diff --git a/experiments/compositions/composition/internal/controller/plan_controller_test.go b/experiments/compositions/composition/internal/controller/plan_controller_test.go
@@ -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() {

diff --git a/experiments/compositions/composition/internal/controller/suite_test.go b/experiments/compositions/composition/internal/controller/suite_test.go
@@ -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
 )
 

diff --git a/experiments/compositions/composition/pkg/applier/applier.go b/experiments/compositions/composition/pkg/applier/applier.go
@@ -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"

diff --git a/experiments/compositions/composition/proto/expander.proto b/experiments/compositions/composition/proto/expander.proto
@@ -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 {

diff --git a/experiments/compositions/composition/tests/cluster/cluster.go b/experiments/compositions/composition/tests/cluster/cluster.go
@@ -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"
 )

diff --git a/experiments/compositions/composition/tests/cluster/configcontroller/cluster.go b/experiments/compositions/composition/tests/cluster/configcontroller/cluster.go
@@ -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"

diff --git a/experiments/compositions/composition/tests/scenario/scenario.go b/experiments/compositions/composition/tests/scenario/scenario.go
@@ -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"

diff --git a/experiments/compositions/composition/tests/testcases/kcc_samples_test.go b/experiments/compositions/composition/tests/testcases/kcc_samples_test.go
@@ -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"
 )
 

diff --git a/experiments/compositions/composition/tests/testcases/main_test.go b/experiments/compositions/composition/tests/testcases/main_test.go
@@ -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"
 )

diff --git a/experiments/compositions/composition/tests/testcases/simple_test.go b/experiments/compositions/composition/tests/testcases/simple_test.go
@@ -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"
 )
 

diff --git a/experiments/compositions/composition/tests/testclient/client.go b/experiments/compositions/composition/tests/testclient/client.go
@@ -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"

diff --git a/experiments/compositions/composition/tests/utils/utils.go b/experiments/compositions/composition/tests/utils/utils.go
@@ -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"