diff --git a/build/proxysql.cnf b/build/proxysql.cnf index b594a917f..1945db3dd 100644 --- a/build/proxysql.cnf +++ b/build/proxysql.cnf @@ -5,6 +5,8 @@ admin_variables = admin_credentials="admin:admin" mysql_ifaces="0.0.0.0:6032" refresh_interval=2000 + restapi_enabled=true + restapi_port=6070 cluster_username="admin" cluster_password="admin" diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127-oc.yml index 82583bc78..940f5976f 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127-oc.yml @@ -111,6 +111,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127.yml index f65e9a22d..47982301f 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127.yml @@ -111,6 +111,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml index edd9ae3f0..d6462a1d4 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml @@ -108,6 +108,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml index 06a2b5526..f8f3714eb 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml @@ -100,6 +100,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127-oc.yml index 81716575e..5d54eeef3 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127-oc.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127.yml index 142e0ef19..91f1c2b74 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml index f7c38a3d2..da394d2ec 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml @@ -81,6 +81,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml index bdc5b0ee1..93753671d 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql-k127-oc.yml index 535986194..a33722a1f 100644 --- a/e2e-tests/affinity/compare/statefulset_region-proxysql-k127-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_region-proxysql-k127-oc.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql-k127.yml index 38d239213..de9e74141 100644 --- a/e2e-tests/affinity/compare/statefulset_region-proxysql-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_region-proxysql-k127.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml index 8e52eec66..fdd97a3e7 100644 --- a/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml @@ -81,6 +81,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql.yml index f1f4c84d0..3da376f87 100644 --- a/e2e-tests/affinity/compare/statefulset_region-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_region-proxysql.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127-oc.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127-oc.yml index 4a60875f3..50db2212b 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127-oc.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127.yml index d47d77edf..1b54ff136 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml index 628bcfd04..c173bb6c3 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml @@ -81,6 +81,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml index 31784e3fb..ca29af9f0 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-k127.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-k127.yml index 6a3376d17..dabdeba8a 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-k127.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-k127.yml @@ -85,6 +85,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-oc.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-oc.yml index 3ceb2857e..1b72e4bdd 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-oc.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-oc.yml @@ -82,6 +82,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-k127.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-k127.yml index b2e148385..d8e33916c 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-k127.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-k127.yml @@ -85,6 +85,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-oc.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-oc.yml index bfd555421..558f0b786 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-oc.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-oc.yml @@ -82,6 +82,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy.yml index 7cd41e7ae..ce51b1227 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy.yml @@ -78,6 +78,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/init-deploy/compare/service_some-name-proxysql.yml b/e2e-tests/init-deploy/compare/service_some-name-proxysql.yml index 5b72198ae..a12d794bc 100644 --- a/e2e-tests/init-deploy/compare/service_some-name-proxysql.yml +++ b/e2e-tests/init-deploy/compare/service_some-name-proxysql.yml @@ -23,6 +23,10 @@ spec: port: 33062 protocol: TCP targetPort: 33062 + - name: stats + port: 6070 + protocol: TCP + targetPort: 6070 selector: app.kubernetes.io/component: proxysql app.kubernetes.io/instance: some-name diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127-oc.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127-oc.yml index 024292505..e32d9e68a 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127-oc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127-oc.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127.yml index da7867335..8f7fedcb4 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-oc.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-oc.yml index 4da2d40a5..809ad5341 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-oc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-oc.yml @@ -81,6 +81,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql.yml index 7c5a23e19..621001cd3 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127-oc.yml index 18916a974..9e0ff8d2c 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127-oc.yml @@ -207,6 +207,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 600m diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127.yml index 1a02fdeb1..5149e5b45 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127.yml @@ -207,6 +207,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 600m diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-oc.yml index ae931b000..cbff0203e 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-oc.yml @@ -204,6 +204,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 600m diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml index ec3f8e8af..8dda3fc18 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml @@ -196,6 +196,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 600m diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127-oc.yml index c8f793071..159c2c20d 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127-oc.yml @@ -207,6 +207,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 300m diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml index 88841f8dc..3f64dd006 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml @@ -207,6 +207,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 300m diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml index adb4a1094..b278acf7c 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml @@ -204,6 +204,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 300m diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml index eb7da15d5..80a681b24 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml @@ -196,6 +196,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 300m diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127-oc.yml index 359146425..bc0ec89aa 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127-oc.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127.yml index ddea4ee55..b0fe21df3 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-oc.yml index 57ec2164a..e9d6dcbb0 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-oc.yml @@ -70,6 +70,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased.yml index 4ca052dfb..4d9d19484 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased.yml @@ -62,6 +62,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127-oc.yml index 359146425..bc0ec89aa 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127-oc.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127.yml index ddea4ee55..b0fe21df3 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-oc.yml index 57ec2164a..e9d6dcbb0 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-oc.yml @@ -70,6 +70,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql.yml index 4ca052dfb..4d9d19484 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql.yml @@ -62,6 +62,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127-oc.yml index 281711f8f..14e607aba 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127-oc.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 600m diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127.yml index fd91b1506..eca3bb8ec 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 600m diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-oc.yml index 289c1c7f4..03de9dfeb 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-oc.yml @@ -70,6 +70,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 600m diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased.yml index c31ea0161..ba381cbd9 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased.yml @@ -62,6 +62,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 600m diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127-oc.yml index ac27cba2e..128cae3b3 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127-oc.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 300m diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127.yml index 40f65087b..f033c6658 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 300m diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-oc.yml index b09c1d89c..e205f31f5 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-oc.yml @@ -70,6 +70,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 300m diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml index 90274f58e..21a92ee93 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml @@ -62,6 +62,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 300m diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-k127.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-k127.yml index 9d9c22f4c..c7cb0f448 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-k127.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-k127.yml @@ -215,6 +215,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix-k127.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix-k127.yml index addc34667..525d5f0da 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix-k127.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix-k127.yml @@ -215,6 +215,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix-oc.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix-oc.yml index 705b0c038..fb4991322 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix-oc.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix-oc.yml @@ -212,6 +212,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix.yml index cbdab8ecc..938d4e949 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-no-prefix.yml @@ -208,6 +208,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-oc.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-oc.yml index be3446dc4..f3954008d 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-oc.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-oc.yml @@ -212,6 +212,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy.yml index 4afab7548..95cc07e85 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy.yml @@ -208,6 +208,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/proxy-protocol/compare/service_proxy-protocol-haproxy-k122.yml b/e2e-tests/proxy-protocol/compare/service_proxy-protocol-haproxy-k122.yml index c251fe8a8..df6f43568 100644 --- a/e2e-tests/proxy-protocol/compare/service_proxy-protocol-haproxy-k122.yml +++ b/e2e-tests/proxy-protocol/compare/service_proxy-protocol-haproxy-k122.yml @@ -35,6 +35,10 @@ spec: port: 33060 protocol: TCP targetPort: 33060 + - name: stats + port: 8404 + protocol: TCP + targetPort: 8404 selector: app.kubernetes.io/component: haproxy app.kubernetes.io/instance: proxy-protocol diff --git a/e2e-tests/proxy-protocol/compare/service_proxy-protocol-haproxy.yml b/e2e-tests/proxy-protocol/compare/service_proxy-protocol-haproxy.yml index 435a9ffcb..61bd66983 100644 --- a/e2e-tests/proxy-protocol/compare/service_proxy-protocol-haproxy.yml +++ b/e2e-tests/proxy-protocol/compare/service_proxy-protocol-haproxy.yml @@ -33,6 +33,10 @@ spec: port: 33060 protocol: TCP targetPort: 33060 + - name: stats + port: 8404 + protocol: TCP + targetPort: 8404 selector: app.kubernetes.io/component: haproxy app.kubernetes.io/instance: proxy-protocol diff --git a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-k127.yml b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-k127.yml index 2364618be..b8ee2e1dd 100644 --- a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-k127.yml +++ b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-k127.yml @@ -76,6 +76,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-oc.yml b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-oc.yml index dead6bd2f..540382b9b 100644 --- a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-oc.yml +++ b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-oc.yml @@ -73,6 +73,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy.yml b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy.yml index 6f2b2052c..b38e5a6bc 100644 --- a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy.yml +++ b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy.yml @@ -69,6 +69,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/proxysql-sidecar-res-limits/compare/service_side-car-proxysql-k122.yml b/e2e-tests/proxysql-sidecar-res-limits/compare/service_side-car-proxysql-k122.yml index 519b8c7c1..1d4239518 100644 --- a/e2e-tests/proxysql-sidecar-res-limits/compare/service_side-car-proxysql-k122.yml +++ b/e2e-tests/proxysql-sidecar-res-limits/compare/service_side-car-proxysql-k122.yml @@ -25,6 +25,10 @@ spec: port: 33062 protocol: TCP targetPort: 33062 + - name: stats + port: 6070 + protocol: TCP + targetPort: 6070 selector: app.kubernetes.io/component: proxysql app.kubernetes.io/instance: side-car diff --git a/e2e-tests/proxysql-sidecar-res-limits/compare/service_side-car-proxysql.yml b/e2e-tests/proxysql-sidecar-res-limits/compare/service_side-car-proxysql.yml index a58a60036..fce3f4223 100644 --- a/e2e-tests/proxysql-sidecar-res-limits/compare/service_side-car-proxysql.yml +++ b/e2e-tests/proxysql-sidecar-res-limits/compare/service_side-car-proxysql.yml @@ -23,6 +23,10 @@ spec: port: 33062 protocol: TCP targetPort: 33062 + - name: stats + port: 6070 + protocol: TCP + targetPort: 6070 selector: app.kubernetes.io/component: proxysql app.kubernetes.io/instance: side-car diff --git a/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127-oc.yml b/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127-oc.yml index 626de8031..8635b63c4 100644 --- a/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127-oc.yml +++ b/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127-oc.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 100m diff --git a/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127.yml b/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127.yml index bc6d2a89d..42dcc78bd 100644 --- a/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127.yml +++ b/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 100m diff --git a/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-oc.yml b/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-oc.yml index 2225dbfe3..4c0ef8422 100644 --- a/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-oc.yml +++ b/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-oc.yml @@ -70,6 +70,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 100m diff --git a/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql.yml b/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql.yml index 1c6b8385a..d9774be4b 100644 --- a/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql.yml +++ b/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql.yml @@ -62,6 +62,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 100m diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-oc.yml b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-oc.yml index cee9bb735..52906aeec 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-oc.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-oc.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 100m diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes.yml b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes.yml index cee9bb735..52906aeec 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 100m diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-oc.yml b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-oc.yml index 3ff6b9b4c..8eb2d189e 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-oc.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-oc.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 100m diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql.yml b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql.yml index 3ff6b9b4c..8eb2d189e 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 100m diff --git a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127-oc.yml b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127-oc.yml index 30a9d4383..efbeff31a 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127-oc.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127-oc.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: ephemeral-storage: 1G diff --git a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127.yml b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127.yml index 3673ca381..996cc1722 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: ephemeral-storage: 1G diff --git a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml index 9d9979875..9e06e86f5 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: ephemeral-storage: 1G diff --git a/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml b/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml index d977aa36c..d1322051b 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: ephemeral-storage: 1G diff --git a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127-oc.yml b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127-oc.yml index 7a2b21cbc..e8e8bd6bf 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127-oc.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127-oc.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127.yml b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127.yml index 1fe08e71c..a7f2b9be3 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml index 3a6be7f92..de0c19d82 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml b/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml index 243f69b2f..4773a4559 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml @@ -73,6 +73,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File diff --git a/e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1170.yml b/e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1170.yml index 5b72198ae..a12d794bc 100644 --- a/e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1170.yml +++ b/e2e-tests/upgrade-consistency/compare/service_some-name-proxysql-1170.yml @@ -23,6 +23,10 @@ spec: port: 33062 protocol: TCP targetPort: 33062 + - name: stats + port: 6070 + protocol: TCP + targetPort: 6070 selector: app.kubernetes.io/component: proxysql app.kubernetes.io/instance: some-name diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1170-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1170-oc.yml index 43a9e2717..aac3a9735 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1170-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1170-oc.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1170.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1170.yml index fd94e821f..77730987f 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1170.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1170.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: limits: cpu: 700m diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-oc.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-oc.yml index 036b7ee05..910b15438 100644 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-oc.yml +++ b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-oc.yml @@ -82,6 +82,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml index 8691d5d17..a9bffebeb 100644 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml +++ b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml @@ -85,6 +85,9 @@ spec: - containerPort: 33060 name: mysqlx protocol: TCP + - containerPort: 8404 + name: stats + protocol: TCP readinessProbe: exec: command: diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-oc.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-oc.yml index 250720103..e4ac0ac31 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-oc.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-oc.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 600m diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml index 35250906a..b1a3405c1 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml @@ -84,6 +84,9 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP + - containerPort: 6070 + name: stats + protocol: TCP resources: requests: cpu: 600m diff --git a/pkg/pxc/app/statefulset/haproxy.go b/pkg/pxc/app/statefulset/haproxy.go index ce2caac6b..f8a6d7f57 100644 --- a/pkg/pxc/app/statefulset/haproxy.go +++ b/pkg/pxc/app/statefulset/haproxy.go @@ -143,6 +143,16 @@ func (c *HAProxy) AppContainer(spec *api.PodSpec, secrets string, cr *api.Percon }, ) + if cr.CompareVersionWith("1.17.0") >= 0 { + appc.Ports = append( + appc.Ports, + corev1.ContainerPort{ + ContainerPort: 8404, + Name: "stats", + }, + ) + } + rsCmd := "/opt/percona/haproxy_readiness_check.sh" lsCmd := "/opt/percona/haproxy_liveness_check.sh" if cr.CompareVersionWith("1.15.0") < 0 { diff --git a/pkg/pxc/app/statefulset/proxysql.go b/pkg/pxc/app/statefulset/proxysql.go index defe2eb6e..9619ace7b 100644 --- a/pkg/pxc/app/statefulset/proxysql.go +++ b/pkg/pxc/app/statefulset/proxysql.go @@ -119,6 +119,16 @@ func (c *Proxy) AppContainer(spec *api.PodSpec, secrets string, cr *api.PerconaX Resources: spec.Resources, } + if cr.CompareVersionWith("1.17.0") >= 0 { + appc.Ports = append( + appc.Ports, + corev1.ContainerPort{ + ContainerPort: 6070, + Name: "stats", + }, + ) + } + fvar := true appc.EnvFrom = []corev1.EnvFromSource{ { diff --git a/pkg/pxc/service.go b/pkg/pxc/service.go index fbba05b38..0be5cced2 100644 --- a/pkg/pxc/service.go +++ b/pkg/pxc/service.go @@ -224,6 +224,10 @@ func NewServiceProxySQL(cr *api.PerconaXtraDBCluster) *corev1.Service { Port: 3306, Name: "mysql", }, + { + Port: 33062, + Name: "mysql-admin", + }, }, Selector: naming.SelectorProxySQL(cr), LoadBalancerSourceRanges: loadBalancerSourceRanges, @@ -259,12 +263,12 @@ func NewServiceProxySQL(cr *api.PerconaXtraDBCluster) *corev1.Service { } } - if cr.CompareVersionWith("1.6.0") >= 0 { + if cr.CompareVersionWith("1.17.0") >= 0 { obj.Spec.Ports = append( obj.Spec.Ports, corev1.ServicePort{ - Port: 33062, - Name: "mysql-admin", + Port: 6070, + Name: "stats", }, ) } @@ -326,6 +330,16 @@ func NewServiceHAProxy(cr *api.PerconaXtraDBCluster) *corev1.Service { TargetPort: intstr.FromInt(3309), Name: "proxy-protocol", }, + { + Port: 33062, + TargetPort: intstr.FromInt(33062), + Name: "mysql-admin", + }, + { + Port: 33060, + TargetPort: intstr.FromInt(33060), + Name: "mysqlx", + }, }, Selector: naming.SelectorHAProxy(cr), LoadBalancerSourceRanges: loadBalancerSourceRanges, @@ -347,24 +361,13 @@ func NewServiceHAProxy(cr *api.PerconaXtraDBCluster) *corev1.Service { obj.Spec.ExternalTrafficPolicy = svcTrafficPolicyType } - if cr.CompareVersionWith("1.6.0") >= 0 { - obj.Spec.Ports = append( - obj.Spec.Ports, - corev1.ServicePort{ - Port: 33062, - TargetPort: intstr.FromInt(33062), - Name: "mysql-admin", - }, - ) - } - - if cr.CompareVersionWith("1.9.0") >= 0 { + if cr.CompareVersionWith("1.17.0") >= 0 { obj.Spec.Ports = append( obj.Spec.Ports, corev1.ServicePort{ - Port: 33060, - TargetPort: intstr.FromInt(33060), - Name: "mysqlx", + Port: 8404, + TargetPort: intstr.FromInt(8404), + Name: "stats", }, ) }