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

chart,config: modify the 3.0.0-alpha to 3.0.0 #804

Merged
merged 1 commit into from
Jul 13, 2023
Merged

chart,config: modify the 3.0.0-alpha to 3.0.0 #804

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
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha1/backup_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions api/v1alpha1/mysqlcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions api/v1beta1/mysqlcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions charts/mysql-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

2 changes: 1 addition & 1 deletion charts/mysql-operator/charts/mysql-cluster/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion charts/mysql-operator/charts/mysql-cluster/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ name: "sample"
namespace: "default"

mysqlVersion: "8.0"
version: v3.0.0-alpha
version: v3.0.0

tls:
enable: false
Expand Down
2 changes: 1 addition & 1 deletion charts/mysql-operator/templates/mysql.radondb.com_backups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions charts/mysql-operator/templates/mysql.radondb.com_mysqlclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/mysql-operator/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/mysql.radondb.com_backups.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions config/crd/bases/mysql.radondb.com_mysqlclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ kind: Kustomization
images:
- name: controller
newName: radondb/mysql-operator
newTag: 3.0.0-alpha
newTag: 3.0.0
2 changes: 1 addition & 1 deletion test/e2e/framework/mysqlcluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/framework/test_context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down