chore: dump v2alpha2 to v2beta1

Signed-off-by: Rory Z <[email protected]>
emqx · Jul 28, 2023 · ef24ef1 · ef24ef1
1 parent 0fd840f
commit ef24ef1
Show file tree

Hide file tree

Showing 101 changed files with 741 additions and 741 deletions.
diff --git a/.github/workflows/cts.yaml b/.github/workflows/cts.yaml
@@ -112,8 +112,8 @@ jobs:
           - [EmqxBroker, emqx, "config/samples/emqx/v1beta4/emqxbroker-full.yaml"]
           - [EmqxEnterprise, emqx-ee, "config/samples/emqx/v1beta4/emqxenterprise-slim.yaml"]
           - [EmqxEnterprise, emqx-ee, "config/samples/emqx/v1beta4/emqxenterprise-full.yaml"]
-          - [EMQX, emqx, "config/samples/emqx/v2alpha2/emqx-slim.yaml"]
-          - [EMQX, emqx, "config/samples/emqx/v2alpha2/emqx-full.yaml"]
+          - [EMQX, emqx, "config/samples/emqx/v2beta1/emqx-slim.yaml"]
+          - [EMQX, emqx, "config/samples/emqx/v2beta1/emqx-full.yaml"]
 
     steps:
       - if: matrix.kubernetes-env == 'k3s'

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -30,8 +30,8 @@ jobs:
           - [EMQX, emqx, "config/samples/emqx/v2alpha1/emqx-slim.yaml"]
           - [EMQX, emqx, "config/samples/emqx/v2alpha1/emqx-full.yaml"]
 
-          - [EMQX, emqx, "config/samples/emqx/v2alpha2/emqx-slim.yaml"]
-          - [EMQX, emqx, "config/samples/emqx/v2alpha2/emqx-full.yaml"]
+          - [EMQX, emqx, "config/samples/emqx/v2beta1/emqx-slim.yaml"]
+          - [EMQX, emqx, "config/samples/emqx/v2beta1/emqx-full.yaml"]
 
     steps:
       - run: minikube start

diff --git a/PROJECT b/PROJECT
@@ -122,8 +122,8 @@ resources:
   domain: emqx.io
   group: apps
   kind: EMQX
-  path: github.com/emqx/emqx-operator/apis/apps/v2alpha2
-  version: v2alpha2
+  path: github.com/emqx/emqx-operator/apis/apps/v2beta1
+  version: v2beta1
   webhooks:
     conversion: true
     defaulting: true
@@ -136,8 +136,8 @@ resources:
   domain: emqx.io
   group: apps
   kind: Rebalance
-  path: github.com/emqx/emqx-operator/apis/apps/v2alpha2
-  version: v2alpha2
+  path: github.com/emqx/emqx-operator/apis/apps/v2beta1
+  version: v2beta1
   webhooks:
     conversion: true
     defaulting: true

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ The EMQX Operator includes, but is not limited to, the following features:
 | 4.4.8 (included) ～ 4.4.14 | 1.2.6, 1.2.7, 1.2.8, 2.0.0, 2.0.1, 2.0.2, 2.0.3 | [apps.emqx.io/v1beta3](./docs/en_US/reference/v1beta3-reference.md) | EmqxEnterprise |
 | 4.4.14 (included) or higher 4.4.x   |                  2.1.0, 2.1.1                   | [apps.emqx.io/v1beta4](./docs/en_US/reference/v1beta4-reference.md) | EmqxEnterprise |
 |      5.0.0 (included) ~ 5.0.23        |    2.0.0, 2.0.1, 2.0.2, 2.0.3, 2.1.0, 2.1.1     | [apps.emqx.io/v2alpha1](./docs/en_US/reference/v2alpha1-reference.md) |      EMQX      |
-|      5.1.1 or higher       |    2.2.0                                        | [apps.emqx.io/v2alpha2](./docs/en_US/reference/v2alpha2-reference.md) |      EMQX      |
+|      5.1.1 or higher       |    2.2.0                                        | [apps.emqx.io/v2beta1](./docs/en_US/reference/v2beta1-reference.md) |      EMQX      |
 
 ### EMQX Open Source
 
@@ -43,7 +43,7 @@ The EMQX Operator includes, but is not limited to, the following features:
 | 5.0.6 (included) ～ 5.0.8 | 2.0.0, 2.0.1, 2.0.3                                |  [apps.emqx.io/v2alpha1](./docs/en_US/reference/v2alpha1-reference.md)         |  EMQX     |
 | 5.0.8 (included) ～  5.0.14 | 2.0.2                                            |  [apps.emqx.io/v2alpha1](./docs/en_US/reference/v2alpha1-reference.md)         |  EMQX     |
 | 5.0.14 (included)  ~ 5.0.23 | 2.1.0, 2.1.1                                                | [apps.emqx.io/v2alpha1](./docs/en_US/reference/v2alpha1-reference.md)         | EMQX     |
-|      5.1.1 or higher       |    2.2.0                                        | [apps.emqx.io/v2alpha2](./docs/en_US/reference/v2alpha2-reference.md) |      EMQX      |
+|      5.1.1 or higher       |    2.2.0                                        | [apps.emqx.io/v2beta1](./docs/en_US/reference/v2beta1-reference.md) |      EMQX      |
 
 ## How to selector Kubernetes version
 

diff --git a/apis/apps/v1beta4/rebalance_conversion.go b/apis/apps/v1beta4/rebalance_conversion.go
@@ -19,13 +19,13 @@ package v1beta4
 import (
 	"encoding/json"
 
-	"github.com/emqx/emqx-operator/apis/apps/v2alpha2"
+	"github.com/emqx/emqx-operator/apis/apps/v2beta1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
 // ConvertTo converts this version to the Hub version (v1).
 func (src *Rebalance) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*v2alpha2.Rebalance)
+	dst := dstRaw.(*v2beta1.Rebalance)
 
 	b, err := json.Marshal(src)
 	if err != nil {
@@ -44,7 +44,7 @@ func (src *Rebalance) ConvertTo(dstRaw conversion.Hub) error {
 
 // ConvertFrom converts from the Hub version (v1) to this version.
 func (dst *Rebalance) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*v2alpha2.Rebalance)
+	src := srcRaw.(*v2beta1.Rebalance)
 
 	b, err := json.Marshal(src)
 	if err != nil {

diff --git a/apis/apps/v1beta4/rebalance_conversion_test.go b/apis/apps/v1beta4/rebalance_conversion_test.go
@@ -19,20 +19,20 @@ package v1beta4
 import (
 	"testing"
 
-	"github.com/emqx/emqx-operator/apis/apps/v2alpha2"
+	"github.com/emqx/emqx-operator/apis/apps/v2beta1"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestConvertTo(t *testing.T) {
-	dst := &v2alpha2.Rebalance{}
+	dst := &v2beta1.Rebalance{}
 	src := &Rebalance{}
 
 	assert.Nil(t, src.ConvertTo(dst))
 }
 
 func TestConvertFrom(t *testing.T) {
 	dst := &Rebalance{}
-	src := &v2alpha2.Rebalance{}
+	src := &v2beta1.Rebalance{}
 
 	assert.Nil(t, dst.ConvertFrom(src))
 }
diff --git a/apis/apps/v2alpha1/emqx_conversion.go b/apis/apps/v2alpha1/emqx_conversion.go
@@ -19,13 +19,13 @@ package v2alpha1
 import (
 	"encoding/json"
 
-	"github.com/emqx/emqx-operator/apis/apps/v2alpha2"
+	"github.com/emqx/emqx-operator/apis/apps/v2beta1"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
 // ConvertTo converts this version to the Hub version (v1).
 func (src *EMQX) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*v2alpha2.EMQX)
+	dst := dstRaw.(*v2beta1.EMQX)
 
 	b, err := json.Marshal(src)
 	if err != nil {
@@ -35,7 +35,7 @@ func (src *EMQX) ConvertTo(dstRaw conversion.Hub) error {
 	if err := json.Unmarshal(b, dst); err != nil {
 		return err
 	}
-	dst.SetGroupVersionKind(v2alpha2.GroupVersion.WithKind("EMQX"))
+	dst.SetGroupVersionKind(v2beta1.GroupVersion.WithKind("EMQX"))
 	dst.Spec.ClusterDomain = "cluster.local"
 	dst.Spec.Config.Data = src.Spec.BootstrapConfig
 
@@ -45,7 +45,7 @@ func (src *EMQX) ConvertTo(dstRaw conversion.Hub) error {
 
 // ConvertFrom converts from the Hub version (v1) to this version.
 func (dst *EMQX) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*v2alpha2.EMQX)
+	src := srcRaw.(*v2beta1.EMQX)
 
 	b, err := json.Marshal(src)
 	if err != nil {

diff --git a/apis/apps/v2alpha1/emqx_conversion_test.go b/apis/apps/v2alpha1/emqx_conversion_test.go
@@ -19,21 +19,21 @@ package v2alpha1
 import (
 	"testing"
 
-	"github.com/emqx/emqx-operator/apis/apps/v2alpha2"
+	"github.com/emqx/emqx-operator/apis/apps/v2beta1"
 	"github.com/stretchr/testify/assert"
 )
 
 func TestConvertTo(t *testing.T) {
-	dst := &v2alpha2.EMQX{}
+	dst := &v2beta1.EMQX{}
 	src := &EMQX{}
 
 	assert.Nil(t, src.ConvertTo(dst))
-	assert.Equal(t, v2alpha2.GroupVersion.String(), dst.GroupVersionKind().GroupVersion().String())
+	assert.Equal(t, v2beta1.GroupVersion.String(), dst.GroupVersionKind().GroupVersion().String())
 }
 
 func TestConvertFrom(t *testing.T) {
 	dst := &EMQX{}
-	src := &v2alpha2.EMQX{}
+	src := &v2beta1.EMQX{}
 
 	assert.Nil(t, dst.ConvertFrom(src))
 	assert.Equal(t, GroupVersion.String(), dst.GroupVersionKind().GroupVersion().String())

diff --git a/apis/apps/v2alpha2/const.go → apis/apps/v2beta1/const.go b/apis/apps/v2alpha2/const.go → apis/apps/v2beta1/const.go
@@ -1,4 +1,4 @@
-package v2alpha2
+package v2beta1
 
 import corev1 "k8s.io/api/core/v1"
 

diff --git a/apis/apps/v2alpha2/emqx_conversion.go → apis/apps/v2beta1/emqx_conversion.go b/apis/apps/v2alpha2/emqx_conversion.go → apis/apps/v2beta1/emqx_conversion.go
@@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 func (*EMQX) Hub() {}
diff --git a/apis/apps/v2alpha2/emqx_types.go → apis/apps/v2beta1/emqx_types.go b/apis/apps/v2alpha2/emqx_types.go → apis/apps/v2beta1/emqx_types.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	corev1 "k8s.io/api/core/v1"

diff --git a/apis/apps/v2alpha2/emqx_webhook.go → apis/apps/v2beta1/emqx_webhook.go b/apis/apps/v2alpha2/emqx_webhook.go → apis/apps/v2beta1/emqx_webhook.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"reflect"
@@ -41,7 +41,7 @@ func (r *EMQX) SetupWebhookWithManager(mgr ctrl.Manager) error {
 		Complete()
 }
 
-//+kubebuilder:webhook:path=/mutate-apps-emqx-io-v2alpha2-emqx,mutating=true,failurePolicy=fail,sideEffects=None,groups=apps.emqx.io,resources=emqxes,verbs=create;update,versions=v2alpha2,name=mutating.apps.emqx.io,admissionReviewVersions={v1,v1beta1}
+//+kubebuilder:webhook:path=/mutate-apps-emqx-io-v2beta1-emqx,mutating=true,failurePolicy=fail,sideEffects=None,groups=apps.emqx.io,resources=emqxes,verbs=create;update,versions=v2beta1,name=mutating.apps.emqx.io,admissionReviewVersions={v1,v1beta1}
 
 var _ webhook.Defaulter = &EMQX{}
 
@@ -59,7 +59,7 @@ func (r *EMQX) Default() {
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
-//+kubebuilder:webhook:path=/validate-apps-emqx-io-v2alpha2-emqx,mutating=false,failurePolicy=fail,sideEffects=None,groups=apps.emqx.io,resources=emqxes,verbs=create;update,versions=v2alpha2,name=validator.apps.emqx.io,admissionReviewVersions={v1,v1beta1}
+//+kubebuilder:webhook:path=/validate-apps-emqx-io-v2beta1-emqx,mutating=false,failurePolicy=fail,sideEffects=None,groups=apps.emqx.io,resources=emqxes,verbs=create;update,versions=v2beta1,name=validator.apps.emqx.io,admissionReviewVersions={v1,v1beta1}
 
 var _ webhook.Validator = &EMQX{}
 

diff --git a/apis/apps/v2alpha2/emqx_webhook_test.go → apis/apps/v2beta1/emqx_webhook_test.go b/apis/apps/v2alpha2/emqx_webhook_test.go → apis/apps/v2beta1/emqx_webhook_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"testing"

diff --git a/apis/apps/v2alpha2/groupversion_info.go → apis/apps/v2beta1/groupversion_info.go b/apis/apps/v2alpha2/groupversion_info.go → apis/apps/v2beta1/groupversion_info.go
@@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v2alpha2 contains API Schema definitions for the apps v2alpha2 API group
+// Package v2beta1 contains API Schema definitions for the apps v2beta1 API group
 // +kubebuilder:object:generate=true
 // +groupName=apps.emqx.io
-package v2alpha2
+package v2beta1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -26,7 +26,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "apps.emqx.io", Version: "v2alpha2"}
+	GroupVersion = schema.GroupVersion{Group: "apps.emqx.io", Version: "v2beta1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}

diff --git a/apis/apps/v2alpha2/names.go → apis/apps/v2beta1/names.go b/apis/apps/v2alpha2/names.go → apis/apps/v2beta1/names.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"fmt"

diff --git a/apis/apps/v2alpha2/rebalance_conversion.go → apis/apps/v2beta1/rebalance_conversion.go b/apis/apps/v2alpha2/rebalance_conversion.go → apis/apps/v2beta1/rebalance_conversion.go
@@ -11,6 +11,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 func (*Rebalance) Hub() {}
diff --git a/apis/apps/v2alpha2/rebalance_types.go → apis/apps/v2beta1/rebalance_types.go b/apis/apps/v2alpha2/rebalance_types.go → apis/apps/v2beta1/rebalance_types.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"fmt"
@@ -27,7 +27,7 @@ import (
 // RebalanceSpec defines the desired state of Rebalance
 type RebalanceSpec struct {
 	// InstanceKind is used to distinguish between EMQX and EMQXEnterprise.
-	// When it is set to "EMQX", it means that the EMQX CR is v2alpha2,
+	// When it is set to "EMQX", it means that the EMQX CR is v2beta1,
 	// and when it is set to "EmqxEnterprise", it means that the EmqxEnterprise CR is v1beta4.
 	//+kubebuilder:default:="EMQX"
 	InstanceKind string `json:"instanceKind"`

diff --git a/apis/apps/v2alpha2/rebalance_types_test.go → apis/apps/v2beta1/rebalance_types_test.go b/apis/apps/v2alpha2/rebalance_types_test.go → apis/apps/v2beta1/rebalance_types_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"testing"

diff --git a/apis/apps/v2alpha2/rebalance_webhook.go → apis/apps/v2beta1/rebalance_webhook.go b/apis/apps/v2alpha2/rebalance_webhook.go → apis/apps/v2beta1/rebalance_webhook.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"errors"
@@ -37,7 +37,7 @@ func (r *Rebalance) SetupWebhookWithManager(mgr ctrl.Manager) error {
 }
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
-//+kubebuilder:webhook:path=/validate-apps-emqx-io-v2alpha2-rebalance,mutating=false,failurePolicy=fail,sideEffects=None,groups=apps.emqx.io,resources=rebalances,verbs=create;update,versions=v2alpha2,name=validator.rebalance.emqx.io,admissionReviewVersions={v1,v1beta1}
+//+kubebuilder:webhook:path=/validate-apps-emqx-io-v2beta1-rebalance,mutating=false,failurePolicy=fail,sideEffects=None,groups=apps.emqx.io,resources=rebalances,verbs=create;update,versions=v2beta1,name=validator.rebalance.emqx.io,admissionReviewVersions={v1,v1beta1}
 
 var _ webhook.Validator = &Rebalance{}
 

diff --git a/apis/apps/v2alpha2/rebalance_webhook_test.go → apis/apps/v2beta1/rebalance_webhook_test.go b/apis/apps/v2alpha2/rebalance_webhook_test.go → apis/apps/v2beta1/rebalance_webhook_test.go
@@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"testing"

diff --git a/apis/apps/v2alpha2/status.go → apis/apps/v2beta1/status.go b/apis/apps/v2alpha2/status.go → apis/apps/v2beta1/status.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"sort"

diff --git a/apis/apps/v2alpha2/status_test.go → apis/apps/v2beta1/status_test.go b/apis/apps/v2alpha2/status_test.go → apis/apps/v2beta1/status_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"testing"

diff --git a/apis/apps/v2alpha2/util.go → apis/apps/v2beta1/util.go b/apis/apps/v2alpha2/util.go → apis/apps/v2beta1/util.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"fmt"

diff --git a/apis/apps/v2alpha2/util_test.go → apis/apps/v2beta1/util_test.go b/apis/apps/v2alpha2/util_test.go → apis/apps/v2beta1/util_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"testing"

diff --git a/apis/apps/v2alpha2/webhook_suite_test.go → apis/apps/v2beta1/webhook_suite_test.go b/apis/apps/v2alpha2/webhook_suite_test.go → apis/apps/v2beta1/webhook_suite_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package v2alpha2
+package v2beta1
 
 import (
 	"context"

diff --git a/apis/apps/v2alpha2/zz_generated.deepcopy.go → apis/apps/v2beta1/zz_generated.deepcopy.go b/apis/apps/v2alpha2/zz_generated.deepcopy.go → apis/apps/v2beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/apps.emqx.io_emqxes.yaml b/config/crd/bases/apps.emqx.io_emqxes.yaml
@@ -6470,7 +6470,7 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v2alpha2
+    name: v2beta1
     schema:
       openAPIV3Schema:
         properties:

diff --git a/config/crd/bases/apps.emqx.io_rebalances.yaml b/config/crd/bases/apps.emqx.io_rebalances.yaml
@@ -146,7 +146,7 @@ spec:
     - jsonPath: .metadata.creationTimestamp
       name: Age
       type: date
-    name: v2alpha2
+    name: v2beta1
     schema:
       openAPIV3Schema:
         properties: