From 2b1f17b687efd0d6c671b8c0602e23381b0faf34 Mon Sep 17 00:00:00 2001 From: Matthias Riegler Date: Tue, 11 Apr 2023 13:51:38 +0200 Subject: [PATCH] chore: go module migrate to composable-operator/composable Signed-off-by: Matthias Riegler --- CONTRIBUTING.md | 6 +++--- PROJECT | 4 ++-- api/v1alpha1/composable_webhook.go | 2 +- api/v1alpha1/groupversion_info.go | 4 ++-- api/v1alpha1/zz_generated.deepcopy.go | 2 -- controllers/composable_controller.go | 4 ++-- controllers/composable_controller_test.go | 4 ++-- controllers/suite_test.go | 4 ++-- controllers/test/gomega.go | 2 +- controllers/test/template.go | 2 +- go.mod | 2 +- main.go | 4 ++-- sdk/README.md | 8 ++++---- sdk/docs/memcached-controller.md | 2 +- sdk/docs/memcached-types.md | 2 +- sdk/docs/tutorial.md | 4 ++-- sdk/zz_generated.deepcopy.go | 2 -- 17 files changed, 27 insertions(+), 31 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 47123689..802bd062 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,14 +12,14 @@ as well as the guidelines we follow for how our documents are formatted. To report an issue, or to suggest an idea for a change that you haven't had time to write-up yet, open an -[issue](https://github.com/IBM/composable/issues). It is best to check -our existing [issues](https://github.com/IBM/composable/issues) first +[issue](https://github.com/composable-operator/composable/issues). It is best to check +our existing [issues](https://github.com/composable-operator/composable/issues) first to see if a similar one has already been opened and discussed. ## Suggesting a Change To suggest a change to this repository, submit a [pull -request](https://github.com/IBM/composable/pulls)(PR) with the complete +request](https://github.com/composable-operator/composable/pulls)(PR) with the complete set of changes you'd like to see. See the [Code Style](#code-style) section for the guidelines we follow for how documents are formatted. diff --git a/PROJECT b/PROJECT index 571d1591..5635c4fe 100644 --- a/PROJECT +++ b/PROJECT @@ -2,7 +2,7 @@ domain: ibm.com layout: - go.kubebuilder.io/v3 projectName: composable -repo: github.com/ibm/composable +repo: github.com/composable-operator/composable resources: - api: crdVersion: v1 @@ -11,7 +11,7 @@ resources: domain: ibm.com group: ibmcloud kind: Composable - path: github.com/ibm/composable/api/v1alpha1 + path: github.com/composable-operator/composable/api/v1alpha1 version: v1alpha1 webhooks: defaulting: true diff --git a/api/v1alpha1/composable_webhook.go b/api/v1alpha1/composable_webhook.go index 1349ee75..da5d79a5 100644 --- a/api/v1alpha1/composable_webhook.go +++ b/api/v1alpha1/composable_webhook.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - sdk "github.com/ibm/composable/sdk" + sdk "github.com/composable-operator/composable/sdk" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go index 14076096..f8f85179 100644 --- a/api/v1alpha1/groupversion_info.go +++ b/api/v1alpha1/groupversion_info.go @@ -15,8 +15,8 @@ limitations under the License. */ // Package v1alpha1 contains API Schema definitions for the ibmcloud v1alpha1 API group -//+kubebuilder:object:generate=true -//+groupName=ibmcloud.ibm.com +// +kubebuilder:object:generate=true +// +groupName=ibmcloud.ibm.com package v1alpha1 import ( diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 265e175c..485a17b0 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -2,8 +2,6 @@ // +build !ignore_autogenerated /* -Copyright 2022. - Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at diff --git a/controllers/composable_controller.go b/controllers/composable_controller.go index e8ac015e..32696b95 100644 --- a/controllers/composable_controller.go +++ b/controllers/composable_controller.go @@ -37,8 +37,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" - ibmcloudv1alpha1 "github.com/ibm/composable/api/v1alpha1" - sdk "github.com/ibm/composable/sdk" + ibmcloudv1alpha1 "github.com/composable-operator/composable/api/v1alpha1" + sdk "github.com/composable-operator/composable/sdk" "github.com/spf13/viper" ) diff --git a/controllers/composable_controller_test.go b/controllers/composable_controller_test.go index 58478eaf..0e2d0c8f 100644 --- a/controllers/composable_controller_test.go +++ b/controllers/composable_controller_test.go @@ -17,8 +17,8 @@ package controllers import ( - "github.com/ibm/composable/controllers/test" - sdk "github.com/ibm/composable/sdk" + "github.com/composable-operator/composable/controllers/test" + sdk "github.com/composable-operator/composable/sdk" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" v1 "k8s.io/api/core/v1" diff --git a/controllers/suite_test.go b/controllers/suite_test.go index 5107fc31..790a7388 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ibm/composable/controllers/test" + "github.com/composable-operator/composable/controllers/test" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "k8s.io/client-go/kubernetes/scheme" @@ -33,7 +33,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - ibmcloudv1alpha1 "github.com/ibm/composable/api/v1alpha1" + ibmcloudv1alpha1 "github.com/composable-operator/composable/api/v1alpha1" //+kubebuilder:scaffold:imports ) diff --git a/controllers/test/gomega.go b/controllers/test/gomega.go index be38be49..d829e5dc 100644 --- a/controllers/test/gomega.go +++ b/controllers/test/gomega.go @@ -19,7 +19,7 @@ package test import ( "context" - "github.com/ibm/composable/api/v1alpha1" + "github.com/composable-operator/composable/api/v1alpha1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/controllers/test/template.go b/controllers/test/template.go index bcc80c15..cc4d35d3 100644 --- a/controllers/test/template.go +++ b/controllers/test/template.go @@ -26,7 +26,7 @@ import ( "k8s.io/apimachinery/pkg/util/yaml" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/ibm/composable/api/v1alpha1" + "github.com/composable-operator/composable/api/v1alpha1" ) // PostInNs the object diff --git a/go.mod b/go.mod index c761f8eb..b4d06e9a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ibm/composable +module github.com/composable-operator/composable go 1.17 diff --git a/main.go b/main.go index cfb1b512..8b45991d 100644 --- a/main.go +++ b/main.go @@ -34,8 +34,8 @@ import ( flag "github.com/spf13/pflag" "github.com/spf13/viper" - ibmcloudv1alpha1 "github.com/ibm/composable/api/v1alpha1" - "github.com/ibm/composable/controllers" + ibmcloudv1alpha1 "github.com/composable-operator/composable/api/v1alpha1" + "github.com/composable-operator/composable/controllers" //+kubebuilder:scaffold:imports ) diff --git a/sdk/README.md b/sdk/README.md index 3b33f83b..5540c59e 100644 --- a/sdk/README.md +++ b/sdk/README.md @@ -3,8 +3,8 @@ :warning: This is not up-to-date anymore! [![Build Status](https://travis-ci.com/IBM/composable.svg?branch=master)](https://travis-ci.com/IBM/composable) -[![Go Report Card](https://goreportcard.com/badge/github.com/IBM/composable)](https://goreportcard.com/report/github.com/IBM/composable) -[![GoDoc](https://godoc.org/github.com/IBM/composable/sdk?status.svg)](https://godoc.org/github.com/IBM/composable/sdk) +[![Go Report Card](https://goreportcard.com/badge/github.com/composable-operator/composable)](https://goreportcard.com/report/github.com/composable-operator/composable) +[![GoDoc](https://godoc.org/github.com/composable-operator/composable/sdk?status.svg)](https://godoc.org/github.com/composable-operator/composable/sdk) Kubernetes object specifications often require constant values for their fields. When deploying an entire application with many different resources, this limitation often results in the need for staged deployments, because some resources @@ -22,7 +22,7 @@ See this [tutorial](./docs/tutorial.md), in which we add cross-references to the To install, run: ``` -go get github.com/ibm/composable/sdk +go get github.com/composable-operator/composable/sdk ``` ## Types @@ -46,7 +46,7 @@ type ComposableGetValueFrom struct { ``` An `ObjectRef` can be used to specify the type of any field of a CRD definition, allowing the value to be determined dynamically. -For a detailed explanation of how to specify an object reference according to this schema, see [here](https://github.com/IBM/composable/blob/master/README.md#getvaluefrom-elements). +For a detailed explanation of how to specify an object reference according to this schema, see [here](https://github.com/composable-operator/composable/blob/master/README.md#getvaluefrom-elements). The Composable SDK offers the following types to be used as part of a Reconciler in a controller: diff --git a/sdk/docs/memcached-controller.md b/sdk/docs/memcached-controller.md index 21331761..3e32b563 100644 --- a/sdk/docs/memcached-controller.md +++ b/sdk/docs/memcached-controller.md @@ -7,7 +7,7 @@ import ( cachev1alpha1 "github.com/operator-framework/operator-sdk-samples/memcached-operator/pkg/apis/cache/v1alpha1" - sdk "github.com/ibm/composable/sdk" + sdk "github.com/composable-operator/composable/sdk" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/sdk/docs/memcached-types.md b/sdk/docs/memcached-types.md index f3d943ea..89ee795e 100644 --- a/sdk/docs/memcached-types.md +++ b/sdk/docs/memcached-types.md @@ -2,7 +2,7 @@ package v1alpha1 import ( - sdk "github.com/ibm/composable/sdk" + sdk "github.com/composable-operator/composable/sdk" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/sdk/docs/tutorial.md b/sdk/docs/tutorial.md index b4c2c9ce..f45e7bb8 100644 --- a/sdk/docs/tutorial.md +++ b/sdk/docs/tutorial.md @@ -28,7 +28,7 @@ type MemcachedSpec struct { We modify this `struct` as shown below: ```golang import ( - sdk "github.com/ibm/composable/sdk" + sdk "github.com/composable-operator/composable/sdk" ... ) @@ -58,7 +58,7 @@ type ComposableGetValueFrom struct { } ``` -For a detailed explanation of how to specify an object reference according to this schema, see [here](https://github.com/IBM/composable/blob/master/README.md#getvaluefrom-elements). +For a detailed explanation of how to specify an object reference according to this schema, see [here](https://github.com/composable-operator/composable/blob/master/README.md#getvaluefrom-elements). Given the new specification for `Memcached`, a sample CR can be written as: ```yaml diff --git a/sdk/zz_generated.deepcopy.go b/sdk/zz_generated.deepcopy.go index ca300fc2..18874ce2 100644 --- a/sdk/zz_generated.deepcopy.go +++ b/sdk/zz_generated.deepcopy.go @@ -2,8 +2,6 @@ // +build !ignore_autogenerated /* -Copyright 2022. - Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at