Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resync fork #1084

Closed
wants to merge 18 commits into from
Closed

Resync fork #1084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fae3279
remove descriptions from crd
BRONSOLO May 10, 2023
3ebbf62
upgrade controller-runtime version (#1034)
CoderTH May 24, 2023
4266fb8
cherry pick commit from harbor-operator main branch
devinturner Jun 23, 2023
361fe61
format harbor webhook imports
devinturner Jun 27, 2023
b2149e6
Merge pull request #1 from plotly/update-controller-runtime
devinturner Jul 6, 2023
3b49216
security: upgrade dependencies to resolve CVE-2022-31836, CVE-2021-30…
devinturner Mar 25, 2024
b76952a
Merge pull request #2 from plotly/sec-upgrade-harbor-operator
devinturner Mar 26, 2024
5a2fef6
fix: add 2.10.x to the known constraints
devinturner Mar 28, 2024
78885d4
fix: upgrade build tools and regenerate
devinturner Mar 28, 2024
33def05
Merge pull request #3 from plotly/fix-version-constraints
devinturner Mar 28, 2024
251d6a2
Merge pull request #4 from plotly/5.3-sp-release
devinturner Apr 12, 2024
995bbad
remove descriptions from crd
BRONSOLO May 10, 2023
1d854c1
cherry pick commit from harbor-operator main branch
devinturner Jun 23, 2023
2ec021a
format harbor webhook imports
devinturner Jun 27, 2023
2281996
security: upgrade dependencies to resolve CVE-2022-31836, CVE-2021-30…
devinturner Mar 25, 2024
596e9f9
fix: add 2.10.x to the known constraints
devinturner Mar 28, 2024
60b58e5
fix: upgrade build tools and regenerate
devinturner Mar 28, 2024
2861d23
Merge branch 'resync_fork' of git@github.com:plotly/harbor-operator.git
agateaux May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ config/rbac: controller-gen $(GO4CONTROLLERGEN_SOURCES)
touch "$@"

config/crd/bases: controller-gen $(GO4CONTROLLERGEN_SOURCES)
$(CONTROLLER_GEN) crd:crdVersions="v1" output:artifacts:config="$@" paths="./..."
$(CONTROLLER_GEN) crd:crdVersions="v1",maxDescLen=0 output:artifacts:config="$@" paths="./..."
touch "$@"

.PHONY: generate
Expand Down Expand Up @@ -530,7 +530,7 @@ clean:

# find or download controller-gen
# download controller-gen if necessary
CONTROLLER_GEN_VERSION := 0.9.2
CONTROLLER_GEN_VERSION := 0.14.0
CONTROLLER_GEN := $(BIN)/controller-gen

.PHONY: controller-gen
Expand Down Expand Up @@ -661,7 +661,7 @@ $(GORELEASER):

# find or download stringer
# download stringer if necessary
STRINGER_VERSION := v0.11.0
STRINGER_VERSION := v0.19.0
STRINGER := $(BIN)/stringer

.PHONY: stringer
Expand Down
2 changes: 1 addition & 1 deletion apis/goharbor.io/v1alpha3/chartmuseum_conversion.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions apis/goharbor.io/v1alpha3/harbor_types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package v1alpha3_test

import (
goharborv1 "github.com/goharbor/harbor-operator/apis/goharbor.io/v1alpha3"
harbormetav1 "github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
12 changes: 7 additions & 5 deletions apis/goharbor.io/v1alpha3/zz_generated.deepcopy.go
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading
Loading