diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f54cd32 --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +.cache +.work +.temp +_output +cover.out +vendor +.vendor-new +.DS_Store + +# ignore vscode files (debug config etc...) +.vscode +.idea + +# Golang github .gitignore https://github.com/github/gitignore/blob/main/Go.gitignore +# Binaries for programs and plugins +*.exe +*.exe~ +*.dll +*.so +*.dylib + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +# Go workspace file +go.work +go.work.sum + +# Crossplane configuration package +*.xpkg + +# Logfiles, like those produced by some of the tests +*.log \ No newline at end of file diff --git a/bind/DEVELOPING.md b/bind/DEVELOPING.md index e020b78..914f3ec 100644 --- a/bind/DEVELOPING.md +++ b/bind/DEVELOPING.md @@ -6,10 +6,10 @@ `make lint` to run the linter to make sure the code is up to standards. Each commit should pass this check. - ## Working with the components in a dev environment binaries are built using `make` + ### Example Backend Testing the backend requires a working and reachable OIDC provider. You can test the backend locally @@ -25,13 +25,14 @@ go run ./cmd/example-backend \ --cookie-signing-key=$(openssl rand -base64 32) / ``` + ### Konnector Most of the Konnector code is located in `./pkg/konnector`. To test out your own changes to the Konnector build a new image using ```sh -KO_DOCKER_REPO= ko build ./cmd/konnector --bare -t +KO_DOCKER_REPO= ko build ./cmd/konnector --bare -t --platform=linux/amd64,linux/arm64 ``` Once you have a new image, you can either `kubectl edit -n bind deployment konnector` on your diff --git a/bind/Makefile b/bind/Makefile index 38dd85a..7d13e22 100644 --- a/bind/Makefile +++ b/bind/Makefile @@ -160,7 +160,7 @@ codegen: $(CONTROLLER_GEN) $(YAML_PATCH) ## Run the codegenerators verify-codegen: if [[ -n "${GITHUB_WORKSPACE}" ]]; then \ mkdir -p $$(go env GOPATH)/src/github.com/kube-bind; \ - ln -s ${GITHUB_WORKSPACE} $$(go env GOPATH)/src/github.com/anynines/klutch/bind; \ + ln -s ${GITHUB_WORKSPACE} $$(go env GOPATH)/src/github.com/anynines/klutchio/bind; \ fi $(MAKE) codegen @@ -176,7 +176,7 @@ $(OPENSHIFT_GOIMPORTS): .PHONY: imports imports: $(OPENSHIFT_GOIMPORTS) - $(OPENSHIFT_GOIMPORTS) -m github.com/anynines/klutch/bind + $(OPENSHIFT_GOIMPORTS) -m github.com/anynines/klutchio/bind $(TOOLS_DIR)/verify_boilerplate.py: mkdir -p $(TOOLS_DIR) diff --git a/bind/cmd/example-backend/main.go b/bind/cmd/example-backend/main.go index 724652a..8306201 100644 --- a/bind/cmd/example-backend/main.go +++ b/bind/cmd/example-backend/main.go @@ -28,8 +28,8 @@ import ( "k8s.io/component-base/version" "k8s.io/klog/v2" - backend "github.com/anynines/klutch/bind/contrib/example-backend" - "github.com/anynines/klutch/bind/contrib/example-backend/options" + backend "github.com/anynines/klutchio/bind/contrib/example-backend" + "github.com/anynines/klutchio/bind/contrib/example-backend/options" ) func main() { diff --git a/bind/cmd/konnector/cmd/konnector.go b/bind/cmd/konnector/cmd/konnector.go index 9572ca2..376bcfe 100644 --- a/bind/cmd/konnector/cmd/konnector.go +++ b/bind/cmd/konnector/cmd/konnector.go @@ -30,9 +30,9 @@ import ( componentbaseversion "k8s.io/component-base/version" "k8s.io/klog/v2" - "github.com/anynines/klutch/bind/pkg/konnector" - konnectoroptions "github.com/anynines/klutch/bind/pkg/konnector/options" - bindversion "github.com/anynines/klutch/bind/pkg/version" + "github.com/anynines/klutchio/bind/pkg/konnector" + konnectoroptions "github.com/anynines/klutchio/bind/pkg/konnector/options" + bindversion "github.com/anynines/klutchio/bind/pkg/version" ) const LeaderElectionTimeout = 3 * time.Second diff --git a/bind/cmd/konnector/main.go b/bind/cmd/konnector/main.go index b2fb39c..74e1a8a 100644 --- a/bind/cmd/konnector/main.go +++ b/bind/cmd/konnector/main.go @@ -22,7 +22,7 @@ import ( genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/component-base/cli" - "github.com/anynines/klutch/bind/cmd/konnector/cmd" + "github.com/anynines/klutchio/bind/cmd/konnector/cmd" ) func main() { diff --git a/bind/cmd/kubectl-bind/main.go b/bind/cmd/kubectl-bind/main.go index ee6ef33..885a703 100644 --- a/bind/cmd/kubectl-bind/main.go +++ b/bind/cmd/kubectl-bind/main.go @@ -26,8 +26,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" - apiservicecmd "github.com/anynines/klutch/bind/pkg/kubectl/bind-apiservice/cmd" - bindcmd "github.com/anynines/klutch/bind/pkg/kubectl/bind/cmd" + apiservicecmd "github.com/anynines/klutchio/bind/pkg/kubectl/bind-apiservice/cmd" + bindcmd "github.com/anynines/klutchio/bind/pkg/kubectl/bind/cmd" ) func init() { diff --git a/bind/contrib/example-backend/apis/examplebackend/v1alpha1/apiserviceexporttemplate_types.go b/bind/contrib/example-backend/apis/examplebackend/v1alpha1/apiserviceexporttemplate_types.go index cc3a37a..66cb827 100644 --- a/bind/contrib/example-backend/apis/examplebackend/v1alpha1/apiserviceexporttemplate_types.go +++ b/bind/contrib/example-backend/apis/examplebackend/v1alpha1/apiserviceexporttemplate_types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // APIServiceExportTemplate specifies the resource to be exported. diff --git a/bind/contrib/example-backend/apis/examplebackend/v1alpha1/zz_generated.deepcopy.go b/bind/contrib/example-backend/apis/examplebackend/v1alpha1/zz_generated.deepcopy.go index 2f98744..c17538c 100644 --- a/bind/contrib/example-backend/apis/examplebackend/v1alpha1/zz_generated.deepcopy.go +++ b/bind/contrib/example-backend/apis/examplebackend/v1alpha1/zz_generated.deepcopy.go @@ -24,7 +24,7 @@ package v1alpha1 import ( runtime "k8s.io/apimachinery/pkg/runtime" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/bind/contrib/example-backend/client/clientset/versioned/clientset.go b/bind/contrib/example-backend/client/clientset/versioned/clientset.go index 9eea898..30e2998 100644 --- a/bind/contrib/example-backend/client/clientset/versioned/clientset.go +++ b/bind/contrib/example-backend/client/clientset/versioned/clientset.go @@ -26,7 +26,7 @@ import ( rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - examplebackendv1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1" + examplebackendv1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1" ) type Interface interface { diff --git a/bind/contrib/example-backend/client/clientset/versioned/fake/clientset_generated.go b/bind/contrib/example-backend/client/clientset/versioned/fake/clientset_generated.go index ab5db1c..54c43c2 100644 --- a/bind/contrib/example-backend/client/clientset/versioned/fake/clientset_generated.go +++ b/bind/contrib/example-backend/client/clientset/versioned/fake/clientset_generated.go @@ -25,9 +25,9 @@ import ( fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned" - examplebackendv1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1" - fakeexamplebackendv1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/fake" + clientset "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned" + examplebackendv1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1" + fakeexamplebackendv1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/bind/contrib/example-backend/client/clientset/versioned/fake/register.go b/bind/contrib/example-backend/client/clientset/versioned/fake/register.go index 014fa5f..ae00e1e 100644 --- a/bind/contrib/example-backend/client/clientset/versioned/fake/register.go +++ b/bind/contrib/example-backend/client/clientset/versioned/fake/register.go @@ -25,7 +25,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - examplebackendv1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/apis/examplebackend/v1alpha1" + examplebackendv1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/apis/examplebackend/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/bind/contrib/example-backend/client/clientset/versioned/scheme/register.go b/bind/contrib/example-backend/client/clientset/versioned/scheme/register.go index 7bb472f..e957d07 100644 --- a/bind/contrib/example-backend/client/clientset/versioned/scheme/register.go +++ b/bind/contrib/example-backend/client/clientset/versioned/scheme/register.go @@ -25,7 +25,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - examplebackendv1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/apis/examplebackend/v1alpha1" + examplebackendv1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/apis/examplebackend/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/apiserviceexporttemplate.go b/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/apiserviceexporttemplate.go index ec78931..7585e3e 100644 --- a/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/apiserviceexporttemplate.go +++ b/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/apiserviceexporttemplate.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/apis/examplebackend/v1alpha1" - scheme "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned/scheme" + v1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/apis/examplebackend/v1alpha1" + scheme "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned/scheme" ) // APIServiceExportTemplatesGetter has a method to return a APIServiceExportTemplateInterface. diff --git a/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/examplebackend_client.go b/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/examplebackend_client.go index 5d0c467..46e790d 100644 --- a/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/examplebackend_client.go +++ b/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/examplebackend_client.go @@ -23,8 +23,8 @@ import ( rest "k8s.io/client-go/rest" - v1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/apis/examplebackend/v1alpha1" - "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned/scheme" + v1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/apis/examplebackend/v1alpha1" + "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned/scheme" ) type ExampleBackendV1alpha1Interface interface { diff --git a/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/fake/fake_apiserviceexporttemplate.go b/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/fake/fake_apiserviceexporttemplate.go index a86d777..99dfbf8 100644 --- a/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/fake/fake_apiserviceexporttemplate.go +++ b/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/fake/fake_apiserviceexporttemplate.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/apis/examplebackend/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/apis/examplebackend/v1alpha1" ) // FakeAPIServiceExportTemplates implements APIServiceExportTemplateInterface diff --git a/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/fake/fake_examplebackend_client.go b/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/fake/fake_examplebackend_client.go index b267d88..29d485a 100644 --- a/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/fake/fake_examplebackend_client.go +++ b/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1/fake/fake_examplebackend_client.go @@ -22,7 +22,7 @@ import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned/typed/examplebackend/v1alpha1" ) type FakeExampleBackendV1alpha1 struct { diff --git a/bind/contrib/example-backend/client/informers/externalversions/examplebackend/interface.go b/bind/contrib/example-backend/client/informers/externalversions/examplebackend/interface.go index 2d59b17..425a6a5 100644 --- a/bind/contrib/example-backend/client/informers/externalversions/examplebackend/interface.go +++ b/bind/contrib/example-backend/client/informers/externalversions/examplebackend/interface.go @@ -19,8 +19,8 @@ limitations under the License. package examplebackend import ( - v1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/client/informers/externalversions/examplebackend/v1alpha1" - internalinterfaces "github.com/anynines/klutch/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/client/informers/externalversions/examplebackend/v1alpha1" + internalinterfaces "github.com/anynines/klutchio/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/bind/contrib/example-backend/client/informers/externalversions/examplebackend/v1alpha1/apiserviceexporttemplate.go b/bind/contrib/example-backend/client/informers/externalversions/examplebackend/v1alpha1/apiserviceexporttemplate.go index 3c0dcb6..38bc60e 100644 --- a/bind/contrib/example-backend/client/informers/externalversions/examplebackend/v1alpha1/apiserviceexporttemplate.go +++ b/bind/contrib/example-backend/client/informers/externalversions/examplebackend/v1alpha1/apiserviceexporttemplate.go @@ -27,10 +27,10 @@ import ( watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - examplebackendv1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/apis/examplebackend/v1alpha1" - versioned "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned" - internalinterfaces "github.com/anynines/klutch/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/client/listers/examplebackend/v1alpha1" + examplebackendv1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/apis/examplebackend/v1alpha1" + versioned "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned" + internalinterfaces "github.com/anynines/klutchio/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/client/listers/examplebackend/v1alpha1" ) // APIServiceExportTemplateInformer provides access to a shared informer and lister for diff --git a/bind/contrib/example-backend/client/informers/externalversions/examplebackend/v1alpha1/interface.go b/bind/contrib/example-backend/client/informers/externalversions/examplebackend/v1alpha1/interface.go index 8119154..d417f77 100644 --- a/bind/contrib/example-backend/client/informers/externalversions/examplebackend/v1alpha1/interface.go +++ b/bind/contrib/example-backend/client/informers/externalversions/examplebackend/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/anynines/klutch/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/anynines/klutchio/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/bind/contrib/example-backend/client/informers/externalversions/factory.go b/bind/contrib/example-backend/client/informers/externalversions/factory.go index be452c2..de25d70 100644 --- a/bind/contrib/example-backend/client/informers/externalversions/factory.go +++ b/bind/contrib/example-backend/client/informers/externalversions/factory.go @@ -28,9 +28,9 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - versioned "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned" - examplebackend "github.com/anynines/klutch/bind/contrib/example-backend/client/informers/externalversions/examplebackend" - internalinterfaces "github.com/anynines/klutch/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces" + versioned "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned" + examplebackend "github.com/anynines/klutchio/bind/contrib/example-backend/client/informers/externalversions/examplebackend" + internalinterfaces "github.com/anynines/klutchio/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/bind/contrib/example-backend/client/informers/externalversions/generic.go b/bind/contrib/example-backend/client/informers/externalversions/generic.go index ef2138e..a1a9e16 100644 --- a/bind/contrib/example-backend/client/informers/externalversions/generic.go +++ b/bind/contrib/example-backend/client/informers/externalversions/generic.go @@ -24,7 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - v1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/apis/examplebackend/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/apis/examplebackend/v1alpha1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces/factory_interfaces.go index c6bd574..037df7a 100644 --- a/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/bind/contrib/example-backend/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -25,7 +25,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - versioned "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned" + versioned "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/bind/contrib/example-backend/client/listers/examplebackend/v1alpha1/apiserviceexporttemplate.go b/bind/contrib/example-backend/client/listers/examplebackend/v1alpha1/apiserviceexporttemplate.go index 1065304..99a0be5 100644 --- a/bind/contrib/example-backend/client/listers/examplebackend/v1alpha1/apiserviceexporttemplate.go +++ b/bind/contrib/example-backend/client/listers/examplebackend/v1alpha1/apiserviceexporttemplate.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/apis/examplebackend/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/apis/examplebackend/v1alpha1" ) // APIServiceExportTemplateLister helps list APIServiceExportTemplates. diff --git a/bind/contrib/example-backend/config.go b/bind/contrib/example-backend/config.go index a652179..0911cf4 100644 --- a/bind/contrib/example-backend/config.go +++ b/bind/contrib/example-backend/config.go @@ -26,9 +26,9 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - "github.com/anynines/klutch/bind/contrib/example-backend/options" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions" + "github.com/anynines/klutchio/bind/contrib/example-backend/options" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions" ) type Config struct { diff --git a/bind/contrib/example-backend/controllers/clusterbinding/clusterbinding_controller.go b/bind/contrib/example-backend/controllers/clusterbinding/clusterbinding_controller.go index 215c960..40c34dd 100644 --- a/bind/contrib/example-backend/controllers/clusterbinding/clusterbinding_controller.go +++ b/bind/contrib/example-backend/controllers/clusterbinding/clusterbinding_controller.go @@ -39,11 +39,11 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/committer" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/committer" ) const ( diff --git a/bind/contrib/example-backend/controllers/clusterbinding/clusterbinding_reconcile.go b/bind/contrib/example-backend/controllers/clusterbinding/clusterbinding_reconcile.go index 0aa3a4e..78b72bb 100644 --- a/bind/contrib/example-backend/controllers/clusterbinding/clusterbinding_reconcile.go +++ b/bind/contrib/example-backend/controllers/clusterbinding/clusterbinding_reconcile.go @@ -29,10 +29,10 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/utils/pointer" - kuberesources "github.com/anynines/klutch/bind/contrib/example-backend/kubernetes/resources" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/util/conditions" + kuberesources "github.com/anynines/klutchio/bind/contrib/example-backend/kubernetes/resources" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/util/conditions" ) type reconciler struct { diff --git a/bind/contrib/example-backend/controllers/serviceexport/serviceexport_controller.go b/bind/contrib/example-backend/controllers/serviceexport/serviceexport_controller.go index 520341b..3c40f8f 100644 --- a/bind/contrib/example-backend/controllers/serviceexport/serviceexport_controller.go +++ b/bind/contrib/example-backend/controllers/serviceexport/serviceexport_controller.go @@ -34,12 +34,12 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/committer" - "github.com/anynines/klutch/bind/pkg/indexers" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/committer" + "github.com/anynines/klutchio/bind/pkg/indexers" ) const ( diff --git a/bind/contrib/example-backend/controllers/serviceexport/serviceexport_reconcile.go b/bind/contrib/example-backend/controllers/serviceexport/serviceexport_reconcile.go index 17011c1..49aafcb 100644 --- a/bind/contrib/example-backend/controllers/serviceexport/serviceexport_reconcile.go +++ b/bind/contrib/example-backend/controllers/serviceexport/serviceexport_reconcile.go @@ -24,10 +24,10 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - kubebindhelpers "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1/helpers" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/util/conditions" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + kubebindhelpers "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1/helpers" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/util/conditions" ) type reconciler struct { diff --git a/bind/contrib/example-backend/controllers/serviceexportrequest/serviceexportrequest_controller.go b/bind/contrib/example-backend/controllers/serviceexportrequest/serviceexportrequest_controller.go index 0a14ccc..fa28396 100644 --- a/bind/contrib/example-backend/controllers/serviceexportrequest/serviceexportrequest_controller.go +++ b/bind/contrib/example-backend/controllers/serviceexportrequest/serviceexportrequest_controller.go @@ -35,13 +35,13 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - "github.com/anynines/klutch/bind/contrib/example-backend/exporttemplate" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/committer" - "github.com/anynines/klutch/bind/pkg/indexers" + "github.com/anynines/klutchio/bind/contrib/example-backend/exporttemplate" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/committer" + "github.com/anynines/klutchio/bind/pkg/indexers" ) const ( diff --git a/bind/contrib/example-backend/controllers/serviceexportrequest/serviceexportrequest_reconcile.go b/bind/contrib/example-backend/controllers/serviceexportrequest/serviceexportrequest_reconcile.go index edc999a..df181ff 100644 --- a/bind/contrib/example-backend/controllers/serviceexportrequest/serviceexportrequest_reconcile.go +++ b/bind/contrib/example-backend/controllers/serviceexportrequest/serviceexportrequest_reconcile.go @@ -26,11 +26,11 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/klog/v2" - "github.com/anynines/klutch/bind/contrib/example-backend/exporttemplate" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1/helpers" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/util/conditions" + "github.com/anynines/klutchio/bind/contrib/example-backend/exporttemplate" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1/helpers" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/util/conditions" ) type reconciler struct { diff --git a/bind/contrib/example-backend/controllers/servicenamespace/servicenamespace_controller.go b/bind/contrib/example-backend/controllers/servicenamespace/servicenamespace_controller.go index 99ea475..7d2b7e9 100644 --- a/bind/contrib/example-backend/controllers/servicenamespace/servicenamespace_controller.go +++ b/bind/contrib/example-backend/controllers/servicenamespace/servicenamespace_controller.go @@ -39,12 +39,12 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/committer" - "github.com/anynines/klutch/bind/pkg/indexers" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/committer" + "github.com/anynines/klutchio/bind/pkg/indexers" ) const ( diff --git a/bind/contrib/example-backend/controllers/servicenamespace/servicenamespace_reconcile.go b/bind/contrib/example-backend/controllers/servicenamespace/servicenamespace_reconcile.go index 9c18d8b..346e8da 100644 --- a/bind/contrib/example-backend/controllers/servicenamespace/servicenamespace_reconcile.go +++ b/bind/contrib/example-backend/controllers/servicenamespace/servicenamespace_reconcile.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kuberesources "github.com/anynines/klutch/bind/contrib/example-backend/kubernetes/resources" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + kuberesources "github.com/anynines/klutchio/bind/contrib/example-backend/kubernetes/resources" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) type reconciler struct { diff --git a/bind/contrib/example-backend/deploy/bootstrap.go b/bind/contrib/example-backend/deploy/bootstrap.go index 2e53b77..bdc232e 100644 --- a/bind/contrib/example-backend/deploy/bootstrap.go +++ b/bind/contrib/example-backend/deploy/bootstrap.go @@ -24,7 +24,7 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" - "github.com/anynines/klutch/bind/pkg/bootstrap" + "github.com/anynines/klutchio/bind/pkg/bootstrap" ) //go:embed *.yaml diff --git a/bind/contrib/example-backend/exporttemplate/index.go b/bind/contrib/example-backend/exporttemplate/index.go index 1626709..c0a90bc 100644 --- a/bind/contrib/example-backend/exporttemplate/index.go +++ b/bind/contrib/example-backend/exporttemplate/index.go @@ -28,8 +28,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" - "github.com/anynines/klutch/bind/contrib/example-backend/apis/examplebackend/v1alpha1" - templates "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned" + "github.com/anynines/klutchio/bind/contrib/example-backend/apis/examplebackend/v1alpha1" + templates "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned" ) type Index struct { diff --git a/bind/contrib/example-backend/exporttemplate/index_test.go b/bind/contrib/example-backend/exporttemplate/index_test.go index 67fc816..e57860b 100644 --- a/bind/contrib/example-backend/exporttemplate/index_test.go +++ b/bind/contrib/example-backend/exporttemplate/index_test.go @@ -26,9 +26,9 @@ import ( crd "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/anynines/klutch/bind/contrib/example-backend/apis/examplebackend/v1alpha1" - templates "github.com/anynines/klutch/bind/contrib/example-backend/client/clientset/versioned/fake" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/contrib/example-backend/apis/examplebackend/v1alpha1" + templates "github.com/anynines/klutchio/bind/contrib/example-backend/client/clientset/versioned/fake" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) var mangodb = apiextensions.CustomResourceDefinition{ diff --git a/bind/contrib/example-backend/http/handler.go b/bind/contrib/example-backend/http/handler.go index 6bb87a3..06680e4 100644 --- a/bind/contrib/example-backend/http/handler.go +++ b/bind/contrib/example-backend/http/handler.go @@ -39,12 +39,12 @@ import ( componentbaseversion "k8s.io/component-base/version" "k8s.io/klog/v2" - "github.com/anynines/klutch/bind/contrib/example-backend/cookie" - "github.com/anynines/klutch/bind/contrib/example-backend/exporttemplate" - "github.com/anynines/klutch/bind/contrib/example-backend/kubernetes" - "github.com/anynines/klutch/bind/contrib/example-backend/template" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindversion "github.com/anynines/klutch/bind/pkg/version" + "github.com/anynines/klutchio/bind/contrib/example-backend/cookie" + "github.com/anynines/klutchio/bind/contrib/example-backend/exporttemplate" + "github.com/anynines/klutchio/bind/contrib/example-backend/kubernetes" + "github.com/anynines/klutchio/bind/contrib/example-backend/template" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindversion "github.com/anynines/klutchio/bind/pkg/version" ) var ( diff --git a/bind/contrib/example-backend/http/server.go b/bind/contrib/example-backend/http/server.go index 2fcab99..0ec4f46 100644 --- a/bind/contrib/example-backend/http/server.go +++ b/bind/contrib/example-backend/http/server.go @@ -24,7 +24,7 @@ import ( "github.com/gorilla/mux" - "github.com/anynines/klutch/bind/contrib/example-backend/options" + "github.com/anynines/klutchio/bind/contrib/example-backend/options" ) type Server struct { diff --git a/bind/contrib/example-backend/kubernetes/indexers.go b/bind/contrib/example-backend/kubernetes/indexers.go index e6fcdad..1bf13cc 100644 --- a/bind/contrib/example-backend/kubernetes/indexers.go +++ b/bind/contrib/example-backend/kubernetes/indexers.go @@ -19,7 +19,7 @@ package kubernetes import ( corev1 "k8s.io/api/core/v1" - "github.com/anynines/klutch/bind/contrib/example-backend/kubernetes/resources" + "github.com/anynines/klutchio/bind/contrib/example-backend/kubernetes/resources" ) const ( diff --git a/bind/contrib/example-backend/kubernetes/manager.go b/bind/contrib/example-backend/kubernetes/manager.go index 1e99214..75d2a8f 100644 --- a/bind/contrib/example-backend/kubernetes/manager.go +++ b/bind/contrib/example-backend/kubernetes/manager.go @@ -30,11 +30,11 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - kuberesources "github.com/anynines/klutch/bind/contrib/example-backend/kubernetes/resources" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/indexers" + kuberesources "github.com/anynines/klutchio/bind/contrib/example-backend/kubernetes/resources" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/indexers" ) type Manager struct { diff --git a/bind/contrib/example-backend/kubernetes/resources/cluster_binding.go b/bind/contrib/example-backend/kubernetes/resources/cluster_binding.go index 0155c9d..3d129a8 100644 --- a/bind/contrib/example-backend/kubernetes/resources/cluster_binding.go +++ b/bind/contrib/example-backend/kubernetes/resources/cluster_binding.go @@ -22,8 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" ) func CreateClusterBinding(ctx context.Context, client bindclient.Interface, ns, secretName, providerPrettyName string) error { diff --git a/bind/contrib/example-backend/options/options.go b/bind/contrib/example-backend/options/options.go index 7426839..5f141d1 100644 --- a/bind/contrib/example-backend/options/options.go +++ b/bind/contrib/example-backend/options/options.go @@ -27,7 +27,7 @@ import ( "k8s.io/component-base/logs" logsv1 "k8s.io/component-base/logs/api/v1" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) type Options struct { diff --git a/bind/contrib/example-backend/server.go b/bind/contrib/example-backend/server.go index a19c0ae..763d719 100644 --- a/bind/contrib/example-backend/server.go +++ b/bind/contrib/example-backend/server.go @@ -26,15 +26,15 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/klog/v2" - "github.com/anynines/klutch/bind/contrib/example-backend/controllers/clusterbinding" - "github.com/anynines/klutch/bind/contrib/example-backend/controllers/serviceexport" - "github.com/anynines/klutch/bind/contrib/example-backend/controllers/serviceexportrequest" - "github.com/anynines/klutch/bind/contrib/example-backend/controllers/servicenamespace" - "github.com/anynines/klutch/bind/contrib/example-backend/deploy" - "github.com/anynines/klutch/bind/contrib/example-backend/exporttemplate" - examplehttp "github.com/anynines/klutch/bind/contrib/example-backend/http" - examplekube "github.com/anynines/klutch/bind/contrib/example-backend/kubernetes" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/contrib/example-backend/controllers/clusterbinding" + "github.com/anynines/klutchio/bind/contrib/example-backend/controllers/serviceexport" + "github.com/anynines/klutchio/bind/contrib/example-backend/controllers/serviceexportrequest" + "github.com/anynines/klutchio/bind/contrib/example-backend/controllers/servicenamespace" + "github.com/anynines/klutchio/bind/contrib/example-backend/deploy" + "github.com/anynines/klutchio/bind/contrib/example-backend/exporttemplate" + examplehttp "github.com/anynines/klutchio/bind/contrib/example-backend/http" + examplekube "github.com/anynines/klutchio/bind/contrib/example-backend/kubernetes" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) type Server struct { diff --git a/bind/deploy/konnector/bootstrap.go b/bind/deploy/konnector/bootstrap.go index 1f366c3..a462d17 100644 --- a/bind/deploy/konnector/bootstrap.go +++ b/bind/deploy/konnector/bootstrap.go @@ -26,7 +26,7 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" - "github.com/anynines/klutch/bind/pkg/bootstrap" + "github.com/anynines/klutchio/bind/pkg/bootstrap" ) //go:embed *.yaml diff --git a/bind/deploy/resources/backup_apiserviceexporttemplate.yaml b/bind/deploy/resources/backup_apiserviceexporttemplate.yaml index e3b078b..505abdf 100644 --- a/bind/deploy/resources/backup_apiserviceexporttemplate.yaml +++ b/bind/deploy/resources/backup_apiserviceexporttemplate.yaml @@ -1,5 +1,5 @@ kind: APIServiceExportTemplate -apiVersion: bind.anynines.com/v1alpha1 +apiVersion: example-backend.klutch.anynines.com/v1alpha1 metadata: name: "backups" namespace: crossplane-system diff --git a/bind/deploy/resources/logme_apiserviceexporttemplate.yaml b/bind/deploy/resources/logme_apiserviceexporttemplate.yaml index 35dd5e4..064c672 100644 --- a/bind/deploy/resources/logme_apiserviceexporttemplate.yaml +++ b/bind/deploy/resources/logme_apiserviceexporttemplate.yaml @@ -1,5 +1,5 @@ kind: APIServiceExportTemplate -apiVersion: bind.anynines.com/v1alpha1 +apiVersion: example-backend.klutch.anynines.com/v1alpha1 metadata: name: logme2instances namespace: crossplane-system diff --git a/bind/deploy/resources/mariadb_apiserviceexporttemplate.yaml b/bind/deploy/resources/mariadb_apiserviceexporttemplate.yaml index 7e5ddf9..9fee98c 100644 --- a/bind/deploy/resources/mariadb_apiserviceexporttemplate.yaml +++ b/bind/deploy/resources/mariadb_apiserviceexporttemplate.yaml @@ -1,5 +1,5 @@ kind: APIServiceExportTemplate -apiVersion: bind.anynines.com/v1alpha1 +apiVersion: example-backend.klutch.anynines.com/v1alpha1 metadata: name: mariadbinstances namespace: crossplane-system diff --git a/bind/deploy/resources/messaging_apiserviceexporttemplate.yaml b/bind/deploy/resources/messaging_apiserviceexporttemplate.yaml index f419b89..0eb3a26 100644 --- a/bind/deploy/resources/messaging_apiserviceexporttemplate.yaml +++ b/bind/deploy/resources/messaging_apiserviceexporttemplate.yaml @@ -1,5 +1,5 @@ kind: APIServiceExportTemplate -apiVersion: bind.anynines.com/v1alpha1 +apiVersion: example-backend.klutch.anynines.com/v1alpha1 metadata: name: messaginginstances namespace: crossplane-system diff --git a/bind/deploy/resources/mongodb_apiserviceexporttemplate.yaml b/bind/deploy/resources/mongodb_apiserviceexporttemplate.yaml index b40dce1..92261c9 100644 --- a/bind/deploy/resources/mongodb_apiserviceexporttemplate.yaml +++ b/bind/deploy/resources/mongodb_apiserviceexporttemplate.yaml @@ -1,5 +1,5 @@ kind: APIServiceExportTemplate -apiVersion: bind.anynines.com/v1alpha1 +apiVersion: example-backend.klutch.anynines.com/v1alpha1 metadata: name: mongodbinstances namespace: crossplane-system diff --git a/bind/deploy/resources/postgresql_apiserviceexporttemplate.yaml b/bind/deploy/resources/postgresql_apiserviceexporttemplate.yaml index dd87f9c..b10dc55 100644 --- a/bind/deploy/resources/postgresql_apiserviceexporttemplate.yaml +++ b/bind/deploy/resources/postgresql_apiserviceexporttemplate.yaml @@ -1,5 +1,5 @@ kind: APIServiceExportTemplate -apiVersion: bind.anynines.com/v1alpha1 +apiVersion: example-backend.klutch.anynines.com/v1alpha1 metadata: name: postgresqlinstances namespace: crossplane-system diff --git a/bind/deploy/resources/prometheus_apiserviceexporttemplate.yaml b/bind/deploy/resources/prometheus_apiserviceexporttemplate.yaml index cd4b0b1..d928b74 100644 --- a/bind/deploy/resources/prometheus_apiserviceexporttemplate.yaml +++ b/bind/deploy/resources/prometheus_apiserviceexporttemplate.yaml @@ -1,5 +1,5 @@ kind: APIServiceExportTemplate -apiVersion: bind.anynines.com/v1alpha1 +apiVersion: example-backend.klutch.anynines.com/v1alpha1 metadata: name: prometheusinstances namespace: crossplane-system diff --git a/bind/deploy/resources/restore_apiserviceexporttemplate.yaml b/bind/deploy/resources/restore_apiserviceexporttemplate.yaml index e691fe0..06b5618 100644 --- a/bind/deploy/resources/restore_apiserviceexporttemplate.yaml +++ b/bind/deploy/resources/restore_apiserviceexporttemplate.yaml @@ -1,5 +1,5 @@ kind: APIServiceExportTemplate -apiVersion: bind.anynines.com/v1alpha1 +apiVersion: example-backend.klutch.anynines.com/v1alpha1 metadata: name: "restores" namespace: crossplane-system diff --git a/bind/deploy/resources/search_apiserviceexporttemplate.yaml b/bind/deploy/resources/search_apiserviceexporttemplate.yaml index a4a8bbf..7e8a8c6 100644 --- a/bind/deploy/resources/search_apiserviceexporttemplate.yaml +++ b/bind/deploy/resources/search_apiserviceexporttemplate.yaml @@ -1,5 +1,5 @@ kind: APIServiceExportTemplate -apiVersion: bind.anynines.com/v1alpha1 +apiVersion: example-backend.klutch.anynines.com/v1alpha1 metadata: name: searchinstances namespace: crossplane-system diff --git a/bind/deploy/resources/servicebinding_apiserviceexporttemplate.yaml b/bind/deploy/resources/servicebinding_apiserviceexporttemplate.yaml index 30958c5..1e961a1 100644 --- a/bind/deploy/resources/servicebinding_apiserviceexporttemplate.yaml +++ b/bind/deploy/resources/servicebinding_apiserviceexporttemplate.yaml @@ -1,5 +1,5 @@ kind: APIServiceExportTemplate -apiVersion: bind.anynines.com/v1alpha1 +apiVersion: example-backend.klutch.anynines.com/v1alpha1 metadata: name: "servicebindings" namespace: crossplane-system diff --git a/bind/go.mod b/bind/go.mod index e4731ee..a126c18 100644 --- a/bind/go.mod +++ b/bind/go.mod @@ -1,4 +1,4 @@ -module github.com/anynines/klutch/bind +module github.com/anynines/klutchio/bind go 1.22.0 diff --git a/bind/hack/update-codegen-clients.sh b/bind/hack/update-codegen-clients.sh index 64a8dbe..781f440 100755 --- a/bind/hack/update-codegen-clients.sh +++ b/bind/hack/update-codegen-clients.sh @@ -25,15 +25,15 @@ SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. CODEGEN_PKG=${CODEGEN_PKG:-$(cd "${SCRIPT_ROOT}"; go list -f '{{.Dir}}' -m k8s.io/code-generator)} bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \ - github.com/anynines/klutch/bind/pkg/client github.com/anynines/klutch/bind/pkg/apis \ + github.com/anynines/klutchio/bind/pkg/client github.com/anynines/klutchio/bind/pkg/apis \ "bind:v1alpha1" \ --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate/boilerplate.generatego.txt \ --output-base "${SCRIPT_ROOT}" \ - --trim-path-prefix github.com/anynines/klutch/bind + --trim-path-prefix github.com/anynines/klutchio/bind bash "${CODEGEN_PKG}"/generate-groups.sh "deepcopy,client,informer,lister" \ - github.com/anynines/klutch/bind/contrib/example-backend/client github.com/anynines/klutch/bind/contrib/example-backend/apis \ + github.com/anynines/klutchio/bind/contrib/example-backend/client github.com/anynines/klutchio/bind/contrib/example-backend/apis \ "examplebackend:v1alpha1" \ --go-header-file "${SCRIPT_ROOT}"/hack/boilerplate/boilerplate.generatego.txt \ --output-base "${SCRIPT_ROOT}" \ - --trim-path-prefix github.com/anynines/klutch/bind + --trim-path-prefix github.com/anynines/klutchio/bind diff --git a/bind/pkg/apis/bind/v1alpha1/apiservicebinding_types.go b/bind/pkg/apis/bind/v1alpha1/apiservicebinding_types.go index 2533784..e3287b2 100644 --- a/bind/pkg/apis/bind/v1alpha1/apiservicebinding_types.go +++ b/bind/pkg/apis/bind/v1alpha1/apiservicebinding_types.go @@ -19,7 +19,7 @@ package v1alpha1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) const ( diff --git a/bind/pkg/apis/bind/v1alpha1/apiserviceexport_types.go b/bind/pkg/apis/bind/v1alpha1/apiserviceexport_types.go index 15f52ad..689da1a 100644 --- a/bind/pkg/apis/bind/v1alpha1/apiserviceexport_types.go +++ b/bind/pkg/apis/bind/v1alpha1/apiserviceexport_types.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) const ( diff --git a/bind/pkg/apis/bind/v1alpha1/apiserviceexportrequest_types.go b/bind/pkg/apis/bind/v1alpha1/apiserviceexportrequest_types.go index 326661f..4d567f7 100644 --- a/bind/pkg/apis/bind/v1alpha1/apiserviceexportrequest_types.go +++ b/bind/pkg/apis/bind/v1alpha1/apiserviceexportrequest_types.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) const ( diff --git a/bind/pkg/apis/bind/v1alpha1/clusterbinding_types.go b/bind/pkg/apis/bind/v1alpha1/clusterbinding_types.go index 62d421b..ce32e02 100644 --- a/bind/pkg/apis/bind/v1alpha1/clusterbinding_types.go +++ b/bind/pkg/apis/bind/v1alpha1/clusterbinding_types.go @@ -20,7 +20,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) const ( diff --git a/bind/pkg/apis/bind/v1alpha1/helpers/crd.go b/bind/pkg/apis/bind/v1alpha1/helpers/crd.go index 1d03aa9..1277d6c 100644 --- a/bind/pkg/apis/bind/v1alpha1/helpers/crd.go +++ b/bind/pkg/apis/bind/v1alpha1/helpers/crd.go @@ -19,10 +19,10 @@ package helpers import ( "strings" - "k8s.io/apimachinery/pkg/apis/meta/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) func IsOwnedByBinding(name string, uid types.UID, refs []v1.OwnerReference) bool { diff --git a/bind/pkg/apis/bind/v1alpha1/helpers/serviceexport.go b/bind/pkg/apis/bind/v1alpha1/helpers/serviceexport.go index 08d6d45..5f7c8d5 100644 --- a/bind/pkg/apis/bind/v1alpha1/helpers/serviceexport.go +++ b/bind/pkg/apis/bind/v1alpha1/helpers/serviceexport.go @@ -27,7 +27,7 @@ import ( runtime2 "k8s.io/apimachinery/pkg/util/runtime" "sigs.k8s.io/yaml" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // ServiceExportToCRD converts a APIServiceExport to a CRD. diff --git a/bind/pkg/apis/bind/v1alpha1/zz_generated.deepcopy.go b/bind/pkg/apis/bind/v1alpha1/zz_generated.deepcopy.go index 6eb9793..be110ce 100644 --- a/bind/pkg/apis/bind/v1alpha1/zz_generated.deepcopy.go +++ b/bind/pkg/apis/bind/v1alpha1/zz_generated.deepcopy.go @@ -25,7 +25,7 @@ import ( v1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" runtime "k8s.io/apimachinery/pkg/runtime" - conditionsv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/getter.go b/bind/pkg/apis/third_party/conditions/util/conditions/getter.go index b1be581..df9e0e2 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/getter.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/getter.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) // Getter interface defines methods that an object should implement in order to diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/getter_test.go b/bind/pkg/apis/third_party/conditions/util/conditions/getter_test.go index 3a38474..43fd124 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/getter_test.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/getter_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) var ( diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/matcher.go b/bind/pkg/apis/third_party/conditions/util/conditions/matcher.go index 65d10b1..c5fb42d 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/matcher.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/matcher.go @@ -22,7 +22,7 @@ import ( "github.com/onsi/gomega" "github.com/onsi/gomega/types" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) // MatchConditions returns a custom matcher to check equality of conditionsapi.Conditions. diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/matcher_test.go b/bind/pkg/apis/third_party/conditions/util/conditions/matcher_test.go index 7e891e1..0e08b56 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/matcher_test.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/matcher_test.go @@ -24,7 +24,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestMatchConditions(t *testing.T) { diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/matchers.go b/bind/pkg/apis/third_party/conditions/util/conditions/matchers.go index ecc60fb..058cd67 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/matchers.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/matchers.go @@ -22,7 +22,7 @@ import ( "github.com/onsi/gomega/format" "github.com/onsi/gomega/types" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) // HaveSameStateOf matches a condition to have the same state of another. diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/merge.go b/bind/pkg/apis/third_party/conditions/util/conditions/merge.go index 99d63c5..ea13b3d 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/merge.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/merge.go @@ -21,7 +21,7 @@ import ( corev1 "k8s.io/api/core/v1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) // localizedCondition defines a condition with the information of the object the conditions diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/merge_strategies.go b/bind/pkg/apis/third_party/conditions/util/conditions/merge_strategies.go index 86afb1e..2afd17e 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/merge_strategies.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/merge_strategies.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) // mergeOptions allows to set strategies for merging a set of conditions into a single condition, diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/merge_strategies_test.go b/bind/pkg/apis/third_party/conditions/util/conditions/merge_strategies_test.go index f2d3395..2c4fd0b 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/merge_strategies_test.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/merge_strategies_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestGetStepCounterMessage(t *testing.T) { diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/merge_test.go b/bind/pkg/apis/third_party/conditions/util/conditions/merge_test.go index 78011d6..efb07ef 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/merge_test.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/merge_test.go @@ -23,7 +23,7 @@ import ( corev1 "k8s.io/api/core/v1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestNewConditionsGroup(t *testing.T) { diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/patch.go b/bind/pkg/apis/third_party/conditions/util/conditions/patch.go index 102f569..428a317 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/patch.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/patch.go @@ -22,7 +22,7 @@ import ( "github.com/google/go-cmp/cmp" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) // Patch defines a list of operations to change a list of conditions into another. diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/patch_test.go b/bind/pkg/apis/third_party/conditions/util/conditions/patch_test.go index a467afe..eba5935 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/patch_test.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/patch_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestNewPatch(t *testing.T) { diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/setter.go b/bind/pkg/apis/third_party/conditions/util/conditions/setter.go index f11b283..c938833 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/setter.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/setter.go @@ -24,7 +24,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) // Setter interface defines methods that an object should implement in order to diff --git a/bind/pkg/apis/third_party/conditions/util/conditions/setter_test.go b/bind/pkg/apis/third_party/conditions/util/conditions/setter_test.go index 4345a98..1e0be57 100644 --- a/bind/pkg/apis/third_party/conditions/util/conditions/setter_test.go +++ b/bind/pkg/apis/third_party/conditions/util/conditions/setter_test.go @@ -28,7 +28,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestHasSameState(t *testing.T) { diff --git a/bind/pkg/client/clientset/versioned/clientset.go b/bind/pkg/client/clientset/versioned/clientset.go index 10cccb7..ecc26f5 100644 --- a/bind/pkg/client/clientset/versioned/clientset.go +++ b/bind/pkg/client/clientset/versioned/clientset.go @@ -26,7 +26,7 @@ import ( rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" - klutchbindv1alpha1 "github.com/anynines/klutch/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1" + klutchbindv1alpha1 "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1" ) type Interface interface { diff --git a/bind/pkg/client/clientset/versioned/fake/clientset_generated.go b/bind/pkg/client/clientset/versioned/fake/clientset_generated.go index afb6583..c1ebd06 100644 --- a/bind/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/bind/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -25,9 +25,9 @@ import ( fakediscovery "k8s.io/client-go/discovery/fake" "k8s.io/client-go/testing" - clientset "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - klutchbindv1alpha1 "github.com/anynines/klutch/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1" - fakeklutchbindv1alpha1 "github.com/anynines/klutch/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake" + clientset "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + klutchbindv1alpha1 "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1" + fakeklutchbindv1alpha1 "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/bind/pkg/client/clientset/versioned/fake/register.go b/bind/pkg/client/clientset/versioned/fake/register.go index 289bc11..e5e68cc 100644 --- a/bind/pkg/client/clientset/versioned/fake/register.go +++ b/bind/pkg/client/clientset/versioned/fake/register.go @@ -25,7 +25,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - klutchbindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + klutchbindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/bind/pkg/client/clientset/versioned/scheme/register.go b/bind/pkg/client/clientset/versioned/scheme/register.go index 7928c83..4beca8b 100644 --- a/bind/pkg/client/clientset/versioned/scheme/register.go +++ b/bind/pkg/client/clientset/versioned/scheme/register.go @@ -25,7 +25,7 @@ import ( serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - klutchbindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + klutchbindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiservicebinding.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiservicebinding.go index 552eb5d..2729974 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiservicebinding.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiservicebinding.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - scheme "github.com/anynines/klutch/bind/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + scheme "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned/scheme" ) // APIServiceBindingsGetter has a method to return a APIServiceBindingInterface. diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiserviceexport.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiserviceexport.go index 2a4d382..1cd16b8 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiserviceexport.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiserviceexport.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - scheme "github.com/anynines/klutch/bind/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + scheme "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned/scheme" ) // APIServiceExportsGetter has a method to return a APIServiceExportInterface. diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiserviceexportrequest.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiserviceexportrequest.go index ab436a0..14295b5 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiserviceexportrequest.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiserviceexportrequest.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - scheme "github.com/anynines/klutch/bind/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + scheme "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned/scheme" ) // APIServiceExportRequestsGetter has a method to return a APIServiceExportRequestInterface. diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiservicenamespace.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiservicenamespace.go index 25babc8..e8b0aca 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiservicenamespace.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/apiservicenamespace.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - scheme "github.com/anynines/klutch/bind/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + scheme "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned/scheme" ) // APIServiceNamespacesGetter has a method to return a APIServiceNamespaceInterface. diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/bind_client.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/bind_client.go index bbb80dc..67ce0d2 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/bind_client.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/bind_client.go @@ -23,8 +23,8 @@ import ( rest "k8s.io/client-go/rest" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned/scheme" ) type KlutchBindV1alpha1Interface interface { diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/clusterbinding.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/clusterbinding.go index 411e020..2ec9fba 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/clusterbinding.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/clusterbinding.go @@ -27,8 +27,8 @@ import ( watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - scheme "github.com/anynines/klutch/bind/pkg/client/clientset/versioned/scheme" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + scheme "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned/scheme" ) // ClusterBindingsGetter has a method to return a ClusterBindingInterface. diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiservicebinding.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiservicebinding.go index ba363e2..a2641f3 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiservicebinding.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiservicebinding.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // FakeAPIServiceBindings implements APIServiceBindingInterface diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiserviceexport.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiserviceexport.go index d7ef3e5..7f9e80e 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiserviceexport.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiserviceexport.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // FakeAPIServiceExports implements APIServiceExportInterface diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiserviceexportrequest.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiserviceexportrequest.go index e9d6710..fe4c105 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiserviceexportrequest.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiserviceexportrequest.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // FakeAPIServiceExportRequests implements APIServiceExportRequestInterface diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiservicenamespace.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiservicenamespace.go index c19cd53..882abe9 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiservicenamespace.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_apiservicenamespace.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // FakeAPIServiceNamespaces implements APIServiceNamespaceInterface diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_bind_client.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_bind_client.go index 269ab0c..2eed569 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_bind_client.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_bind_client.go @@ -22,7 +22,7 @@ import ( rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/anynines/klutch/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1" ) type FakeKlutchBindV1alpha1 struct { diff --git a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_clusterbinding.go b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_clusterbinding.go index 16ef6a5..435d9a2 100644 --- a/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_clusterbinding.go +++ b/bind/pkg/client/clientset/versioned/typed/bind/v1alpha1/fake/fake_clusterbinding.go @@ -28,7 +28,7 @@ import ( watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // FakeClusterBindings implements ClusterBindingInterface diff --git a/bind/pkg/client/informers/externalversions/bind/interface.go b/bind/pkg/client/informers/externalversions/bind/interface.go index 2135247..d1a27db 100644 --- a/bind/pkg/client/informers/externalversions/bind/interface.go +++ b/bind/pkg/client/informers/externalversions/bind/interface.go @@ -19,8 +19,8 @@ limitations under the License. package bind import ( - v1alpha1 "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - internalinterfaces "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + internalinterfaces "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to each of this group's versions. diff --git a/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiservicebinding.go b/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiservicebinding.go index 05c3be2..287c16a 100644 --- a/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiservicebinding.go +++ b/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiservicebinding.go @@ -27,10 +27,10 @@ import ( watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - versioned "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - internalinterfaces "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + versioned "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + internalinterfaces "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" ) // APIServiceBindingInformer provides access to a shared informer and lister for diff --git a/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiserviceexport.go b/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiserviceexport.go index f950f0c..9d3b100 100644 --- a/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiserviceexport.go +++ b/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiserviceexport.go @@ -27,10 +27,10 @@ import ( watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - versioned "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - internalinterfaces "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + versioned "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + internalinterfaces "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" ) // APIServiceExportInformer provides access to a shared informer and lister for diff --git a/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiserviceexportrequest.go b/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiserviceexportrequest.go index c0d6db8..8d06b1e 100644 --- a/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiserviceexportrequest.go +++ b/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiserviceexportrequest.go @@ -27,10 +27,10 @@ import ( watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - versioned "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - internalinterfaces "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + versioned "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + internalinterfaces "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" ) // APIServiceExportRequestInformer provides access to a shared informer and lister for diff --git a/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiservicenamespace.go b/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiservicenamespace.go index fa4a55c..4886a80 100644 --- a/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiservicenamespace.go +++ b/bind/pkg/client/informers/externalversions/bind/v1alpha1/apiservicenamespace.go @@ -27,10 +27,10 @@ import ( watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - versioned "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - internalinterfaces "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + versioned "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + internalinterfaces "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" ) // APIServiceNamespaceInformer provides access to a shared informer and lister for diff --git a/bind/pkg/client/informers/externalversions/bind/v1alpha1/clusterbinding.go b/bind/pkg/client/informers/externalversions/bind/v1alpha1/clusterbinding.go index 2037df1..ffafe91 100644 --- a/bind/pkg/client/informers/externalversions/bind/v1alpha1/clusterbinding.go +++ b/bind/pkg/client/informers/externalversions/bind/v1alpha1/clusterbinding.go @@ -27,10 +27,10 @@ import ( watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - versioned "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - internalinterfaces "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + versioned "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + internalinterfaces "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" ) // ClusterBindingInformer provides access to a shared informer and lister for diff --git a/bind/pkg/client/informers/externalversions/bind/v1alpha1/interface.go b/bind/pkg/client/informers/externalversions/bind/v1alpha1/interface.go index 539b699..2ea55be 100644 --- a/bind/pkg/client/informers/externalversions/bind/v1alpha1/interface.go +++ b/bind/pkg/client/informers/externalversions/bind/v1alpha1/interface.go @@ -19,7 +19,7 @@ limitations under the License. package v1alpha1 import ( - internalinterfaces "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/bind/pkg/client/informers/externalversions/factory.go b/bind/pkg/client/informers/externalversions/factory.go index 31e55e6..57d36af 100644 --- a/bind/pkg/client/informers/externalversions/factory.go +++ b/bind/pkg/client/informers/externalversions/factory.go @@ -28,9 +28,9 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - versioned "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bind "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind" - internalinterfaces "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/internalinterfaces" + versioned "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bind "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind" + internalinterfaces "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/internalinterfaces" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/bind/pkg/client/informers/externalversions/generic.go b/bind/pkg/client/informers/externalversions/generic.go index 486bffa..3d3f214 100644 --- a/bind/pkg/client/informers/externalversions/generic.go +++ b/bind/pkg/client/informers/externalversions/generic.go @@ -24,7 +24,7 @@ import ( schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/bind/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/bind/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 06ab6b4..c1920a8 100644 --- a/bind/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/bind/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -25,7 +25,7 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - versioned "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" + versioned "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/bind/pkg/client/listers/bind/v1alpha1/apiservicebinding.go b/bind/pkg/client/listers/bind/v1alpha1/apiservicebinding.go index d92124d..52e5bd6 100644 --- a/bind/pkg/client/listers/bind/v1alpha1/apiservicebinding.go +++ b/bind/pkg/client/listers/bind/v1alpha1/apiservicebinding.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // APIServiceBindingLister helps list APIServiceBindings. diff --git a/bind/pkg/client/listers/bind/v1alpha1/apiserviceexport.go b/bind/pkg/client/listers/bind/v1alpha1/apiserviceexport.go index b1d3990..9caa0d6 100644 --- a/bind/pkg/client/listers/bind/v1alpha1/apiserviceexport.go +++ b/bind/pkg/client/listers/bind/v1alpha1/apiserviceexport.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // APIServiceExportLister helps list APIServiceExports. diff --git a/bind/pkg/client/listers/bind/v1alpha1/apiserviceexportrequest.go b/bind/pkg/client/listers/bind/v1alpha1/apiserviceexportrequest.go index 23627db..b6cee27 100644 --- a/bind/pkg/client/listers/bind/v1alpha1/apiserviceexportrequest.go +++ b/bind/pkg/client/listers/bind/v1alpha1/apiserviceexportrequest.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // APIServiceExportRequestLister helps list APIServiceExportRequests. diff --git a/bind/pkg/client/listers/bind/v1alpha1/apiservicenamespace.go b/bind/pkg/client/listers/bind/v1alpha1/apiservicenamespace.go index a27fa7d..af2d5c2 100644 --- a/bind/pkg/client/listers/bind/v1alpha1/apiservicenamespace.go +++ b/bind/pkg/client/listers/bind/v1alpha1/apiservicenamespace.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // APIServiceNamespaceLister helps list APIServiceNamespaces. diff --git a/bind/pkg/client/listers/bind/v1alpha1/clusterbinding.go b/bind/pkg/client/listers/bind/v1alpha1/clusterbinding.go index 5f6f2b8..649ad01 100644 --- a/bind/pkg/client/listers/bind/v1alpha1/clusterbinding.go +++ b/bind/pkg/client/listers/bind/v1alpha1/clusterbinding.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + v1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) // ClusterBindingLister helps list ClusterBindings. diff --git a/bind/pkg/indexers/crd.go b/bind/pkg/indexers/crd.go index ff74835..b0a809e 100644 --- a/bind/pkg/indexers/crd.go +++ b/bind/pkg/indexers/crd.go @@ -21,7 +21,7 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) const ( diff --git a/bind/pkg/indexers/servicebinding.go b/bind/pkg/indexers/servicebinding.go index 18d2428..d306b0b 100644 --- a/bind/pkg/indexers/servicebinding.go +++ b/bind/pkg/indexers/servicebinding.go @@ -17,7 +17,7 @@ limitations under the License. package indexers import ( - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) const ( diff --git a/bind/pkg/indexers/serviceexport.go b/bind/pkg/indexers/serviceexport.go index 80827bd..9699a28 100644 --- a/bind/pkg/indexers/serviceexport.go +++ b/bind/pkg/indexers/serviceexport.go @@ -17,7 +17,7 @@ limitations under the License. package indexers import ( - "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) const ( diff --git a/bind/pkg/indexers/serviceexportrequest.go b/bind/pkg/indexers/serviceexportrequest.go index 5ed622d..d6df070 100644 --- a/bind/pkg/indexers/serviceexportrequest.go +++ b/bind/pkg/indexers/serviceexportrequest.go @@ -17,7 +17,7 @@ limitations under the License. package indexers import ( - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) const ( diff --git a/bind/pkg/indexers/servicenamespace.go b/bind/pkg/indexers/servicenamespace.go index 9d9ca00..55a28e3 100644 --- a/bind/pkg/indexers/servicenamespace.go +++ b/bind/pkg/indexers/servicenamespace.go @@ -17,7 +17,7 @@ limitations under the License. package indexers import ( - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) const ( diff --git a/bind/pkg/konnector/config.go b/bind/pkg/konnector/config.go index 2ee0d0d..148f64a 100644 --- a/bind/pkg/konnector/config.go +++ b/bind/pkg/konnector/config.go @@ -26,9 +26,9 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions" - "github.com/anynines/klutch/bind/pkg/konnector/options" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions" + "github.com/anynines/klutchio/bind/pkg/konnector/options" ) type Config struct { diff --git a/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_controller.go b/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_controller.go index 188864c..99ef457 100644 --- a/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_controller.go +++ b/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_controller.go @@ -35,11 +35,11 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/indexers" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/indexers" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" ) const ( diff --git a/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_reconciler.go b/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_reconciler.go index cfa5a24..1739996 100644 --- a/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_reconciler.go +++ b/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_reconciler.go @@ -27,7 +27,7 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) const annotation = "klutch.anynines.com/resource-owner" diff --git a/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_reconciler_test.go b/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_reconciler_test.go index a1e8daa..143e0b9 100644 --- a/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_reconciler_test.go +++ b/bind/pkg/konnector/controllers/cluster/claimedresources/claimedresources_reconciler_test.go @@ -25,7 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) func TestDownstreamCreation(t *testing.T) { diff --git a/bind/pkg/konnector/controllers/cluster/cluster_controller.go b/bind/pkg/konnector/controllers/cluster/cluster_controller.go index 9873a3d..d521bad 100644 --- a/bind/pkg/konnector/controllers/cluster/cluster_controller.go +++ b/bind/pkg/konnector/controllers/cluster/cluster_controller.go @@ -33,18 +33,18 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/util/conditions" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/indexers" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/clusterbinding" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/namespacedeletion" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/servicebinding" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/util/conditions" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/indexers" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/clusterbinding" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/namespacedeletion" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/servicebinding" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" ) const ( diff --git a/bind/pkg/konnector/controllers/cluster/clusterbinding/clusterbinding_controller.go b/bind/pkg/konnector/controllers/cluster/clusterbinding/clusterbinding_controller.go index c461773..01cdd23 100644 --- a/bind/pkg/konnector/controllers/cluster/clusterbinding/clusterbinding_controller.go +++ b/bind/pkg/konnector/controllers/cluster/clusterbinding/clusterbinding_controller.go @@ -36,15 +36,15 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/util/conditions" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/committer" - "github.com/anynines/klutch/bind/pkg/indexers" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/util/conditions" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/committer" + "github.com/anynines/klutchio/bind/pkg/indexers" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" ) const ( diff --git a/bind/pkg/konnector/controllers/cluster/clusterbinding/clusterbinding_reconcile.go b/bind/pkg/konnector/controllers/cluster/clusterbinding/clusterbinding_reconcile.go index 1e1bd03..8672e09 100644 --- a/bind/pkg/konnector/controllers/cluster/clusterbinding/clusterbinding_reconcile.go +++ b/bind/pkg/konnector/controllers/cluster/clusterbinding/clusterbinding_reconcile.go @@ -28,10 +28,10 @@ import ( componentbaseversion "k8s.io/component-base/version" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/util/conditions" - "github.com/anynines/klutch/bind/pkg/version" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/util/conditions" + "github.com/anynines/klutchio/bind/pkg/version" ) type reconciler struct { diff --git a/bind/pkg/konnector/controllers/cluster/namespacedeletion/namespacedeletion_controller.go b/bind/pkg/konnector/controllers/cluster/namespacedeletion/namespacedeletion_controller.go index 0fe179e..f19e9ff 100644 --- a/bind/pkg/konnector/controllers/cluster/namespacedeletion/namespacedeletion_controller.go +++ b/bind/pkg/konnector/controllers/cluster/namespacedeletion/namespacedeletion_controller.go @@ -33,11 +33,11 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" ) const ( diff --git a/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_controller.go b/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_controller.go index 01c75f3..0b79b1d 100644 --- a/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_controller.go +++ b/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_controller.go @@ -34,13 +34,13 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/committer" - "github.com/anynines/klutch/bind/pkg/indexers" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/committer" + "github.com/anynines/klutchio/bind/pkg/indexers" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" ) const ( diff --git a/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_reconcile.go b/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_reconcile.go index 5c54e74..f4ada8c 100644 --- a/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_reconcile.go +++ b/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_reconcile.go @@ -25,10 +25,10 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/utils/pointer" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - kubebindhelpers "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1/helpers" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/util/conditions" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + kubebindhelpers "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1/helpers" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/util/conditions" ) type reconciler struct { diff --git a/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_reconcile_test.go b/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_reconcile_test.go index e15b78a..abb20f5 100644 --- a/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_reconcile_test.go +++ b/bind/pkg/konnector/controllers/cluster/servicebinding/servicebinding_reconcile_test.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestEnsureCRDs(t *testing.T) { diff --git a/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_controller.go b/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_controller.go index 32f80cc..b72cd8e 100644 --- a/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_controller.go +++ b/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_controller.go @@ -35,12 +35,12 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/indexers" - clusterscoped "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/cluster-scoped" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/indexers" + clusterscoped "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/cluster-scoped" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" ) const ( diff --git a/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_reconcile.go b/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_reconcile.go index 30037fb..4e00ec8 100644 --- a/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_reconcile.go +++ b/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_reconcile.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/konnector/adopt" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/konnector/adopt" ) type reconciler struct { diff --git a/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_reconcile_test.go b/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_reconcile_test.go index 4eb062f..294de2f 100644 --- a/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_reconcile_test.go +++ b/bind/pkg/konnector/controllers/cluster/serviceexport/adopt/adopt_reconcile_test.go @@ -26,7 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) func TestAnnotationsAdded(t *testing.T) { diff --git a/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer/informer.go b/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer/informer.go index d4c654e..045d603 100644 --- a/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer/informer.go +++ b/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer/informer.go @@ -35,10 +35,10 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/indexers" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/indexers" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" ) const ( diff --git a/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_controller.go b/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_controller.go index 35ba139..aadcabe 100644 --- a/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_controller.go +++ b/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_controller.go @@ -32,13 +32,13 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/committer" - "github.com/anynines/klutch/bind/pkg/indexers" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/committer" + "github.com/anynines/klutchio/bind/pkg/indexers" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" ) const ( diff --git a/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_reconcile.go b/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_reconcile.go index b89967f..6c13461 100644 --- a/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_reconcile.go +++ b/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_reconcile.go @@ -33,16 +33,16 @@ import ( "k8s.io/client-go/rest" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/util/conditions" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/claimedresources" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/adopt" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/spec" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/status" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/util/conditions" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/claimedresources" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/adopt" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/spec" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/status" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" ) type reconciler struct { diff --git a/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_reconcile_test.go b/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_reconcile_test.go index b556511..4491b4b 100644 --- a/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_reconcile_test.go +++ b/bind/pkg/konnector/controllers/cluster/serviceexport/serviceexport_reconcile_test.go @@ -27,8 +27,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" ) func TestEnsureCRDConditionsCopied(t *testing.T) { diff --git a/bind/pkg/konnector/controllers/cluster/serviceexport/spec/spec_controller.go b/bind/pkg/konnector/controllers/cluster/serviceexport/spec/spec_controller.go index f2c80ac..266c69d 100644 --- a/bind/pkg/konnector/controllers/cluster/serviceexport/spec/spec_controller.go +++ b/bind/pkg/konnector/controllers/cluster/serviceexport/spec/spec_controller.go @@ -38,13 +38,13 @@ import ( "k8s.io/klog/v2" "k8s.io/utils/pointer" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/indexers" - clusterscoped "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/cluster-scoped" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/indexers" + clusterscoped "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/cluster-scoped" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" ) const ( diff --git a/bind/pkg/konnector/controllers/cluster/serviceexport/spec/spec_reconcile.go b/bind/pkg/konnector/controllers/cluster/serviceexport/spec/spec_reconcile.go index aa26370..09a755a 100644 --- a/bind/pkg/konnector/controllers/cluster/serviceexport/spec/spec_reconcile.go +++ b/bind/pkg/konnector/controllers/cluster/serviceexport/spec/spec_reconcile.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/konnector/adopt" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/konnector/adopt" ) type reconciler struct { diff --git a/bind/pkg/konnector/controllers/cluster/serviceexport/status/status_controller.go b/bind/pkg/konnector/controllers/cluster/serviceexport/status/status_controller.go index a105b79..a658a1a 100644 --- a/bind/pkg/konnector/controllers/cluster/serviceexport/status/status_controller.go +++ b/bind/pkg/konnector/controllers/cluster/serviceexport/status/status_controller.go @@ -35,12 +35,12 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/indexers" - clusterscoped "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/cluster-scoped" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/indexers" + clusterscoped "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/cluster-scoped" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/multinsinformer" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" ) const ( diff --git a/bind/pkg/konnector/controllers/cluster/serviceexport/status/status_reconcile.go b/bind/pkg/konnector/controllers/cluster/serviceexport/status/status_reconcile.go index 74cf6a6..a4e64ce 100644 --- a/bind/pkg/konnector/controllers/cluster/serviceexport/status/status_reconcile.go +++ b/bind/pkg/konnector/controllers/cluster/serviceexport/status/status_reconcile.go @@ -25,8 +25,8 @@ import ( "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/konnector/adopt" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/konnector/adopt" ) type reconciler struct { diff --git a/bind/pkg/konnector/controllers/servicebinding/servicebinding_controller.go b/bind/pkg/konnector/controllers/servicebinding/servicebinding_controller.go index 4505f67..e094520 100644 --- a/bind/pkg/konnector/controllers/servicebinding/servicebinding_controller.go +++ b/bind/pkg/konnector/controllers/servicebinding/servicebinding_controller.go @@ -33,12 +33,12 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/committer" - "github.com/anynines/klutch/bind/pkg/indexers" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/committer" + "github.com/anynines/klutchio/bind/pkg/indexers" ) const ( diff --git a/bind/pkg/konnector/controllers/servicebinding/servicebinding_reconcile.go b/bind/pkg/konnector/controllers/servicebinding/servicebinding_reconcile.go index 1800610..cc10e43 100644 --- a/bind/pkg/konnector/controllers/servicebinding/servicebinding_reconcile.go +++ b/bind/pkg/konnector/controllers/servicebinding/servicebinding_reconcile.go @@ -24,9 +24,9 @@ import ( utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/client-go/tools/clientcmd" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/util/conditions" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/util/conditions" ) type reconciler struct { diff --git a/bind/pkg/konnector/konnector_controller.go b/bind/pkg/konnector/konnector_controller.go index 48bc9f3..a61b818 100644 --- a/bind/pkg/konnector/konnector_controller.go +++ b/bind/pkg/konnector/konnector_controller.go @@ -35,15 +35,15 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - bindinformers "github.com/anynines/klutch/bind/pkg/client/informers/externalversions/bind/v1alpha1" - bindlisters "github.com/anynines/klutch/bind/pkg/client/listers/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/committer" - "github.com/anynines/klutch/bind/pkg/indexers" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/dynamic" - "github.com/anynines/klutch/bind/pkg/konnector/controllers/servicebinding" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + bindinformers "github.com/anynines/klutchio/bind/pkg/client/informers/externalversions/bind/v1alpha1" + bindlisters "github.com/anynines/klutchio/bind/pkg/client/listers/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/committer" + "github.com/anynines/klutchio/bind/pkg/indexers" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/dynamic" + "github.com/anynines/klutchio/bind/pkg/konnector/controllers/servicebinding" ) const ( diff --git a/bind/pkg/konnector/konnector_reconcile.go b/bind/pkg/konnector/konnector_reconcile.go index 0c1123f..645e253 100644 --- a/bind/pkg/konnector/konnector_reconcile.go +++ b/bind/pkg/konnector/konnector_reconcile.go @@ -27,7 +27,7 @@ import ( "k8s.io/client-go/tools/clientcmd" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) type startable interface { diff --git a/bind/pkg/konnector/server.go b/bind/pkg/konnector/server.go index 3d410a4..53cf532 100644 --- a/bind/pkg/konnector/server.go +++ b/bind/pkg/konnector/server.go @@ -23,9 +23,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" - "github.com/anynines/klutch/bind/deploy/crd" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - healthz "github.com/anynines/klutch/bind/pkg/konnector/healthz" + "github.com/anynines/klutchio/bind/deploy/crd" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + healthz "github.com/anynines/klutchio/bind/pkg/konnector/healthz" ) type Server struct { diff --git a/bind/pkg/kubectl/bind-apiservice/cmd/cmd.go b/bind/pkg/kubectl/bind-apiservice/cmd/cmd.go index da020ee..3ed69dd 100644 --- a/bind/pkg/kubectl/bind-apiservice/cmd/cmd.go +++ b/bind/pkg/kubectl/bind-apiservice/cmd/cmd.go @@ -27,7 +27,7 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" logsv1 "k8s.io/component-base/logs/api/v1" - "github.com/anynines/klutch/bind/pkg/kubectl/bind-apiservice/plugin" + "github.com/anynines/klutchio/bind/pkg/kubectl/bind-apiservice/plugin" ) var ( diff --git a/bind/pkg/kubectl/bind-apiservice/plugin/bind.go b/bind/pkg/kubectl/bind-apiservice/plugin/bind.go index c63d3ec..a69013a 100644 --- a/bind/pkg/kubectl/bind-apiservice/plugin/bind.go +++ b/bind/pkg/kubectl/bind-apiservice/plugin/bind.go @@ -39,8 +39,8 @@ import ( logsv1 "k8s.io/component-base/logs/api/v1" "sigs.k8s.io/yaml" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/kubectl/base" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/kubectl/base" ) // BindAPIServiceOptions are the options for the kubectl-bind-apiservice command. diff --git a/bind/pkg/kubectl/bind-apiservice/plugin/konnector.go b/bind/pkg/kubectl/bind-apiservice/plugin/konnector.go index 8e2e77c..d6f0b18 100644 --- a/bind/pkg/kubectl/bind-apiservice/plugin/konnector.go +++ b/bind/pkg/kubectl/bind-apiservice/plugin/konnector.go @@ -34,9 +34,9 @@ import ( "k8s.io/client-go/rest" "k8s.io/klog/v2" - "github.com/anynines/klutch/bind/deploy/konnector" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" - "github.com/anynines/klutch/bind/pkg/version" + "github.com/anynines/klutchio/bind/deploy/konnector" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" + "github.com/anynines/klutchio/bind/pkg/version" ) const ( diff --git a/bind/pkg/kubectl/bind-apiservice/plugin/secret.go b/bind/pkg/kubectl/bind-apiservice/plugin/secret.go index 1ea075f..e276a14 100644 --- a/bind/pkg/kubectl/bind-apiservice/plugin/secret.go +++ b/bind/pkg/kubectl/bind-apiservice/plugin/secret.go @@ -26,7 +26,7 @@ import ( kubeclient "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" - "github.com/anynines/klutch/bind/pkg/kubectl/base" + "github.com/anynines/klutchio/bind/pkg/kubectl/base" ) func (b *BindAPIServiceOptions) createKubeconfigSecret(ctx context.Context, config *rest.Config, remoteHost, remoteNamespace, kubeconfig string) (string, error) { diff --git a/bind/pkg/kubectl/bind-apiservice/plugin/servicebindings.go b/bind/pkg/kubectl/bind-apiservice/plugin/servicebindings.go index ea34ba3..0489890 100644 --- a/bind/pkg/kubectl/bind-apiservice/plugin/servicebindings.go +++ b/bind/pkg/kubectl/bind-apiservice/plugin/servicebindings.go @@ -31,11 +31,11 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/rest" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1/helpers" - conditionsapi "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" - "github.com/anynines/klutch/bind/pkg/apis/third_party/conditions/util/conditions" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1/helpers" + conditionsapi "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/apis/conditions/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/apis/third_party/conditions/util/conditions" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" ) func (b *BindAPIServiceOptions) createAPIServiceBindings(ctx context.Context, config *rest.Config, request *bindv1alpha1.APIServiceExportRequest, secretName string) ([]*bindv1alpha1.APIServiceBinding, error) { diff --git a/bind/pkg/kubectl/bind-apiservice/plugin/servicebindings_test.go b/bind/pkg/kubectl/bind-apiservice/plugin/servicebindings_test.go index 24f1611..8d030ce 100644 --- a/bind/pkg/kubectl/bind-apiservice/plugin/servicebindings_test.go +++ b/bind/pkg/kubectl/bind-apiservice/plugin/servicebindings_test.go @@ -23,7 +23,7 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) func TestHumanReadablePromt(t *testing.T) { diff --git a/bind/pkg/kubectl/bind-apiservice/plugin/serviceexportrequest.go b/bind/pkg/kubectl/bind-apiservice/plugin/serviceexportrequest.go index 8a5bd5e..5ee1670 100644 --- a/bind/pkg/kubectl/bind-apiservice/plugin/serviceexportrequest.go +++ b/bind/pkg/kubectl/bind-apiservice/plugin/serviceexportrequest.go @@ -29,8 +29,8 @@ import ( "k8s.io/cli-runtime/pkg/printers" "k8s.io/client-go/rest" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - bindclient "github.com/anynines/klutch/bind/pkg/client/clientset/versioned" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + bindclient "github.com/anynines/klutchio/bind/pkg/client/clientset/versioned" ) func (b *BindAPIServiceOptions) createServiceExportRequest( diff --git a/bind/pkg/kubectl/bind/authenticator/authenticator.go b/bind/pkg/kubectl/bind/authenticator/authenticator.go index 5c02b4b..714346f 100644 --- a/bind/pkg/kubectl/bind/authenticator/authenticator.go +++ b/bind/pkg/kubectl/bind/authenticator/authenticator.go @@ -33,7 +33,7 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/klog/v2" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) var ( diff --git a/bind/pkg/kubectl/bind/cmd/cmd.go b/bind/pkg/kubectl/bind/cmd/cmd.go index bf38388..b4b6666 100644 --- a/bind/pkg/kubectl/bind/cmd/cmd.go +++ b/bind/pkg/kubectl/bind/cmd/cmd.go @@ -28,7 +28,7 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" logsv1 "k8s.io/component-base/logs/api/v1" - "github.com/anynines/klutch/bind/pkg/kubectl/bind/plugin" + "github.com/anynines/klutchio/bind/pkg/kubectl/bind/plugin" ) var ( diff --git a/bind/pkg/kubectl/bind/plugin/authenticate.go b/bind/pkg/kubectl/bind/plugin/authenticate.go index b22b7dc..1d13913 100644 --- a/bind/pkg/kubectl/bind/plugin/authenticate.go +++ b/bind/pkg/kubectl/bind/plugin/authenticate.go @@ -31,8 +31,8 @@ import ( clientgoversion "k8s.io/client-go/pkg/version" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/version" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/version" ) func getProvider(url string) (*bindv1alpha1.BindingProvider, error) { diff --git a/bind/pkg/kubectl/bind/plugin/bind.go b/bind/pkg/kubectl/bind/plugin/bind.go index 3f278ad..2197a45 100644 --- a/bind/pkg/kubectl/bind/plugin/bind.go +++ b/bind/pkg/kubectl/bind/plugin/bind.go @@ -42,9 +42,9 @@ import ( "k8s.io/component-base/logs" logsv1 "k8s.io/component-base/logs/api/v1" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/kubectl/base" - "github.com/anynines/klutch/bind/pkg/kubectl/bind/authenticator" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/kubectl/base" + "github.com/anynines/klutchio/bind/pkg/kubectl/bind/authenticator" ) // BindOptions contains the options for creating an APIBinding. diff --git a/bind/test/e2e/bind/fixtures/consumer/bootstrap.go b/bind/test/e2e/bind/fixtures/consumer/bootstrap.go index 878621b..38fb07f 100644 --- a/bind/test/e2e/bind/fixtures/consumer/bootstrap.go +++ b/bind/test/e2e/bind/fixtures/consumer/bootstrap.go @@ -27,7 +27,7 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" - "github.com/anynines/klutch/bind/pkg/bootstrap" + "github.com/anynines/klutchio/bind/pkg/bootstrap" ) //go:embed *.yaml diff --git a/bind/test/e2e/bind/fixtures/provider/bootstrap.go b/bind/test/e2e/bind/fixtures/provider/bootstrap.go index be2d9b3..c099fa5 100644 --- a/bind/test/e2e/bind/fixtures/provider/bootstrap.go +++ b/bind/test/e2e/bind/fixtures/provider/bootstrap.go @@ -27,7 +27,7 @@ import ( "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" - "github.com/anynines/klutch/bind/pkg/bootstrap" + "github.com/anynines/klutchio/bind/pkg/bootstrap" ) //go:embed *.yaml diff --git a/bind/test/e2e/bind/happy-case_test.go b/bind/test/e2e/bind/happy-case_test.go index cc5ec83..281ca4d 100644 --- a/bind/test/e2e/bind/happy-case_test.go +++ b/bind/test/e2e/bind/happy-case_test.go @@ -39,10 +39,10 @@ import ( "k8s.io/client-go/util/retry" "sigs.k8s.io/yaml" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - clusterscoped "github.com/anynines/klutch/bind/pkg/konnector/controllers/cluster/serviceexport/cluster-scoped" - providerfixtures "github.com/anynines/klutch/bind/test/e2e/bind/fixtures/provider" - "github.com/anynines/klutch/bind/test/e2e/framework" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + clusterscoped "github.com/anynines/klutchio/bind/pkg/konnector/controllers/cluster/serviceexport/cluster-scoped" + providerfixtures "github.com/anynines/klutchio/bind/test/e2e/bind/fixtures/provider" + "github.com/anynines/klutchio/bind/test/e2e/framework" ) func TestClusterScoped(t *testing.T) { diff --git a/bind/test/e2e/framework/backend.go b/bind/test/e2e/framework/backend.go index d23cb3c..5ef4a7e 100644 --- a/bind/test/e2e/framework/backend.go +++ b/bind/test/e2e/framework/backend.go @@ -35,12 +35,12 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" - backendcrd "github.com/anynines/klutch/bind/contrib/deploy/crd" - backend "github.com/anynines/klutch/bind/contrib/example-backend" - backendv1alpha1 "github.com/anynines/klutch/bind/contrib/example-backend/apis/examplebackend/v1alpha1" - "github.com/anynines/klutch/bind/contrib/example-backend/options" - "github.com/anynines/klutch/bind/deploy/crd" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" + backendcrd "github.com/anynines/klutchio/bind/contrib/deploy/crd" + backend "github.com/anynines/klutchio/bind/contrib/example-backend" + backendv1alpha1 "github.com/anynines/klutchio/bind/contrib/example-backend/apis/examplebackend/v1alpha1" + "github.com/anynines/klutchio/bind/contrib/example-backend/options" + "github.com/anynines/klutchio/bind/deploy/crd" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" ) func StartBackend(t *testing.T, clientConfig *rest.Config, args ...string) (net.Addr, *backend.Server) { diff --git a/bind/test/e2e/framework/bind.go b/bind/test/e2e/framework/bind.go index 6e822a6..25c1240 100644 --- a/bind/test/e2e/framework/bind.go +++ b/bind/test/e2e/framework/bind.go @@ -29,8 +29,8 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" - bindapiserviceplugin "github.com/anynines/klutch/bind/pkg/kubectl/bind-apiservice/plugin" - bindplugin "github.com/anynines/klutch/bind/pkg/kubectl/bind/plugin" + bindapiserviceplugin "github.com/anynines/klutchio/bind/pkg/kubectl/bind-apiservice/plugin" + bindplugin "github.com/anynines/klutchio/bind/pkg/kubectl/bind/plugin" ) func Bind(t *testing.T, iostreams genericclioptions.IOStreams, authURLCh chan<- string, invocations chan<- SubCommandInvocation, positionalArg string, flags ...string) { diff --git a/bind/test/e2e/framework/konnector.go b/bind/test/e2e/framework/konnector.go index a3ba76b..724d6dc 100644 --- a/bind/test/e2e/framework/konnector.go +++ b/bind/test/e2e/framework/konnector.go @@ -27,10 +27,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/rest" - "github.com/anynines/klutch/bind/deploy/crd" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - "github.com/anynines/klutch/bind/pkg/konnector" - "github.com/anynines/klutch/bind/pkg/konnector/options" + "github.com/anynines/klutchio/bind/deploy/crd" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + "github.com/anynines/klutchio/bind/pkg/konnector" + "github.com/anynines/klutchio/bind/pkg/konnector/options" ) func StartKonnector(t *testing.T, clientConfig *rest.Config, args ...string) *konnector.Server { diff --git a/bind/test/e2e/konnector/adopt_test.go b/bind/test/e2e/konnector/adopt_test.go index dac36b5..512d8c4 100644 --- a/bind/test/e2e/konnector/adopt_test.go +++ b/bind/test/e2e/konnector/adopt_test.go @@ -32,9 +32,9 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "sigs.k8s.io/yaml" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - providerfixtures "github.com/anynines/klutch/bind/test/e2e/bind/fixtures/provider" - "github.com/anynines/klutch/bind/test/e2e/framework" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + providerfixtures "github.com/anynines/klutchio/bind/test/e2e/bind/fixtures/provider" + "github.com/anynines/klutchio/bind/test/e2e/framework" ) func TestKonnectorAdopt(t *testing.T) { diff --git a/bind/test/e2e/konnector/claimedresources_test.go b/bind/test/e2e/konnector/claimedresources_test.go index de01a38..4dde7c8 100644 --- a/bind/test/e2e/konnector/claimedresources_test.go +++ b/bind/test/e2e/konnector/claimedresources_test.go @@ -37,10 +37,10 @@ import ( "k8s.io/cli-runtime/pkg/genericclioptions" "sigs.k8s.io/yaml" - bindv1alpha1 "github.com/anynines/klutch/bind/pkg/apis/bind/v1alpha1" - consumerfixtures "github.com/anynines/klutch/bind/test/e2e/bind/fixtures/consumer" - providerfixtures "github.com/anynines/klutch/bind/test/e2e/bind/fixtures/provider" - "github.com/anynines/klutch/bind/test/e2e/framework" + bindv1alpha1 "github.com/anynines/klutchio/bind/pkg/apis/bind/v1alpha1" + consumerfixtures "github.com/anynines/klutchio/bind/test/e2e/bind/fixtures/consumer" + providerfixtures "github.com/anynines/klutchio/bind/test/e2e/bind/fixtures/provider" + "github.com/anynines/klutchio/bind/test/e2e/framework" ) func TestProviderOwned(t *testing.T) { diff --git a/clients/a9s-backup-manager/README.md b/clients/a9s-backup-manager/README.md index 3f50db6..470e473 100644 --- a/clients/a9s-backup-manager/README.md +++ b/clients/a9s-backup-manager/README.md @@ -7,14 +7,15 @@ ## Testing the client [//]: # (TODO: Add more details or link to provider-anynines for more details.) + * Create a data service by executing the `/create postgresql` command in [create-data-service slack channel]. * After which create a postgres service instance using the crossplane Postgresql managed resource -or by any other method. +or by any other method. * Once service broker has been successfully created run the following cmds in a terminal to expose the backup-manager-api port locally on your system (*do not close the terminal else the connection would be closed*). - * Set the values of {service-instance-name}(the name of the service instance you want to connect + * Set the values of {service-instance-name}(the name of the service instance you want to connect to e.g. postgresql-ms-1234567890) and {localport}(the local port you want to expose e.g. 8989). ``` bash @@ -50,42 +51,39 @@ echo bkp-mgr-password=$BACKUP_MANAGER_PASSWORD package main import ( - "fmt" + "fmt" - backupmanager "github.com/anynines/klutch/clients/a9s-backup-manager" + backupmanager "github.com/anynines/klutchio/clients/a9s-backup-manager" ) func main() { - config := &backupmanager.ClientConfiguration{ - URL: "http://localhost:8989", - AuthConfig: &backupmanager.AuthConfig{ - BasicAuthConfig: &backupmanager.BasicAuthConfig{ - Username: "username", - Password: "password", - }, - }, - TimeoutSeconds: 10, - Verbose: true, - } - client, err := backupmanager.NewClient(config) - if err != nil { - panic(err) - } - - req := backupmanager.CreateBackupRequest{ - InstanceID: "", - } - - resp, err := client.CreateBackup(&req) - if err != nil { - panic(err) - } - - fmt.Println(resp) + config := &backupmanager.ClientConfiguration{ + URL: "http://localhost:8989", + AuthConfig: &backupmanager.AuthConfig{ + BasicAuthConfig: &backupmanager.BasicAuthConfig{ + Username: "username", + Password: "password", + }, + }, + TimeoutSeconds: 10, + Verbose: true, + } + client, err := backupmanager.NewClient(config) + if err != nil { + panic(err) + } + + req := backupmanager.CreateBackupRequest{ + InstanceID: "", + } + + resp, err := client.CreateBackup(&req) + if err != nil { + panic(err) + } + + fmt.Println(resp) } ``` -[epo-deployments-a9s]: https://github.com/anynines/epo-deployments-a9s/pull/1650 -[ds-epo slack channel]: https://anynines-gmbh.slack.com/archives/C02BNGWD2L8 [create-data-service slack channel]: https://anynines-gmbh.slack.com/archives/C02EJBT3947 -[ssh]: https://anynines.atlassian.net/wiki/spaces/DS/pages/2428043267/a9s+System+Environments#SSH-Access diff --git a/clients/a9s-backup-manager/fake/mock_client.go b/clients/a9s-backup-manager/fake/mock_client.go index caff995..1ae0d0a 100644 --- a/clients/a9s-backup-manager/fake/mock_client.go +++ b/clients/a9s-backup-manager/fake/mock_client.go @@ -19,7 +19,7 @@ package fake import ( "sync" - backupmanager "github.com/anynines/klutch/clients/a9s-backup-manager" + backupmanager "github.com/anynines/klutchio/clients/a9s-backup-manager" "k8s.io/utils/pointer" ) diff --git a/clients/a9s-backup-manager/fake/mock_client_test.go b/clients/a9s-backup-manager/fake/mock_client_test.go index f77ae57..f75a8d9 100644 --- a/clients/a9s-backup-manager/fake/mock_client_test.go +++ b/clients/a9s-backup-manager/fake/mock_client_test.go @@ -19,8 +19,8 @@ package fake_test import ( "testing" - backupmanager "github.com/anynines/klutch/clients/a9s-backup-manager" - "github.com/anynines/klutch/clients/a9s-backup-manager/fake" + backupmanager "github.com/anynines/klutchio/clients/a9s-backup-manager" + "github.com/anynines/klutchio/clients/a9s-backup-manager/fake" "github.com/google/go-cmp/cmp" "k8s.io/utils/pointer" ) diff --git a/clients/a9s-backup-manager/go.mod b/clients/a9s-backup-manager/go.mod index fe0aceb..12e1136 100644 --- a/clients/a9s-backup-manager/go.mod +++ b/clients/a9s-backup-manager/go.mod @@ -1,4 +1,4 @@ -module github.com/anynines/klutch/clients/a9s-backup-manager +module github.com/anynines/klutchio/clients/a9s-backup-manager go 1.22 diff --git a/clients/a9s-open-service-broker/README.md b/clients/a9s-open-service-broker/README.md index f0f25f9..fa67139 100644 --- a/clients/a9s-open-service-broker/README.md +++ b/clients/a9s-open-service-broker/README.md @@ -17,19 +17,19 @@ between an application platform and the Open Service Broker API. ```go import ( - osb "github.com/anynines/klutch/clients/a9s-open-service-broker" + osb "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) func GetBrokerCatalog(URL string) (*osb.CatalogResponse, error) { - config := osb.DefaultClientConfiguration() - config.URL = URL + config := osb.DefaultClientConfiguration() + config.URL = URL - client, err := osb.NewClient(config) - if err != nil { - return nil, err - } + client, err := osb.NewClient(config) + if err != nil { + return nil, err + } - return client.GetCatalog() + return client.GetCatalog() } ``` diff --git a/clients/a9s-open-service-broker/docs/README.md b/clients/a9s-open-service-broker/docs/README.md index f70b461..9a81f46 100644 --- a/clients/a9s-open-service-broker/docs/README.md +++ b/clients/a9s-open-service-broker/docs/README.md @@ -15,20 +15,20 @@ Example: ## Background Reading Reading the -[API specification](https://github.com/openservicebrokerapi/servicebroker/blob/master/spec.md) is +[API specification](https://github.com/openservicebrokerapi/servicebroker/blob/master/spec.md) is recommended before reading this documentation. ## API Fundamentals There are 7 operations in the API: -1. Getting a broker's 'catalog' of services: [`Client.GetCatalog`](#getting-a-brokers-catalog) -2. Provisioning a new instance of a service: [`Client.ProvisionInstance`](#provisioning-a-new-instance-of-a-service) -3. Updating properties of an instance: [`Client.UpdateInstance`](#updating-properties-of-an-instance) -4. Deprovisioning an instance: [`Client.DeprovisionInstance`](#deprovisioning-an-instance) -5. Checking the status of an asynchronous operation (provision, update, or deprovision) on an instance: [`Client.PollLastOperation`](#provisioning-a-new-instance-of-a-service) -6. Binding to an instance: [`Client.Bind`](#binding-to-an-instance) -7. Unbinding from an instance: [`Client.Unbind`](#unbinding-from-an-instance) +1. Getting a broker's 'catalog' of services: [`Client.GetCatalog`](#getting-a-brokers-catalog) +2. Provisioning a new instance of a service: [`Client.ProvisionInstance`](#provisioning-a-new-instance-of-a-service) +3. Updating properties of an instance: [`Client.UpdateInstance`](#updating-properties-of-an-instance) +4. Deprovisioning an instance: [`Client.DeprovisionInstance`](#deprovisioning-an-instance) +5. Checking the status of an asynchronous operation (provision, update, or deprovision) on an instance: [`Client.PollLastOperation`](#provisioning-a-new-instance-of-a-service) +6. Binding to an instance: [`Client.Bind`](#binding-to-an-instance) +7. Unbinding from an instance: [`Client.Unbind`](#unbinding-from-an-instance) ### Getting a broker's catalog @@ -38,19 +38,19 @@ catalog. ```go import ( - osb "github.com/anynines/klutch/clients/a9s-open-service-broker" + osb "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) func GetBrokerCatalog(URL string) (*osb.CatalogResponse, error) { - config := osb.DefaultClientConfiguration() - config.URL = URL + config := osb.DefaultClientConfiguration() + config.URL = URL - client, err := osb.NewClient(config) - if err != nil { - return nil, err - } + client, err := osb.NewClient(config) + if err != nil { + return nil, err + } - return client.GetCatalog() + return client.GetCatalog() } ``` @@ -72,48 +72,48 @@ Key points: ```go import ( - osb "github.com/anynines/klutch/clients/a9s-open-service-broker" + osb "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) func ProvisionService(client osb.Client, request osb.ProvisionRequest) (*osb.CatalogResponse, error) { - request := &ProvisionRequest{ - InstanceID: "my-dbaas-service-instance", - - // Made up parameters for a hypothetical service - ServiceID: "dbaas-service", - PlanID: "dbaas-gold-plan", - Parameters: map[string]interface{}{ - "tablespace-page-cost": 100, - "tablespace-io-concurrency": 5, - }, - - // Set the AcceptsIncomplete field to indicate that this client can - // support asynchronous operations (provision, update, deprovision). - AcceptsIncomplete: true, - } - - // ProvisionInstance returns a response from the broker for successful - // operations, or an error if the broker returned an error response or - // there was a problem communicating with the broker. - resp, err := client.ProvisionInstance(request) - if err != nil { - // Use the IsHTTPError method to test and convert errors from Brokers - // into the standard broker error type, allowing access to conventional - // broker-provided fields. - errHttp, isError := osb.IsHTTPError(err) - if isError { - // handle error response from broker - } else { - // handle errors communicating with the broker - } - } - - // The response.Async field indicates whether the broker is performing the - // provision concurrently. See the LastOperation method for information - // about handling asynchronous operations. - if response.Async { - // handle asynchronous operation - } + request := &ProvisionRequest{ + InstanceID: "my-dbaas-service-instance", + + // Made up parameters for a hypothetical service + ServiceID: "dbaas-service", + PlanID: "dbaas-gold-plan", + Parameters: map[string]interface{}{ + "tablespace-page-cost": 100, + "tablespace-io-concurrency": 5, + }, + + // Set the AcceptsIncomplete field to indicate that this client can + // support asynchronous operations (provision, update, deprovision). + AcceptsIncomplete: true, + } + + // ProvisionInstance returns a response from the broker for successful + // operations, or an error if the broker returned an error response or + // there was a problem communicating with the broker. + resp, err := client.ProvisionInstance(request) + if err != nil { + // Use the IsHTTPError method to test and convert errors from Brokers + // into the standard broker error type, allowing access to conventional + // broker-provided fields. + errHttp, isError := osb.IsHTTPError(err) + if isError { + // handle error response from broker + } else { + // handle errors communicating with the broker + } + } + + // The response.Async field indicates whether the broker is performing the + // provision concurrently. See the LastOperation method for information + // about handling asynchronous operations. + if response.Async { + // handle asynchronous operation + } } ``` @@ -139,44 +139,44 @@ Key points: ```go import ( - osb "github.com/anynines/klutch/clients/a9s-open-service-broker" + osb "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) func UpdateService(client osb.Client) { - newPlan := "dbaas-quadruple-plan", - - request := &osb.UpdateInstanceRequest{ - InstanceID: "my-dbaas-service-instance", - ServiceID: "dbaas-service", - AcceptsIncomplete: true, - - // Passing the plan indicates that the user - // wants the plan to change. - PlanID: &newPlan, - - // Passing a parameter indicates that the user - // wants the parameter value to change. - Parameters: map[string]interface{}{ - "tablespace-page-cost": 50, - "tablespace-io-concurrency": 100, - }, - } - - response, err := client.UpdateInstance(request) - if err != nil { - httpErr, isError := osb.IsHTTPError(err) - if isError { - // handle errors from broker - } else { - // handle errors communicating with broker - } - } - - if response.Async { - // handle asynchronous update operation - } else { - // handle successful update - } + newPlan := "dbaas-quadruple-plan", + + request := &osb.UpdateInstanceRequest{ + InstanceID: "my-dbaas-service-instance", + ServiceID: "dbaas-service", + AcceptsIncomplete: true, + + // Passing the plan indicates that the user + // wants the plan to change. + PlanID: &newPlan, + + // Passing a parameter indicates that the user + // wants the parameter value to change. + Parameters: map[string]interface{}{ + "tablespace-page-cost": 50, + "tablespace-io-concurrency": 100, + }, + } + + response, err := client.UpdateInstance(request) + if err != nil { + httpErr, isError := osb.IsHTTPError(err) + if isError { + // handle errors from broker + } else { + // handle errors communicating with broker + } + } + + if response.Async { + // handle asynchronous update operation + } else { + // handle successful update + } } ``` @@ -200,38 +200,38 @@ Key points: ```go import ( - osb "github.com/anynines/klutch/clients/a9s-open-service-broker" + osb "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) func DeprovisionService(client osb.Client) { - request := &osb.DeprovisionRequest{ - InstanceID: "my-dbaas-service-instance", - ServiceID: "dbaas-service", - PlanID: "dbaas-gold-plan", - AcceptsIncomplete: true, - } - - response, err := client.DeprovisionInstance(request) - if err != nil { - httpErr, isError := osb.IsHTTPError(err) - if isError { - // handle errors from broker - - if osb.IsGoneError(httpErr) { - // A 'gone' status code means that the service instance - // doesn't exist. This means there is no more work to do and - // should be equivalent to a success. - } - } else { - // handle errors communicating with broker - } - } - - if response.Async { - // handle asynchronous deprovisions - } else { - // handle successful deprovision - } + request := &osb.DeprovisionRequest{ + InstanceID: "my-dbaas-service-instance", + ServiceID: "dbaas-service", + PlanID: "dbaas-gold-plan", + AcceptsIncomplete: true, + } + + response, err := client.DeprovisionInstance(request) + if err != nil { + httpErr, isError := osb.IsHTTPError(err) + if isError { + // handle errors from broker + + if osb.IsGoneError(httpErr) { + // A 'gone' status code means that the service instance + // doesn't exist. This means there is no more work to do and + // should be equivalent to a success. + } + } else { + // handle errors communicating with broker + } + } + + if response.Async { + // handle asynchronous deprovisions + } else { + // handle successful deprovision + } } ``` @@ -246,41 +246,41 @@ check on the status of the operation. ```go import ( - osb "github.com/anynines/klutch/clients/a9s-open-service-broker" + osb "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) func PollServiceInstance(client osb.Client, deleting bool) error { - request := &osb.LastOperationRequest{ - InstanceID: "my-dbaas-service-instance" - ServiceID: "dbaas-service", - PlanID: "dbaas-gold-plan", - - // Brokers may provide an identifying key for an asychronous operation. - OperationKey: osb.OperationKey("12345") - } - - response, err := client.PollLastOperation(request) - if err != nil { - // If the operation was for delete and we receive a http.StatusGone, - // this is considered a success as per the spec. - if osb.IsGoneError(err) && deleting { - // handle instances that we were deprovisioning and that are now - // gone - } - - // The broker returned an error. While polling last operation, this - // represents an invalid response and callers should continue polling - // last operation. - } - - switch response.State { - case osb.StateInProgress: - // The operation is still in progress - case osb.StateSucceeded: - // The operation succeeded - case osb.StateFailed: - // The operation failed. - } + request := &osb.LastOperationRequest{ + InstanceID: "my-dbaas-service-instance" + ServiceID: "dbaas-service", + PlanID: "dbaas-gold-plan", + + // Brokers may provide an identifying key for an asychronous operation. + OperationKey: osb.OperationKey("12345") + } + + response, err := client.PollLastOperation(request) + if err != nil { + // If the operation was for delete and we receive a http.StatusGone, + // this is considered a success as per the spec. + if osb.IsGoneError(err) && deleting { + // handle instances that we were deprovisioning and that are now + // gone + } + + // The broker returned an error. While polling last operation, this + // represents an invalid response and callers should continue polling + // last operation. + } + + switch response.State { + case osb.StateInProgress: + // The operation is still in progress + case osb.StateSucceeded: + // The operation succeeded + case osb.StateFailed: + // The operation failed. + } } ``` @@ -300,34 +300,34 @@ Key points: ```go import ( - osb "github.com/anynines/klutch/clients/a9s-open-service-broker" + osb "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) func BindToInstance(client osb.Client) { - request := &osb.BindRequest{ - BindingID: "binding-id", - InstanceID: "instance-id", - ServiceID: "dbaas-service", - PlanID: "dbaas-gold-plan", - - // platforms might want to pass an identifier for applications here - AppGUID: "app-guid", - - // pass parameters here - Parameters: map[string]interface{}{}, - } - - response, err := brokerClient.Bind(request) - if err != nil { - httpErr, isError := osb.IsHTTPError(err) - if isError { - // handle errors from the broker - } else { - // handle errors communicating with the broker - } - } - - // do something with the credentials + request := &osb.BindRequest{ + BindingID: "binding-id", + InstanceID: "instance-id", + ServiceID: "dbaas-service", + PlanID: "dbaas-gold-plan", + + // platforms might want to pass an identifier for applications here + AppGUID: "app-guid", + + // pass parameters here + Parameters: map[string]interface{}{}, + } + + response, err := brokerClient.Bind(request) + if err != nil { + httpErr, isError := osb.IsHTTPError(err) + if isError { + // handle errors from the broker + } else { + // handle errors communicating with the broker + } + } + + // do something with the credentials } ``` @@ -346,28 +346,28 @@ Key points: ```go import ( - osb "github.com/anynines/klutch/clients/a9s-open-service-broker" + osb "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) func UnbindFromInstance(client osb.Client) { - request := &osb.UnbindRequest{ - BindingID: "binding-id", - InstanceID: "instance-id", - ServiceID: "dbaas-service", - PlanID: "dbaas-gold-plan", - AppGUID: "app-guid", - } - - response, err := brokerClient.Unbind(request) - if err != nil { - httpErr, isError := osb.IsHTTPError(err) - if isError { - // handle errors from the broker - } else { - // handle errors communicating with the broker - } - } - - // handle successful unbind + request := &osb.UnbindRequest{ + BindingID: "binding-id", + InstanceID: "instance-id", + ServiceID: "dbaas-service", + PlanID: "dbaas-gold-plan", + AppGUID: "app-guid", + } + + response, err := brokerClient.Unbind(request) + if err != nil { + httpErr, isError := osb.IsHTTPError(err) + if isError { + // handle errors from the broker + } else { + // handle errors communicating with the broker + } + } + + // handle successful unbind } ``` diff --git a/clients/a9s-open-service-broker/fake/fake.go b/clients/a9s-open-service-broker/fake/fake.go index 597eee9..1e8da28 100644 --- a/clients/a9s-open-service-broker/fake/fake.go +++ b/clients/a9s-open-service-broker/fake/fake.go @@ -5,7 +5,7 @@ import ( "net/http" "sync" - v2 "github.com/anynines/klutch/clients/a9s-open-service-broker" + v2 "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) // NewFakeClientFunc returns a v2.CreateFunc that returns a FakeClient with diff --git a/clients/a9s-open-service-broker/fake/fake_test.go b/clients/a9s-open-service-broker/fake/fake_test.go index 4b3b32c..34e70c8 100644 --- a/clients/a9s-open-service-broker/fake/fake_test.go +++ b/clients/a9s-open-service-broker/fake/fake_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - v2 "github.com/anynines/klutch/clients/a9s-open-service-broker" - "github.com/anynines/klutch/clients/a9s-open-service-broker/fake" + v2 "github.com/anynines/klutchio/clients/a9s-open-service-broker" + "github.com/anynines/klutchio/clients/a9s-open-service-broker/fake" ) func catalogResponse() *v2.CatalogResponse { diff --git a/clients/a9s-open-service-broker/generator/catalog.go b/clients/a9s-open-service-broker/generator/catalog.go index 13c86bf..2b7cf28 100644 --- a/clients/a9s-open-service-broker/generator/catalog.go +++ b/clients/a9s-open-service-broker/generator/catalog.go @@ -23,7 +23,7 @@ import ( "k8s.io/klog/v2" - v2 "github.com/anynines/klutch/clients/a9s-open-service-broker" + v2 "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) // GetCatalog will produce a valid GetCatalog response based on the generator settings. diff --git a/clients/a9s-open-service-broker/go.mod b/clients/a9s-open-service-broker/go.mod index 2697e24..cc747f3 100644 --- a/clients/a9s-open-service-broker/go.mod +++ b/clients/a9s-open-service-broker/go.mod @@ -1,4 +1,4 @@ -module github.com/anynines/klutch/clients/a9s-open-service-broker +module github.com/anynines/klutchio/clients/a9s-open-service-broker go 1.22 diff --git a/crossplane-api/Makefile b/crossplane-api/Makefile index 41aaa07..ec212a6 100644 --- a/crossplane-api/Makefile +++ b/crossplane-api/Makefile @@ -1,5 +1,5 @@ IMAGE_NAME := dataservices -ECR_REPO := public.ecr.aws/w5n9a2g2/anynines +ECR_REPO := public.ecr.aws/w5n9a2g2/klutch providerconfig: # Populate Secrets and create PostgreSQL ProvideConfig using the instance name diff --git a/crossplane-api/README.md b/crossplane-api/README.md index 4d7e4c2..a4e34a2 100644 --- a/crossplane-api/README.md +++ b/crossplane-api/README.md @@ -36,7 +36,7 @@ machine for development and testing purposes. - Alternately, you can install a *specific* Crossplane version using helm's [*--version *](https://docs.crossplane.io/v1.11/software/install/) - option, and then deploy the [Crossplane Provider for Kubernetes](https://github.com/anynines/klutch/blob/main/crossplane-api/deploy/provider-kubernetes.yaml). + option, and then deploy the [Crossplane Provider for Kubernetes](https://github.com/anynines/klutchio/blob/main/crossplane-api/deploy/provider-kubernetes.yaml). - To build, push, and install Crossplane packages, you need the Crossplane CLI. You can install it with the following command: @@ -90,10 +90,9 @@ aws ecr-public get-login-password --region us-east-1 --profile=ECR | docker logi ### Push images to ECR There are two ECR repositories, one is used to store provider images -(`public.ecr.aws/w5n9a2g2/anynines/provider-anynines`) and the other +(`public.ecr.aws/w5n9a2g2/klutch/provider-anynines`) and the other one is used for the provider controller images -(`public.ecr.aws/w5n9a2g2/anynines/provider-anynines-controller`). - +(`public.ecr.aws/w5n9a2g2/klutch/provider-anynines-controller`). > **Important Note!** > To make sure you don't overwrite existing images, it's @@ -191,7 +190,7 @@ below are necessary. #### Create ssh tunnel for Service Broker and Backup Manager -Follow the steps described [here](https://github.com/anynines/klutch/blob/main/clients/a9s-backup-manager/README.md#pre-req) to get access to "aws-inception". +Follow the steps described [here](https://github.com/anynines/klutchio/blob/main/clients/a9s-backup-manager/README.md#pre-req) to get access to "aws-inception". #### Start Service Broker tunnel @@ -202,7 +201,12 @@ In a separate terminal start an ssh tunnel to Service Broker ```bash export SERVICE_INSTANCE_NAME= #e.g. postgresql-ms-1686299661 -export SERVICEBROKER_IP=$(ssh aws-s1-inception ". /var/vcap/store/jumpbox/home/a9s/bosh/envs/dsf2;bosh -d $SERVICE_INSTANCE_NAME instances | grep broker/" | awk '{print $4}') +``` + +**NOTE:** You would have to load the credentials to execute the bosh cli cmd in the BOSH director env. + +```bash +export SERVICEBROKER_IP=$(ssh {IP of the virtual machine from where you can access the BOSH director};bosh -d $SERVICE_INSTANCE_NAME instances | grep broker/" | awk '{print $4}') echo $SERVICEBROKER_IP @@ -215,8 +219,12 @@ In a separate terminal start an ssh tunnel to Backup Manager ```bash export SERVICE_INSTANCE_NAME= #e.g. postgresql-ms-1686299661 +``` -export BACKUP_MANAGER_IP=$(ssh aws-s1-inception ". /var/vcap/store/jumpbox/home/a9s/bosh/envs/dsf2;bosh -d $SERVICE_INSTANCE_NAME instances | grep backup-manager/" | awk '{print $4}') +**NOTE:** You would have to load the credentials to execute the bosh cli cmd in the BOSH director env. + +```bash +export BACKUP_MANAGER_IP=$(ssh {IP of the virtual machine from where you can access the BOSH director};bosh -d $SERVICE_INSTANCE_NAME instances | grep backup-manager/" | awk '{print $4}') echo $BACKUP_MANAGER_IP @@ -277,7 +285,7 @@ To install the configuration package (containing definitions and compositions), 1. Install the package via crossplane: ```bash -crossplane xpkg install configuration public.ecr.aws/w5n9a2g2/anynines/dataservices:v1.3.0 +crossplane xpkg install configuration public.ecr.aws/w5n9a2g2/klutch/dataservices:v1.3.0 ``` 2. Install files directly: @@ -487,84 +495,6 @@ you can restore a PostgreSQL Backup with the following command: kubectl apply -f ./crossplane-api/examples/a9s/postgresql/restore-claim.yaml ``` -## Usage - aws s3 provider - -The aws s3 provider does require the helm and crossplane pre-requisites in order to be deployed - -### AWS Access - -Some of the pipelines require access to AWS EKS in order to be able to create clusters for testing -purposes. For these pipelines please apply a manifest using the following template: - -```yaml -apiVersion: v1 -kind: Secret -metadata: - name: aws-secret - namespace: crossplane-system -type: Opaque -stringData: - creds: |- - [default] - AWS_ACCESS_KEY_ID: # - AWS_SECRET_ACCESS_KEY: # - config: |- - [default] - AWS_DEFAULT_REGION: eu-central-1 -``` - -### Provision the aws s3 provider - -The provider itself can be run by applying the provider file - -```bash -kubectl apply -f ./crossplane-api/deploy/provider-aws.yaml -``` - -Verify the providers were created successfully. There should be 2 providers: provider-aws-s3 and upboard-provider-family-aws -```bash -kubectl get providers -``` - -Apply the provider config -```bash -kubectl apply -f ./crossplane-api/deploy/provider-aws-config.yaml -``` - -### Managing an s3 bucket - -To create an s3 bucket, use the example object store yaml. This generates a hash for the name - -```bash -kubectl create -f ./crossplane-api/examples/a8s/objectstore-claim.yaml -``` - -Check that the bucket was created successfully -```bash -kubectl get buckets -``` - -To delete the s3 bucket: - -```bash -kubectl delete bucket -``` - -### Creating an s3 bucket policy - -To add an s3 bucket policy as a service binding, use the example s3 service binding claim. -Make sure to update the claim with the bucket name and the iam role arn. - -```bash -kubectl apply -f ./crossplane-api/examples/a8s/s3-servicebinding-claim.yaml -``` - -To remove the service binding - -```bash -kubectl delete servicebinding/example-a8s-s3 -``` - ## Update or Add a Service or Plan in a8s In case of a Service or Plan is changed or a new one is added, it is essential @@ -588,7 +518,7 @@ Here is a breakdown of the steps to follow for different scenarios: 1. Edit the [composition.yaml](api/a8s/postgresql/composition.yaml) file using a text editor or IDE. -2. Locate the [metadata.labels](https://github.com/anynines/klutch/blob/5afcaefaad082059177dbce1f267ffc7339bf62c/crossplane-api/api/a8s/postgresql/composition.yaml#LL5C3-L5C10) +2. Locate the [metadata.labels](https://github.com/anynines/klutchio/blob/main/crossplane-api/api/a8s/postgresql/composition.yaml#LL5C3-L5C10) field at the top of the file. Within this field, you can see the name and the corresponding value for disk, cpu and memory resources for the different Plan sizes. @@ -621,12 +551,12 @@ sizes. ### Add a Plan -1. Edit the [definition.yaml](api/a8s/postgresql/definition.yaml) +1. Edit the [definition.yaml](api/common/postgresql_definition.yaml) and [composition.yaml](api/a8s/postgresql/composition.yaml) files using a text editor or IDE. -2. Locate the [supported.plans](https://github.com/anynines/klutch/blob/5afcaefaad082059177dbce1f267ffc7339bf62c/crossplane-api/api/a8s/postgresql/definition.yaml#L22) -field in [definition.yaml](https://github.com/anynines/klutch/blob/5afcaefaad082059177dbce1f267ffc7339bf62c/crossplane-api/api/a8s/postgresql/definition.yaml). +2. Locate the [supported.plans](https://github.com/anynines/klutchio/blob/main/crossplane-api/api/common/postgresql_definition.yaml#L49) +field in [definition.yaml](https://github.com/anynines/klutchio/blob/main/crossplane-api/api/common/postgresql_definition.yaml). Within this field you can see a list of supported Plans: ```yaml @@ -653,7 +583,7 @@ Within this field you can see a list of supported Plans: Because only upgrades from smaller to larger DS instance sizes are allowed, the validation should also be updated. The validation rule is located in the - [definition.yaml](https://github.com/anynines/klutch/blob/5afcaefaad082059177dbce1f267ffc7339bf62c/crossplane-api/api/a8s/postgresql/definition.yaml#L53) + [definition.yaml](https://github.com/anynines/klutchio/blob/main/crossplane-api/api/common/postgresql_definition.yaml#L30) file under the x-kubernetes-validations.rule field. Continuing the example with the "postgresql-single-extralarge", the @@ -666,8 +596,8 @@ Within this field you can see a list of supported Plans: !(self.find('[A-Za-z]+$') == ‘large’ && oldSelf.find('[A-Za-z]+$') == ‘extralarge’) ``` -5. Additionally, the [metadata.labels](https://github.com/anynines/klutch/blob/5afcaefaad082059177dbce1f267ffc7339bf62c/crossplane-api/api/a8s/postgresql/composition.yaml#L5) - field in the [composition file](https://github.com/anynines/klutch/blob/5afcaefaad082059177dbce1f267ffc7339bf62c/crossplane-api/api/a8s/postgresql/composition.yaml) +5. Additionally, the [metadata.labels](https://github.com/anynines/klutchio/blob/main/crossplane-api/api/a8s/postgresql/composition.yaml#L5) + field in the [composition file](https://github.com/anynines/klutchio/blob/main/crossplane-api/api/a8s/postgresql/composition.yaml) should also be updated. For the "postgresql-single-extralarge" example, we could add something @@ -679,9 +609,9 @@ Within this field you can see a list of supported Plans: MemoryExtraLarge: &MemoryExtraLarge "32Gi" ``` -6. Finally, the [maps](https://github.com/anynines/klutch/blob/5afcaefaad082059177dbce1f267ffc7339bf62c/crossplane-api/api/a8s/postgresql/composition.yaml#L50) +6. Finally, the [maps](https://github.com/anynines/klutchio/blob/main/crossplane-api/api/a8s/postgresql/composition.yaml#L53) used for patching the disk, cpu and memory resources in the - [composition file](https://github.com/anynines/klutch/blob/5afcaefaad082059177dbce1f267ffc7339bf62c/crossplane-api/api/a8s/postgresql/composition.yaml) + [composition file](https://github.com/anynines/klutchio/blob/main/crossplane-api/api/a8s/postgresql/composition.yaml) should also be updated. For our favorite "postgresql-single-extralarge" example this could mean @@ -726,10 +656,10 @@ service name. Consequently, updating a service would mean deleting the current service and creating a new one. Thus, in this case, a Service update is equivalent to adding a new Service. The steps to add a Service are: -1. Open the [definition.yaml](https://github.com/anynines/klutch/blob/5afcaefaad082059177dbce1f267ffc7339bf62c/crossplane-api/api/a8s/postgresql/definition.yaml) +1. Open the [definition.yaml](https://github.com/anynines/klutchio/blob/main/crossplane-api/api/common/postgresql_definition.yaml) file using a text editor or IDE. -2. Locate the [supported.services](https://github.com/anynines/klutch/blob/5afcaefaad082059177dbce1f267ffc7339bf62c/crossplane-api/api/a8s/postgresql/definition.yaml#L26) +2. Locate the [supported.services](https://github.com/anynines/klutchio/blob/main/crossplane-api/api/common/postgresql_definition.yaml#L34) field. Within this field you can see a list with the supported Services: diff --git a/crossplane-api/api/a8s/s3/composition.yaml b/crossplane-api/api/a8s/s3/composition.yaml deleted file mode 100644 index 0b40435..0000000 --- a/crossplane-api/api/a8s/s3/composition.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: Composition -metadata: - name: a8s-s3-bucket -spec: - compositeTypeRef: - apiVersion: anynines.com/v1 - kind: XObjectStorageInstance - resources: - - name: a8s-s3-bucket - base: - apiVersion: s3.aws.upbound.io/v1beta1 - kind: Bucket - spec: - forProvider: - region: "eu-central-1" - providerConfigRef: - name: aws-s3-provider - patches: - - type: FromCompositeFieldPath - fromFieldPath: "spec.region" - toFieldPath: "spec.forProvider.region" \ No newline at end of file diff --git a/crossplane-api/api/a8s/servicebinding/s3-composition.yaml b/crossplane-api/api/a8s/servicebinding/s3-composition.yaml deleted file mode 100644 index 70e4a20..0000000 --- a/crossplane-api/api/a8s/servicebinding/s3-composition.yaml +++ /dev/null @@ -1,41 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: Composition -metadata: - name: a8s-s3-servicebinding -spec: - compositeTypeRef: - apiVersion: anynines.com/v1 - kind: XServiceBinding - resources: - - name: a8s-s3-bucket-policy - base: - apiVersion: s3.aws.upbound.io/v1beta1 - kind: BucketPolicy - spec: - providerConfigRef: - name: aws-s3-provider - forProvider: - bucketRef.name: "s3-bucket-name" - region: "eu-central-1" - policy: > - { - "Id": "Policy1712922854010", - "Version": "2012-10-17", - "Statement": [ - { - "Sid": "Stmt1712922850476", - "Action": "s3:*", - "Effect": "Deny", - "Resource": "arn:aws:s3:::*/*", - "Principal": "*" - } - ] - } - patches: - - type: FromCompositeFieldPath - fromFieldPath: "spec.region" - toFieldPath: "spec.forProvider.region" - - fromFieldPath: "spec.instanceRef" - toFieldPath: "spec.forProvider.bucketRef.name" - - fromFieldPath: "spec.policy" - toFieldPath: "spec.forProvider.policy" \ No newline at end of file diff --git a/crossplane-api/api/anynines-dataservices-300f2df2a659.xpkg b/crossplane-api/api/anynines-dataservices-300f2df2a659.xpkg deleted file mode 100644 index 22ab1d3..0000000 Binary files a/crossplane-api/api/anynines-dataservices-300f2df2a659.xpkg and /dev/null differ diff --git a/crossplane-api/api/common/servicebinding_definition.yaml b/crossplane-api/api/common/servicebinding_definition.yaml index 7ec3e9c..9f55507 100644 --- a/crossplane-api/api/common/servicebinding_definition.yaml +++ b/crossplane-api/api/common/servicebinding_definition.yaml @@ -23,7 +23,7 @@ spec: - region: ®ion ["eu-central-1", "us-east-1"] - types: &serviceInstanceTypes ["postgresql", "mongodb", "search", "logme2", "prometheus", "messaging", "mariadb", - "messaging", "s3"] + "messaging"] properties: spec: x-kubernetes-validations: diff --git a/crossplane-api/api/iam/policy_composition.yaml b/crossplane-api/api/iam/policy_composition.yaml deleted file mode 100644 index 8f3b08d..0000000 --- a/crossplane-api/api/iam/policy_composition.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: Composition -metadata: - name: a8s-iam-policy -spec: - compositeTypeRef: - apiVersion: anynines.com/v1 - kind: XPolicy - mode: Pipeline - pipeline: - - step: run-the-template - functionRef: - name: function-iam-policy - input: - apiVersion: iam.fn.anynines.com/v1beta1 - kind: Input - providerConfigRef: "aws-iam-provider" diff --git a/crossplane-api/api/iam/policy_definition.yaml b/crossplane-api/api/iam/policy_definition.yaml deleted file mode 100644 index a9e64d8..0000000 --- a/crossplane-api/api/iam/policy_definition.yaml +++ /dev/null @@ -1,56 +0,0 @@ -apiVersion: apiextensions.crossplane.io/v1 -kind: CompositeResourceDefinition -metadata: - name: xpolicies.anynines.com -spec: - group: anynines.com - names: - kind: XPolicy - plural: xpolicies - claimNames: - kind: Policy - plural: policies - defaultCompositionRef: - name: a8s-iam-policy - defaultCompositeDeletePolicy: Foreground - versions: - - name: v1 - served: true - referenceable: true - schema: - openAPIV3Schema: - properties: - spec: - type: object - properties: - resource: - description: | - The Resource defines the object or objects that the statement applies to. Statements must include either a Resource or a NotResource element - type: string - path: - description: | - Path in which to create the policy - type: string - description: - description: | - Description of the policy - type: string - actions: - description: | - Action describes the specific action or actions that will be allowed like Get, List, etc.. - type: array - items: - type: string - tags: - description: | - Key-value map of resource tags. - type: object - required: - - resource - - actions - status: - type: object - properties: - managed: - type: object - x-kubernetes-preserve-unknown-fields: true diff --git a/crossplane-api/deploy/config-pkg-anynines.yaml b/crossplane-api/deploy/config-pkg-anynines.yaml index a93d7f8..c4661ba 100644 --- a/crossplane-api/deploy/config-pkg-anynines.yaml +++ b/crossplane-api/deploy/config-pkg-anynines.yaml @@ -3,4 +3,4 @@ kind: Configuration metadata: name: anynines-dataservices spec: - package: public.ecr.aws/w5n9a2g2/anynines/dataservices:v1.3.0 + package: public.ecr.aws/w5n9a2g2/klutch/dataservices:v1.3.0 diff --git a/crossplane-api/deploy/provider-anynines.yaml b/crossplane-api/deploy/provider-anynines.yaml index 237b18b..4872427 100644 --- a/crossplane-api/deploy/provider-anynines.yaml +++ b/crossplane-api/deploy/provider-anynines.yaml @@ -3,7 +3,7 @@ kind: Provider metadata: name: provider-anynines spec: - package: "public.ecr.aws/w5n9a2g2/anynines/provider-anynines:v1.3.0" + package: "public.ecr.aws/w5n9a2g2/klutch/provider-anynines:v1.3.0" runtimeConfigRef: name: provider-anynines --- diff --git a/crossplane-api/deploy/provider-aws-config.yaml b/crossplane-api/deploy/provider-aws-config.yaml deleted file mode 100644 index b8174e8..0000000 --- a/crossplane-api/deploy/provider-aws-config.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: aws.upbound.io/v1beta1 -kind: ProviderConfig -metadata: - name: aws-s3-provider -spec: - credentials: - source: Secret - secretRef: - namespace: crossplane-system - name: aws-secret - key: creds ---- -apiVersion: aws.upbound.io/v1beta1 -kind: ProviderConfig -metadata: - name: aws-iam-provider -spec: - credentials: - source: Secret - secretRef: - namespace: crossplane-system - name: aws-secret - key: creds \ No newline at end of file diff --git a/crossplane-api/deploy/provider-aws.yaml b/crossplane-api/deploy/provider-aws.yaml deleted file mode 100644 index 1046a69..0000000 --- a/crossplane-api/deploy/provider-aws.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: pkg.crossplane.io/v1 -kind: Provider -metadata: - name: provider-aws-s3 -spec: - package: xpkg.upbound.io/upbound/provider-aws-s3:v1.1.0 ---- -apiVersion: pkg.crossplane.io/v1 -kind: Provider -metadata: - name: provider-aws-iam -spec: - package: xpkg.upbound.io/upbound/provider-aws-iam:v1.1.0 diff --git a/crossplane-api/examples/a8s/objectstore-claim.yaml b/crossplane-api/examples/a8s/objectstore-claim.yaml deleted file mode 100644 index d362098..0000000 --- a/crossplane-api/examples/a8s/objectstore-claim.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: anynines.com/v1 -kind: ObjectStorageInstance -metadata: - name: test-crossplane-bucket -spec: - region: "us-east-1" - compositionRef: - name: a8s-s3-bucket \ No newline at end of file diff --git a/crossplane-api/examples/a8s/policy-claim.yaml b/crossplane-api/examples/a8s/policy-claim.yaml deleted file mode 100644 index 8dc3c5a..0000000 --- a/crossplane-api/examples/a8s/policy-claim.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: anynines.com/v1 -kind: Policy -metadata: - name: example-a8s-policy - namespace: default -spec: - actions: - - s3:GetObject - - s3:PutObject - - s3:ListBucket - - s3:DeleteObject - resource: arn:aws:s3:::*/* - description: this is a test policy created by a composite function diff --git a/crossplane-api/examples/a8s/s3-servicebinding-claim.yaml b/crossplane-api/examples/a8s/s3-servicebinding-claim.yaml deleted file mode 100644 index 5fbb575..0000000 --- a/crossplane-api/examples/a8s/s3-servicebinding-claim.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: anynines.com/v1 -kind: ServiceBinding -metadata: - name: example-a8s-s3 - namespace: default -spec: - instanceRef: - serviceInstanceType: s3 - region: "us-east-1" - policy: > - { - "Version": "2012-10-17", - "Statement": [ - { - "Sid": "AllowIAMRolesToAccessBucket", - "Action": "s3:*", - "Effect": "Allow", - "Resource": "arn:aws:s3:::/*", - "Principal": { - "AWS": [ - "arn:aws:iam::" - ] - } - } - ] - } - compositionRef: - name: a8s-s3-servicebinding diff --git a/crossplane-api/kustomization.yaml b/crossplane-api/kustomization.yaml index 09e92cb..cfe14e9 100644 --- a/crossplane-api/kustomization.yaml +++ b/crossplane-api/kustomization.yaml @@ -7,8 +7,6 @@ resources: - api/a8s/postgresql/composition.yaml - api/a8s/restore/composition.yaml - api/a8s/servicebinding/composition.yaml - - api/a8s/servicebinding/s3-composition.yaml - - api/a8s/s3/composition.yaml # a9s - api/a9s/backup/composition.yaml - api/a9s/logme2/composition.yaml @@ -33,7 +31,3 @@ resources: - api/common/postgresql_definition.yaml - api/common/restore_definition.yaml - api/common/servicebinding_definition.yaml - -# IAM - - api/iam/policy_composition.yaml - - api/iam/policy_definition.yaml diff --git a/docs/for-developers/tutorials/index.md b/docs/for-developers/tutorials/index.md index 20e641e..41bbe4c 100644 --- a/docs/for-developers/tutorials/index.md +++ b/docs/for-developers/tutorials/index.md @@ -54,9 +54,8 @@ To follow along with this tutorial, you need to install the following specialize Ensure your machine can reach the following external resources: -1. Configuration: `https://anynines-artifacts.s3.eu-central-1.amazonaws.com/central-management/v1.3.0/crds.yaml` -2. Docker Image Repositories: - - `public.ecr.aws/w5n9a2g2/anynines/` +1. Docker Image Repositories: + - `public.ecr.aws/w5n9a2g2/klutch/` - `dexidp/dex` - `curlimages/curl` - `xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.14.1` @@ -220,12 +219,12 @@ Checking Prerequisites... ... The following command will be executed for you: -/opt/homebrew/bin/kubectl bind http://192.168.0.91:8080/export --konnector-image public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 --context kind-klutch-app +/opt/homebrew/bin/kubectl bind http://192.168.0.91:8080/export --konnector-image public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 --context kind-klutch-app ``` Next, a browser window will open for authentication. Use these demo credentials: -- Username: admin@example.com +- Username: - Password: password :::note @@ -378,7 +377,7 @@ kubectl apply -f <(eval "echo \"$(cat external-pg-service.yaml)\"") c. Set up port forwarding using one of the following methods: - - Manual method (replace placeholders with actual values): +- Manual method (replace placeholders with actual values): ```bash kubectl -n port-forward svc/example-a8s-postgresql-master 5432:5432 --address @@ -386,7 +385,8 @@ kubectl apply -f <(eval "echo \"$(cat external-pg-service.yaml)\"") **OR** - - Automatic method: +- Automatic method: + ```bash bash -c 'get_ip() { if [[ "$OSTYPE" == "darwin"* ]]; then ifconfig | grep "inet " | grep -v 127.0.0.1 | awk "{print \$2}" | head -n 1; else ip -4 addr show scope global | grep inet | awk "{print \$2}" | cut -d / -f 1 | head -n 1; fi; }; NAMESPACE=$(kubectl get namespaces -o name | sed "s/^namespace\///" | grep "^kube-bind.*default$"); IP=$(get_ip); [ -z "$NAMESPACE" ] || [ -z "$IP" ] && exit 1; exec kubectl -n "$NAMESPACE" port-forward svc/example-a8s-postgresql-master 5432:5432 --address "$IP"' ``` @@ -480,12 +480,11 @@ Set up port forwarding: kubectl port-forward svc/demo-app 3000:3000 ``` -Open your web browser and navigate to http://localhost:3000 to access the blogpost application. You should now see the +Open your web browser and navigate to to access the blogpost application. You should now see the blogpost application interface. :tada: ![Blog application](./blogpost_app_ui.png) - ## Step 4: Clean Up Klutch-Created Clusters If you need to start over or remove the clusters created by Klutch, use the following command: diff --git a/docs/platform-operator/control-plane-cluster-setup/index.md b/docs/platform-operator/control-plane-cluster-setup/index.md index 9755445..7182026 100644 --- a/docs/platform-operator/control-plane-cluster-setup/index.md +++ b/docs/platform-operator/control-plane-cluster-setup/index.md @@ -246,7 +246,7 @@ spec: serviceAccountName: anynines-backend containers: - name: anynines-backend - image: public.ecr.aws/w5n9a2g2/anynines/kubebind-backend:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/example-backend:v1.3.0 args: - --namespace-prefix=cluster - --pretty-name=anynines diff --git a/docs/platform-operator/control-plane-cluster-setup/setup-app-cluster.md b/docs/platform-operator/control-plane-cluster-setup/setup-app-cluster.md index 089ae00..46b2994 100644 --- a/docs/platform-operator/control-plane-cluster-setup/setup-app-cluster.md +++ b/docs/platform-operator/control-plane-cluster-setup/setup-app-cluster.md @@ -162,7 +162,7 @@ backend. To create this binding, execute the following commands: 1. In the following line, replace `` with the hostname of the Klutch backend: ```bash - kubectl bind http://:443/export --konnector-image=public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 + kubectl bind http://:443/export --konnector-image=public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 ``` 2. Authenticate using provided URL and your OIDC credentials. Grant the OIDC client access in the @@ -255,7 +255,7 @@ spec: containers: - name: konnector # Make sure to use the latest image version here: - image: public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 env: - name: POD_NAME valueFrom: @@ -299,7 +299,7 @@ spec: containers: - name: konnector # Replace this with the new image version: - image: public.ecr.aws/w5n9a2g2/anynines/konnector:v3.141.59 + image: public.ecr.aws/w5n9a2g2/klutch/konnector:v3.141.59 env: - name: POD_NAME valueFrom: diff --git a/docs/platform-operator/monitoring.md b/docs/platform-operator/monitoring.md index f05248c..dd186fa 100644 --- a/docs/platform-operator/monitoring.md +++ b/docs/platform-operator/monitoring.md @@ -18,7 +18,7 @@ condition of the installed crossplane providers: $ kubectl get providers NAME INSTALLED HEALTHY PACKAGE AGE crossplane-contrib-provider-kubernetes True True xpkg.upbound.io/crossplane-contrib/provider-kubernetes:v0.9.0 118m -provider-anynines True True public.ecr.aws/w5n9a2g2/anynines/provider-anynines:v1.3.0 118m +provider-anynines True True public.ecr.aws/w5n9a2g2/klutch/provider-anynines:v1.3.0 118m ``` If one of the underlying pods encounters an error and needs to be recreated, the HEALTHY condition diff --git a/docs/platform-operator/update-cluster-components/index.md b/docs/platform-operator/update-cluster-components/index.md index 1dfa624..c43058b 100644 --- a/docs/platform-operator/update-cluster-components/index.md +++ b/docs/platform-operator/update-cluster-components/index.md @@ -25,18 +25,18 @@ depend on your installation method. 1. Update provider-anynines The latest `provider-anynines` image can be found by checking out the tab "Image tags" for this -image in our [image registry](https://gallery.ecr.aws/w5n9a2g2/anynines/provider-anynines). +image in our [image registry](https://gallery.ecr.aws/w5n9a2g2/klutch/provider-anynines). ```bash kubectl patch providers/provider-anynines \ - --type merge -p '{"spec":{"package":"public.ecr.aws/w5n9a2g2/anynines/provider-anynines:v1.3.0"}}' + --type merge -p '{"spec":{"package":"public.ecr.aws/w5n9a2g2/klutch/provider-anynines:v1.3.0"}}' ``` 2. Finally update anynines configuration package ```bash kubectl patch configurations/anynines-dataservices \ - --type merge -p '{"spec":{"package":"public.ecr.aws/w5n9a2g2/anynines/dataservices:v1.3.0"}}' + --type merge -p '{"spec":{"package":"public.ecr.aws/w5n9a2g2/klutch/dataservices:v1.3.0"}}' ``` ### Control Plane Cluster backend @@ -77,7 +77,7 @@ checking out the tab "Image tags" for this image in our ### Example using kubectl ```bash -kubectl set image --namespace kube-bind deployment/konnector konnector=public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 +kubectl set image --namespace kube-bind deployment/konnector konnector=public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 ``` ### Example using a manifest @@ -107,7 +107,7 @@ spec: containers: - name: konnector # This image should point to the new version: - image: public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 env: - name: POD_NAME valueFrom: diff --git a/docs/static/po_files/backend-anynines.template.yaml b/docs/static/po_files/backend-anynines.template.yaml index f141cb5..d1c98f7 100644 --- a/docs/static/po_files/backend-anynines.template.yaml +++ b/docs/static/po_files/backend-anynines.template.yaml @@ -21,7 +21,7 @@ spec: serviceAccountName: anynines-backend containers: - name: anynines-backend - image: public.ecr.aws/w5n9a2g2/anynines/kubebind-backend:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/klutchbind-backend:v1.3.0 args: - --namespace-prefix=cluster - --pretty-name=anynines diff --git a/docs/static/po_files/konnector.yaml b/docs/static/po_files/konnector.yaml index 94e0fd2..dfe5001 100644 --- a/docs/static/po_files/konnector.yaml +++ b/docs/static/po_files/konnector.yaml @@ -56,7 +56,7 @@ spec: containers: - name: konnector # Make sure to use the latest image version here: - image: public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 env: - name: POD_NAME valueFrom: diff --git a/docs/static/po_files/update-konnector.yaml b/docs/static/po_files/update-konnector.yaml index 4a6d433..5962162 100644 --- a/docs/static/po_files/update-konnector.yaml +++ b/docs/static/po_files/update-konnector.yaml @@ -20,7 +20,7 @@ spec: containers: - name: konnector # This image should point to the new version: - image: public.ecr.aws/w5n9a2g2/anynines/konnector:v1.3.0 + image: public.ecr.aws/w5n9a2g2/klutch/konnector:v1.3.0 env: - name: POD_NAME valueFrom: diff --git a/kustomization.yaml b/kustomization.yaml index 98d22a6..d0960a0 100644 --- a/kustomization.yaml +++ b/kustomization.yaml @@ -3,5 +3,10 @@ kind: Kustomization resources: - crossplane-api/deploy - - https://anynines-artifacts.s3.eu-central-1.amazonaws.com/central-management/v1.3.0/crds.yaml + - https://raw.githubusercontent.com/anynines/klutchio/refs/heads/main/bind/deploy/crd/klutch.anynines.com_apiservicebindings.yaml + - https://raw.githubusercontent.com/anynines/klutchio/refs/heads/main/bind/deploy/crd/klutch.anynines.com_apiserviceexportrequests.yaml + - https://raw.githubusercontent.com/anynines/klutchio/refs/heads/main/bind/deploy/crd/klutch.anynines.com_apiserviceexports.yaml + - https://raw.githubusercontent.com/anynines/klutchio/refs/heads/main/bind/deploy/crd/klutch.anynines.com_apiservicenamespaces.yaml + - https://raw.githubusercontent.com/anynines/klutchio/refs/heads/main/bind/deploy/crd/klutch.anynines.com_clusterbindings.yaml + - https://raw.githubusercontent.com/anynines/klutchio/refs/heads/main/bind/contrib/deploy/crd/example-backend.klutch.anynines.com_apiserviceexporttemplates.yaml - bind/contrib/example-backend/deploy/01-clusterrole.yaml diff --git a/provider-anynines/.cache/tools/darwin_arm64/gomplate-3.10.0 b/provider-anynines/.cache/tools/darwin_arm64/gomplate-3.10.0 deleted file mode 100755 index ea19df9..0000000 Binary files a/provider-anynines/.cache/tools/darwin_arm64/gomplate-3.10.0 and /dev/null differ diff --git a/provider-anynines/.cache/tools/darwin_arm64/up-v0.19.2 b/provider-anynines/.cache/tools/darwin_arm64/up-v0.19.2 deleted file mode 100755 index 9e2b22a..0000000 Binary files a/provider-anynines/.cache/tools/darwin_arm64/up-v0.19.2 and /dev/null differ diff --git a/provider-anynines/DEVELOPING.md b/provider-anynines/DEVELOPING.md index 220a1b6..22450c5 100644 --- a/provider-anynines/DEVELOPING.md +++ b/provider-anynines/DEVELOPING.md @@ -19,7 +19,7 @@ Execute `make submodules` to initialize ```shell $ make submodules Submodule 'provider-anynines/build' (https://github.com/crossplane/build) registered for path 'build' -Cloning into '/klutch/provider-anynines/build'... +Cloning into '/klutchio/provider-anynines/build'... ``` ## Test & Build @@ -75,8 +75,8 @@ by simply deleting and recreating the corresponding object. The chance of such a collision however is extremely low. More information can be found in: -- https://github.com/kubernetes/design-proposals-archive/blob/main/architecture/identifiers.md -- https://www.ietf.org/rfc/rfc4122.txt +- +- [provider-dev]: https://github.com/crossplane/crossplane/blob/master/contributing/guide-provider-development.md diff --git a/provider-anynines/Makefile b/provider-anynines/Makefile index 58f169a..2e32c77 100644 --- a/provider-anynines/Makefile +++ b/provider-anynines/Makefile @@ -1,9 +1,9 @@ # ==================================================================================== # Setup Project PROJECT_NAME := provider-anynines -PROJECT_REPO := github.com/anynines/klutch/$(PROJECT_NAME) +PROJECT_REPO := github.com/anynines/klutchio/$(PROJECT_NAME) ECR_ACCOUNT := public.ecr.aws/w5n9a2g2 -ECR_FOLDER_PATH := anynines +ECR_FOLDER_PATH := klutch ECR_REPO := $(ECR_ACCOUNT)/$(ECR_FOLDER_PATH) BUILDX_NAME := provider-builder @@ -207,7 +207,7 @@ provider-controller-build-push: touch builder_created.flag; \ fi - @cp ./cluster/images/provider-anynines-controller/Dockerfile $(IMAGE_TEMP_DIR) || $(FAIL) + @cp ./cluster/images/provider-anynines/Dockerfile $(IMAGE_TEMP_DIR) || $(FAIL) @cp $(OUTPUT_DIR)/bin/$(OS)_$(ARCH)/provider $(IMAGE_TEMP_DIR) || $(FAIL) @cd $(IMAGE_TEMP_DIR) && $(SED_CMD) 's|BASEIMAGE|$(OSBASEIMAGE)|g' Dockerfile || $(FAIL) docker buildx build -o type=image --builder=$(BUILDER_NAME) \ diff --git a/provider-anynines/_output/bin/darwin_arm64/provider b/provider-anynines/_output/bin/darwin_arm64/provider deleted file mode 100755 index 8f538a2..0000000 Binary files a/provider-anynines/_output/bin/darwin_arm64/provider and /dev/null differ diff --git a/provider-anynines/_output/bin/linux_amd64/provider b/provider-anynines/_output/bin/linux_amd64/provider deleted file mode 100755 index b9bf271..0000000 Binary files a/provider-anynines/_output/bin/linux_amd64/provider and /dev/null differ diff --git a/provider-anynines/_output/bin/linux_arm64/provider b/provider-anynines/_output/bin/linux_arm64/provider deleted file mode 100755 index 1a22ca5..0000000 Binary files a/provider-anynines/_output/bin/linux_arm64/provider and /dev/null differ diff --git a/provider-anynines/_output/version b/provider-anynines/_output/version deleted file mode 100644 index 7f0e906..0000000 --- a/provider-anynines/_output/version +++ /dev/null @@ -1 +0,0 @@ -v1.2.0-40.g263edfd diff --git a/provider-anynines/apis/anynines.go b/provider-anynines/apis/anynines.go index a15ec6a..b46c090 100644 --- a/provider-anynines/apis/anynines.go +++ b/provider-anynines/apis/anynines.go @@ -20,11 +20,11 @@ package apis import ( "k8s.io/apimachinery/pkg/runtime" - bkpv1 "github.com/anynines/klutch/provider-anynines/apis/backup/v1" - rstv1 "github.com/anynines/klutch/provider-anynines/apis/restore/v1" - sbv1 "github.com/anynines/klutch/provider-anynines/apis/servicebinding/v1" - dsv1 "github.com/anynines/klutch/provider-anynines/apis/serviceinstance/v1" - anyninesv1 "github.com/anynines/klutch/provider-anynines/apis/v1" + bkpv1 "github.com/anynines/klutchio/provider-anynines/apis/backup/v1" + rstv1 "github.com/anynines/klutchio/provider-anynines/apis/restore/v1" + sbv1 "github.com/anynines/klutchio/provider-anynines/apis/servicebinding/v1" + dsv1 "github.com/anynines/klutchio/provider-anynines/apis/serviceinstance/v1" + anyninesv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" ) func init() { diff --git a/provider-anynines/apis/backup/v1/backup_types.go b/provider-anynines/apis/backup/v1/backup_types.go index eb65e9f..6a68f30 100644 --- a/provider-anynines/apis/backup/v1/backup_types.go +++ b/provider-anynines/apis/backup/v1/backup_types.go @@ -23,7 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema" - utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" + utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" ) diff --git a/provider-anynines/apis/serviceinstance/v1/serviceinstance_types.go b/provider-anynines/apis/serviceinstance/v1/serviceinstance_types.go index dc5f500..423071f 100644 --- a/provider-anynines/apis/serviceinstance/v1/serviceinstance_types.go +++ b/provider-anynines/apis/serviceinstance/v1/serviceinstance_types.go @@ -24,7 +24,7 @@ import ( "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/intstr" - utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" + utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" ) diff --git a/provider-anynines/cmd/provider/main.go b/provider-anynines/cmd/provider/main.go index 5963e2c..a63ee1d 100644 --- a/provider-anynines/cmd/provider/main.go +++ b/provider-anynines/cmd/provider/main.go @@ -39,11 +39,11 @@ import ( "github.com/go-logr/logr" ctrllog "sigs.k8s.io/controller-runtime/pkg/log" - "github.com/anynines/klutch/provider-anynines/apis" - anyninesv1 "github.com/anynines/klutch/provider-anynines/apis/v1" - anynines "github.com/anynines/klutch/provider-anynines/internal/controller" - "github.com/anynines/klutch/provider-anynines/internal/controller/features" - "github.com/anynines/klutch/provider-anynines/pkg/healthz" + "github.com/anynines/klutchio/provider-anynines/apis" + anyninesv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + anynines "github.com/anynines/klutchio/provider-anynines/internal/controller" + "github.com/anynines/klutchio/provider-anynines/internal/controller/features" + "github.com/anynines/klutchio/provider-anynines/pkg/healthz" ) func main() { diff --git a/provider-anynines/docs/developer-guide.md b/provider-anynines/docs/developer-guide.md index 03b7a56..4cacb48 100644 --- a/provider-anynines/docs/developer-guide.md +++ b/provider-anynines/docs/developer-guide.md @@ -14,7 +14,7 @@ Use alias for kubectl alias k=kubectl ``` -Using [provider-anynines](https://github.com/anynines/klutch/tree/main/provider-anynines) execute the following commands. +Using [provider-anynines](https://github.com/anynines/klutchio/tree/main/provider-anynines) execute the following commands. Install CRDs @@ -28,7 +28,7 @@ Create crossplane-system namespace k create ns crossplane-system ``` -Use [Setup tunnel to service-broker](https://anynines.atlassian.net/browse/A8S-1205) to configure port-forward to anynines service-broker and backup-manager. +Use [Setup tunnel to service-broker](https://anynines.atlassian.net/browse/A8S-1205) to configure port-forward to anynines service-broker and backup-manager. Update `examples/provider/config.yaml` to use the username and password for the service-broker and backup-manager derived using the scripts from [Setup tunnel to service-broker](https://anynines.atlassian.net/browse/A8S-1205). URL should be `http://localhost:8989`. @@ -110,7 +110,7 @@ provider-anynines will create a secret for you named `example-sb-creds` in the ` watch kubectl apply -f examples/sample/sb-example.yaml -o yaml ``` -ssh onto Inception and then onto the service broker. The service-broker can be accessed using `bosh -d ssh broker`. Then install the postgresql-client using `sudo apt update && sudo apt install -y postgresql-client`. +ssh onto Inception and then onto the service broker. The service-broker can be accessed using `bosh -d ssh broker`. Then install the postgresql-client using `sudo apt update && sudo apt install -y postgresql-client`. Use this script to fetch and decode the ENDPOINT. @@ -167,4 +167,4 @@ Restore the database to the previous state. watch kubectl apply -f examples/sample/restore-example.yaml -o yaml ``` -Check that the data has been reverted to the state at the time of backup. \ No newline at end of file +Check that the data has been reverted to the state at the time of backup. diff --git a/provider-anynines/examples/provider/provider.yaml b/provider-anynines/examples/provider/provider.yaml index 49f0476..4db02ca 100644 --- a/provider-anynines/examples/provider/provider.yaml +++ b/provider-anynines/examples/provider/provider.yaml @@ -3,4 +3,4 @@ kind: Provider metadata: name: provider-anynines spec: - package: "public.ecr.aws/w5n9a2g2/anynines/provider-anynines:v1.3.0" + package: "public.ecr.aws/w5n9a2g2/klutch/provider-anynines:v1.3.0" diff --git a/provider-anynines/go.mod b/provider-anynines/go.mod index de17b4e..5e995ac 100644 --- a/provider-anynines/go.mod +++ b/provider-anynines/go.mod @@ -1,10 +1,10 @@ -module github.com/anynines/klutch/provider-anynines +module github.com/anynines/klutchio/provider-anynines go 1.22 require ( - github.com/anynines/klutch/clients/a9s-backup-manager v0.0.1 - github.com/anynines/klutch/clients/a9s-open-service-broker v0.0.1 + github.com/anynines/klutchio/clients/a9s-backup-manager v0.0.1 + github.com/anynines/klutchio/clients/a9s-open-service-broker v0.0.1 github.com/crossplane/crossplane-runtime v1.15.1 github.com/crossplane/crossplane-tools v0.0.0-20230925130601-628280f8bf79 github.com/go-logr/logr v1.4.1 @@ -91,6 +91,6 @@ require ( ) replace ( - github.com/anynines/klutch/clients/a9s-backup-manager v0.0.1 => ../clients/a9s-backup-manager - github.com/anynines/klutch/clients/a9s-open-service-broker v0.0.1 => ../clients/a9s-open-service-broker + github.com/anynines/klutchio/clients/a9s-backup-manager v0.0.1 => ../clients/a9s-backup-manager + github.com/anynines/klutchio/clients/a9s-open-service-broker v0.0.1 => ../clients/a9s-open-service-broker ) diff --git a/provider-anynines/hack/helpers/controller/KIND_LOWER/KIND_LOWER.go.tmpl b/provider-anynines/hack/helpers/controller/KIND_LOWER/KIND_LOWER.go.tmpl index b1c761f..595a6ee 100644 --- a/provider-anynines/hack/helpers/controller/KIND_LOWER/KIND_LOWER.go.tmpl +++ b/provider-anynines/hack/helpers/controller/KIND_LOWER/KIND_LOWER.go.tmpl @@ -19,7 +19,7 @@ import ( "{{ .Env.PROJECT_REPO | strings.ToLower }}/apis/{{ .Env.GROUP | strings.ToLower }}/{{ .Env.APIVERSION | strings.ToLower }}" apisv1alpha1 "{{ .Env.PROJECT_REPO | strings.ToLower }}/apis/v1alpha1" "{{ .Env.PROJECT_REPO | strings.ToLower }}/internal/features" - util "github.com/anynines/klutch/provider-anynines/internal/controller/utils" + util "github.com/anynines/klutchio/provider-anynines/internal/controller/utils" ) const ( diff --git a/provider-anynines/internal/controller/anynines.go b/provider-anynines/internal/controller/anynines.go index ee355b1..df66da5 100644 --- a/provider-anynines/internal/controller/anynines.go +++ b/provider-anynines/internal/controller/anynines.go @@ -20,12 +20,12 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/controller" ctrl "sigs.k8s.io/controller-runtime" - "github.com/anynines/klutch/provider-anynines/internal/controller/backup" - "github.com/anynines/klutch/provider-anynines/internal/controller/config" - "github.com/anynines/klutch/provider-anynines/internal/controller/confighealth" - "github.com/anynines/klutch/provider-anynines/internal/controller/restore" - "github.com/anynines/klutch/provider-anynines/internal/controller/servicebinding" - "github.com/anynines/klutch/provider-anynines/internal/controller/serviceinstance" + "github.com/anynines/klutchio/provider-anynines/internal/controller/backup" + "github.com/anynines/klutchio/provider-anynines/internal/controller/config" + "github.com/anynines/klutchio/provider-anynines/internal/controller/confighealth" + "github.com/anynines/klutchio/provider-anynines/internal/controller/restore" + "github.com/anynines/klutchio/provider-anynines/internal/controller/servicebinding" + "github.com/anynines/klutchio/provider-anynines/internal/controller/serviceinstance" ) // Setup creates all anynines controllers with the supplied logger and adds them to diff --git a/provider-anynines/internal/controller/backup/backup.go b/provider-anynines/internal/controller/backup/backup.go index 6dc05ef..4868311 100644 --- a/provider-anynines/internal/controller/backup/backup.go +++ b/provider-anynines/internal/controller/backup/backup.go @@ -36,14 +36,14 @@ import ( ctrl "sigs.k8s.io/controller-runtime" k8sclient "sigs.k8s.io/controller-runtime/pkg/client" - bkpmgrclient "github.com/anynines/klutch/clients/a9s-backup-manager" - v1 "github.com/anynines/klutch/provider-anynines/apis/backup/v1" - dsv1 "github.com/anynines/klutch/provider-anynines/apis/serviceinstance/v1" - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" - util "github.com/anynines/klutch/provider-anynines/internal/controller/utils" - bkpclient "github.com/anynines/klutch/provider-anynines/pkg/client/backupmanager" - "github.com/anynines/klutch/provider-anynines/pkg/constants" - utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" + bkpmgrclient "github.com/anynines/klutchio/clients/a9s-backup-manager" + v1 "github.com/anynines/klutchio/provider-anynines/apis/backup/v1" + dsv1 "github.com/anynines/klutchio/provider-anynines/apis/serviceinstance/v1" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + util "github.com/anynines/klutchio/provider-anynines/internal/controller/utils" + bkpclient "github.com/anynines/klutchio/provider-anynines/pkg/client/backupmanager" + "github.com/anynines/klutchio/provider-anynines/pkg/constants" + utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" ) const ( diff --git a/provider-anynines/internal/controller/backup/backup_test.go b/provider-anynines/internal/controller/backup/backup_test.go index a8e2b63..60824da 100644 --- a/provider-anynines/internal/controller/backup/backup_test.go +++ b/provider-anynines/internal/controller/backup/backup_test.go @@ -32,14 +32,14 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - bkpmgrclient "github.com/anynines/klutch/clients/a9s-backup-manager" - fakebkpmgr "github.com/anynines/klutch/clients/a9s-backup-manager/fake" - v1 "github.com/anynines/klutch/provider-anynines/apis/backup/v1" - dsv1 "github.com/anynines/klutch/provider-anynines/apis/serviceinstance/v1" - "github.com/anynines/klutch/provider-anynines/internal/controller/backup" - bkpcontroller "github.com/anynines/klutch/provider-anynines/internal/controller/backup" - a9stest "github.com/anynines/klutch/provider-anynines/internal/controller/test" - utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" + bkpmgrclient "github.com/anynines/klutchio/clients/a9s-backup-manager" + fakebkpmgr "github.com/anynines/klutchio/clients/a9s-backup-manager/fake" + v1 "github.com/anynines/klutchio/provider-anynines/apis/backup/v1" + dsv1 "github.com/anynines/klutchio/provider-anynines/apis/serviceinstance/v1" + "github.com/anynines/klutchio/provider-anynines/internal/controller/backup" + bkpcontroller "github.com/anynines/klutchio/provider-anynines/internal/controller/backup" + a9stest "github.com/anynines/klutchio/provider-anynines/internal/controller/test" + utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" ) // Unlike many Kubernetes projects Crossplane does not use third party testing diff --git a/provider-anynines/internal/controller/config/config.go b/provider-anynines/internal/controller/config/config.go index c9a73f4..c1ea916 100644 --- a/provider-anynines/internal/controller/config/config.go +++ b/provider-anynines/internal/controller/config/config.go @@ -25,7 +25,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/reconciler/providerconfig" "github.com/crossplane/crossplane-runtime/pkg/resource" - v1 "github.com/anynines/klutch/provider-anynines/apis/v1" + v1 "github.com/anynines/klutchio/provider-anynines/apis/v1" ) // Setup adds a controller that reconciles ProviderConfigs by accounting for diff --git a/provider-anynines/internal/controller/confighealth/confighealth.go b/provider-anynines/internal/controller/confighealth/confighealth.go index 784f7a6..107fb49 100644 --- a/provider-anynines/internal/controller/confighealth/confighealth.go +++ b/provider-anynines/internal/controller/confighealth/confighealth.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - osbclient "github.com/anynines/klutch/clients/a9s-open-service-broker" + osbclient "github.com/anynines/klutchio/clients/a9s-open-service-broker" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" @@ -36,9 +36,9 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/logging" "github.com/crossplane/crossplane-runtime/pkg/ratelimiter" - v1 "github.com/anynines/klutch/provider-anynines/apis/v1" - credhelp "github.com/anynines/klutch/provider-anynines/internal/controller/utils" - client "github.com/anynines/klutch/provider-anynines/pkg/client/osb" + v1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + credhelp "github.com/anynines/klutchio/provider-anynines/internal/controller/utils" + client "github.com/anynines/klutchio/provider-anynines/pkg/client/osb" ) const ( diff --git a/provider-anynines/internal/controller/confighealth/confighealth_test.go b/provider-anynines/internal/controller/confighealth/confighealth_test.go index cedfb41..96857fe 100644 --- a/provider-anynines/internal/controller/confighealth/confighealth_test.go +++ b/provider-anynines/internal/controller/confighealth/confighealth_test.go @@ -33,15 +33,15 @@ import ( xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" - osbclient "github.com/anynines/klutch/clients/a9s-open-service-broker" - fakeosb "github.com/anynines/klutch/clients/a9s-open-service-broker/fake" - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" - a9stest "github.com/anynines/klutch/provider-anynines/internal/controller/test" + osbclient "github.com/anynines/klutchio/clients/a9s-open-service-broker" + fakeosb "github.com/anynines/klutchio/clients/a9s-open-service-broker/fake" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + a9stest "github.com/anynines/klutchio/provider-anynines/internal/controller/test" ) func TestMain(m *testing.M) { if err := apisv1.AddToScheme(scheme.Scheme); err != nil { - panic("failed to add API github.com/anynines/klutch/provider-anynines/apis/v1 to scheme") + panic("failed to add API github.com/anynines/klutchio/provider-anynines/apis/v1 to scheme") } os.Exit(m.Run()) diff --git a/provider-anynines/internal/controller/restore/restore.go b/provider-anynines/internal/controller/restore/restore.go index 30f8f26..9899d9e 100644 --- a/provider-anynines/internal/controller/restore/restore.go +++ b/provider-anynines/internal/controller/restore/restore.go @@ -34,14 +34,14 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - a9sbackupmanager "github.com/anynines/klutch/clients/a9s-backup-manager" - bkpv1 "github.com/anynines/klutch/provider-anynines/apis/backup/v1" - v1 "github.com/anynines/klutch/provider-anynines/apis/restore/v1" - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" - util "github.com/anynines/klutch/provider-anynines/internal/controller/utils" - bkpclient "github.com/anynines/klutch/provider-anynines/pkg/client/backupmanager" - "github.com/anynines/klutch/provider-anynines/pkg/constants" - utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" + a9sbackupmanager "github.com/anynines/klutchio/clients/a9s-backup-manager" + bkpv1 "github.com/anynines/klutchio/provider-anynines/apis/backup/v1" + v1 "github.com/anynines/klutchio/provider-anynines/apis/restore/v1" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + util "github.com/anynines/klutchio/provider-anynines/internal/controller/utils" + bkpclient "github.com/anynines/klutchio/provider-anynines/pkg/client/backupmanager" + "github.com/anynines/klutchio/provider-anynines/pkg/constants" + utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" ) const ( diff --git a/provider-anynines/internal/controller/restore/restore_test.go b/provider-anynines/internal/controller/restore/restore_test.go index f5f3865..d15db10 100644 --- a/provider-anynines/internal/controller/restore/restore_test.go +++ b/provider-anynines/internal/controller/restore/restore_test.go @@ -35,13 +35,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - a9sbackupmanager "github.com/anynines/klutch/clients/a9s-backup-manager" - fakebkpmgr "github.com/anynines/klutch/clients/a9s-backup-manager/fake" - bkpv1 "github.com/anynines/klutch/provider-anynines/apis/backup/v1" - v1 "github.com/anynines/klutch/provider-anynines/apis/restore/v1" - dsv1 "github.com/anynines/klutch/provider-anynines/apis/serviceinstance/v1" - a9stest "github.com/anynines/klutch/provider-anynines/internal/controller/test" - utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" + a9sbackupmanager "github.com/anynines/klutchio/clients/a9s-backup-manager" + fakebkpmgr "github.com/anynines/klutchio/clients/a9s-backup-manager/fake" + bkpv1 "github.com/anynines/klutchio/provider-anynines/apis/backup/v1" + v1 "github.com/anynines/klutchio/provider-anynines/apis/restore/v1" + dsv1 "github.com/anynines/klutchio/provider-anynines/apis/serviceinstance/v1" + a9stest "github.com/anynines/klutchio/provider-anynines/internal/controller/test" + utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" ) // Unlike many Kubernetes projects Crossplane does not use third party testing diff --git a/provider-anynines/internal/controller/servicebinding/servicebinding.go b/provider-anynines/internal/controller/servicebinding/servicebinding.go index d0af5d0..e47a16d 100644 --- a/provider-anynines/internal/controller/servicebinding/servicebinding.go +++ b/provider-anynines/internal/controller/servicebinding/servicebinding.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - osbclient "github.com/anynines/klutch/clients/a9s-open-service-broker" + osbclient "github.com/anynines/klutchio/clients/a9s-open-service-broker" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" k8sclient "sigs.k8s.io/controller-runtime/pkg/client" @@ -35,14 +35,14 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - v1 "github.com/anynines/klutch/provider-anynines/apis/servicebinding/v1" - dsv1 "github.com/anynines/klutch/provider-anynines/apis/serviceinstance/v1" - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" - util "github.com/anynines/klutch/provider-anynines/internal/controller/utils" - client "github.com/anynines/klutch/provider-anynines/pkg/client/osb" - "github.com/anynines/klutch/provider-anynines/pkg/constants" - utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" - utils "github.com/anynines/klutch/provider-anynines/pkg/utils" + v1 "github.com/anynines/klutchio/provider-anynines/apis/servicebinding/v1" + dsv1 "github.com/anynines/klutchio/provider-anynines/apis/serviceinstance/v1" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + util "github.com/anynines/klutchio/provider-anynines/internal/controller/utils" + client "github.com/anynines/klutchio/provider-anynines/pkg/client/osb" + "github.com/anynines/klutchio/provider-anynines/pkg/constants" + utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" + utils "github.com/anynines/klutchio/provider-anynines/pkg/utils" ) const ( diff --git a/provider-anynines/internal/controller/servicebinding/servicebinding_test.go b/provider-anynines/internal/controller/servicebinding/servicebinding_test.go index 1c358ad..06c6649 100644 --- a/provider-anynines/internal/controller/servicebinding/servicebinding_test.go +++ b/provider-anynines/internal/controller/servicebinding/servicebinding_test.go @@ -31,13 +31,13 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/fake" - osbclient "github.com/anynines/klutch/clients/a9s-open-service-broker" - fakeosb "github.com/anynines/klutch/clients/a9s-open-service-broker/fake" - v1 "github.com/anynines/klutch/provider-anynines/apis/servicebinding/v1" - dsv1 "github.com/anynines/klutch/provider-anynines/apis/serviceinstance/v1" - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" - a9stest "github.com/anynines/klutch/provider-anynines/internal/controller/test" - utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" + osbclient "github.com/anynines/klutchio/clients/a9s-open-service-broker" + fakeosb "github.com/anynines/klutchio/clients/a9s-open-service-broker/fake" + v1 "github.com/anynines/klutchio/provider-anynines/apis/servicebinding/v1" + dsv1 "github.com/anynines/klutchio/provider-anynines/apis/serviceinstance/v1" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + a9stest "github.com/anynines/klutchio/provider-anynines/internal/controller/test" + utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" "github.com/crossplane/crossplane-runtime/pkg/meta" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" @@ -54,7 +54,7 @@ var defaultBindingParameters = &v1.ServiceBindingParameters{ func TestMain(m *testing.M) { if err := apisv1.AddToScheme(scheme.Scheme); err != nil { - panic("failed to add API github.com/anynines/klutch/provider-anynines/apis/v1alpha1 to scheme") + panic("failed to add API github.com/anynines/klutchio/provider-anynines/apis/v1alpha1 to scheme") } os.Exit(m.Run()) diff --git a/provider-anynines/internal/controller/serviceinstance/errors.go b/provider-anynines/internal/controller/serviceinstance/errors.go index 2d59bb6..cbfa1b1 100644 --- a/provider-anynines/internal/controller/serviceinstance/errors.go +++ b/provider-anynines/internal/controller/serviceinstance/errors.go @@ -16,7 +16,7 @@ limitations under the License. package serviceinstance -import utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" +import utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" const ( errNotServiceInstance = utilerr.PlainUserErr("managed resource is not a ServiceInstance custom resource") diff --git a/provider-anynines/internal/controller/serviceinstance/serviceinstance.go b/provider-anynines/internal/controller/serviceinstance/serviceinstance.go index ab6ce13..6330c5e 100644 --- a/provider-anynines/internal/controller/serviceinstance/serviceinstance.go +++ b/provider-anynines/internal/controller/serviceinstance/serviceinstance.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - osbclient "github.com/anynines/klutch/clients/a9s-open-service-broker" + osbclient "github.com/anynines/klutchio/clients/a9s-open-service-broker" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" k8sclient "sigs.k8s.io/controller-runtime/pkg/client" @@ -35,13 +35,13 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" "github.com/crossplane/crossplane-runtime/pkg/resource" - v1 "github.com/anynines/klutch/provider-anynines/apis/serviceinstance/v1" - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" - util "github.com/anynines/klutch/provider-anynines/internal/controller/utils" - anynines "github.com/anynines/klutch/provider-anynines/pkg/client" - client "github.com/anynines/klutch/provider-anynines/pkg/client/osb" - "github.com/anynines/klutch/provider-anynines/pkg/client/serviceinstance" - utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" + v1 "github.com/anynines/klutchio/provider-anynines/apis/serviceinstance/v1" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + util "github.com/anynines/klutchio/provider-anynines/internal/controller/utils" + anynines "github.com/anynines/klutchio/provider-anynines/pkg/client" + client "github.com/anynines/klutchio/provider-anynines/pkg/client/osb" + "github.com/anynines/klutchio/provider-anynines/pkg/client/serviceinstance" + utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" ) const ( diff --git a/provider-anynines/internal/controller/serviceinstance/serviceinstance_test.go b/provider-anynines/internal/controller/serviceinstance/serviceinstance_test.go index 052f000..1be4859 100644 --- a/provider-anynines/internal/controller/serviceinstance/serviceinstance_test.go +++ b/provider-anynines/internal/controller/serviceinstance/serviceinstance_test.go @@ -37,13 +37,13 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/test" "k8s.io/apimachinery/pkg/util/intstr" - osbclient "github.com/anynines/klutch/clients/a9s-open-service-broker" - fakeosb "github.com/anynines/klutch/clients/a9s-open-service-broker/fake" - sbv1 "github.com/anynines/klutch/provider-anynines/apis/servicebinding/v1" - v1 "github.com/anynines/klutch/provider-anynines/apis/serviceinstance/v1" - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" - a9stest "github.com/anynines/klutch/provider-anynines/internal/controller/test" - utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" + osbclient "github.com/anynines/klutchio/clients/a9s-open-service-broker" + fakeosb "github.com/anynines/klutchio/clients/a9s-open-service-broker/fake" + sbv1 "github.com/anynines/klutchio/provider-anynines/apis/servicebinding/v1" + v1 "github.com/anynines/klutchio/provider-anynines/apis/serviceinstance/v1" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + a9stest "github.com/anynines/klutchio/provider-anynines/internal/controller/test" + utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" ) var defaultCatalogResponse = osbclient.CatalogResponse{ @@ -205,7 +205,7 @@ func InstanceNotProvisionedResponse() sbError { func TestMain(m *testing.M) { if err := apisv1.AddToScheme(scheme.Scheme); err != nil { - panic("failed to add API github.com/anynines/klutch/provider-anynines/apis/v1 to scheme") + panic("failed to add API github.com/anynines/klutchio/provider-anynines/apis/v1 to scheme") } os.Exit(m.Run()) diff --git a/provider-anynines/internal/controller/test/utils.go b/provider-anynines/internal/controller/test/utils.go index d1bf8ba..9a939e2 100644 --- a/provider-anynines/internal/controller/test/utils.go +++ b/provider-anynines/internal/controller/test/utils.go @@ -24,9 +24,9 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/types" - sbv1 "github.com/anynines/klutch/provider-anynines/apis/servicebinding/v1" - dsv1 "github.com/anynines/klutch/provider-anynines/apis/serviceinstance/v1" - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" + sbv1 "github.com/anynines/klutchio/provider-anynines/apis/servicebinding/v1" + dsv1 "github.com/anynines/klutchio/provider-anynines/apis/serviceinstance/v1" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" "github.com/go-logr/logr/testr" corev1 "k8s.io/api/core/v1" diff --git a/provider-anynines/internal/controller/utils/connection_publisher_helper.go b/provider-anynines/internal/controller/utils/connection_publisher_helper.go index 395d48e..4e2bd7c 100644 --- a/provider-anynines/internal/controller/utils/connection_publisher_helper.go +++ b/provider-anynines/internal/controller/utils/connection_publisher_helper.go @@ -17,8 +17,8 @@ limitations under the License. package utils import ( - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" - "github.com/anynines/klutch/provider-anynines/internal/controller/features" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + "github.com/anynines/klutchio/provider-anynines/internal/controller/features" "github.com/crossplane/crossplane-runtime/pkg/connection" "github.com/crossplane/crossplane-runtime/pkg/controller" "github.com/crossplane/crossplane-runtime/pkg/reconciler/managed" diff --git a/provider-anynines/internal/controller/utils/credentials_helper.go b/provider-anynines/internal/controller/utils/credentials_helper.go index d6d7b53..501ac19 100644 --- a/provider-anynines/internal/controller/utils/credentials_helper.go +++ b/provider-anynines/internal/controller/utils/credentials_helper.go @@ -19,8 +19,8 @@ package utils import ( "context" - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" - utilerr "github.com/anynines/klutch/provider-anynines/pkg/utilerr" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + utilerr "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" resource "github.com/crossplane/crossplane-runtime/pkg/resource" k8sclient "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/provider-anynines/package/crossplane.yaml b/provider-anynines/package/crossplane.yaml index 0563f5c..20641d3 100644 --- a/provider-anynines/package/crossplane.yaml +++ b/provider-anynines/package/crossplane.yaml @@ -3,11 +3,11 @@ kind: Provider metadata: name: provider-anynines annotations: - meta.crossplane.io/maintainer: anynines - meta.crossplane.io/source: anynines + meta.crossplane.io/maintainer: klutch + meta.crossplane.io/source: klutch meta.crossplane.io/description: | A provider that can provision anynines Data Service Instances. spec: controller: - image: "public.ecr.aws/w5n9a2g2/anynines/provider-anynines-controller:VERSION" + image: "public.ecr.aws/w5n9a2g2/klutch/provider-anynines-controller:VERSION" diff --git a/provider-anynines/pkg/client/backupmanager/client.go b/provider-anynines/pkg/client/backupmanager/client.go index 149eecc..db8db6a 100644 --- a/provider-anynines/pkg/client/backupmanager/client.go +++ b/provider-anynines/pkg/client/backupmanager/client.go @@ -20,9 +20,9 @@ import ( "errors" "strings" - bkpmgrclient "github.com/anynines/klutch/clients/a9s-backup-manager" - v1 "github.com/anynines/klutch/provider-anynines/apis/backup/v1" - rstv1 "github.com/anynines/klutch/provider-anynines/apis/restore/v1" + bkpmgrclient "github.com/anynines/klutchio/clients/a9s-backup-manager" + v1 "github.com/anynines/klutchio/provider-anynines/apis/backup/v1" + rstv1 "github.com/anynines/klutchio/provider-anynines/apis/restore/v1" ) const ( diff --git a/provider-anynines/pkg/client/osb/client.go b/provider-anynines/pkg/client/osb/client.go index f8732a0..fcc01fb 100644 --- a/provider-anynines/pkg/client/osb/client.go +++ b/provider-anynines/pkg/client/osb/client.go @@ -20,7 +20,7 @@ import ( "errors" "strings" - osbclient "github.com/anynines/klutch/clients/a9s-open-service-broker" + osbclient "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) const ( diff --git a/provider-anynines/pkg/client/serviceinstance/serviceinstance.go b/provider-anynines/pkg/client/serviceinstance/serviceinstance.go index 655395b..173194f 100644 --- a/provider-anynines/pkg/client/serviceinstance/serviceinstance.go +++ b/provider-anynines/pkg/client/serviceinstance/serviceinstance.go @@ -17,9 +17,9 @@ limitations under the License. package serviceinstance import ( - osbclient "github.com/anynines/klutch/clients/a9s-open-service-broker" - v1 "github.com/anynines/klutch/provider-anynines/apis/serviceinstance/v1" - "github.com/anynines/klutch/provider-anynines/pkg/utils" + osbclient "github.com/anynines/klutchio/clients/a9s-open-service-broker" + v1 "github.com/anynines/klutchio/provider-anynines/apis/serviceinstance/v1" + "github.com/anynines/klutchio/provider-anynines/pkg/utils" "github.com/google/go-cmp/cmp" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/utils/ptr" diff --git a/provider-anynines/pkg/healthz/handler.go b/provider-anynines/pkg/healthz/handler.go index c9dd07e..d48e346 100644 --- a/provider-anynines/pkg/healthz/handler.go +++ b/provider-anynines/pkg/healthz/handler.go @@ -22,7 +22,7 @@ import ( "fmt" "net/http" - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/provider-anynines/pkg/healthz/handler_test.go b/provider-anynines/pkg/healthz/handler_test.go index 9fd9720..40f0df1 100644 --- a/provider-anynines/pkg/healthz/handler_test.go +++ b/provider-anynines/pkg/healthz/handler_test.go @@ -29,13 +29,13 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" - apisv1 "github.com/anynines/klutch/provider-anynines/apis/v1" - a9stest "github.com/anynines/klutch/provider-anynines/internal/controller/test" + apisv1 "github.com/anynines/klutchio/provider-anynines/apis/v1" + a9stest "github.com/anynines/klutchio/provider-anynines/internal/controller/test" ) func TestMain(m *testing.M) { if err := apisv1.AddToScheme(scheme.Scheme); err != nil { - panic("failed to add API github.com/anynines/klutch/provider-anynines/apis/v1 to scheme") + panic("failed to add API github.com/anynines/klutchio/provider-anynines/apis/v1 to scheme") } os.Exit(m.Run()) diff --git a/provider-anynines/pkg/utilerr/error.go b/provider-anynines/pkg/utilerr/error.go index 9565b13..c80f773 100644 --- a/provider-anynines/pkg/utilerr/error.go +++ b/provider-anynines/pkg/utilerr/error.go @@ -19,8 +19,8 @@ package utilerr import ( "errors" - backupClient "github.com/anynines/klutch/clients/a9s-backup-manager" - osbclient "github.com/anynines/klutch/clients/a9s-open-service-broker" + backupClient "github.com/anynines/klutchio/clients/a9s-backup-manager" + osbclient "github.com/anynines/klutchio/clients/a9s-open-service-broker" ) var _ Userdisplayer = &userError{} diff --git a/provider-anynines/pkg/utilerr/error_decorator_test.go b/provider-anynines/pkg/utilerr/error_decorator_test.go index c447134..a6b95f5 100644 --- a/provider-anynines/pkg/utilerr/error_decorator_test.go +++ b/provider-anynines/pkg/utilerr/error_decorator_test.go @@ -26,7 +26,7 @@ import ( "github.com/crossplane/crossplane-runtime/pkg/resource" "github.com/go-logr/logr" - logging "github.com/anynines/klutch/provider-anynines/pkg/utilerr" + logging "github.com/anynines/klutchio/provider-anynines/pkg/utilerr" ) func TestDecorated(t *testing.T) { diff --git a/release/patches/release.yaml.template b/release/patches/release.yaml.template index f8b420e..889bbb7 100644 --- a/release/patches/release.yaml.template +++ b/release/patches/release.yaml.template @@ -9,14 +9,14 @@ kind: Configuration metadata: name: anynines-dataservices spec: - package: "public.ecr.aws/w5n9a2g2/anynines/dataservices:$CONFIG_VERSION" + package: "public.ecr.aws/w5n9a2g2/klutch/dataservices:$CONFIG_VERSION" --- apiVersion: pkg.crossplane.io/v1 kind: Provider metadata: name: provider-anynines spec: - package: "public.ecr.aws/w5n9a2g2/anynines/provider-anynines:$PROVIDER_ANYNINES_VERSION" + package: "public.ecr.aws/w5n9a2g2/klutch/provider-anynines:$PROVIDER_ANYNINES_VERSION" --- apiVersion: pkg.crossplane.io/v1 kind: Provider @@ -35,4 +35,4 @@ spec: spec: containers: - name: anynines-backend - image: "public.ecr.aws/w5n9a2g2/anynines/kubebind-backend:$KUBE_BIND_BACKEND_VERSION" + image: "public.ecr.aws/w5n9a2g2/klutch/klutchbind-backend:$KUBE_BIND_BACKEND_VERSION" diff --git a/test/e2e/README.md b/test/e2e/README.md index 07c5377..6b8fbe7 100644 --- a/test/e2e/README.md +++ b/test/e2e/README.md @@ -10,7 +10,7 @@ This directory contains klutch e2e tests. It contains: The tests can be executed in a local `kind` cluster. We assume that these tests can be deployed in an environment where a Kubernetes cluster already exists. -- Follow the instructions from [this repo](https://github.com/anynines/klutch/tree/main/crossplane-api) to setup all the prerequisites and the actual provider-anynines. You will need to follow the steps outlined in the [Prerequisites](https://github.com/anynines/klutch/tree/main/crossplane-api#prerequisites) and [Installation](https://github.com/anynines/klutch/tree/main/crossplane-api#installation) sections. +- Follow the instructions from [this repo](https://github.com/anynines/klutchio/tree/main/crossplane-api) to setup all the prerequisites and the actual provider-anynines. You will need to follow the steps outlined in the [Prerequisites](https://github.com/anynines/klutchio/tree/main/crossplane-api#prerequisites) and [Installation](https://github.com/anynines/klutchio/tree/main/crossplane-api#installation) sections. - You also need to set some environment variables: - KUBECONFIG @@ -28,10 +28,12 @@ can be deployed in an environment where a Kubernetes cluster already exists. ## How to run the provider tests The following tools need to be installed: + - `kind`: used to create a test cluster - `helm`: used to install crossplane To run the tests, execute: + ```bash go test -v ./provider ``` @@ -42,11 +44,13 @@ After the test completes successfully, the cluster is deleted. In case of a failed test run the cluster is not deleted, allowing you to inspect it. If you want to keep the cluster around even after a successful test run, set `KEEP_CLUSTER=true`: + ```bash KEEP_CLUSTER=true go test -v ./provider ``` To clean up all clusters left behind by e2e tests in one go, run: + ``` make cleanup-clusters ``` diff --git a/test/e2e/funcs/feature.go b/test/e2e/funcs/feature.go index 3931c18..60e0915 100644 --- a/test/e2e/funcs/feature.go +++ b/test/e2e/funcs/feature.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/anynines/klutch/test/e2e/utils" + "github.com/anynines/klutchio/test/e2e/utils" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "github.com/crossplane/crossplane-runtime/pkg/fieldpath" "k8s.io/apimachinery/pkg/api/errors" diff --git a/test/e2e/go.mod b/test/e2e/go.mod index bae6f93..af9c2c5 100644 --- a/test/e2e/go.mod +++ b/test/e2e/go.mod @@ -1,4 +1,4 @@ -module github.com/anynines/klutch/test/e2e +module github.com/anynines/klutchio/test/e2e go 1.22 diff --git a/test/e2e/logme2/logme2_test.go b/test/e2e/logme2/logme2_test.go index 8e29787..e98cbbc 100644 --- a/test/e2e/logme2/logme2_test.go +++ b/test/e2e/logme2/logme2_test.go @@ -23,7 +23,7 @@ import ( xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "sigs.k8s.io/e2e-framework/pkg/features" - "github.com/anynines/klutch/test/e2e/funcs" + "github.com/anynines/klutchio/test/e2e/funcs" ) func TestLogme2InstanceLifecycle(t *testing.T) { diff --git a/test/e2e/mariadb/mariadb_test.go b/test/e2e/mariadb/mariadb_test.go index 8eae4eb..c239c2a 100644 --- a/test/e2e/mariadb/mariadb_test.go +++ b/test/e2e/mariadb/mariadb_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/anynines/klutch/test/e2e/funcs" + "github.com/anynines/klutchio/test/e2e/funcs" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "sigs.k8s.io/e2e-framework/pkg/features" diff --git a/test/e2e/messaging/messaging_test.go b/test/e2e/messaging/messaging_test.go index d60ff00..6602282 100644 --- a/test/e2e/messaging/messaging_test.go +++ b/test/e2e/messaging/messaging_test.go @@ -23,7 +23,7 @@ import ( xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "sigs.k8s.io/e2e-framework/pkg/features" - "github.com/anynines/klutch/test/e2e/funcs" + "github.com/anynines/klutchio/test/e2e/funcs" ) func TestMessagingInstanceLifecycle(t *testing.T) { diff --git a/test/e2e/mongodb/mongodb_test.go b/test/e2e/mongodb/mongodb_test.go index 2f57a5e..c58bca8 100644 --- a/test/e2e/mongodb/mongodb_test.go +++ b/test/e2e/mongodb/mongodb_test.go @@ -23,7 +23,7 @@ import ( xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "sigs.k8s.io/e2e-framework/pkg/features" - "github.com/anynines/klutch/test/e2e/funcs" + "github.com/anynines/klutchio/test/e2e/funcs" ) func TestMongoDBInstanceLifecycle(t *testing.T) { diff --git a/test/e2e/postgresql/postgresql_test.go b/test/e2e/postgresql/postgresql_test.go index 5f89906..6701e16 100644 --- a/test/e2e/postgresql/postgresql_test.go +++ b/test/e2e/postgresql/postgresql_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/anynines/klutch/test/e2e/funcs" + "github.com/anynines/klutchio/test/e2e/funcs" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "sigs.k8s.io/e2e-framework/pkg/features" diff --git a/test/e2e/prometheus/prometheus_test.go b/test/e2e/prometheus/prometheus_test.go index b6cc703..98a14a6 100644 --- a/test/e2e/prometheus/prometheus_test.go +++ b/test/e2e/prometheus/prometheus_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/anynines/klutch/test/e2e/funcs" + "github.com/anynines/klutchio/test/e2e/funcs" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "sigs.k8s.io/e2e-framework/pkg/features" diff --git a/test/e2e/provider/install_and_configure_test.go b/test/e2e/provider/install_and_configure_test.go index 927add2..123a6a4 100644 --- a/test/e2e/provider/install_and_configure_test.go +++ b/test/e2e/provider/install_and_configure_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/anynines/klutch/test/e2e/funcs" + "github.com/anynines/klutchio/test/e2e/funcs" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "sigs.k8s.io/e2e-framework/pkg/features" ) diff --git a/test/e2e/provider/manifests/configuration.yaml b/test/e2e/provider/manifests/configuration.yaml index a93d7f8..c4661ba 100644 --- a/test/e2e/provider/manifests/configuration.yaml +++ b/test/e2e/provider/manifests/configuration.yaml @@ -3,4 +3,4 @@ kind: Configuration metadata: name: anynines-dataservices spec: - package: public.ecr.aws/w5n9a2g2/anynines/dataservices:v1.3.0 + package: public.ecr.aws/w5n9a2g2/klutch/dataservices:v1.3.0 diff --git a/test/e2e/provider/manifests/install/provider.yaml b/test/e2e/provider/manifests/install/provider.yaml index 779af93..77793a3 100644 --- a/test/e2e/provider/manifests/install/provider.yaml +++ b/test/e2e/provider/manifests/install/provider.yaml @@ -3,6 +3,6 @@ kind: Provider metadata: name: anynines-provider spec: - package: public.ecr.aws/w5n9a2g2/anynines/provider-anynines:v1.3.0 + package: public.ecr.aws/w5n9a2g2/klutch/provider-anynines:v1.3.0 runtimeConfigRef: name: enable-debug-logging diff --git a/test/e2e/search/search_test.go b/test/e2e/search/search_test.go index c57c699..69c4ffe 100644 --- a/test/e2e/search/search_test.go +++ b/test/e2e/search/search_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/anynines/klutch/test/e2e/funcs" + "github.com/anynines/klutchio/test/e2e/funcs" xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1" "sigs.k8s.io/e2e-framework/pkg/features"