Skip to content

Commit

Permalink
refactor(module) Move repository to github.com/goharbor/harbor-core-o…
Browse files Browse the repository at this point in the history
…perator

Signed-off-by: Pierre Péronnet <pierre.peronnet@ovhcloud.com>
  • Loading branch information
holyhope committed Mar 5, 2020
1 parent ea81be3 commit 66f8851
Show file tree
Hide file tree
Showing 63 changed files with 136 additions and 136 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ COPY go.sum go.sum

ENV CGO_ENABLED=0 \
GOOS="linux" \
GO_APP_PKG="github.com/ovh/harbor-operator" \
GO_APP_PKG="github.com/goharbor/harbor-core-operator" \
GO111MODULE=on

# Copy the go source
Expand Down
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
domain: ovhcloud.com
repo: github.com/ovh/harbor-operator
repo: github.com/goharbor/harbor-core-operator
resources:
- group: containerregistry
kind: Harbor
Expand Down
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@

Harbor Operator is a [Kubernetes Operator](https://kubernetes.io/docs/concepts/extend-kubernetes/operator/) which manage Harbor applications. Deploy harbor easily with a single Custom Resource.

[![Docker Hub](https://d36jcksde1wxzq.cloudfront.net/saas-mega/blueFingerprint.png)](https://hub.docker.com/r/ovhcom/harbor-operator)
[![Docker Hub](https://d36jcksde1wxzq.cloudfront.net/saas-mega/blueFingerprint.png)](https://hub.docker.com/r/goharbor/harbor-core-operator)

## Installation

Currently working on a Helm Chart, meanwhile you can use the `make` command.

```bash
git clone https://github.com/ovh/harbor-operator.git
cd harbor-operator
git clone https://github.com/goharbor/harbor-core-operator.git
cd harbor-core-operator
make deploy
```

Expand All @@ -28,19 +28,19 @@ Generate resources using `make generate`

## Hacking

Follow the [Development guide](https://github.com/ovh/harbor-operator/blob/master/docs/development.md) to start on the project.
Follow the [Development guide](https://github.com/goharbor/harbor-core-operator/blob/master/docs/development.md) to start on the project.

## Get the sources

```bash
git clone https://github.com/ovh/harbor-operator.git
cd harbor-operator
git clone https://github.com/goharbor/harbor-core-operator.git
cd harbor-core-operator
```

You've developed a new cool feature ? Fixed an annoying bug ? We'd be happy
to hear from you!

Have a look in [CONTRIBUTING.md](https://github.com/ovh/harbor-operator/blob/master/CONTRIBUTING.md)
Have a look in [CONTRIBUTING.md](https://github.com/goharbor/harbor-core-operator/blob/master/CONTRIBUTING.md)

## Run the tests

Expand All @@ -59,15 +59,15 @@ Have a look in [CONTRIBUTING.md](https://github.com/ovh/harbor-operator/blob/mas

## Additional documentation

1. [Learn how reconciliation works](https://github.com/ovh/harbor-operator/blob/master/docs/reconciler.md)
2. [Custom Resource Definition](https://github.com/ovh/harbor-operator/blob/master/docs/custom-resource-definition.md)
1. [Learn how reconciliation works](https://github.com/goharbor/harbor-core-operator/blob/master/docs/reconciler.md)
2. [Custom Resource Definition](https://github.com/goharbor/harbor-core-operator/blob/master/docs/custom-resource-definition.md)

## Related links

* Contribute: <https://github.com/ovh/harbor-operator/blob/master/CONTRIBUTING.md>
* Report bugs: <https://github.com/ovh/harbor-operator/issues>
* Get latest version: <https://hub.docker.com/r/ovhcom/harbor-operator>
* Contribute: <https://github.com/goharbor/harbor-core-operator/blob/master/CONTRIBUTING.md>
* Report bugs: <https://github.com/goharbor/harbor-core-operator/issues>
* Get latest version: <https://hub.docker.com/r/goharbor/harbor-core-operator>

## License

See <https://github.com/ovh/harbor-operator/blob/master/LICENSE>
See <https://github.com/goharbor/harbor-core-operator/blob/master/LICENSE>
4 changes: 2 additions & 2 deletions config/default/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Adds namespace to all resources.
namespace: harbor-operator-system
namespace: harbor-core-operator-system

# Value of this field is prepended to the
# names of all resources, e.g. a deployment named
# "wordpress" becomes "alices-wordpress".
# Note that it should also match with the prefix (text before '-') of the namespace
# field above.
namePrefix: harbor-operator-
namePrefix: harbor-core-operator-

# Labels to add to all resources and selectors.
#commonLabels:
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/controllers/harbor/components"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/controllers/harbor/components"
)

func (r *Reconciler) ApplyMutationFunc(ctx context.Context, harbor *containerregistryv1alpha1.Harbor, resource components.Resource, result metav1.Object, mutate controllerutil.MutateFn) func() error {
Expand Down
2 changes: 1 addition & 1 deletion controllers/harbor/components/chartmuseum/chartmuseum.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package chartmuseum
import (
"context"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
)

type ChartMuseum struct {
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/chartmuseum/configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/chartmuseum/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/chartmuseum/ingresses.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

func (c *ChartMuseum) GetIngresses(ctx context.Context) []*netv1.Ingress { // nolint:funlen
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/chartmuseum/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion controllers/harbor/components/clair/clair.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package clair
import (
"context"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
)

type Clair struct {
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/clair/configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions controllers/harbor/components/clair/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
"github.com/ovh/harbor-operator/pkg/factories/logger"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
"github.com/goharbor/harbor-core-operator/pkg/factories/logger"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/clair/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

const (
Expand Down
18 changes: 9 additions & 9 deletions controllers/harbor/components/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
harbor_chartmuseum "github.com/ovh/harbor-operator/controllers/harbor/components/chartmuseum"
harbor_clair "github.com/ovh/harbor-operator/controllers/harbor/components/clair"
harbor_core "github.com/ovh/harbor-operator/controllers/harbor/components/harbor-core"
harbor_jobservice "github.com/ovh/harbor-operator/controllers/harbor/components/jobservice"
harbor_notary "github.com/ovh/harbor-operator/controllers/harbor/components/notary"
harbor_portal "github.com/ovh/harbor-operator/controllers/harbor/components/portal"
harbor_registry "github.com/ovh/harbor-operator/controllers/harbor/components/registry"
"github.com/ovh/harbor-operator/pkg/factories/logger"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
harbor_chartmuseum "github.com/goharbor/harbor-core-operator/controllers/harbor/components/chartmuseum"
harbor_clair "github.com/goharbor/harbor-core-operator/controllers/harbor/components/clair"
harbor_core "github.com/goharbor/harbor-core-operator/controllers/harbor/components/harbor-core"
harbor_jobservice "github.com/goharbor/harbor-core-operator/controllers/harbor/components/jobservice"
harbor_notary "github.com/goharbor/harbor-core-operator/controllers/harbor/components/notary"
harbor_portal "github.com/goharbor/harbor-core-operator/controllers/harbor/components/portal"
harbor_registry "github.com/goharbor/harbor-core-operator/controllers/harbor/components/registry"
"github.com/goharbor/harbor-core-operator/pkg/factories/logger"
)

type Resource interface {
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/components_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

// +kubebuilder:scaffold:imports

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/logger"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/logger"
)

// These tests use Ginkgo (BDD-style Go testing framework). Refer to
Expand Down
8 changes: 4 additions & 4 deletions controllers/harbor/components/harbor-core/configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/controllers/harbor/components/clair"
"github.com/goharbor/harbor-core-operator/controllers/harbor/components/notary"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
"github.com/markbates/pkger"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/controllers/harbor/components/clair"
"github.com/ovh/harbor-operator/controllers/harbor/components/notary"
"github.com/ovh/harbor-operator/pkg/factories/application"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/harbor-core/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion controllers/harbor/components/harbor-core/harbor-core.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package core
import (
"context"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
)

type HarborCore struct {
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/harbor-core/ingresses.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

func (c *HarborCore) GetIngresses(ctx context.Context) []*netv1.Ingress { // nolint:funlen
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/harbor-core/secrets.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/harbor-core/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/jobservice/configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
"github.com/markbates/pkger"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/jobservice/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion controllers/harbor/components/jobservice/jobservice.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package jobservice
import (
"context"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
)

type JobService struct {
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/jobservice/secrets.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/jobservice/services.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/notary/certificates.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/ovh/configstore"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/ovh/harbor-operator/pkg/factories/application"
"github.com/ovh/harbor-operator/pkg/factories/logger"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
"github.com/goharbor/harbor-core-operator/pkg/factories/logger"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion controllers/harbor/components/notary/configs.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/ovh/harbor-operator/pkg/factories/application"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/notary/deployments.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
)

const (
Expand Down

0 comments on commit 66f8851

Please sign in to comment.