diff --git a/e2e-tests/functions b/e2e-tests/functions index 7af44809c1..72cf0dcb89 100755 --- a/e2e-tests/functions +++ b/e2e-tests/functions @@ -2,7 +2,8 @@ GIT_COMMIT=$(git rev-parse HEAD) GIT_BRANCH=${VERSION:-$(git rev-parse --abbrev-ref HEAD | sed -e 's^/^-^g; s^[.]^-^g;' | tr '[:upper:]' '[:lower:]')} -IMAGE="perconalab/percona-xtradb-cluster-operator:${GIT_BRANCH}" +#IMAGE="perconalab/percona-xtradb-cluster-operator:${GIT_BRANCH}" +IMAGE="perconalab/percona-xtradb-cluster-operator:master" tmp_dir=$(mktemp -d) sed=$(which gsed || which sed) date=$(which gdate || which date) diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-proxysql-increased.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml similarity index 52% rename from e2e-tests/limits/compare/statefulset_no-limits-pxc-proxysql-increased.yml rename to e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml index 4becdddd83..bb2cc8a432 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc-proxysql-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: generation: 2 - name: no-limits-pxc-proxysql + name: no-limits-proxysql ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-limits - component: no-limits-pxc-proxysql - serviceName: no-limits-pxc-proxysql + component: no-limits-proxysql + serviceName: no-limits-proxysql-headless template: metadata: labels: app: pxc cluster: no-limits - component: no-limits-pxc-proxysql + component: no-limits-proxysql spec: containers: - env: @@ -39,20 +39,11 @@ spec: secretKeyRef: key: proxyadmin name: my-cluster-secrets - - name: MYSQL_PROXY_USER - value: proxyuser - - name: MYSQL_PROXY_PASSWORD - valueFrom: - secretKeyRef: - key: proxyuser - name: my-cluster-secrets - name: MONITOR_PASSWORD valueFrom: secretKeyRef: key: monitor name: my-cluster-secrets - - name: PXCSERVICE - value: no-limits-pxc-nodes imagePullPolicy: Always name: proxysql ports: @@ -72,6 +63,64 @@ spec: - mountPath: /var/lib/proxysql name: proxydata subPath: data + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_pxc_nodes.sh + - -service=$(PXC_SERVICE) + env: + - name: PXC_SERVICE + value: no-limits-pxc + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: pxc-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_proxysql_nodes.sh + - -service=$(PROXYSQL_SERVICE) + env: + - name: PROXYSQL_SERVICE + value: no-limits-proxysql-headless + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: proxysql-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File dnsPolicy: ClusterFirst restartPolicy: Always schedulerName: default-scheduler @@ -92,6 +141,6 @@ spec: - ReadWriteOnce resources: requests: - storage: 2Gi + storage: 6Gi status: phase: Pending diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml similarity index 52% rename from e2e-tests/limits/compare/statefulset_no-limits-pxc-proxysql.yml rename to e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml index c0248ce6d9..c381cf8b76 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc-proxysql.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: generation: 1 - name: no-limits-pxc-proxysql + name: no-limits-proxysql ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-limits - component: no-limits-pxc-proxysql - serviceName: no-limits-pxc-proxysql + component: no-limits-proxysql + serviceName: no-limits-proxysql-headless template: metadata: labels: app: pxc cluster: no-limits - component: no-limits-pxc-proxysql + component: no-limits-proxysql spec: containers: - env: @@ -39,20 +39,11 @@ spec: secretKeyRef: key: proxyadmin name: my-cluster-secrets - - name: MYSQL_PROXY_USER - value: proxyuser - - name: MYSQL_PROXY_PASSWORD - valueFrom: - secretKeyRef: - key: proxyuser - name: my-cluster-secrets - name: MONITOR_PASSWORD valueFrom: secretKeyRef: key: monitor name: my-cluster-secrets - - name: PXCSERVICE - value: no-limits-pxc-nodes imagePullPolicy: Always name: proxysql ports: @@ -72,6 +63,64 @@ spec: - mountPath: /var/lib/proxysql name: proxydata subPath: data + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_pxc_nodes.sh + - -service=$(PXC_SERVICE) + env: + - name: PXC_SERVICE + value: no-limits-pxc + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: pxc-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_proxysql_nodes.sh + - -service=$(PROXYSQL_SERVICE) + env: + - name: PROXYSQL_SERVICE + value: no-limits-proxysql-headless + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: proxysql-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File dnsPolicy: ClusterFirst restartPolicy: Always schedulerName: default-scheduler @@ -92,6 +141,6 @@ spec: - ReadWriteOnce resources: requests: - storage: 2Gi + storage: 6Gi status: phase: Pending diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-node-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-oc.yml similarity index 92% rename from e2e-tests/limits/compare/statefulset_no-limits-pxc-node-increased-oc.yml rename to e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-oc.yml index e94783b2ff..e1bd612138 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc-node-increased-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-oc.yml @@ -5,8 +5,8 @@ metadata: labels: app: pxc cluster: no-limits - component: no-limits-pxc-nodes - name: no-limits-pxc-node + component: no-limits-pxc + name: no-limits-pxc ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -20,14 +20,14 @@ spec: matchLabels: app: pxc cluster: no-limits - component: no-limits-pxc-nodes - serviceName: no-limits-pxc-nodes + component: no-limits-pxc + serviceName: no-limits-pxc template: metadata: labels: app: pxc cluster: no-limits - component: no-limits-pxc-nodes + component: no-limits-pxc spec: containers: - env: @@ -61,7 +61,7 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 - name: node + name: pxc ports: - containerPort: 3306 name: mysql @@ -96,7 +96,7 @@ spec: volumes: - configMap: defaultMode: 420 - name: no-limits-pxc-nodes + name: no-limits-pxc optional: true name: config-volume updateStrategy: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-node-increased.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased.yml similarity index 93% rename from e2e-tests/limits/compare/statefulset_no-limits-pxc-node-increased.yml rename to e2e-tests/limits/compare/statefulset_no-limits-pxc-increased.yml index 2b41a20f41..0a93f155f1 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc-node-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: generation: 2 - name: no-limits-pxc-node + name: no-limits-pxc ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-limits - component: no-limits-pxc-nodes - serviceName: no-limits-pxc-nodes + component: no-limits-pxc + serviceName: no-limits-pxc template: metadata: labels: app: pxc cluster: no-limits - component: no-limits-pxc-nodes + component: no-limits-pxc spec: containers: - env: @@ -57,7 +57,7 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 - name: node + name: pxc ports: - containerPort: 3306 name: mysql @@ -93,7 +93,7 @@ spec: volumes: - configMap: defaultMode: 420 - name: no-limits-pxc-nodes + name: no-limits-pxc optional: true name: config-volume updateStrategy: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-node-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-oc.yml similarity index 92% rename from e2e-tests/limits/compare/statefulset_no-limits-pxc-node-oc.yml rename to e2e-tests/limits/compare/statefulset_no-limits-pxc-oc.yml index b8038726d0..bdf7e4c583 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc-node-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-pxc-oc.yml @@ -5,8 +5,8 @@ metadata: labels: app: pxc cluster: no-limits - component: no-limits-pxc-nodes - name: no-limits-pxc-node + component: no-limits-pxc + name: no-limits-pxc ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -20,14 +20,14 @@ spec: matchLabels: app: pxc cluster: no-limits - component: no-limits-pxc-nodes - serviceName: no-limits-pxc-nodes + component: no-limits-pxc + serviceName: no-limits-pxc template: metadata: labels: app: pxc cluster: no-limits - component: no-limits-pxc-nodes + component: no-limits-pxc spec: containers: - env: @@ -61,7 +61,7 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 - name: node + name: pxc ports: - containerPort: 3306 name: mysql @@ -96,7 +96,7 @@ spec: volumes: - configMap: defaultMode: 420 - name: no-limits-pxc-nodes + name: no-limits-pxc optional: true name: config-volume updateStrategy: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-node.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc.yml similarity index 93% rename from e2e-tests/limits/compare/statefulset_no-limits-pxc-node.yml rename to e2e-tests/limits/compare/statefulset_no-limits-pxc.yml index 14e254cda4..5f983e58ff 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc-node.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-pxc.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: generation: 1 - name: no-limits-pxc-node + name: no-limits-pxc ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-limits - component: no-limits-pxc-nodes - serviceName: no-limits-pxc-nodes + component: no-limits-pxc + serviceName: no-limits-pxc template: metadata: labels: app: pxc cluster: no-limits - component: no-limits-pxc-nodes + component: no-limits-pxc spec: containers: - env: @@ -57,7 +57,7 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 - name: node + name: pxc ports: - containerPort: 3306 name: mysql @@ -93,7 +93,7 @@ spec: volumes: - configMap: defaultMode: 420 - name: no-limits-pxc-nodes + name: no-limits-pxc optional: true name: config-volume updateStrategy: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased.yml similarity index 50% rename from e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-proxysql.yml rename to e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased.yml index 441a8f986d..6cd28b42a6 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-proxysql.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased.yml @@ -1,8 +1,8 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 1 - name: no-requests-no-limits-pxc-proxysql + generation: 2 + name: no-requests-no-limits-proxysql ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-requests-no-limits - component: no-requests-no-limits-pxc-proxysql - serviceName: no-requests-no-limits-pxc-proxysql + component: no-requests-no-limits-proxysql + serviceName: no-requests-no-limits-proxysql-headless template: metadata: labels: app: pxc cluster: no-requests-no-limits - component: no-requests-no-limits-pxc-proxysql + component: no-requests-no-limits-proxysql spec: containers: - env: @@ -39,20 +39,11 @@ spec: secretKeyRef: key: proxyadmin name: my-cluster-secrets - - name: MYSQL_PROXY_USER - value: proxyuser - - name: MYSQL_PROXY_PASSWORD - valueFrom: - secretKeyRef: - key: proxyuser - name: my-cluster-secrets - name: MONITOR_PASSWORD valueFrom: secretKeyRef: key: monitor name: my-cluster-secrets - - name: PXCSERVICE - value: no-requests-no-limits-pxc-nodes imagePullPolicy: Always name: proxysql ports: @@ -62,13 +53,74 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP - resources: {} + resources: + requests: + cpu: 600m + memory: 1G terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: - mountPath: /var/lib/proxysql name: proxydata subPath: data + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_pxc_nodes.sh + - -service=$(PXC_SERVICE) + env: + - name: PXC_SERVICE + value: no-requests-no-limits-pxc + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: pxc-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_proxysql_nodes.sh + - -service=$(PROXYSQL_SERVICE) + env: + - name: PROXYSQL_SERVICE + value: no-requests-no-limits-proxysql-headless + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: proxysql-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File dnsPolicy: ClusterFirst restartPolicy: Always schedulerName: default-scheduler @@ -89,6 +141,6 @@ spec: - ReadWriteOnce resources: requests: - storage: 2Gi + storage: 6Gi status: phase: Pending diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-proxysql-increased.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql.yml similarity index 50% rename from e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-proxysql-increased.yml rename to e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql.yml index 441a8f986d..bf517b4199 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-proxysql-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: generation: 1 - name: no-requests-no-limits-pxc-proxysql + name: no-requests-no-limits-proxysql ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-requests-no-limits - component: no-requests-no-limits-pxc-proxysql - serviceName: no-requests-no-limits-pxc-proxysql + component: no-requests-no-limits-proxysql + serviceName: no-requests-no-limits-proxysql-headless template: metadata: labels: app: pxc cluster: no-requests-no-limits - component: no-requests-no-limits-pxc-proxysql + component: no-requests-no-limits-proxysql spec: containers: - env: @@ -39,20 +39,11 @@ spec: secretKeyRef: key: proxyadmin name: my-cluster-secrets - - name: MYSQL_PROXY_USER - value: proxyuser - - name: MYSQL_PROXY_PASSWORD - valueFrom: - secretKeyRef: - key: proxyuser - name: my-cluster-secrets - name: MONITOR_PASSWORD valueFrom: secretKeyRef: key: monitor name: my-cluster-secrets - - name: PXCSERVICE - value: no-requests-no-limits-pxc-nodes imagePullPolicy: Always name: proxysql ports: @@ -62,13 +53,74 @@ spec: - containerPort: 6032 name: proxyadm protocol: TCP - resources: {} + resources: + requests: + cpu: 300m + memory: 500M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: - mountPath: /var/lib/proxysql name: proxydata subPath: data + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_pxc_nodes.sh + - -service=$(PXC_SERVICE) + env: + - name: PXC_SERVICE + value: no-requests-no-limits-pxc + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: pxc-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_proxysql_nodes.sh + - -service=$(PROXYSQL_SERVICE) + env: + - name: PROXYSQL_SERVICE + value: no-requests-no-limits-proxysql-headless + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: proxysql-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File dnsPolicy: ClusterFirst restartPolicy: Always schedulerName: default-scheduler @@ -89,6 +141,6 @@ spec: - ReadWriteOnce resources: requests: - storage: 2Gi + storage: 6Gi status: phase: Pending diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-node-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased-oc.yml similarity index 100% rename from e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-node-increased-oc.yml rename to e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased-oc.yml diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-node.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased.yml similarity index 88% rename from e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-node.yml rename to e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased.yml index 70b85170da..bb6b73ae17 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-node.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased.yml @@ -1,8 +1,8 @@ apiVersion: apps/v1 kind: StatefulSet metadata: - generation: 1 - name: no-requests-no-limits-pxc-node + generation: 2 + name: no-requests-no-limits-pxc ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-requests-no-limits - component: no-requests-no-limits-pxc-nodes - serviceName: no-requests-no-limits-pxc-nodes + component: no-requests-no-limits-pxc + serviceName: no-requests-no-limits-pxc template: metadata: labels: app: pxc cluster: no-requests-no-limits - component: no-requests-no-limits-pxc-nodes + component: no-requests-no-limits-pxc spec: containers: - env: @@ -57,7 +57,7 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 - name: node + name: pxc ports: - containerPort: 3306 name: mysql @@ -71,7 +71,10 @@ spec: periodSeconds: 30 successThreshold: 1 timeoutSeconds: 15 - resources: {} + resources: + requests: + cpu: 600m + memory: 1G terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: @@ -90,7 +93,7 @@ spec: volumes: - configMap: defaultMode: 420 - name: no-requests-no-limits-pxc-nodes + name: no-requests-no-limits-pxc optional: true name: config-volume updateStrategy: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-node-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-oc.yml similarity index 100% rename from e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-node-oc.yml rename to e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-oc.yml diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-node-increased.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc.yml similarity index 89% rename from e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-node-increased.yml rename to e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc.yml index 70b85170da..d5f08b69d8 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-node-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: generation: 1 - name: no-requests-no-limits-pxc-node + name: no-requests-no-limits-pxc ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-requests-no-limits - component: no-requests-no-limits-pxc-nodes - serviceName: no-requests-no-limits-pxc-nodes + component: no-requests-no-limits-pxc + serviceName: no-requests-no-limits-pxc template: metadata: labels: app: pxc cluster: no-requests-no-limits - component: no-requests-no-limits-pxc-nodes + component: no-requests-no-limits-pxc spec: containers: - env: @@ -57,7 +57,7 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 - name: node + name: pxc ports: - containerPort: 3306 name: mysql @@ -71,7 +71,10 @@ spec: periodSeconds: 30 successThreshold: 1 timeoutSeconds: 15 - resources: {} + resources: + requests: + cpu: 300m + memory: 500M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: @@ -90,7 +93,7 @@ spec: volumes: - configMap: defaultMode: 420 - name: no-requests-no-limits-pxc-nodes + name: no-requests-no-limits-pxc optional: true name: config-volume updateStrategy: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-proxysql-increased.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased.yml similarity index 51% rename from e2e-tests/limits/compare/statefulset_no-requests-pxc-proxysql-increased.yml rename to e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased.yml index d3b9a928a3..85cb716672 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-proxysql-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: generation: 2 - name: no-requests-pxc-proxysql + name: no-requests-proxysql ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-requests - component: no-requests-pxc-proxysql - serviceName: no-requests-pxc-proxysql + component: no-requests-proxysql + serviceName: no-requests-proxysql-headless template: metadata: labels: app: pxc cluster: no-requests - component: no-requests-pxc-proxysql + component: no-requests-proxysql spec: containers: - env: @@ -39,20 +39,11 @@ spec: secretKeyRef: key: proxyadmin name: my-cluster-secrets - - name: MYSQL_PROXY_USER - value: proxyuser - - name: MYSQL_PROXY_PASSWORD - valueFrom: - secretKeyRef: - key: proxyuser - name: my-cluster-secrets - name: MONITOR_PASSWORD valueFrom: secretKeyRef: key: monitor name: my-cluster-secrets - - name: PXCSERVICE - value: no-requests-pxc-nodes imagePullPolicy: Always name: proxysql ports: @@ -72,6 +63,64 @@ spec: - mountPath: /var/lib/proxysql name: proxydata subPath: data + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_pxc_nodes.sh + - -service=$(PXC_SERVICE) + env: + - name: PXC_SERVICE + value: no-requests-pxc + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: pxc-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_proxysql_nodes.sh + - -service=$(PROXYSQL_SERVICE) + env: + - name: PROXYSQL_SERVICE + value: no-requests-proxysql-headless + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: proxysql-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File dnsPolicy: ClusterFirst restartPolicy: Always schedulerName: default-scheduler @@ -91,7 +140,12 @@ spec: accessModes: - ReadWriteOnce resources: + limits: + cpu: 700m + memory: 1G requests: - storage: 2Gi + cpu: 600m + memory: 1G + storage: 6Gi status: phase: Pending diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml similarity index 51% rename from e2e-tests/limits/compare/statefulset_no-requests-pxc-proxysql.yml rename to e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml index 344012a6bc..bb857c9afc 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-proxysql.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: generation: 1 - name: no-requests-pxc-proxysql + name: no-requests-proxysql ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-requests - component: no-requests-pxc-proxysql - serviceName: no-requests-pxc-proxysql + component: no-requests-proxysql + serviceName: no-requests-proxysql-headless template: metadata: labels: app: pxc cluster: no-requests - component: no-requests-pxc-proxysql + component: no-requests-proxysql spec: containers: - env: @@ -39,20 +39,11 @@ spec: secretKeyRef: key: proxyadmin name: my-cluster-secrets - - name: MYSQL_PROXY_USER - value: proxyuser - - name: MYSQL_PROXY_PASSWORD - valueFrom: - secretKeyRef: - key: proxyuser - name: my-cluster-secrets - name: MONITOR_PASSWORD valueFrom: secretKeyRef: key: monitor name: my-cluster-secrets - - name: PXCSERVICE - value: no-requests-pxc-nodes imagePullPolicy: Always name: proxysql ports: @@ -72,6 +63,64 @@ spec: - mountPath: /var/lib/proxysql name: proxydata subPath: data + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_pxc_nodes.sh + - -service=$(PXC_SERVICE) + env: + - name: PXC_SERVICE + value: no-requests-pxc + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: pxc-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + - args: + - /usr/bin/peer-list + - -on-change=/usr/bin/add_proxysql_nodes.sh + - -service=$(PROXYSQL_SERVICE) + env: + - name: PROXYSQL_SERVICE + value: no-requests-proxysql-headless + - name: MYSQL_ROOT_PASSWORD + valueFrom: + secretKeyRef: + key: root + name: my-cluster-secrets + - name: PROXY_ADMIN_USER + value: proxyadmin + - name: PROXY_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + key: proxyadmin + name: my-cluster-secrets + - name: MONITOR_PASSWORD + valueFrom: + secretKeyRef: + key: monitor + name: my-cluster-secrets + imagePullPolicy: Always + name: proxysql-monit + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File dnsPolicy: ClusterFirst restartPolicy: Always schedulerName: default-scheduler @@ -91,7 +140,12 @@ spec: accessModes: - ReadWriteOnce resources: + limits: + cpu: 700m + memory: 1G requests: - storage: 2Gi + cpu: 600m + memory: 1G + storage: 6Gi status: phase: Pending diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-node-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-oc.yml similarity index 91% rename from e2e-tests/limits/compare/statefulset_no-requests-pxc-node-increased-oc.yml rename to e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-oc.yml index 81ee1cb82c..7e902305e0 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-node-increased-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-oc.yml @@ -5,8 +5,8 @@ metadata: labels: app: pxc cluster: no-requests - component: no-requests-pxc-nodes - name: no-requests-pxc-node + component: no-requests-pxc + name: no-requests-pxc ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -20,14 +20,14 @@ spec: matchLabels: app: pxc cluster: no-requests - component: no-requests-pxc-nodes - serviceName: no-requests-pxc-nodes + component: no-requests-pxc + serviceName: no-requests-pxc template: metadata: labels: app: pxc cluster: no-requests - component: no-requests-pxc-nodes + component: no-requests-pxc spec: containers: - env: @@ -61,7 +61,7 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 - name: node + name: pxc ports: - containerPort: 3306 name: mysql @@ -96,7 +96,7 @@ spec: volumes: - configMap: defaultMode: 420 - name: no-requests-pxc-nodes + name: no-requests-pxc optional: true name: config-volume updateStrategy: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-node-increased.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased.yml similarity index 92% rename from e2e-tests/limits/compare/statefulset_no-requests-pxc-node-increased.yml rename to e2e-tests/limits/compare/statefulset_no-requests-pxc-increased.yml index 295231df36..0f16bf21ae 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-node-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: generation: 2 - name: no-requests-pxc-node + name: no-requests-pxc ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-requests - component: no-requests-pxc-nodes - serviceName: no-requests-pxc-nodes + component: no-requests-pxc + serviceName: no-requests-pxc template: metadata: labels: app: pxc cluster: no-requests - component: no-requests-pxc-nodes + component: no-requests-pxc spec: containers: - env: @@ -57,7 +57,7 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 - name: node + name: pxc ports: - containerPort: 3306 name: mysql @@ -93,7 +93,7 @@ spec: volumes: - configMap: defaultMode: 420 - name: no-requests-pxc-nodes + name: no-requests-pxc optional: true name: config-volume updateStrategy: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-node-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc-oc.yml similarity index 100% rename from e2e-tests/limits/compare/statefulset_no-requests-pxc-node-oc.yml rename to e2e-tests/limits/compare/statefulset_no-requests-pxc-oc.yml diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-node.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc.yml similarity index 92% rename from e2e-tests/limits/compare/statefulset_no-requests-pxc-node.yml rename to e2e-tests/limits/compare/statefulset_no-requests-pxc.yml index 4fc6169b2e..c2015027ac 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-node.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc.yml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: generation: 1 - name: no-requests-pxc-node + name: no-requests-pxc ownerReferences: - apiVersion: pxc.percona.com/v1alpha1 controller: true @@ -16,14 +16,14 @@ spec: matchLabels: app: pxc cluster: no-requests - component: no-requests-pxc-nodes - serviceName: no-requests-pxc-nodes + component: no-requests-pxc + serviceName: no-requests-pxc template: metadata: labels: app: pxc cluster: no-requests - component: no-requests-pxc-nodes + component: no-requests-pxc spec: containers: - env: @@ -57,7 +57,7 @@ spec: periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 - name: node + name: pxc ports: - containerPort: 3306 name: mysql @@ -93,7 +93,7 @@ spec: volumes: - configMap: defaultMode: 420 - name: no-requests-pxc-nodes + name: no-requests-pxc optional: true name: config-volume updateStrategy: diff --git a/e2e-tests/limits/conf/no-limits-pxc.yml b/e2e-tests/limits/conf/no-limits-pxc.yml index bd624c029a..b469cd0a4b 100644 --- a/e2e-tests/limits/conf/no-limits-pxc.yml +++ b/e2e-tests/limits/conf/no-limits-pxc.yml @@ -12,8 +12,16 @@ spec: memory: 500M cpu: 300m volumeSpec: - accessModes: [ "ReadWriteOnce" ] - size: 6Gi + emptyDir: {} +# hostPath: +# path: /data +# type: Directory + persistentVolumeClaim: +# storageClassName: standard +# accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 6Gi affinity: antiAffinityTopologyKey: none proxysql: @@ -25,9 +33,16 @@ spec: memory: 500M cpu: 300m volumeSpec: - # storageClass: standard - accessModes: [ "ReadWriteOnce" ] - size: 2Gi + emptyDir: {} +# hostPath: +# path: /data +# type: Directory + persistentVolumeClaim: +# storageClassName: standard +# accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 6Gi affinity: antiAffinityTopologyKey: none pmm: diff --git a/e2e-tests/limits/conf/no-requests-no-limits-pxc.yml b/e2e-tests/limits/conf/no-requests-no-limits-pxc.yml index d6877f50e5..7795c9660b 100644 --- a/e2e-tests/limits/conf/no-requests-no-limits-pxc.yml +++ b/e2e-tests/limits/conf/no-requests-no-limits-pxc.yml @@ -7,19 +7,42 @@ spec: pxc: size: 3 image: perconalab/pxc-openshift:0.2.0 + resources: + requests: + memory: 500M + cpu: 300m volumeSpec: - accessModes: [ "ReadWriteOnce" ] - size: 6Gi + emptyDir: {} +# hostPath: +# path: /data +# type: Directory + persistentVolumeClaim: +# storageClassName: standard +# accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 6Gi affinity: antiAffinityTopologyKey: none proxysql: enabled: true size: 1 image: perconalab/proxysql-openshift:0.2.0 + resources: + requests: + memory: 500M + cpu: 300m volumeSpec: - # storageClass: standard - accessModes: [ "ReadWriteOnce" ] - size: 2Gi + emptyDir: {} +# hostPath: +# path: /data +# type: Directory + persistentVolumeClaim: +# storageClassName: standard +# accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 6Gi affinity: antiAffinityTopologyKey: none pmm: diff --git a/e2e-tests/limits/conf/no-requests-pxc.yml b/e2e-tests/limits/conf/no-requests-pxc.yml index 454dc69110..b4fed6d018 100644 --- a/e2e-tests/limits/conf/no-requests-pxc.yml +++ b/e2e-tests/limits/conf/no-requests-pxc.yml @@ -12,8 +12,16 @@ spec: memory: 500M cpu: 300m volumeSpec: - accessModes: [ "ReadWriteOnce" ] - size: 6Gi + emptyDir: {} +# hostPath: +# path: /data +# type: Directory + persistentVolumeClaim: +# storageClassName: standard +# accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 6Gi affinity: antiAffinityTopologyKey: none proxysql: @@ -25,9 +33,21 @@ spec: memory: 500M cpu: 300m volumeSpec: - # storageClass: standard - accessModes: [ "ReadWriteOnce" ] - size: 2Gi + emptyDir: {} +# hostPath: +# path: /data +# type: Directory + persistentVolumeClaim: +# storageClassName: standard + accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 6Gi + memory: 1G + cpu: 600m + limits: + memory: 1G + cpu: 700m affinity: antiAffinityTopologyKey: none pmm: diff --git a/e2e-tests/limits/conf/no-storage-pxc.yml b/e2e-tests/limits/conf/no-storage-pxc.yml index 9750d8342d..a8ebafd370 100644 --- a/e2e-tests/limits/conf/no-storage-pxc.yml +++ b/e2e-tests/limits/conf/no-storage-pxc.yml @@ -8,7 +8,16 @@ spec: size: 3 image: perconalab/pxc-openshift:0.2.0 volumeSpec: - accessModes: [ "ReadWriteOnce" ] +# emptyDir: {} +# hostPath: +# path: /data +# type: Directory +# persistentVolumeClaim: +# storageClassName: standard + accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 6Gi affinity: antiAffinityTopologyKey: none proxysql: @@ -16,7 +25,16 @@ spec: size: 1 image: perconalab/proxysql-openshift:0.2.0 volumeSpec: - accessModes: [ "ReadWriteOnce" ] +# emptyDir: {} +# hostPath: +# path: /data +# type: Directory +# persistentVolumeClaim: +# storageClassName: standard + accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 6Gi affinity: antiAffinityTopologyKey: none pmm: diff --git a/e2e-tests/limits/run b/e2e-tests/limits/run index 15d663a174..217e8683d8 100755 --- a/e2e-tests/limits/run +++ b/e2e-tests/limits/run @@ -11,17 +11,17 @@ check_cr_config() { # apply cr config kubectl apply \ - -f $test_dir/conf/$cluster.yml + -f $test_dir/conf/$cluster-pxc.yml # check if at least 1 Pod started - wait_for_running $cluster-node 1 + wait_for_running $cluster-pxc 1 # check if statefulset created with expected config - compare_kubectl statefulset/$cluster-node + compare_kubectl statefulset/$cluster-pxc compare_kubectl statefulset/$cluster-proxysql # change resources - cat $test_dir/conf/$cluster.yml \ + cat $test_dir/conf/$cluster-pxc.yml \ | sed -e 's/300m/600m/' \ | sed -e 's/500M/1G/' \ | sed -e 's/0.5G/1G/' \ @@ -29,12 +29,12 @@ check_cr_config() { sleep 2 # check if statefulset was updated with expected config - compare_kubectl statefulset/$cluster-node "-increased" + compare_kubectl statefulset/$cluster-pxc "-increased" compare_kubectl statefulset/$cluster-proxysql "-increased" # delete cluster kubectl delete \ - -f $test_dir/conf/$cluster.yml + -f $test_dir/conf/$cluster-pxc.yml } no_storage() { @@ -44,9 +44,10 @@ no_storage() { kubectl apply \ -f $test_dir/conf/$cluster.yml + # check operator logs kubectl logs $(get_operator_pod) \ - | grep "volume.Size can't be empty" - + | grep "volume.resources.storage can't be empty" + # delete cluster kubectl delete \ -f $test_dir/conf/$cluster.yml @@ -58,13 +59,13 @@ main() { kubectl apply -f $conf_dir/secrets.yml desc 'check if possible to create cluster without CPU/Memory limits' - check_cr_config "no-limits-pxc" + check_cr_config "no-limits" desc 'check if possible to create cluster without CPU/Memory requests' - check_cr_config "no-requests-pxc" + check_cr_config "no-requests" desc 'check if possible to create cluster without CPU/Memory requests and limits' - check_cr_config "no-requests-no-limits-pxc" + check_cr_config "no-requests-no-limits" desc 'check if possible to create cluster without storage size' no_storage