Skip to content

Commit 6e190e6

Browse files
inelpandzichors
andauthored
K8SPS-244: Restart router pods on user created config CM change (#381)
* Restart router and mysql on user created config CM. * Update config test. * make manifest with VERSION=main * Update config-router test. * Increate test timeout. * fix users test * Clearer implementation. * Update tests. * Fix config test. --------- Co-authored-by: Viacheslav Sarzhan <[email protected]>
1 parent cf12d8b commit 6e190e6

File tree

14 files changed

+76
-74
lines changed

14 files changed

+76
-74
lines changed

config/manager/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ kind: Kustomization
1313
images:
1414
- name: perconalab/percona-server-mysql-operator
1515
newName: perconalab/percona-server-mysql-operator
16-
newTag: k8sps-239
16+
newTag: main

deploy/bundle.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8680,7 +8680,7 @@ spec:
86808680
fieldPath: metadata.namespace
86818681
- name: DISABLE_TELEMETRY
86828682
value: "false"
8683-
image: perconalab/percona-server-mysql-operator:k8sps-239
8683+
image: perconalab/percona-server-mysql-operator:main
86848684
imagePullPolicy: Always
86858685
livenessProbe:
86868686
httpGet:

deploy/operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
fieldPath: metadata.namespace
4848
- name: DISABLE_TELEMETRY
4949
value: "false"
50-
image: perconalab/percona-server-mysql-operator:k8sps-239
50+
image: perconalab/percona-server-mysql-operator:main
5151
imagePullPolicy: Always
5252
livenessProbe:
5353
httpGet:

e2e-tests/conf/client.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: v1
22
kind: Pod
33
metadata:
44
name: mysql-client
5+
labels:
6+
name: mysql-client
57
spec:
68
containers:
79
- name: mysql-client

e2e-tests/functions

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,20 @@ get_cr() {
140140
fi
141141
}
142142

143+
get_client_pod() {
144+
kubectl -n "${NAMESPACE}" get pods \
145+
--selector=name=mysql-client \
146+
-o 'jsonpath={.items[].metadata.name}'
147+
}
148+
143149
run_mysql() {
144150
local command="$1"
145151
local uri="$2"
146152
local pod="$3"
147153

154+
client_pod=$(get_client_pod)
155+
wait_pod $client_pod 1>&2
156+
148157
kubectl -n "${NAMESPACE}" exec "${pod:-mysql-client}" -- \
149158
bash -c "printf '%s\n' \"${command}\" | mysql -sN $uri" 2>&1 \
150159
| sed -e 's/mysql: //' \
Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,29 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestAssert
3-
timeout: 60
3+
timeout: 420
44
---
55
apiVersion: v1
66
kind: ConfigMap
77
metadata:
88
name: config-router-router
9+
---
10+
apiVersion: apps/v1
11+
kind: StatefulSet
12+
metadata:
13+
name: config-router-mysql
14+
status:
15+
observedGeneration: 1
16+
readyReplicas: 3
17+
replicas: 3
18+
updatedReplicas: 3
19+
---
20+
apiVersion: apps/v1
21+
kind: Deployment
22+
metadata:
23+
generation: 4
24+
name: config-router-router
25+
status:
26+
observedGeneration: 4
27+
readyReplicas: 3
28+
replicas: 3
29+
updatedReplicas: 3

e2e-tests/tests/config-router/06-assert.yaml

Lines changed: 0 additions & 24 deletions
This file was deleted.

e2e-tests/tests/config-router/06-restart-router.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

e2e-tests/tests/config/05-assert.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestAssert
3-
timeout: 60
3+
timeout: 420
44
---
55
apiVersion: v1
66
kind: ConfigMap
@@ -11,3 +11,13 @@ apiVersion: v1
1111
kind: Secret
1212
metadata:
1313
name: config-mysql
14+
---
15+
apiVersion: apps/v1
16+
kind: StatefulSet
17+
metadata:
18+
name: config-mysql
19+
status:
20+
observedGeneration: 4
21+
readyReplicas: 3
22+
replicas: 3
23+
updatedReplicas: 3

e2e-tests/tests/config/06-assert.yaml

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)