Skip to content

Commit

Permalink
Revert "refactor(module) Move repository to github.com/goharbor/harbo…
Browse files Browse the repository at this point in the history
…r-core-operator"

This reverts commit 66f8851.

Signed-off-by: Pierre Péronnet <pierre.peronnet@ovhcloud.com>
  • Loading branch information
holyhope committed Mar 6, 2020
1 parent 02ac6cb commit 693d7a4
Show file tree
Hide file tree
Showing 65 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/goharbor/harbor-core-operator" \
GO_APP_PKG="github.com/ovh/harbor-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/goharbor/harbor-core-operator
repo: github.com/ovh/harbor-operator
resources:
- group: containerregistry
kind: Harbor
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[Harbor](https://github.com/goharbor/harbor/) is a very active project, composed on numerous stateful and stateless sub-projects and dependencies.
These components may be deployed, updated, healed, backuped or scaled respecting some constraints.

The Harbor Core Operator extends the usual K8s resources with Harbor-related custom ones. The Kubernetes API can then be used in a declarative way to manage Harbor and ensure its high-availability operation, thanks to the [Kubernetes control loop](https://kubernetes.io/docs/concepts/#kubernetes-control-plane).
The Harbor Operator extends the usual K8s resources with Harbor-related custom ones. The Kubernetes API can then be used in a declarative way to manage Harbor and ensure its high-availability operation, thanks to the [Kubernetes control loop](https://kubernetes.io/docs/concepts/#kubernetes-control-plane).

The Harbor operator aims to cover both Day1 and Day2 operations of an enterprise-grade Harbor deployment.

Expand All @@ -20,7 +20,7 @@ It is designed to be used on any Kubernetes cluster, in a cloud or on premise co

## Project status

Harbor Core Operator is still very early stage and currently covers deployment, scale and destruction of Harbor in 1.10 version.
Harbor Operator is still very early stage and currently covers deployment, scale and destruction of Harbor in 1.10 version.
Other parts of the life-cycle will be managed in future versions of the operator.
As any project in this repository, do not hesitate to raise issues or suggest code improvements.

Expand Down Expand Up @@ -62,7 +62,7 @@ It is possible to add and delete ChartMuseum, Notary and Clair by editing the Ha

## Installation

See [install documentation](https://github.com/goharbor/harbor-core-operator/blob/master/docs/installation.md).
See [install documentation](https://github.com/goharbor/harbor-operator/blob/master/docs/installation.md).

## Compatibility

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

## Development

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

## Additional documentation

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)
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)

## Related links

- 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>
- Contribute: <https://github.com/goharbor/harbor-operator/blob/master/CONTRIBUTING.md>
- Report bugs: <https://github.com/goharbor/harbor-operator/issues>
- Get latest version: <https://hub.docker.com/r/goharbor/harbor-operator>

## License

See <https://github.com/goharbor/harbor-core-operator/blob/master/LICENSE>
See <https://github.com/ovh/harbor-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-core-operator-system
namespace: harbor-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-core-operator-
namePrefix: harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/controllers/harbor/components"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
containerregistryv1alpha1 "github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
containerregistryv1alpha1 "github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
"github.com/goharbor/harbor-core-operator/pkg/factories/logger"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/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"
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"
)

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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/logger"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
containerregistryv1alpha1 "github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
containerregistryv1alpha1 "github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/pkg/factories/application"
"github.com/goharbor/harbor-core-operator/pkg/factories/logger"
"github.com/ovh/harbor-operator/pkg/factories/application"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/pkg/factories/application"
"github.com/ovh/harbor-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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions controllers/harbor/components/notary/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/goharbor/harbor-core-operator/api/v1alpha1"
"github.com/goharbor/harbor-core-operator/pkg/factories/application"
containerregistryv1alpha1 "github.com/ovh/harbor-operator/api/v1alpha1"
"github.com/ovh/harbor-operator/pkg/factories/application"
)

func (n *Notary) GetIngresses(ctx context.Context) []*netv1.Ingress {
Expand Down

0 comments on commit 693d7a4

Please sign in to comment.