rabbitmq · ChunyiLyu · Apr 28, 2021 · Apr 27, 2021 · Apr 27, 2021 · Apr 28, 2021
diff --git a/Makefile b/Makefile
@@ -72,7 +72,7 @@ manifests: install-tools
 # Generate API reference documentation
 api-reference:
 	crd-ref-docs \
-		--source-path ./api/v1alpha2 \
+		--source-path ./api/v1beta1 \
 		--config ./docs/api/autogen/config.yaml \
 		--templates-dir ./docs/api/autogen/templates \
 		--output-path ./docs/api/rabbitmq.com.ref.asciidoc \

diff --git a/PROJECT b/PROJECT
@@ -3,26 +3,26 @@ repo: github.com/rabbitmq/messaging-topology-operator
 resources:
 - group: rabbitmq.com
   kind: Queue
-  version: v1alpha2
+  version: v1beta1
 - group: rabbitmq.com
   kind: Exchange
-  version: v1alpha2
+  version: v1beta1
 - group: rabbitmq.com
   kind: Binding
-  version: v1alpha2
+  version: v1beta1
 - group: rabbitmq.com
   kind: User
-  version: v1alpha2
+  version: v1beta1
 - group: rabbitmq.com
   kind: Vhost
-  version: v1alpha2
+  version: v1beta1
 - group: rabbitmq.com
   kind: Policy
-  version: v1alpha2
+  version: v1beta1
 - group: rabbitmq.com
   kind: Permission
-  version: v1alpha2
+  version: v1beta1
 - group: rabbitmq.com
   kind: SchemaReplication
-  version: v1alpha2
+  version: v1beta1
 version: "2"
diff --git a/api/v1alpha2/binding_types.go → api/v1beta1/binding_types.go b/api/v1alpha2/binding_types.go → api/v1beta1/binding_types.go
@@ -7,7 +7,7 @@ This product is licensed to you under the Mozilla Public License 2.0 license (th
 This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
 */
 
-package v1alpha2
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -47,10 +47,10 @@ type BindingStatus struct {
 }
 
 // +genclient
-
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories=all
 // +kubebuilder:subresource:status
+
 // Binding is the Schema for the bindings API
 type Binding struct {
 	metav1.TypeMeta   `json:",inline"`

diff --git a/api/v1alpha2/binding_types_test.go → api/v1beta1/binding_types_test.go b/api/v1alpha2/binding_types_test.go → api/v1beta1/binding_types_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"context"

diff --git a/api/v1alpha2/binding_webhook.go → api/v1beta1/binding_webhook.go b/api/v1alpha2/binding_webhook.go → api/v1beta1/binding_webhook.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"fmt"
@@ -16,7 +16,7 @@ func (b *Binding) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1alpha2-binding,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=bindings,versions=v1alpha2,name=vbinding.kb.io,sideEffects=none,admissionReviewVersions=v1
+// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1beta1-binding,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=bindings,versions=v1beta1,name=vbinding.kb.io,sideEffects=none,admissionReviewVersions=v1
 
 var _ webhook.Validator = &Binding{}
 

diff --git a/api/v1alpha2/binding_webhook_test.go → api/v1beta1/binding_webhook_test.go b/api/v1alpha2/binding_webhook_test.go → api/v1beta1/binding_webhook_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1alpha2/conditions.go → api/v1beta1/conditions.go b/api/v1alpha2/conditions.go → api/v1beta1/conditions.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	corev1 "k8s.io/api/core/v1"

diff --git a/api/v1alpha2/conditions_test.go → api/v1beta1/conditions_test.go b/api/v1alpha2/conditions_test.go → api/v1beta1/conditions_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1alpha2/exchange_types.go → api/v1beta1/exchange_types.go b/api/v1alpha2/exchange_types.go → api/v1beta1/exchange_types.go
@@ -7,7 +7,7 @@ This product is licensed to you under the Mozilla Public License 2.0 license (th
 This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
 */
 
-package v1alpha2
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -45,7 +45,6 @@ type ExchangeStatus struct {
 }
 
 // +genclient
-
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories=all
 // +kubebuilder:subresource:status

diff --git a/api/v1alpha2/exchange_types_test.go → api/v1beta1/exchange_types_test.go b/api/v1alpha2/exchange_types_test.go → api/v1beta1/exchange_types_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"context"

diff --git a/api/v1alpha2/exchange_webhook.go → api/v1beta1/exchange_webhook.go b/api/v1alpha2/exchange_webhook.go → api/v1beta1/exchange_webhook.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"fmt"
@@ -15,7 +15,7 @@ func (r *Exchange) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1alpha2-exchange,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=exchanges,versions=v1alpha2,name=vexchange.kb.io,sideEffects=none,admissionReviewVersions=v1
+// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1beta1-exchange,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=exchanges,versions=v1beta1,name=vexchange.kb.io,sideEffects=none,admissionReviewVersions=v1
 
 var _ webhook.Validator = &Exchange{}
 

diff --git a/api/v1alpha2/exchange_webhook_test.go → api/v1beta1/exchange_webhook_test.go b/api/v1alpha2/exchange_webhook_test.go → api/v1beta1/exchange_webhook_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1alpha2/groupversion_info.go → api/v1beta1/groupversion_info.go b/api/v1alpha2/groupversion_info.go → api/v1beta1/groupversion_info.go
@@ -7,10 +7,10 @@ This product is licensed to you under the Mozilla Public License 2.0 license (th
 This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
 */
 
-// Package v1alpha2 contains API Schema definitions for the rabbitmq.com v1alpha2 API group
+// Package v1beta1 contains API Schema definitions for the rabbitmq.com v1beta1 API group
 // +kubebuilder:object:generate=true
 // +groupName=rabbitmq.com
-package v1alpha2
+package v1beta1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -19,7 +19,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "rabbitmq.com", Version: "v1alpha2"}
+	GroupVersion = schema.GroupVersion{Group: "rabbitmq.com", Version: "v1beta1"}
 
 	// SchemeGroupVersion is group version used to register these objects
 	// added for generated clientset

diff --git a/api/v1alpha2/permission_types.go → api/v1beta1/permission_types.go b/api/v1alpha2/permission_types.go → api/v1beta1/permission_types.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -42,6 +42,7 @@ type PermissionStatus struct {
 	Conditions         []Condition `json:"conditions,omitempty"`
 }
 
+// +genclient
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories=all
 // +kubebuilder:subresource:status

diff --git a/api/v1alpha2/permission_types_test.go → api/v1beta1/permission_types_test.go b/api/v1alpha2/permission_types_test.go → api/v1beta1/permission_types_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"context"

diff --git a/api/v1alpha2/permission_webhook.go → api/v1beta1/permission_webhook.go b/api/v1alpha2/permission_webhook.go → api/v1beta1/permission_webhook.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"fmt"
@@ -15,7 +15,7 @@ func (p *Permission) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1alpha2-permission,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=permissions,versions=v1alpha2,name=vpermission.kb.io,sideEffects=none,admissionReviewVersions=v1
+// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1beta1-permission,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=permissions,versions=v1beta1,name=vpermission.kb.io,sideEffects=none,admissionReviewVersions=v1
 
 var _ webhook.Validator = &Permission{}
 

diff --git a/api/v1alpha2/permission_webhook_test.go → api/v1beta1/permission_webhook_test.go b/api/v1alpha2/permission_webhook_test.go → api/v1beta1/permission_webhook_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1alpha2/policy_types.go → api/v1beta1/policy_types.go b/api/v1alpha2/policy_types.go → api/v1beta1/policy_types.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -47,7 +47,6 @@ type PolicyStatus struct {
 }
 
 // +genclient
-
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories=all
 // +kubebuilder:subresource:status

diff --git a/api/v1alpha2/policy_types_test.go → api/v1beta1/policy_types_test.go b/api/v1alpha2/policy_types_test.go → api/v1beta1/policy_types_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"context"

diff --git a/api/v1alpha2/policy_webhook.go → api/v1beta1/policy_webhook.go b/api/v1alpha2/policy_webhook.go → api/v1beta1/policy_webhook.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"fmt"
@@ -15,7 +15,7 @@ func (p *Policy) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1alpha2-policy,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=policies,versions=v1alpha2,name=vpolicy.kb.io,sideEffects=none,admissionReviewVersions=v1
+// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1beta1-policy,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=policies,versions=v1beta1,name=vpolicy.kb.io,sideEffects=none,admissionReviewVersions=v1
 
 var _ webhook.Validator = &Policy{}
 

diff --git a/api/v1alpha2/policy_webhook_test.go → api/v1beta1/policy_webhook_test.go b/api/v1alpha2/policy_webhook_test.go → api/v1beta1/policy_webhook_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1alpha2/queue_types.go → api/v1beta1/queue_types.go b/api/v1alpha2/queue_types.go → api/v1beta1/queue_types.go
@@ -7,7 +7,7 @@ This product is licensed to you under the Mozilla Public License 2.0 license (th
 This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
 */
 
-package v1alpha2
+package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -56,7 +56,6 @@ type QueueStatus struct {
 }
 
 // +genclient
-
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories=all
 // +kubebuilder:subresource:status

diff --git a/api/v1alpha2/queue_types_test.go → api/v1beta1/queue_types_test.go b/api/v1alpha2/queue_types_test.go → api/v1beta1/queue_types_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"context"

diff --git a/api/v1alpha2/queue_webhook.go → api/v1beta1/queue_webhook.go b/api/v1alpha2/queue_webhook.go → api/v1beta1/queue_webhook.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"fmt"
@@ -15,7 +15,7 @@ func (r *Queue) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1alpha2-queue,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=queues,versions=v1alpha2,name=vqueue.kb.io,sideEffects=none,admissionReviewVersions=v1sideEffects=none,admissionReviewVersions=v1
+// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1beta1-queue,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=queues,versions=v1beta1,name=vqueue.kb.io,sideEffects=none,admissionReviewVersions=v1sideEffects=none,admissionReviewVersions=v1
 
 var _ webhook.Validator = &Queue{}
 

diff --git a/api/v1alpha2/queue_webhook_test.go → api/v1beta1/queue_webhook_test.go b/api/v1alpha2/queue_webhook_test.go → api/v1beta1/queue_webhook_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1alpha2/schemareplication_types.go → api/v1beta1/schemareplication_types.go b/api/v1alpha2/schemareplication_types.go → api/v1beta1/schemareplication_types.go
@@ -7,7 +7,7 @@ This product is licensed to you under the Mozilla Public License 2.0 license (th
 This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
 */
 
-package v1alpha2
+package v1beta1
 
 import (
 	corev1 "k8s.io/api/core/v1"
@@ -35,6 +35,7 @@ type SchemaReplicationStatus struct {
 	Conditions         []Condition `json:"conditions,omitempty"`
 }
 
+// +genclient
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 

diff --git a/api/v1alpha2/schemareplication_types_test.go → api/v1beta1/schemareplication_types_test.go b/api/v1alpha2/schemareplication_types_test.go → api/v1beta1/schemareplication_types_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"context"

diff --git a/api/v1alpha2/schemareplication_webhook.go → api/v1beta1/schemareplication_webhook.go b/api/v1alpha2/schemareplication_webhook.go → api/v1beta1/schemareplication_webhook.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"fmt"
@@ -15,7 +15,7 @@ func (s *SchemaReplication) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1alpha2-schemareplication,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=schemareplications,versions=v1alpha2,name=vschemareplication.kb.io,sideEffects=none,admissionReviewVersions=v1
+// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1beta1-schemareplication,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=schemareplications,versions=v1beta1,name=vschemareplication.kb.io,sideEffects=none,admissionReviewVersions=v1
 
 var _ webhook.Validator = &SchemaReplication{}
 

diff --git a/...1alpha2/schemareplication_webhook_test.go → ...v1beta1/schemareplication_webhook_test.go b/...1alpha2/schemareplication_webhook_test.go → ...v1beta1/schemareplication_webhook_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"

diff --git a/api/v1alpha2/suite_test.go → api/v1beta1/suite_test.go b/api/v1alpha2/suite_test.go → api/v1beta1/suite_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"path/filepath"
@@ -24,7 +24,7 @@ func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
 
 	RunSpecsWithDefaultAndCustomReporters(t,
-		"v1alpha2 Suite",
+		"v1beta1 Suite",
 		[]Reporter{printer.NewlineReporter{}})
 }
 

diff --git a/api/v1alpha2/user_types.go → api/v1beta1/user_types.go b/api/v1alpha2/user_types.go → api/v1beta1/user_types.go
@@ -7,7 +7,7 @@ This product is licensed to you under the Mozilla Public License 2.0 license (th
 This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file.
 */
 
-package v1alpha2
+package v1beta1
 
 import (
 	corev1 "k8s.io/api/core/v1"
@@ -52,7 +52,6 @@ type UserStatus struct {
 type UserTag string
 
 // +genclient
-
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:categories=all
 // +kubebuilder:subresource:status

diff --git a/api/v1alpha2/user_types_test.go → api/v1beta1/user_types_test.go b/api/v1alpha2/user_types_test.go → api/v1beta1/user_types_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"context"

diff --git a/api/v1alpha2/user_webhook.go → api/v1beta1/user_webhook.go b/api/v1alpha2/user_webhook.go → api/v1beta1/user_webhook.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	"fmt"
@@ -15,7 +15,7 @@ func (u *User) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1alpha2-user,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=users,versions=v1alpha2,name=vuser.kb.io,sideEffects=none,admissionReviewVersions=v1
+// +kubebuilder:webhook:verbs=create;update,path=/validate-rabbitmq-com-v1beta1-user,mutating=false,failurePolicy=fail,groups=rabbitmq.com,resources=users,versions=v1beta1,name=vuser.kb.io,sideEffects=none,admissionReviewVersions=v1
 
 var _ webhook.Validator = &User{}
 

diff --git a/api/v1alpha2/user_webhook_test.go → api/v1beta1/user_webhook_test.go b/api/v1alpha2/user_webhook_test.go → api/v1beta1/user_webhook_test.go
@@ -1,4 +1,4 @@
-package v1alpha2
+package v1beta1
 
 import (
 	. "github.com/onsi/ginkgo"