diff --git a/config/crd/bases/apps.emqx.io_emqxbrokers.yaml b/config/crd/bases/apps.emqx.io_emqxbrokers.yaml index fb047f3d..e3afc977 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 b960198a..ac0282c5 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 93b64b68..bdbd853b 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 da967842..bf19794f 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 b0056f2e..3ad98a54 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 88d0812e..81189d36 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 eba9b272..a65c85d8 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 a08c8f28..9691e8c5 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 adf76118..32204903 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 4a9955af..4ca99680 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 ee80a5ef..39cf19f9 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 5a158629..69e8c513 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 3e69be2a..b0476b56 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: