Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: dump kube version to 0.16.3 #1074

Merged
merged 1 commit into from
Sep 23, 2024
Merged

chore: dump kube version to 0.16.3 #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions apis/apps/v2alpha1/emqx_conversion.go
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion deploy/charts/emqx-operator/templates/crd.emqxbrokers.apps.emqx.io.yaml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion deploy/charts/emqx-operator/templates/crd.emqxenterprises.apps.emqx.io.yaml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion deploy/charts/emqx-operator/templates/crd.emqxes.apps.emqx.io.yaml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion deploy/charts/emqx-operator/templates/crd.emqxplugins.apps.emqx.io.yaml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion deploy/charts/emqx-operator/templates/crd.rebalances.apps.emqx.io.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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