refactor(crd) Change resource group to goharbor.io

Signed-off-by: Pierre Péronnet <pierre.peronnet@ovhcloud.com>
goharbor · Mar 6, 2020 · 5c5100a · 5c5100a
1 parent 9f94c00
commit 5c5100a
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 67 deletions.
diff --git a/api/v1alpha1/groupversion_info.go b/api/v1alpha1/groupversion_info.go
@@ -1,6 +1,6 @@
 // Package v1alpha1 contains API Schema definitions for the containerregistry v1alpha1 API group
 // +kubebuilder:object:generate=true
-// +groupName=containerregistry.ovhcloud.com
+// +groupName=goharbor.io
 package v1alpha1
 
 import (
@@ -10,7 +10,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "containerregistry.ovhcloud.com", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{Group: "goharbor.io", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/api/v1alpha1/harbor_webhook.go b/api/v1alpha1/harbor_webhook.go
@@ -15,7 +15,7 @@ func (r *Harbor) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:path=/mutate-containerregistry-ovhcloud-com-v1alpha1-harbor,mutating=true,failurePolicy=fail,groups=containerregistry.ovhcloud.com,resources=harbors,verbs=create;update,versions=v1alpha1,name=mharbor.kb.io
+// +kubebuilder:webhook:path=/mutate-goharbor-v1alpha1-harbor,mutating=true,failurePolicy=fail,groups=goharbor.io,resources=harbors,verbs=create;update,versions=v1alpha1,name=mharbor.kb.io
 
 var _ webhook.Defaulter = &Harbor{}
 

diff --git a/api/v1alpha1/metadata.go b/api/v1alpha1/metadata.go
@@ -1,12 +1,12 @@
 package v1alpha1
 
 const (
-	HarborClassAnnotation = "containerregistry.ovhcloud.com/harbor-class"
+	HarborClassAnnotation = "goharbor.io/harbor-class"
 )
 
 const (
-	WarningLabel         = "containerregistry.ovhcloud.com/warning"
-	OperatorNameLabel    = "containerregistry.ovhcloud.com/name"
-	OperatorVersionLabel = "containerregistry.ovhcloud.com/version"
-	ComponentNameLabel   = "containerregistry.ovhcloud.com/component"
+	WarningLabel         = "goharbor.io/warning"
+	OperatorNameLabel    = "goharbor.io/name"
+	OperatorVersionLabel = "goharbor.io/version"
+	ComponentNameLabel   = "goharbor.io/component"
 )
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -2,7 +2,7 @@
 # since it depends on service name and namespace that are out of this kustomize package.
 # It should be run by config/default
 resources:
-- bases/containerregistry.ovhcloud.com_harbors.yaml
+- bases/goharbor.io_harbors.yaml
 # +kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:

diff --git a/config/crd/patches/cainjection_in_harbors.yaml b/config/crd/patches/cainjection_in_harbors.yaml
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
-  name: harbors.containerregistry.ovhcloud.com
+  name: harbors.goharbor.io
diff --git a/config/crd/patches/webhook_in_harbors.yaml b/config/crd/patches/webhook_in_harbors.yaml
@@ -3,7 +3,7 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
 metadata:
-  name: harbors.containerregistry.ovhcloud.com
+  name: harbors.goharbor.io
 spec:
   # https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#pruning-versus-preserving-unknown-fields
   preserveUnknownFields: false

diff --git a/config/rbac/harbor_editor_role.yaml b/config/rbac/harbor_editor_role.yaml
@@ -5,7 +5,7 @@ metadata:
   name: harbor-editor-role
 rules:
 - apiGroups:
-  - containerregistry.ovhcloud.com
+  - goharbor.io
   resources:
   - harbors
   verbs:
@@ -17,7 +17,7 @@ rules:
   - update
   - watch
 - apiGroups:
-  - containerregistry.ovhcloud.com
+  - goharbor.io
   resources:
   - harbors/status
   verbs:

diff --git a/config/rbac/harbor_viewer_role.yaml b/config/rbac/harbor_viewer_role.yaml
@@ -5,15 +5,15 @@ metadata:
   name: harbor-viewer-role
 rules:
 - apiGroups:
-  - containerregistry.ovhcloud.com
+  - goharbor.io
   resources:
   - harbors
   verbs:
   - get
   - list
   - watch
 - apiGroups:
-  - containerregistry.ovhcloud.com
+  - goharbor.io
   resources:
   - harbors/status
   verbs:

diff --git a/config/samples/containerregistry_v1alpha1_harbor.yaml b/config/samples/containerregistry_v1alpha1_harbor.yaml
diff --git a/controllers/harbor/reconcile.go b/controllers/harbor/reconcile.go
@@ -18,8 +18,8 @@ import (
 	"github.com/goharbor/harbor-operator/pkg/factories/logger"
 )
 
-// +kubebuilder:rbac:groups=containerregistry.ovhcloud.com,resources=harbors,verbs=get;list;watch
-// +kubebuilder:rbac:groups=containerregistry.ovhcloud.com,resources=harbors/status,verbs=get;update;patch
+// +kubebuilder:rbac:groups=goharbor.io,resources=harbors,verbs=get;list;watch
+// +kubebuilder:rbac:groups=goharbor.io,resources=harbors/status,verbs=get;update;patch
 
 func (r *Reconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
 	ctx := context.TODO()