diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 01826e4097..87a0ca18bc 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -12577,7 +12577,7 @@ spec: type: object runtimeClassName: type: string - scheduler: + pxchandler: type: string schedulerName: type: string diff --git a/deploy/cr.yaml b/deploy/cr.yaml index 9320ea2aa6..4f14f0afd9 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -315,7 +315,7 @@ spec: gracePeriod: 30 proxysql: enabled: false - scheduler: percona + pxchandler: internal size: 3 image: perconalab/percona-xtradb-cluster-operator:main-proxysql # imagePullPolicy: Always diff --git a/deploy/crd.yaml b/deploy/crd.yaml index d4073938de..b585e98811 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -12577,7 +12577,7 @@ spec: type: object runtimeClassName: type: string - scheduler: + pxchandler: type: string schedulerName: type: string diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index 3f460d1df2..816d8b7126 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -12577,7 +12577,7 @@ spec: type: object runtimeClassName: type: string - scheduler: + pxchandler: type: string schedulerName: type: string diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml index 77e6fc794a..2989acc467 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml @@ -89,8 +89,8 @@ spec: secretKeyRef: key: monitor name: internal-custom - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: custom-env-vars-proxysql @@ -144,8 +144,8 @@ spec: secretKeyRef: key: monitor name: internal-custom - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: custom-env-vars-proxysql @@ -179,8 +179,8 @@ spec: secretKeyRef: key: monitor name: internal-custom - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: custom-env-vars-proxysql diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml index b43628a032..ff2eb1d094 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml @@ -89,8 +89,8 @@ spec: secretKeyRef: key: monitor name: internal-custom - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: custom-env-vars-proxysql @@ -144,8 +144,8 @@ spec: secretKeyRef: key: monitor name: internal-custom - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: custom-env-vars-proxysql @@ -179,8 +179,8 @@ spec: secretKeyRef: key: monitor name: internal-custom - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: custom-env-vars-proxysql diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml index bc9628386c..a817783dcb 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-hostname - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostname-env-vars-proxysql @@ -117,8 +117,8 @@ spec: secretKeyRef: key: monitor name: internal-hostname - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostname-env-vars-proxysql @@ -152,8 +152,8 @@ spec: secretKeyRef: key: monitor name: internal-hostname - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostname-env-vars-proxysql diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml index e4b124df61..260e666e3a 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-hostname - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostname-env-vars-proxysql @@ -117,8 +117,8 @@ spec: secretKeyRef: key: monitor name: internal-hostname - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostname-env-vars-proxysql @@ -152,8 +152,8 @@ spec: secretKeyRef: key: monitor name: internal-hostname - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostname-env-vars-proxysql diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml index f7f6a3a0d9..8a58f0f183 100644 --- a/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-region - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: region-env-vars-proxysql @@ -117,8 +117,8 @@ spec: secretKeyRef: key: monitor name: internal-region - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: region-env-vars-proxysql @@ -152,8 +152,8 @@ spec: secretKeyRef: key: monitor name: internal-region - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: region-env-vars-proxysql diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql.yml index f4737f0f97..1d92b9037e 100644 --- a/e2e-tests/affinity/compare/statefulset_region-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_region-proxysql.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-region - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: region-env-vars-proxysql @@ -117,8 +117,8 @@ spec: secretKeyRef: key: monitor name: internal-region - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: region-env-vars-proxysql @@ -152,8 +152,8 @@ spec: secretKeyRef: key: monitor name: internal-region - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: region-env-vars-proxysql diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml index 7cbb9772be..8d2858b929 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-zone - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: zone-env-vars-proxysql @@ -117,8 +117,8 @@ spec: secretKeyRef: key: monitor name: internal-zone - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: zone-env-vars-proxysql @@ -152,8 +152,8 @@ spec: secretKeyRef: key: monitor name: internal-zone - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: zone-env-vars-proxysql diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml index 63e53829ac..1f76b033d5 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-zone - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: zone-env-vars-proxysql @@ -117,8 +117,8 @@ spec: secretKeyRef: key: monitor name: internal-zone - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: zone-env-vars-proxysql @@ -152,8 +152,8 @@ spec: secretKeyRef: key: monitor name: internal-zone - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: zone-env-vars-proxysql diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-oc.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-oc.yml index bcbd21c91c..c03f5f0bac 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-oc.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-oc.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql @@ -119,8 +119,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql @@ -154,8 +154,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret-oc.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret-oc.yml index c78fd5cd51..7163edc751 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret-oc.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret-oc.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql @@ -119,8 +119,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql @@ -154,8 +154,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret.yml index 7c81601a2d..f879abf135 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql @@ -119,8 +119,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql @@ -154,8 +154,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql.yml index 944f7bc54f..89229accbf 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql @@ -119,8 +119,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql @@ -154,8 +154,8 @@ spec: secretKeyRef: key: monitor name: internal-haproxy - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: haproxy-env-vars-proxysql 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 f83cb83883..edfeee687e 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 @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql @@ -117,8 +117,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql @@ -152,8 +152,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql 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 95e9399b98..84187fb6c4 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql @@ -117,8 +117,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql @@ -152,8 +152,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql 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 648a3f9964..08da9f0f8f 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 @@ -183,8 +183,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql @@ -235,8 +235,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql @@ -270,8 +270,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql 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 3e280a5374..da898728cd 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml @@ -183,8 +183,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql @@ -235,8 +235,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql @@ -270,8 +270,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql 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 9522523219..ad605d9854 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml @@ -183,8 +183,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql @@ -235,8 +235,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql @@ -270,8 +270,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml index 809fd8ed0d..b3fb7a3ef5 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml @@ -183,8 +183,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql @@ -235,8 +235,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql @@ -270,8 +270,8 @@ spec: secretKeyRef: key: monitor name: internal-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-limits-env-vars-proxysql 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 5fb2ed7b59..5b067c1682 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 @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql @@ -100,8 +100,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql @@ -135,8 +135,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql 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 42ff41219c..cf654ed294 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 @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql @@ -100,8 +100,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql @@ -135,8 +135,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql 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 5fb2ed7b59..5b067c1682 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 @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql @@ -100,8 +100,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql @@ -135,8 +135,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql 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 42ff41219c..cf654ed294 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 @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql @@ -100,8 +100,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql @@ -135,8 +135,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests-no-limits - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-no-limits-env-vars-proxysql 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 a5c1e81887..21c47dd3be 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 @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql @@ -103,8 +103,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql @@ -138,8 +138,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql 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 0bdf3fa187..8b6677ac29 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased.yml @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql @@ -103,8 +103,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql @@ -138,8 +138,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql 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 1ebbf28aed..f701e9ff47 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-oc.yml @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql @@ -103,8 +103,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql @@ -138,8 +138,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml index eee85f3094..a10dfd0e20 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql @@ -103,8 +103,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql @@ -138,8 +138,8 @@ spec: secretKeyRef: key: monitor name: internal-no-requests - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: no-requests-env-vars-proxysql 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 643a41f82e..ad8b016ac7 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 @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-side-car - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: side-car-env-vars-proxysql @@ -103,8 +103,8 @@ spec: secretKeyRef: key: monitor name: internal-side-car - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: side-car-env-vars-proxysql @@ -144,8 +144,8 @@ spec: secretKeyRef: key: monitor name: internal-side-car - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: side-car-env-vars-proxysql 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 fd67861f4c..52eaeb40d9 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 @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-side-car - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: side-car-env-vars-proxysql @@ -103,8 +103,8 @@ spec: secretKeyRef: key: monitor name: internal-side-car - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: side-car-env-vars-proxysql @@ -144,8 +144,8 @@ spec: secretKeyRef: key: monitor name: internal-side-car - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: side-car-env-vars-proxysql diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-4-oc.yml b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-4-oc.yml index 507478c552..d1435bfbc7 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-4-oc.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-4-oc.yml @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql @@ -105,8 +105,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql @@ -140,8 +140,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql 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 3caa292250..fb6a6a8139 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 @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql @@ -105,8 +105,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql @@ -140,8 +140,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql 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 507478c552..d1435bfbc7 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 @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql @@ -105,8 +105,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql @@ -140,8 +140,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql 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 ade0a1eb84..48e624c157 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql.yml @@ -51,8 +51,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql @@ -105,8 +105,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql @@ -140,8 +140,8 @@ spec: secretKeyRef: key: monitor name: internal-sec-context - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: sec-context-env-vars-proxysql diff --git a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml index 4de3018533..d0c60a6248 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-emptydir - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: emptydir-env-vars-proxysql @@ -113,8 +113,8 @@ spec: secretKeyRef: key: monitor name: internal-emptydir - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: emptydir-env-vars-proxysql @@ -148,8 +148,8 @@ spec: secretKeyRef: key: monitor name: internal-emptydir - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: emptydir-env-vars-proxysql diff --git a/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml b/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml index 8fb5964214..a3d832f3f6 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-emptydir - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: emptydir-env-vars-proxysql @@ -113,8 +113,8 @@ spec: secretKeyRef: key: monitor name: internal-emptydir - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: emptydir-env-vars-proxysql @@ -148,8 +148,8 @@ spec: secretKeyRef: key: monitor name: internal-emptydir - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: emptydir-env-vars-proxysql diff --git a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml index 2ddd83f6b4..fbf2cb7afa 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-hostpath - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostpath-env-vars-proxysql @@ -111,8 +111,8 @@ spec: secretKeyRef: key: monitor name: internal-hostpath - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostpath-env-vars-proxysql @@ -146,8 +146,8 @@ spec: secretKeyRef: key: monitor name: internal-hostpath - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostpath-env-vars-proxysql diff --git a/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml b/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml index 9e050a62cd..ea0b20eeb9 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-hostpath - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostpath-env-vars-proxysql @@ -111,8 +111,8 @@ spec: secretKeyRef: key: monitor name: internal-hostpath - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostpath-env-vars-proxysql @@ -146,8 +146,8 @@ spec: secretKeyRef: key: monitor name: internal-hostpath - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: hostpath-env-vars-proxysql diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1120-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1120-oc.yml index bf3725d48a..3c0cd08b73 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1120-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1120-oc.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql @@ -117,8 +117,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql @@ -152,8 +152,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1120.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1120.yml index aa64918810..a937c33885 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1120.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1120.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql @@ -117,8 +117,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql @@ -152,8 +152,8 @@ spec: secretKeyRef: key: monitor name: internal-some-name - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: some-name-env-vars-proxysql 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 99db659ee9..ad8a27a345 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 @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-upgrade-proxysql - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: upgrade-proxysql-env-vars-proxysql @@ -114,8 +114,8 @@ spec: secretKeyRef: key: monitor name: internal-upgrade-proxysql - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: upgrade-proxysql-env-vars-proxysql @@ -149,8 +149,8 @@ spec: secretKeyRef: key: monitor name: internal-upgrade-proxysql - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: upgrade-proxysql-env-vars-proxysql 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 40626dd374..1d76ebc2c2 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml @@ -62,8 +62,8 @@ spec: secretKeyRef: key: monitor name: internal-upgrade-proxysql - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: upgrade-proxysql-env-vars-proxysql @@ -114,8 +114,8 @@ spec: secretKeyRef: key: monitor name: internal-upgrade-proxysql - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: upgrade-proxysql-env-vars-proxysql @@ -149,8 +149,8 @@ spec: secretKeyRef: key: monitor name: internal-upgrade-proxysql - - name: SCHEDULER - value: proxysql-admin + - name: PXC_HANDLER + value: internal envFrom: - secretRef: name: upgrade-proxysql-env-vars-proxysql diff --git a/pkg/apis/pxc/v1/pxc_types.go b/pkg/apis/pxc/v1/pxc_types.go index 2b51b6cc0b..af7659b751 100644 --- a/pkg/apis/pxc/v1/pxc_types.go +++ b/pkg/apis/pxc/v1/pxc_types.go @@ -431,7 +431,7 @@ type HAProxySpec struct { type ProxySQLSpec struct { PodSpec `json:",inline"` // +kubebuilder:validation:Enum={percona,proxysql-admin} - Scheduler string `json:"scheduler,omitempty"` + PXCHandler string `json:"pxchandler,omitempty"` } type PodDisruptionBudgetSpec struct { @@ -793,8 +793,8 @@ func (cr *PerconaXtraDBCluster) CheckNSetDefaults(serverVersion *version.ServerV c.ProxySQL.ImagePullPolicy = corev1.PullAlways } - if cr.CompareVersionWith("1.12.0") >= 0 && len(c.ProxySQL.Scheduler) == 0 { - c.ProxySQL.Scheduler = "proxysql-admin" + if cr.CompareVersionWith("1.12.0") >= 0 && len(c.ProxySQL.PXCHandler) == 0 { + c.ProxySQL.PXCHandler = "internal" } c.ProxySQL.VolumeSpec.reconcileOpts() diff --git a/pkg/controller/pxc/upgrade.go b/pkg/controller/pxc/upgrade.go index 32e1287716..c52f600b26 100644 --- a/pkg/controller/pxc/upgrade.go +++ b/pkg/controller/pxc/upgrade.go @@ -354,7 +354,7 @@ func (r *ReconcilePerconaXtraDBCluster) applyNWait(cr *api.PerconaXtraDBCluster, return errors.Wrap(err, "failed to wait pxc sync") } - if cr.Spec.ProxySQL.Scheduler == "proxysql-admin" { + if cr.Spec.ProxySQL.PXCHandler == "internal" { if err := r.waitHostgroups(cr, sfs.Name, pod, waitLimit, logger); err != nil { return errors.Wrap(err, "failed to wait hostgroups status") } diff --git a/pkg/pxc/app/statefulset/proxysql.go b/pkg/pxc/app/statefulset/proxysql.go index 7031a48fcc..9c14c9de4f 100644 --- a/pkg/pxc/app/statefulset/proxysql.go +++ b/pkg/pxc/app/statefulset/proxysql.go @@ -147,8 +147,8 @@ func (c *Proxy) AppContainer(spec *api.PodSpec, secrets string, cr *api.PerconaX if cr.CompareVersionWith("1.12.0") >= 0 { appc.Env = append(appc.Env, corev1.EnvVar{ - Name: "SCHEDULER", - Value: cr.Spec.ProxySQL.Scheduler, + Name: "PXC_HANDLER", + Value: cr.Spec.ProxySQL.PXCHandler, }) } @@ -242,7 +242,7 @@ func (c *Proxy) SidecarContainers(spec *api.PodSpec, secrets string, cr *api.Per }, } - if cr.CompareVersionWith("1.12.0") >= 0 && cr.Spec.ProxySQL.Scheduler == "percona" { + if cr.CompareVersionWith("1.12.0") >= 0 && cr.Spec.ProxySQL.PXCHandler == "scheduler" { volMounts := []corev1.VolumeMount{ { Name: "ssl", @@ -257,12 +257,12 @@ func (c *Proxy) SidecarContainers(spec *api.PodSpec, secrets string, cr *api.Per } if cr.CompareVersionWith("1.12.0") >= 0 { pxcMonit.Env = append(pxcMonit.Env, corev1.EnvVar{ - Name: "SCHEDULER", - Value: cr.Spec.ProxySQL.Scheduler, + Name: "PXC_HANDLER", + Value: cr.Spec.ProxySQL.PXCHandler, }) proxysqlMonit.Env = append(proxysqlMonit.Env, corev1.EnvVar{ - Name: "SCHEDULER", - Value: cr.Spec.ProxySQL.Scheduler, + Name: "PXC_HANDLER", + Value: cr.Spec.ProxySQL.PXCHandler, }) } if cr.Spec.AllowUnsafeConfig && (cr.Spec.TLS == nil || cr.Spec.TLS.IssuerConf == nil) {