Skip to content

Commit ea9205e

Browse files
committed
Bump version
Change-Id: I35f6ba59a0ca5097f9e6b0c38f189efbec1e9d4b
1 parent 668e7f9 commit ea9205e

File tree

11 files changed

+34
-18
lines changed

11 files changed

+34
-18
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ Building container images for the MySQL Operator with our provided `Dockerfile`
3737

3838
For changes only to the Operator code, which don't require changes to dependencies, an easy alternative is just to patch the images we provide adding your code changes. A way to facilitate is via a `Dockerfile` like this:
3939

40-
ARG BASE_VERSION=9.4.0-2.2.5
40+
ARG BASE_VERSION=9.5.0-2.2.6
4141
FROM container-registry.oracle.com/mysql/community-operator:$BASE_VERSION
4242
COPY mysqloperator/ /usr/lib/mysqlsh/python-packages/
4343

4444
After building an image like this:
4545

46-
docker build -t mysql/community-operator:9.4.0-2.2.5 -f Dockerfile.patch .
46+
docker build -t mysql/community-operator:9.5.0-2.2.6 -f Dockerfile.patch .
4747

4848
This can be passed to a local registry and used from there. Please refer to the MySQL Operator documentation and the documentation of your Kubernetes distribution of choice.
4949

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ and attribution notices for these materials, please refer to the `LICENSE` file.
3030
First deploy the Custom Resource Definition (CRDs):
3131

3232
```sh
33-
$> kubectl apply -f https://raw.githubusercontent.com/mysql/mysql-operator/9.4.0-2.2.5/deploy/deploy-crds.yaml
33+
$> kubectl apply -f https://raw.githubusercontent.com/mysql/mysql-operator/9.5.0-2.2.6/deploy/deploy-crds.yaml
3434
```
3535

3636
Then deploy MySQL Operator for Kubernetes:
3737

3838
```sh
39-
$> kubectl apply -f https://raw.githubusercontent.com/mysql/mysql-operator/9.4.0-2.2.5/deploy/deploy-operator.yaml
39+
$> kubectl apply -f https://raw.githubusercontent.com/mysql/mysql-operator/9.5.0-2.2.6/deploy/deploy-operator.yaml
4040
```
4141

4242
Verify the operator is running by checking the deployment inside the `mysql-operator` namespace:

deploy/deploy-operator.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ metadata:
165165
version: "1.0"
166166
app.kubernetes.io/name: mysql-operator
167167
app.kubernetes.io/instance: mysql-operator
168-
app.kubernetes.io/version: 9.4.0-2.2.5
168+
app.kubernetes.io/version: 9.5.0-2.2.6
169169
app.kubernetes.io/component: controller
170170
app.kubernetes.io/managed-by: mysql-operator
171171
app.kubernetes.io/created-by: mysql-operator
@@ -183,7 +183,7 @@ spec:
183183
runAsNonRoot: true
184184
containers:
185185
- name: mysql-operator
186-
image: container-registry.oracle.com/mysql/community-operator:9.4.0-2.2.5
186+
image: container-registry.oracle.com/mysql/community-operator:9.5.0-2.2.6
187187
imagePullPolicy: IfNotPresent
188188
args:
189189
[

gen_dockerfile.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
MYSQL_REPO_URL="http://repo.mysql.com"; [ -n "${1}" ] && MYSQL_REPO_URL="${1}"
99
MYSQL_OPERATOR_PYTHON_DEPS="mysql-operator-python-deps"; [ -n "${2}" ] && MYSQL_OPERATOR_PYTHON_DEPS="${2}"
1010
MYSQL_OPERATOR_PYTHON_DEPS_VERSION="3.10.8"; [ -n "${3}" ] && MYSQL_OPERATOR_PYTHON_DEPS_VERSION="${3}"
11-
MYSQL_SHELL_VERSION=9.4.0; [ -n "${4}" ] && MYSQL_SHELL_VERSION="${4}"
11+
MYSQL_SHELL_VERSION=9.5.0; [ -n "${4}" ] && MYSQL_SHELL_VERSION="${4}"
1212
MYSQL_CONFIG_PKG="mysql80-community-release"; [ -n "${5}" ] && MYSQL_CONFIG_PKG="${5}"
1313
MYSQL_SHELL_REPO="mysql-tools-community"; [ -n "${6}" ] && MYSQL_SHELL_REPO="${6}"
1414
ARCH="amd64"; [ -n "${7}" ] && ARCH="${7}"
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
2-
appVersion: "9.4.0"
2+
appVersion: "9.5.0"
33
name: mysql-innodbcluster
44
description: MySQL InnoDB Cluster Helm Chart for deploying MySQL InnoDB Cluster in Kubernetes
55
type: application
6-
version: "2.2.5"
6+
version: "2.2.6"
77
icon: https://www.mysql.com/common/logos/logo-mysql-170x115.png

helm/mysql-innodbcluster/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tls:
1919
# serverCertAndPKsecretName:
2020
# routerCertAndPKsecretName: # our use router.certAndPKsecretName
2121

22-
#serverVersion: 9.4.0
22+
#serverVersion: 9.5.0
2323
serverInstances: 3
2424
routerInstances: 1 # or use router.instances
2525
baseServerId: 1000

helm/mysql-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: v2
2-
appVersion: "9.4.0-2.2.5"
2+
appVersion: "9.5.0-2.2.6"
33
name: mysql-operator
44
description: MySQL Operator Helm Chart for deploying MySQL InnoDB Cluster in Kubernetes
55
type: application
6-
version: "2.2.5"
6+
version: "2.2.6"
77
icon: https://www.mysql.com/common/logos/logo-mysql-170x115.png

mysqloperator/controller/config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
OPERATOR_EDITION = Edition.community
2626

2727
# Constants
28-
OPERATOR_VERSION = "2.2.5"
28+
OPERATOR_VERSION = "2.2.6"
2929
OPERATOR_EDITION_NAME_TO_ENUM = { edition.value : edition.name for edition in Edition }
3030

31-
DEFAULT_VERSION_TAG = "9.4.0"
31+
DEFAULT_VERSION_TAG = "9.5.0"
3232

3333
MIN_BASE_SERVER_ID = 1
3434
MAX_BASE_SERVER_ID = 4000000000

tag.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66

77
SUFFIX=''; [ -n "$1" ] && SUFFIX=${1}
88

9-
echo "9.4.0-2.2.5$SUFFIX"
9+
echo "9.5.0-2.2.6$SUFFIX"

tests/ci/registry/images-list.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@ community-server:9.4.0
8282
mysql/community-server:9.4.0
8383
1
8484
---
85+
community-server:9.5.0
86+
mysql/community-server:9.5.0
87+
1
88+
---
8589
community-router:8.0.28
8690
mysql-router:8.0.28
8791
1
@@ -166,6 +170,10 @@ community-router:9.4.0
166170
mysql/community-router:9.4.0
167171
1
168172
---
173+
community-router:9.5.0
174+
mysql/community-router:9.5.0
175+
1
176+
---
169177
community-operator:8.0.29-2.0.4
170178
mysql-operator:8.0.29-2.0.4
171179
1
@@ -342,6 +350,10 @@ enterprise-router:9.4.0
342350
mysql/enterprise-router:9.4.0
343351
1
344352
---
353+
enterprise-router:9.5.0
354+
mysql/enterprise-router:9.5.0
355+
1
356+
---
345357
enterprise-router:8.2.0-arm64
346358
mysql-enterprise-router:8.2.0-arm64
347359
1
@@ -466,6 +478,10 @@ enterprise-server:9.4.0
466478
mysql/enterprise-server:9.4.0
467479
1
468480
---
481+
enterprise-server:9.5.0
482+
mysql/enterprise-server:9.5.0
483+
1
484+
---
469485
enterprise-server:8.2.0-arm
470486
mysql-enterprise-server:8.2.0-arm
471487
1

0 commit comments

Comments
 (0)