diff --git a/Makefile b/Makefile index f95a9fe2..55ba3f67 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ # Image URL to use all building/pushing image targets -FROM_VERSION ?=v2.3.0 -CHART_VERSION ?=2.3.0 -CHART_TOVERSION ?=3.0.0-alpha -TO_VERSION ?=v3.0.0-alpha -TAG ?=v3.0.0-alpha +FROM_VERSION ?=v3.0.0-alpha +CHART_VERSION ?=3.0.0-alpha +CHART_TOVERSION ?=3.0.0 +TO_VERSION ?=v3.0.0 +TAG ?=v3.0.0 IMGPREFIX ?=radondb/ IMG ?= $(IMGPREFIX)mysql-operator:$(TAG) SIDECAR57_IMG ?= $(IMGPREFIX)mysql57-sidecar:$(TAG) diff --git a/api/v1alpha1/backup_types.go b/api/v1alpha1/backup_types.go index b784c386..23e3e22a 100644 --- a/api/v1alpha1/backup_types.go +++ b/api/v1alpha1/backup_types.go @@ -29,7 +29,7 @@ type BackupSpec struct { // To specify the image that will be used for sidecar container. // +optional - // +kubebuilder:default:="radondb/mysql57-sidecar:v3.0.0-alpha" + // +kubebuilder:default:="radondb/mysql57-sidecar:v3.0.0" Image string `json:"image"` // HostName represents the host for which to take backup diff --git a/api/v1alpha1/mysqlcluster_types.go b/api/v1alpha1/mysqlcluster_types.go index aee8dc2a..1b26499f 100644 --- a/api/v1alpha1/mysqlcluster_types.go +++ b/api/v1alpha1/mysqlcluster_types.go @@ -50,7 +50,7 @@ type MysqlClusterSpec struct { // XenonOpts is the options of xenon container. // +optional - // +kubebuilder:default:={image: "radondb/xenon:v3.0.0-alpha", admitDefeatHearbeatCount: 5, electionTimeout: 10000, resources: {limits: {cpu: "100m", memory: "256Mi"}, requests: {cpu: "50m", memory: "128Mi"}}} + // +kubebuilder:default:={image: "radondb/xenon:v3.0.0", admitDefeatHearbeatCount: 5, electionTimeout: 10000, resources: {limits: {cpu: "100m", memory: "256Mi"}, requests: {cpu: "50m", memory: "128Mi"}}} XenonOpts XenonOpts `json:"xenonOpts,omitempty"` // MetricsOpts is the options of metrics container. @@ -67,7 +67,7 @@ type MysqlClusterSpec struct { // PodPolicy defines the policy to extra specification. // +optional - // +kubebuilder:default:={imagePullPolicy: "IfNotPresent", extraResources: {requests: {cpu: "10m", memory: "32Mi"}}, sidecarImage: "radondb/mysql57-sidecar:v3.0.0-alpha", busyboxImage: "busybox:1.32"} + // +kubebuilder:default:={imagePullPolicy: "IfNotPresent", extraResources: {requests: {cpu: "10m", memory: "32Mi"}}, sidecarImage: "radondb/mysql57-sidecar:v3.0.0", busyboxImage: "busybox:1.32"} PodPolicy PodPolicy `json:"podPolicy,omitempty"` // PVC extra specifiaction. @@ -206,7 +206,7 @@ type MysqlOpts struct { type XenonOpts struct { // To specify the image that will be used for xenon container. // +optional - // +kubebuilder:default:="radondb/xenon:v3.0.0-alpha" + // +kubebuilder:default:="radondb/xenon:v3.0.0" Image string `json:"image,omitempty"` // High available component admit defeat heartbeat count. @@ -273,7 +273,7 @@ type PodPolicy struct { // To specify the image that will be used for sidecar container. // +optional - // +kubebuilder:default:="radondb/mysql57-sidecar:v3.0.0-alpha" + // +kubebuilder:default:="radondb/mysql57-sidecar:v3.0.0" SidecarImage string `json:"sidecarImage,omitempty"` // The busybox image. diff --git a/api/v1beta1/mysqlcluster_types.go b/api/v1beta1/mysqlcluster_types.go index 1faf38b3..e35fff3e 100644 --- a/api/v1beta1/mysqlcluster_types.go +++ b/api/v1beta1/mysqlcluster_types.go @@ -69,7 +69,7 @@ type MysqlClusterSpec struct { // XenonOpts is the options of xenon container. // +optional - // +kubebuilder:default:={image: "radondb/xenon:v3.0.0-alpha", admitDefeatHearbeatCount: 5, electionTimeout: 10000, resources: {limits: {cpu: "100m", memory: "256Mi"}, requests: {cpu: "50m", memory: "128Mi"}}} + // +kubebuilder:default:={image: "radondb/xenon:v3.0.0", admitDefeatHearbeatCount: 5, electionTimeout: 10000, resources: {limits: {cpu: "100m", memory: "256Mi"}, requests: {cpu: "50m", memory: "128Mi"}}} Xenon XenonOpts `json:"xenonOpts,omitempty"` // Backup is the options of backup container. @@ -358,7 +358,7 @@ const ( type XenonOpts struct { // To specify the image that will be used for xenon container. // +optional - // +kubebuilder:default:="radondb/xenon:v3.0.0-alpha" + // +kubebuilder:default:="radondb/xenon:v3.0.0" Image string `json:"image,omitempty"` // High available component admit defeat heartbeat count. diff --git a/charts/mysql-operator/Chart.yaml b/charts/mysql-operator/Chart.yaml index 90be491c..79517fe1 100644 --- a/charts/mysql-operator/Chart.yaml +++ b/charts/mysql-operator/Chart.yaml @@ -15,14 +15,14 @@ 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: v3.0.0-alpha +version: v3.0.0 # 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. # It is recommended to use it with quotes. -appVersion: "v3.0.0-alpha" +appVersion: "v3.0.0" dependencies: - name: "mysqlcluster" - version: "v3.0.0-alpha" + version: "v3.0.0" \ No newline at end of file diff --git a/charts/mysql-operator/charts/mysql-cluster/Chart.yaml b/charts/mysql-operator/charts/mysql-cluster/Chart.yaml index 2690f548..29612e5e 100644 --- a/charts/mysql-operator/charts/mysql-cluster/Chart.yaml +++ b/charts/mysql-operator/charts/mysql-cluster/Chart.yaml @@ -21,4 +21,4 @@ version: 3.0.0 # 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. # It is recommended to use it with quotes. -appVersion: "v3.0.0-alpha" +appVersion: "v3.0.0" diff --git a/charts/mysql-operator/charts/mysql-cluster/values.yaml b/charts/mysql-operator/charts/mysql-cluster/values.yaml index 45e5e1ff..f7079a1b 100644 --- a/charts/mysql-operator/charts/mysql-cluster/values.yaml +++ b/charts/mysql-operator/charts/mysql-cluster/values.yaml @@ -6,7 +6,7 @@ name: "sample" namespace: "default" mysqlVersion: "8.0" -version: v3.0.0-alpha +version: v3.0.0 tls: enable: false diff --git a/charts/mysql-operator/templates/mysql.radondb.com_backups.yaml b/charts/mysql-operator/templates/mysql.radondb.com_backups.yaml index 783f1b3e..4efe82fe 100644 --- a/charts/mysql-operator/templates/mysql.radondb.com_backups.yaml +++ b/charts/mysql-operator/templates/mysql.radondb.com_backups.yaml @@ -85,7 +85,7 @@ spec: If is empty, is use leader HostName type: string image: - default: radondb/mysql57-sidecar:v3.0.0-alpha + default: radondb/mysql57-sidecar:v3.0.0 description: To specify the image that will be used for sidecar container. type: string nfsServerAddress: diff --git a/charts/mysql-operator/templates/mysql.radondb.com_mysqlclusters.yaml b/charts/mysql-operator/templates/mysql.radondb.com_mysqlclusters.yaml index 7a993982..71b2daf9 100644 --- a/charts/mysql-operator/templates/mysql.radondb.com_mysqlclusters.yaml +++ b/charts/mysql-operator/templates/mysql.radondb.com_mysqlclusters.yaml @@ -327,7 +327,7 @@ spec: cpu: 10m memory: 32Mi imagePullPolicy: IfNotPresent - sidecarImage: radondb/mysql57-sidecar:v3.0.0-alpha + sidecarImage: radondb/mysql57-sidecar:v3.0.0 description: PodPolicy defines the policy to extra specification. properties: affinity: @@ -1257,7 +1257,7 @@ spec: schedulerName: type: string sidecarImage: - default: radondb/mysql57-sidecar:v3.0.0-alpha + default: radondb/mysql57-sidecar:v3.0.0 description: To specify the image that will be used for sidecar container. type: string @@ -2274,7 +2274,7 @@ spec: default: admitDefeatHearbeatCount: 5 electionTimeout: 10000 - image: radondb/xenon:v3.0.0-alpha + image: radondb/xenon:v3.0.0 resources: limits: cpu: 100m @@ -2301,7 +2301,7 @@ spec: automatically rebuild the invalid node. type: boolean image: - default: radondb/xenon:v3.0.0-alpha + default: radondb/xenon:v3.0.0 description: To specify the image that will be used for xenon container. type: string @@ -4940,7 +4940,7 @@ spec: default: admitDefeatHearbeatCount: 5 electionTimeout: 10000 - image: radondb/xenon:v3.0.0-alpha + image: radondb/xenon:v3.0.0 resources: limits: cpu: 100m @@ -4967,7 +4967,7 @@ spec: automatically rebuild the invalid node. type: boolean image: - default: radondb/xenon:v3.0.0-alpha + default: radondb/xenon:v3.0.0 description: To specify the image that will be used for xenon container. type: string diff --git a/charts/mysql-operator/values.yaml b/charts/mysql-operator/values.yaml index f8d97edd..a466ae89 100644 --- a/charts/mysql-operator/values.yaml +++ b/charts/mysql-operator/values.yaml @@ -7,7 +7,7 @@ installCRDS: true mysqlcluster: install: false - version: v3.0.0-alpha + version: v3.0.0 ## Specify an imagePullPolicy (Required) ## It's recommended to change this to 'Always' if the image tag is 'latest' ## ref: http://kubernetes.io/docs/user-guide/images/#updating-images @@ -25,7 +25,7 @@ tolerationSeconds: 30 manager: image: radondb/mysql-operator - tag: v3.0.0-alpha + tag: v3.0.0 enableWebhooks: true resources: {} # We usually recommend not to specify default resources and to leave this as a conscious diff --git a/config/crd/bases/mysql.radondb.com_backups.yaml b/config/crd/bases/mysql.radondb.com_backups.yaml index 8de57375..142e1dbd 100644 --- a/config/crd/bases/mysql.radondb.com_backups.yaml +++ b/config/crd/bases/mysql.radondb.com_backups.yaml @@ -67,7 +67,7 @@ spec: If is empty, is use leader HostName type: string image: - default: radondb/mysql57-sidecar:v3.0.0-alpha + default: radondb/mysql57-sidecar:v3.0.0 description: To specify the image that will be used for sidecar container. type: string nfsServerAddress: diff --git a/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml b/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml index a673435f..51846e3d 100644 --- a/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml +++ b/config/crd/bases/mysql.radondb.com_mysqlclusters.yaml @@ -309,7 +309,7 @@ spec: cpu: 10m memory: 32Mi imagePullPolicy: IfNotPresent - sidecarImage: radondb/mysql57-sidecar:v3.0.0-alpha + sidecarImage: radondb/mysql57-sidecar:v3.0.0 description: PodPolicy defines the policy to extra specification. properties: affinity: @@ -1239,7 +1239,7 @@ spec: schedulerName: type: string sidecarImage: - default: radondb/mysql57-sidecar:v3.0.0-alpha + default: radondb/mysql57-sidecar:v3.0.0 description: To specify the image that will be used for sidecar container. type: string @@ -2256,7 +2256,7 @@ spec: default: admitDefeatHearbeatCount: 5 electionTimeout: 10000 - image: radondb/xenon:v3.0.0-alpha + image: radondb/xenon:v3.0.0 resources: limits: cpu: 100m @@ -2283,7 +2283,7 @@ spec: automatically rebuild the invalid node. type: boolean image: - default: radondb/xenon:v3.0.0-alpha + default: radondb/xenon:v3.0.0 description: To specify the image that will be used for xenon container. type: string @@ -4922,7 +4922,7 @@ spec: default: admitDefeatHearbeatCount: 5 electionTimeout: 10000 - image: radondb/xenon:v3.0.0-alpha + image: radondb/xenon:v3.0.0 resources: limits: cpu: 100m @@ -4949,7 +4949,7 @@ spec: automatically rebuild the invalid node. type: boolean image: - default: radondb/xenon:v3.0.0-alpha + default: radondb/xenon:v3.0.0 description: To specify the image that will be used for xenon container. type: string diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 73b6dbdc..a31a6486 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: radondb/mysql-operator - newTag: 3.0.0-alpha + newTag: 3.0.0 diff --git a/test/e2e/framework/mysqlcluster.go b/test/e2e/framework/mysqlcluster.go index e97db13d..7199f18a 100644 --- a/test/e2e/framework/mysqlcluster.go +++ b/test/e2e/framework/mysqlcluster.go @@ -42,7 +42,7 @@ metadata: spec: replicas: %d xenonOpts: - image: radondb/xenon:v3.0.0-alpha + image: radondb/xenon:v3.0.0 ` MySQL57ReleaseAssetURL = "https://github.com/radondb/radondb-mysql-kubernetes/releases/latest/download/mysql_v1alpha1_mysqlcluster.yaml" ) diff --git a/test/e2e/framework/test_context.go b/test/e2e/framework/test_context.go index 613986e9..eb1e1d8e 100644 --- a/test/e2e/framework/test_context.go +++ b/test/e2e/framework/test_context.go @@ -38,7 +38,7 @@ const ( // // Image path of mysql operator. // OperatorImagePath = "radondb/mysql-operator:v2.3.0" // Image path for mysql sidecar. - SidecarImagePath = "radondb/mysql57-sidecar:v3.0.0-alpha" + SidecarImagePath = "radondb/mysql57-sidecar:v3.0.0" // The namespace where the resource created by E2E. E2ETestNamespace = "radondb-mysql-e2e"