Fix limits test (percona#99)

dcaputo-harmoni · Mar 18, 2019 · 4c410dd · 4c410dd
1 parent 687ea93
commit 4c410dd
Show file tree

Hide file tree

Showing 24 changed files with 570 additions and 176 deletions.
diff --git 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/...lset_no-limits-pxc-proxysql-increased.yml → ...tefulset_no-limits-proxysql-increased.yml b/...lset_no-limits-pxc-proxysql-increased.yml → ...tefulset_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/...re/statefulset_no-limits-pxc-proxysql.yml → ...ompare/statefulset_no-limits-proxysql.yml b/...re/statefulset_no-limits-pxc-proxysql.yml → ...ompare/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/...ulset_no-limits-pxc-node-increased-oc.yml → ...tatefulset_no-limits-pxc-increased-oc.yml b/...ulset_no-limits-pxc-node-increased-oc.yml → ...tatefulset_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/...tefulset_no-limits-pxc-node-increased.yml → ...e/statefulset_no-limits-pxc-increased.yml b/...tefulset_no-limits-pxc-node-increased.yml → ...e/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/...are/statefulset_no-limits-pxc-node-oc.yml → .../compare/statefulset_no-limits-pxc-oc.yml b/...are/statefulset_no-limits-pxc-node-oc.yml → .../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: