Skip to content

Commit

Permalink
Merge pull request #1 from plotly/update-controller-runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
devinturner authored Jul 6, 2023
2 parents fae3279 + 361fe61 commit b2149e6
Show file tree
Hide file tree
Showing 281 changed files with 18,359 additions and 13,630 deletions.
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/chartmuseum_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/pkg/convert"
"github.com/plotly/harbor-operator/pkg/convert"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/chartmuseum_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/core_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/pkg/convert"
"github.com/plotly/harbor-operator/pkg/convert"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/core_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/exporter_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/pkg/convert"
"github.com/plotly/harbor-operator/pkg/convert"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/exporter_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha3
import (
"strconv"

harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/harbor_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/pkg/convert"
"github.com/plotly/harbor-operator/pkg/convert"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
4 changes: 2 additions & 2 deletions apis/goharbor.io/v1alpha3/harbor_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"path"
"strings"

harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
"github.com/goharbor/harbor-operator/pkg/image"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
"github.com/plotly/harbor-operator/pkg/image"
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
7 changes: 3 additions & 4 deletions apis/goharbor.io/v1alpha3/harbor_types_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package v1alpha3_test

import (
goharborv1 "github.com/goharbor/harbor-operator/apis/goharbor.io/v1alpha3"
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
goharborv1 "github.com/plotly/harbor-operator/apis/goharbor.io/v1alpha3"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
corev1 "k8s.io/api/core/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/harborcluster_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/apis/goharbor.io/v1beta1"
"github.com/plotly/harbor-operator/apis/goharbor.io/v1beta1"
corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/harborcluster_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/jobservice_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/pkg/convert"
"github.com/plotly/harbor-operator/pkg/convert"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/jobservice_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha3
import (
"errors"

harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/notary_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
)

type NotaryLoggingSpec struct {
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/notaryserver_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/pkg/convert"
"github.com/plotly/harbor-operator/pkg/convert"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/notaryserver_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/notarysigner_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/pkg/convert"
"github.com/plotly/harbor-operator/pkg/convert"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/notarysigner_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/portal_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/pkg/convert"
"github.com/plotly/harbor-operator/pkg/convert"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/portal_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/registry_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/pkg/convert"
"github.com/plotly/harbor-operator/pkg/convert"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/registry_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/registryctl_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/pkg/convert"
"github.com/plotly/harbor-operator/pkg/convert"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/registryctl_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/trivy_conversion.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
"github.com/goharbor/harbor-operator/pkg/convert"
"github.com/plotly/harbor-operator/pkg/convert"
"sigs.k8s.io/controller-runtime/pkg/conversion"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/trivy_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1alpha3

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/v1alpha3_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1alpha3_test
import (
"testing"

. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/zz_generated.deepcopy.go

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

2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/chartmuseum_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1beta1

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/core_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1beta1

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/exporter_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1beta1
import (
"strconv"

harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
4 changes: 2 additions & 2 deletions apis/goharbor.io/v1beta1/harbor_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"path"
"strings"

harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
"github.com/goharbor/harbor-operator/pkg/image"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
"github.com/plotly/harbor-operator/pkg/image"
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/harbor_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"net/url"

"github.com/goharbor/harbor-operator/pkg/version"
"github.com/pkg/errors"
"github.com/plotly/harbor-operator/pkg/version"
apierrors "k8s.io/apimachinery/pkg/api/errors"
runtime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/harborcluster_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1beta1

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/harborcluster_webhook.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/goharbor/harbor-operator/pkg/version"
"github.com/plotly/harbor-operator/pkg/version"
"github.com/pkg/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"
runtime "k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/jobservice_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v1beta1
import (
"errors"

harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/notary_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1beta1

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
)

type NotaryLoggingSpec struct {
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/notaryserver_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1beta1

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/notarysigner_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1beta1

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/portal_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1beta1

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/registry_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1beta1

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/registryctl_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1beta1

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1beta1/trivy_types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v1beta1

import (
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
harbormetav1 "github.com/plotly/harbor-operator/apis/meta/v1alpha1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
Loading

0 comments on commit b2149e6

Please sign in to comment.