Skip to content

Commit

Permalink
chore: dump kube version to 0.16.3
Browse files Browse the repository at this point in the history
Signed-off-by: Rory Z <[email protected]>
  • Loading branch information
Rory-Z committed Sep 23, 2024
1 parent df0410b commit 90791ce
Show file tree
Hide file tree
Showing 16 changed files with 20 additions and 16 deletions.
4 changes: 4 additions & 0 deletions apis/apps/v2alpha1/emqx_conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/apps.emqx.io_emqxbrokers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/apps.emqx.io_emqxenterprises.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/apps.emqx.io_emqxes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/apps.emqx.io_emqxplugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/apps.emqx.io_rebalances.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/samples/emqx/v2alpha1/emqx-full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: EMQX
metadata:
name: emqx
spec:
image: "emqx:5"
image: "emqx/emqx-enterprise:latest"
imagePullPolicy: IfNotPresent
# imagePullSecrets:
# - name: fake-secrets
Expand Down
2 changes: 1 addition & 1 deletion config/samples/emqx/v2beta1/emqx-full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions deploy/charts/emqx-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion e2e/v2beta1/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())

Expand Down
2 changes: 1 addition & 1 deletion e2e/v2beta1/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down

0 comments on commit 90791ce

Please sign in to comment.