Skip to content

Commit

Permalink
chore: go module migrate to composable-operator/composable
Browse files Browse the repository at this point in the history
Signed-off-by: Matthias Riegler <[email protected]>
  • Loading branch information
xvzf committed Apr 11, 2023
1 parent 2058409 commit 2b1f17b
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 31 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/composable_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha1/groupversion_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 0 additions & 2 deletions api/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions controllers/composable_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions controllers/composable_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion controllers/test/gomega.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion controllers/test/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/ibm/composable
module github.com/composable-operator/composable

go 1.17

Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
8 changes: 4 additions & 4 deletions sdk/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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:

Expand Down
2 changes: 1 addition & 1 deletion sdk/docs/memcached-controller.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion sdk/docs/memcached-types.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions sdk/docs/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
...
)

Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions sdk/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2b1f17b

Please sign in to comment.