From 90791ce19bd319ee2330678d4d01b59380f0749c Mon Sep 17 00:00:00 2001 From: Rory Z <16801068+Rory-Z@users.noreply.github.com> Date: Mon, 23 Sep 2024 14:36:02 +0800 Subject: [PATCH] chore: dump kube version to 0.16.3 Signed-off-by: Rory Z <16801068+Rory-Z@users.noreply.github.com> --- apis/apps/v2alpha1/emqx_conversion.go | 4 ++++ config/crd/bases/apps.emqx.io_emqxbrokers.yaml | 2 +- config/crd/bases/apps.emqx.io_emqxenterprises.yaml | 2 +- config/crd/bases/apps.emqx.io_emqxes.yaml | 2 +- config/crd/bases/apps.emqx.io_emqxplugins.yaml | 2 +- config/crd/bases/apps.emqx.io_rebalances.yaml | 2 +- config/samples/emqx/v2alpha1/emqx-full.yaml | 2 +- config/samples/emqx/v2beta1/emqx-full.yaml | 2 +- deploy/charts/emqx-operator/Chart.yaml | 4 ++-- .../emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml | 2 +- .../templates/crd.emqxenterprises.apps.emqx.io.yaml | 2 +- .../emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml | 2 +- .../emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml | 2 +- .../emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml | 2 +- e2e/v2beta1/e2e_test.go | 2 +- e2e/v2beta1/suite_test.go | 2 +- 16 files changed, 20 insertions(+), 16 deletions(-) diff --git a/apis/apps/v2alpha1/emqx_conversion.go b/apis/apps/v2alpha1/emqx_conversion.go index c3f6c7182..55e3c8609 100644 --- a/apis/apps/v2alpha1/emqx_conversion.go +++ b/apis/apps/v2alpha1/emqx_conversion.go @@ -39,6 +39,10 @@ func (src *EMQX) ConvertTo(dstRaw conversion.Hub) error { dst.Spec.ClusterDomain = "cluster.local" dst.Spec.Config.Data = src.Spec.BootstrapConfig + if src.Spec.ReplicantTemplate.Spec.Replicas == nil { + dst.Spec.ReplicantTemplate = nil + } + // +kubebuilder:docs-gen:collapse=rote conversion return nil } diff --git a/config/crd/bases/apps.emqx.io_emqxbrokers.yaml b/config/crd/bases/apps.emqx.io_emqxbrokers.yaml index fb047f3da..e3afc977e 100644 --- a/config/crd/bases/apps.emqx.io_emqxbrokers.yaml +++ b/config/crd/bases/apps.emqx.io_emqxbrokers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: emqxbrokers.apps.emqx.io spec: group: apps.emqx.io diff --git a/config/crd/bases/apps.emqx.io_emqxenterprises.yaml b/config/crd/bases/apps.emqx.io_emqxenterprises.yaml index b960198ae..ac0282c59 100644 --- a/config/crd/bases/apps.emqx.io_emqxenterprises.yaml +++ b/config/crd/bases/apps.emqx.io_emqxenterprises.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: emqxenterprises.apps.emqx.io spec: group: apps.emqx.io diff --git a/config/crd/bases/apps.emqx.io_emqxes.yaml b/config/crd/bases/apps.emqx.io_emqxes.yaml index 93b64b68a..bdbd853b9 100644 --- a/config/crd/bases/apps.emqx.io_emqxes.yaml +++ b/config/crd/bases/apps.emqx.io_emqxes.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: emqxes.apps.emqx.io spec: group: apps.emqx.io diff --git a/config/crd/bases/apps.emqx.io_emqxplugins.yaml b/config/crd/bases/apps.emqx.io_emqxplugins.yaml index da9678426..bf19794fb 100644 --- a/config/crd/bases/apps.emqx.io_emqxplugins.yaml +++ b/config/crd/bases/apps.emqx.io_emqxplugins.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: emqxplugins.apps.emqx.io spec: group: apps.emqx.io diff --git a/config/crd/bases/apps.emqx.io_rebalances.yaml b/config/crd/bases/apps.emqx.io_rebalances.yaml index b0056f2ea..3ad98a541 100644 --- a/config/crd/bases/apps.emqx.io_rebalances.yaml +++ b/config/crd/bases/apps.emqx.io_rebalances.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: rebalances.apps.emqx.io spec: group: apps.emqx.io diff --git a/config/samples/emqx/v2alpha1/emqx-full.yaml b/config/samples/emqx/v2alpha1/emqx-full.yaml index 88d0812e5..81189d36c 100644 --- a/config/samples/emqx/v2alpha1/emqx-full.yaml +++ b/config/samples/emqx/v2alpha1/emqx-full.yaml @@ -3,7 +3,7 @@ kind: EMQX metadata: name: emqx spec: - image: "emqx:5" + image: "emqx/emqx-enterprise:latest" imagePullPolicy: IfNotPresent # imagePullSecrets: # - name: fake-secrets diff --git a/config/samples/emqx/v2beta1/emqx-full.yaml b/config/samples/emqx/v2beta1/emqx-full.yaml index eba9b272f..a65c85d81 100644 --- a/config/samples/emqx/v2beta1/emqx-full.yaml +++ b/config/samples/emqx/v2beta1/emqx-full.yaml @@ -6,7 +6,7 @@ metadata: apps.emqx.io/instance: emqx apps.emqx.io/managed-by: emqx-operator spec: - image: "emqx:5" + image: "emqx/emqx-enterprise:latest" imagePullPolicy: Always revisionHistoryLimit: 3 config: diff --git a/deploy/charts/emqx-operator/Chart.yaml b/deploy/charts/emqx-operator/Chart.yaml index a08c8f286..9691e8c5d 100644 --- a/deploy/charts/emqx-operator/Chart.yaml +++ b/deploy/charts/emqx-operator/Chart.yaml @@ -15,12 +15,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.2.24-rc.1 +version: 2.2.24 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 2.2.24-rc.1 +appVersion: 2.2.24 sources: - https://github.com/emqx/emqx-operator/tree/main/deploy/charts/emqx-operator diff --git a/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml index adf761185..32204903a 100644 --- a/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml +++ b/deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml @@ -5,7 +5,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: emqxbrokers.apps.emqx.io spec: conversion: diff --git a/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml index 4a9955afe..4ca996803 100644 --- a/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml +++ b/deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml @@ -6,7 +6,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: emqxenterprises.apps.emqx.io spec: conversion: diff --git a/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml index ee80a5ef5..39cf19f9a 100644 --- a/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml +++ b/deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml @@ -6,7 +6,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: emqxes.apps.emqx.io spec: conversion: diff --git a/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml index 5a1586299..69e8c513c 100644 --- a/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml +++ b/deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml @@ -6,7 +6,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: emqxplugins.apps.emqx.io spec: conversion: diff --git a/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml b/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml index 3e69be2a2..b0476b561 100644 --- a/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml +++ b/deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml @@ -6,7 +6,7 @@ kind: CustomResourceDefinition metadata: annotations: cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ include "emqx-operator.fullname" . }}-serving-cert' - controller-gen.kubebuilder.io/version: v0.16.2 + controller-gen.kubebuilder.io/version: v0.16.3 name: rebalances.apps.emqx.io spec: conversion: diff --git a/e2e/v2beta1/e2e_test.go b/e2e/v2beta1/e2e_test.go index 661b0b610..5e67ca75f 100644 --- a/e2e/v2beta1/e2e_test.go +++ b/e2e/v2beta1/e2e_test.go @@ -513,7 +513,7 @@ var _ = Describe("E2E Test", Label("base"), Ordered, func() { if err := k8sClient.Get(ctx, client.ObjectKeyFromObject(instance), instance); err != nil { return err } - instance.Spec.Image = "emqx/emqx-enterprise:latest" // EMQX Community Edition is not supported core + replicant cluster after 5.7 + instance.Spec.Image = "emqx/emqx-enterprise:latest-elixir" // EMQX Community Edition is not supported core + replicant cluster after 5.7 return k8sClient.Update(ctx, instance) })).Should(Succeed()) diff --git a/e2e/v2beta1/suite_test.go b/e2e/v2beta1/suite_test.go index a13b16ac6..e89040a87 100644 --- a/e2e/v2beta1/suite_test.go +++ b/e2e/v2beta1/suite_test.go @@ -149,7 +149,7 @@ func genEMQX() *appsv2beta1.EMQX { Namespace: "e2e-test-v2beta1" + "-" + rand.String(5), }, Spec: appsv2beta1.EMQXSpec{ - Image: "emqx:latest", + Image: "emqx/emqx-enterprise:latest", ImagePullPolicy: corev1.PullAlways, ClusterDomain: "cluster.local", Config: appsv2beta1.Config{