diff --git a/Jenkinsfile b/Jenkinsfile index a0dc54692a..b83c12dbab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -GKERegion='us-central1-a' +region='us-central1-a' testUrlPrefix="https://percona-jenkins-artifactory-public.s3.amazonaws.com/cloud-pxc-operator" tests=[] @@ -7,22 +7,20 @@ void createCluster(String CLUSTER_SUFFIX) { sh """ NODES_NUM=3 export KUBECONFIG=/tmp/$CLUSTER_NAME-${CLUSTER_SUFFIX} - export USE_GKE_GCLOUD_AUTH_PLUGIN=True - source $HOME/google-cloud-sdk/path.bash.inc ret_num=0 while [ \${ret_num} -lt 15 ]; do ret_val=0 gcloud auth activate-service-account --key-file $CLIENT_SECRET_FILE gcloud config set project $GCP_PROJECT - gcloud container clusters list --filter $CLUSTER_NAME-${CLUSTER_SUFFIX} --zone $GKERegion --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $GKERegion --quiet || true + gcloud container clusters list --filter $CLUSTER_NAME-${CLUSTER_SUFFIX} --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true - gcloud container clusters create --zone $GKERegion $CLUSTER_NAME-${CLUSTER_SUFFIX} --cluster-version=1.25 --machine-type=n1-standard-4 --preemptible --disk-size 30 --num-nodes=\$NODES_NUM --network=jenkins-vpc --subnetwork=jenkins-${CLUSTER_SUFFIX} --no-enable-autoupgrade --cluster-ipv4-cidr=/21 --labels delete-cluster-after-hours=6 && \ + gcloud container clusters create --zone $region $CLUSTER_NAME-${CLUSTER_SUFFIX} --cluster-version=1.25 --machine-type=n1-standard-4 --preemptible --disk-size 30 --num-nodes=\$NODES_NUM --network=jenkins-vpc --subnetwork=jenkins-${CLUSTER_SUFFIX} --no-enable-autoupgrade --cluster-ipv4-cidr=/21 --labels delete-cluster-after-hours=6 && \ kubectl create clusterrolebinding cluster-admin-binding --clusterrole cluster-admin --user jenkins@"$GCP_PROJECT".iam.gserviceaccount.com || ret_val=\$? if [ \${ret_val} -eq 0 ]; then break; fi ret_num=\$((ret_num + 1)) done if [ \${ret_num} -eq 15 ]; then - gcloud container clusters list --filter $CLUSTER_NAME-${CLUSTER_SUFFIX} --zone $GKERegion --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $GKERegion --quiet || true + gcloud container clusters list --filter $CLUSTER_NAME-${CLUSTER_SUFFIX} --zone $region --format='csv[no-heading](name)' | xargs gcloud container clusters delete --zone $region --quiet || true exit 1 fi """ @@ -33,8 +31,6 @@ void shutdownCluster(String CLUSTER_SUFFIX) { withCredentials([string(credentialsId: 'GCP_PROJECT_ID', variable: 'GCP_PROJECT'), file(credentialsId: 'gcloud-key-file', variable: 'CLIENT_SECRET_FILE')]) { sh """ export KUBECONFIG=/tmp/$CLUSTER_NAME-${CLUSTER_SUFFIX} - export USE_GKE_GCLOUD_AUTH_PLUGIN=True - source $HOME/google-cloud-sdk/path.bash.inc gcloud auth activate-service-account --key-file $CLIENT_SECRET_FILE gcloud config set project $GCP_PROJECT for namespace in \$(kubectl get namespaces --no-headers | awk '{print \$1}' | grep -vE "^kube-|^openshift" | sed '/-operator/ s/^/1-/' | sort | sed 's/^1-//'); do @@ -46,7 +42,7 @@ void shutdownCluster(String CLUSTER_SUFFIX) { kubectl delete pods --all -n \$namespace --force --grace-period=0 || true done kubectl get svc --all-namespaces || true - gcloud container clusters delete --zone $GKERegion $CLUSTER_NAME-${CLUSTER_SUFFIX} + gcloud container clusters delete --zone $region $CLUSTER_NAME-${CLUSTER_SUFFIX} """ } } @@ -54,9 +50,7 @@ void shutdownCluster(String CLUSTER_SUFFIX) { void deleteOldClusters(String FILTER) { withCredentials([string(credentialsId: 'GCP_PROJECT_ID', variable: 'GCP_PROJECT'), file(credentialsId: 'gcloud-key-file', variable: 'CLIENT_SECRET_FILE')]) { sh """ - if [ -f $HOME/google-cloud-sdk/path.bash.inc ]; then - export USE_GKE_GCLOUD_AUTH_PLUGIN=True - source $HOME/google-cloud-sdk/path.bash.inc + if gcloud --version > /dev/null 2>&1; then gcloud auth activate-service-account --key-file $CLIENT_SECRET_FILE gcloud config set project $GCP_PROJECT for GKE_CLUSTER in \$(gcloud container clusters list --format='csv[no-heading](name)' --filter="$FILTER"); do @@ -72,7 +66,7 @@ void deleteOldClusters(String FILTER) { break fi done - gcloud container clusters delete --async --zone $GKERegion --quiet \$GKE_CLUSTER || true + gcloud container clusters delete --async --zone $region --quiet \$GKE_CLUSTER || true done fi """ @@ -140,8 +134,6 @@ void markPassedTests() { void printKubernetesStatus(String LOCATION, String CLUSTER_SUFFIX) { sh """ export KUBECONFIG=/tmp/$CLUSTER_NAME-$CLUSTER_SUFFIX - export USE_GKE_GCLOUD_AUTH_PLUGIN=True - source $HOME/google-cloud-sdk/path.bash.inc echo "========== KUBERNETES STATUS $LOCATION TEST ==========" gcloud container clusters list|grep -E "NAME|$CLUSTER_NAME-$CLUSTER_SUFFIX " echo @@ -223,8 +215,7 @@ void runTest(Integer TEST_ID) { fi export KUBECONFIG=/tmp/$CLUSTER_NAME-$clusterSuffix export MYSQL_VERSION=$mysqlVer - source $HOME/google-cloud-sdk/path.bash.inc - time bash ./e2e-tests/$testName/run + time bash e2e-tests/$testName/run """ } pushArtifactFile("${env.GIT_BRANCH}-${env.GIT_SHORT_COMMIT}-$testNameWithMysqlVersion") @@ -293,34 +284,39 @@ pipeline { } } } - sh ''' - sudo yum install -y https://repo.percona.com/yum/percona-release-latest.noarch.rpm || true - sudo percona-release enable-only tools - sudo yum install -y percona-xtrabackup-80 | true - - if [ ! -d $HOME/google-cloud-sdk/bin ]; then - rm -rf $HOME/google-cloud-sdk - curl https://sdk.cloud.google.com | bash - fi - - source $HOME/google-cloud-sdk/path.bash.inc - gcloud components install alpha - gcloud components install kubectl - curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash - curl -s -L https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz \ - | sudo tar -C /usr/local/bin --strip-components 1 --wildcards -zxvpf - '*/oc' + sh """ + sudo curl -s -L -o /usr/local/bin/kubectl https://dl.k8s.io/release/\$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl && sudo chmod +x /usr/local/bin/kubectl + kubectl version --client --output=yaml - curl -s -L https://github.com/mitchellh/golicense/releases/latest/download/golicense_0.2.0_linux_x86_64.tar.gz \ - | sudo tar -C /usr/local/bin --wildcards -zxvpf - + curl -fsSL https://get.helm.sh/helm-v3.12.3-linux-amd64.tar.gz | sudo tar -C /usr/local/bin --strip-components 1 -xzf - linux-amd64/helm - sudo sh -c "curl -s -L https://github.com/mikefarah/yq/releases/download/v4.34.1/yq_linux_amd64 > /usr/local/bin/yq" - sudo sh -c "curl -s -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 > /usr/local/bin/jq" + sudo sh -c "curl -s -L https://github.com/mikefarah/yq/releases/download/v4.35.1/yq_linux_amd64 > /usr/local/bin/yq" sudo chmod +x /usr/local/bin/yq + + sudo sh -c "curl -s -L https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 > /usr/local/bin/jq" sudo chmod +x /usr/local/bin/jq - ''' + + sudo tee /etc/yum.repos.d/google-cloud-sdk.repo << EOF +[google-cloud-cli] +name=Google Cloud CLI +baseurl=https://packages.cloud.google.com/yum/repos/cloud-sdk-el7-x86_64 +enabled=1 +gpgcheck=1 +repo_gpgcheck=0 +gpgkey=https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg +EOF + sudo yum install -y google-cloud-cli google-cloud-cli-gke-gcloud-auth-plugin + + curl -sL https://github.com/mitchellh/golicense/releases/latest/download/golicense_0.2.0_linux_x86_64.tar.gz | sudo tar -C /usr/local/bin -xzf - golicense + + sudo yum install -y https://repo.percona.com/yum/percona-release-latest.noarch.rpm || true + sudo percona-release enable-only tools + sudo yum install -y percona-xtrabackup-80 | true + """ + withCredentials([file(credentialsId: 'cloud-secret-file', variable: 'CLOUD_SECRET_FILE')]) { sh ''' - cp $CLOUD_SECRET_FILE ./e2e-tests/conf/cloud-secret.yml + cp $CLOUD_SECRET_FILE e2e-tests/conf/cloud-secret.yml ''' } deleteOldClusters("jen-pxc-$CHANGE_ID") @@ -509,9 +505,8 @@ pipeline { } deleteOldClusters("$CLUSTER_NAME") sh """ - sudo docker system prune -fa - sudo rm -rf ./* - sudo rm -rf $HOME/google-cloud-sdk + sudo docker system prune --volumes -af + sudo rm -rf * """ deleteDir() } diff --git a/config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml b/config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml index e14495bcba..02db77c543 100644 --- a/config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml +++ b/config/crd/bases/pxc.percona.com_perconaxtradbclusters.yaml @@ -1709,6 +1709,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -1749,8 +1754,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -2904,6 +2907,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: @@ -3241,6 +3246,42 @@ spec: items: type: string type: array + initContainer: + properties: + image: + type: string + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + type: object initImage: type: string logCollectorSecretName: @@ -4341,6 +4382,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -4381,8 +4427,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -5536,6 +5580,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: @@ -6791,6 +6837,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -6831,8 +6882,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -7986,6 +8035,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: diff --git a/deploy/bundle.yaml b/deploy/bundle.yaml index 962bde8b9a..d120743ea6 100644 --- a/deploy/bundle.yaml +++ b/deploy/bundle.yaml @@ -2446,6 +2446,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -2486,8 +2491,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -3641,6 +3644,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: @@ -3978,6 +3983,42 @@ spec: items: type: string type: array + initContainer: + properties: + image: + type: string + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + type: object initImage: type: string logCollectorSecretName: @@ -5078,6 +5119,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -5118,8 +5164,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -6273,6 +6317,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: @@ -7528,6 +7574,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -7568,8 +7619,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -8723,6 +8772,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: diff --git a/deploy/cr.yaml b/deploy/cr.yaml index 97ca98a740..b4e75b0b4b 100644 --- a/deploy/cr.yaml +++ b/deploy/cr.yaml @@ -20,7 +20,15 @@ spec: # sslSecretName: cluster1-ssl # sslInternalSecretName: cluster1-ssl-internal # logCollectorSecretName: cluster1-log-collector-secrets -# initImage: perconalab/percona-xtradb-cluster-operator:main +# initContainer: +# image: perconalab/percona-xtradb-cluster-operator:main +# resources: +# requests: +# memory: 100M +# cpu: 100m +# limits: +# memory: 200M +# cpu: 200m # enableCRValidationWebhook: true # tls: # SANs: diff --git a/deploy/crd.yaml b/deploy/crd.yaml index 2b65638431..fe8902597e 100644 --- a/deploy/crd.yaml +++ b/deploy/crd.yaml @@ -2446,6 +2446,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -2486,8 +2491,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -3641,6 +3644,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: @@ -3978,6 +3983,42 @@ spec: items: type: string type: array + initContainer: + properties: + image: + type: string + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + type: object initImage: type: string logCollectorSecretName: @@ -5078,6 +5119,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -5118,8 +5164,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -6273,6 +6317,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: @@ -7528,6 +7574,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -7568,8 +7619,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -8723,6 +8772,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: diff --git a/deploy/cw-bundle.yaml b/deploy/cw-bundle.yaml index dd26bcd4ee..45494fe85c 100644 --- a/deploy/cw-bundle.yaml +++ b/deploy/cw-bundle.yaml @@ -2446,6 +2446,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -2486,8 +2491,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -3641,6 +3644,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: @@ -3978,6 +3983,42 @@ spec: items: type: string type: array + initContainer: + properties: + image: + type: string + resources: + properties: + claims: + items: + properties: + name: + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + type: object + type: object + type: object initImage: type: string logCollectorSecretName: @@ -5078,6 +5119,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -5118,8 +5164,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -6273,6 +6317,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: @@ -7528,6 +7574,11 @@ spec: items: type: string type: array + allocatedResourceStatuses: + additionalProperties: + type: string + type: object + x-kubernetes-map-type: granular allocatedResources: additionalProperties: anyOf: @@ -7568,8 +7619,6 @@ spec: type: array phase: type: string - resizeStatus: - type: string type: object type: object type: array @@ -8723,6 +8772,8 @@ spec: x-kubernetes-int-or-string: true type: object type: object + restartPolicy: + type: string securityContext: properties: allowPrivilegeEscalation: diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127.yml index ce67b2cfe0..2422d6b686 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-proxysql-k127.yml @@ -193,11 +193,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml index 06f2f0e5b3..9e450272e4 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-proxysql-oc.yml @@ -190,11 +190,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml b/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml index 17d44bd21e..6f7bb0abed 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-proxysql.yml @@ -190,11 +190,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_custom-pxc-k127.yml b/e2e-tests/affinity/compare/statefulset_custom-pxc-k127.yml index cca0acb321..1745390d51 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-pxc-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-pxc-k127.yml @@ -182,11 +182,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_custom-pxc-oc.yml b/e2e-tests/affinity/compare/statefulset_custom-pxc-oc.yml index 747fb83c70..6f78f147db 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-pxc-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-pxc-oc.yml @@ -179,11 +179,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_custom-pxc.yml b/e2e-tests/affinity/compare/statefulset_custom-pxc.yml index 52a891d805..2bc6a31936 100644 --- a/e2e-tests/affinity/compare/statefulset_custom-pxc.yml +++ b/e2e-tests/affinity/compare/statefulset_custom-pxc.yml @@ -179,11 +179,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127.yml index 63b78eba5b..91a0031395 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-k127.yml @@ -166,11 +166,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml index 0654abe0ab..e2dda2c14e 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-proxysql-oc.yml @@ -163,11 +163,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml b/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml index f193360ab1..55e518491d 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-proxysql.yml @@ -163,11 +163,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127.yml b/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127.yml index 3923414476..5579a8f5a3 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-pxc-k127.yml @@ -155,11 +155,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_hostname-pxc-oc.yml b/e2e-tests/affinity/compare/statefulset_hostname-pxc-oc.yml index 206806b3f1..7046b0d39c 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-pxc-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-pxc-oc.yml @@ -152,11 +152,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_hostname-pxc.yml b/e2e-tests/affinity/compare/statefulset_hostname-pxc.yml index 628f5e778a..d34c54fdb2 100644 --- a/e2e-tests/affinity/compare/statefulset_hostname-pxc.yml +++ b/e2e-tests/affinity/compare/statefulset_hostname-pxc.yml @@ -152,11 +152,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql-k127.yml index 8a05a98967..31142a6295 100644 --- a/e2e-tests/affinity/compare/statefulset_region-proxysql-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_region-proxysql-k127.yml @@ -166,11 +166,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml index 7e3a59bbf3..a0325a94ee 100644 --- a/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_region-proxysql-oc.yml @@ -163,11 +163,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_region-proxysql.yml b/e2e-tests/affinity/compare/statefulset_region-proxysql.yml index 3d656835c9..e4a23fc028 100644 --- a/e2e-tests/affinity/compare/statefulset_region-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_region-proxysql.yml @@ -163,11 +163,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_region-pxc-k127.yml b/e2e-tests/affinity/compare/statefulset_region-pxc-k127.yml index 03b7a37af4..d2b3ddf1a0 100644 --- a/e2e-tests/affinity/compare/statefulset_region-pxc-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_region-pxc-k127.yml @@ -155,11 +155,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_region-pxc-oc.yml b/e2e-tests/affinity/compare/statefulset_region-pxc-oc.yml index 921441d664..ddcd456269 100644 --- a/e2e-tests/affinity/compare/statefulset_region-pxc-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_region-pxc-oc.yml @@ -152,11 +152,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_region-pxc.yml b/e2e-tests/affinity/compare/statefulset_region-pxc.yml index a3db28bdaa..9c6ce70543 100644 --- a/e2e-tests/affinity/compare/statefulset_region-pxc.yml +++ b/e2e-tests/affinity/compare/statefulset_region-pxc.yml @@ -152,11 +152,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127.yml index f54434e10e..3bd74856c7 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-proxysql-k127.yml @@ -166,11 +166,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml index f0fcf9b23e..06238826c6 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-proxysql-oc.yml @@ -163,11 +163,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml b/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml index 848257f754..7ff3822dd0 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-proxysql.yml @@ -163,11 +163,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_zone-pxc-k127.yml b/e2e-tests/affinity/compare/statefulset_zone-pxc-k127.yml index 67c847431d..f873fd86db 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-pxc-k127.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-pxc-k127.yml @@ -155,11 +155,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_zone-pxc-oc.yml b/e2e-tests/affinity/compare/statefulset_zone-pxc-oc.yml index 66c1ea4924..025a7b8f88 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-pxc-oc.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-pxc-oc.yml @@ -152,11 +152,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/affinity/compare/statefulset_zone-pxc.yml b/e2e-tests/affinity/compare/statefulset_zone-pxc.yml index 08e17ec2cd..48adff54df 100644 --- a/e2e-tests/affinity/compare/statefulset_zone-pxc.yml +++ b/e2e-tests/affinity/compare/statefulset_zone-pxc.yml @@ -152,11 +152,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/default-cr/compare/statefulset_cluster1-haproxy-k127.yml b/e2e-tests/default-cr/compare/statefulset_cluster1-haproxy-k127.yml index 5ac5ff603c..3e56b5ddc9 100644 --- a/e2e-tests/default-cr/compare/statefulset_cluster1-haproxy-k127.yml +++ b/e2e-tests/default-cr/compare/statefulset_cluster1-haproxy-k127.yml @@ -137,9 +137,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/default-cr/compare/statefulset_cluster1-haproxy.yml b/e2e-tests/default-cr/compare/statefulset_cluster1-haproxy.yml index 0330c5ff05..526b2d53e8 100644 --- a/e2e-tests/default-cr/compare/statefulset_cluster1-haproxy.yml +++ b/e2e-tests/default-cr/compare/statefulset_cluster1-haproxy.yml @@ -134,9 +134,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/default-cr/compare/statefulset_cluster1-pxc-k127.yml b/e2e-tests/default-cr/compare/statefulset_cluster1-pxc-k127.yml index cdbf71437d..78c1e062b6 100644 --- a/e2e-tests/default-cr/compare/statefulset_cluster1-pxc-k127.yml +++ b/e2e-tests/default-cr/compare/statefulset_cluster1-pxc-k127.yml @@ -204,9 +204,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/default-cr/compare/statefulset_cluster1-pxc-oc.yml b/e2e-tests/default-cr/compare/statefulset_cluster1-pxc-oc.yml index 13f63a79a0..1f2564a06a 100644 --- a/e2e-tests/default-cr/compare/statefulset_cluster1-pxc-oc.yml +++ b/e2e-tests/default-cr/compare/statefulset_cluster1-pxc-oc.yml @@ -201,9 +201,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/default-cr/compare/statefulset_cluster1-pxc.yml b/e2e-tests/default-cr/compare/statefulset_cluster1-pxc.yml index f701291bab..e2ce3e6e8a 100644 --- a/e2e-tests/default-cr/compare/statefulset_cluster1-pxc.yml +++ b/e2e-tests/default-cr/compare/statefulset_cluster1-pxc.yml @@ -201,9 +201,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-haproxy-k127.yml b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-haproxy-k127.yml index 8994e9247f..82247f7df8 100644 --- a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-haproxy-k127.yml +++ b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-haproxy-k127.yml @@ -133,7 +133,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-haproxy.yml b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-haproxy.yml index 5f3cbae6ba..349ade5ea6 100644 --- a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-haproxy.yml +++ b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-haproxy.yml @@ -130,7 +130,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc-k127.yml b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc-k127.yml index 6e5ec907f0..b83681ddd2 100644 --- a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc-k127.yml +++ b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc-k127.yml @@ -194,7 +194,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc-oc.yml b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc-oc.yml index c741e0e8e8..d39d46ebb8 100644 --- a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc-oc.yml +++ b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc-oc.yml @@ -191,7 +191,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc.yml b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc.yml index 232cd860ea..a6ae11d45b 100644 --- a/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc.yml +++ b/e2e-tests/default-cr/compare/statefulset_minimal-cluster-pxc.yml @@ -191,7 +191,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/functions b/e2e-tests/functions index e50eb2e6f4..20bb574a74 100755 --- a/e2e-tests/functions +++ b/e2e-tests/functions @@ -810,7 +810,7 @@ cat_config() { | $sed -e "s#apiVersion: pxc.percona.com/v.*\$#apiVersion: $API#" \ | $sed -e "s#image:.*-pxc\([0-9]*.[0-9]*\)\{0,1\}\$#image: $IMAGE_PXC#" \ | $sed -e "s#image:.*\/percona-xtradb-cluster:.*\$#image: $IMAGE_PXC#" \ - | $sed -e "s#initImage:.*-init\$#initImage: $IMAGE#" \ + | $sed -e "s#image:.*-init\$#image: $IMAGE#" \ | $sed -e "s#image:.*-pmm\$#image: $IMAGE_PMM_CLIENT#" \ | $sed -e "s#image:.*-backup\$#image: $IMAGE_BACKUP#" \ | $sed -e "s#image:.*-proxysql\$#image: $IMAGE_PROXY#" \ @@ -1592,4 +1592,4 @@ deploy_pmm_server() { helm uninstall monitoring || : retry 10 60 helm install monitoring --set imageRepo=${IMAGE_PMM_SERVER%:*} --set imageTag=${IMAGE_PMM_SERVER#*:} $additional_params https://percona-charts.storage.googleapis.com/pmm-server-$PMM_SERVER_VER.tgz -} \ No newline at end of file +} diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-k127.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-k127.yml index 43a41d7d37..caad04d28e 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-k127.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-k127.yml @@ -146,10 +146,10 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 500M requests: - cpu: 100m - memory: 100M + cpu: 300m + memory: 200M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-k127.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-k127.yml index 6b7d1e24ec..744180ad61 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-k127.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret-k127.yml @@ -146,10 +146,10 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 500M requests: - cpu: 100m - memory: 100M + cpu: 300m + memory: 200M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret.yml index 667fa13ebb..1985fbd0b5 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy-secret.yml @@ -143,10 +143,10 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 500M requests: - cpu: 100m - memory: 100M + cpu: 300m + memory: 200M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy.yml index 288dce0b75..a299603c31 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-haproxy.yml @@ -143,10 +143,10 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 500M requests: - cpu: 100m - memory: 100M + cpu: 300m + memory: 200M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-k127.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-k127.yml index 1442a942f9..aa381daf6f 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-k127.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-k127.yml @@ -189,10 +189,10 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 500M requests: - cpu: 100m - memory: 100M + cpu: 300m + memory: 200M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-oc.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-oc.yml index 728ee3573b..22e1b28673 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-oc.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-oc.yml @@ -186,10 +186,10 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 500M requests: - cpu: 100m - memory: 100M + cpu: 300m + memory: 200M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret-k127.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret-k127.yml index fffd31fc36..5ba4be4b60 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret-k127.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret-k127.yml @@ -189,10 +189,10 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 500M requests: - cpu: 100m - memory: 100M + cpu: 300m + memory: 200M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 7e55bdae18..7b3aa16cc1 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret-oc.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret-oc.yml @@ -186,10 +186,10 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 500M requests: - cpu: 100m - memory: 100M + cpu: 300m + memory: 200M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret.yml index 5e91867684..8294451e9e 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql-secret.yml @@ -186,10 +186,10 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 500M requests: - cpu: 100m - memory: 100M + cpu: 300m + memory: 200M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql.yml b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql.yml index 1cca0b611d..90d9f94e7c 100644 --- a/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql.yml +++ b/e2e-tests/haproxy/compare/statefulset_haproxy-proxysql.yml @@ -186,10 +186,10 @@ spec: resources: limits: cpu: "1" - memory: 1G + memory: 500M requests: - cpu: 100m - memory: 100M + cpu: 300m + memory: 200M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/haproxy/conf/haproxy.yml b/e2e-tests/haproxy/conf/haproxy.yml index ab1716dd0a..5c33a2c76f 100644 --- a/e2e-tests/haproxy/conf/haproxy.yml +++ b/e2e-tests/haproxy/conf/haproxy.yml @@ -5,6 +5,14 @@ metadata: finalizers: - delete-pxc-pods-in-order spec: + initContainer: + resources: + requests: + memory: 0.2G + cpu: 300m + limits: + memory: 0.5G + cpu: "1" secretsName: my-cluster-secrets vaultSecretName: haproxy-vault pause: false diff --git a/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc-k127.yml b/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc-k127.yml index 70ed4f0e82..76f6fff039 100644 --- a/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc-k127.yml +++ b/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc-k127.yml @@ -150,9 +150,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 100m - memory: 100M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc-oc.yml b/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc-oc.yml index 996254e089..75ab1e41a5 100644 --- a/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc-oc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc-oc.yml @@ -147,9 +147,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 100m - memory: 100M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc.yml b/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc.yml index 110797083b..a38725eb46 100644 --- a/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_no-proxysql-pxc.yml @@ -147,9 +147,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 100m - memory: 100M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127.yml index dd40f6b65a..24b74084f7 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql-k127.yml @@ -166,11 +166,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 e06c4ad093..3daf616927 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 @@ -163,11 +163,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 ca0d6364ad..185818364e 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-proxysql.yml @@ -163,11 +163,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127.yml index a9359f25ae..676902e5e8 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-k127.yml @@ -202,11 +202,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-oc.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-oc.yml index 943a916671..3eb16d5c71 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-oc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-pxc-oc.yml @@ -199,11 +199,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/init-deploy/compare/statefulset_some-name-pxc.yml b/e2e-tests/init-deploy/compare/statefulset_some-name-pxc.yml index 6b0fda53ed..d1ebed5837 100644 --- a/e2e-tests/init-deploy/compare/statefulset_some-name-pxc.yml +++ b/e2e-tests/init-deploy/compare/statefulset_some-name-pxc.yml @@ -199,11 +199,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127.yml index f4ee7e491d..29fe3a7ab6 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased-k127.yml @@ -283,9 +283,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 4952e61915..ec211babc2 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 @@ -280,9 +280,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 474f025ea6..7b2e01bc69 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-increased.yml @@ -280,9 +280,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml index 2cc629668c..ff7a8753b2 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-k127.yml @@ -283,9 +283,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 d34622e0ab..cfe7bbf07e 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql-oc.yml @@ -280,9 +280,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml index 9e491563e0..35788e5d21 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-proxysql.yml @@ -280,9 +280,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-k127.yml index 84b546e12c..5c826b10ce 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-k127.yml @@ -267,9 +267,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-oc.yml index b789bfa694..0467b4d0bb 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased-oc.yml @@ -264,9 +264,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased.yml index 4924248482..a6f2b50be4 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-pxc-increased.yml @@ -264,9 +264,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-k127.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-k127.yml index 0e05b41b2c..51c563fe1c 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-pxc-k127.yml @@ -267,9 +267,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc-oc.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc-oc.yml index c189dcd092..d0927aa0a3 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-pxc-oc.yml @@ -264,9 +264,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-limits-pxc.yml b/e2e-tests/limits/compare/statefulset_no-limits-pxc.yml index 639c21141c..9a92baa21d 100644 --- a/e2e-tests/limits/compare/statefulset_no-limits-pxc.yml +++ b/e2e-tests/limits/compare/statefulset_no-limits-pxc.yml @@ -264,9 +264,9 @@ spec: imagePullPolicy: IfNotPresent name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127.yml index ce9e54b4de..8bf370b5d8 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-increased-k127.yml @@ -147,7 +147,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 5ca7cce1aa..ed9a34f352 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 @@ -144,7 +144,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 0fe1e21d8c..e18623871a 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 @@ -144,7 +144,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127.yml index ce9e54b4de..8bf370b5d8 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-proxysql-k127.yml @@ -147,7 +147,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 5ca7cce1aa..ed9a34f352 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 @@ -144,7 +144,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 0fe1e21d8c..e18623871a 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 @@ -144,7 +144,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased-k127.yml index 636f41018a..aa5306c67d 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased-k127.yml @@ -136,7 +136,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased-oc.yml index 9e92dbce1c..5fb873e73e 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased-oc.yml @@ -133,7 +133,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased.yml index bc20058521..7813032d1c 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-increased.yml @@ -133,7 +133,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-k127.yml index 636f41018a..aa5306c67d 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-k127.yml @@ -136,7 +136,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-oc.yml index 9e92dbce1c..5fb873e73e 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc-oc.yml @@ -133,7 +133,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc.yml b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc.yml index bc20058521..7813032d1c 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-no-limits-pxc.yml @@ -133,7 +133,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127.yml index 592456e2ec..e9b9abee83 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased-k127.yml @@ -152,8 +152,8 @@ spec: name: pxc-init resources: limits: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 5c9248d38e..326999aea1 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 @@ -149,8 +149,8 @@ spec: name: pxc-init resources: limits: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 63009ca0a4..87173801ca 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-increased.yml @@ -149,8 +149,8 @@ spec: name: pxc-init resources: limits: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127.yml index 62827822e4..30cda5dba4 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-k127.yml @@ -152,8 +152,8 @@ spec: name: pxc-init resources: limits: - cpu: 300m - memory: 600M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 ede5cc1adb..a3bf3c0f97 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql-oc.yml @@ -149,8 +149,8 @@ spec: name: pxc-init resources: limits: - cpu: 300m - memory: 600M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml b/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml index 381919cb93..c7f3f1de1f 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-proxysql.yml @@ -149,8 +149,8 @@ spec: name: pxc-init resources: limits: - cpu: 300m - memory: 600M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127.yml index e34023b9e4..6a29b09ce1 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased-k127.yml @@ -141,8 +141,8 @@ spec: name: pxc-init resources: limits: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased.yml index 964398510f..e6fc3d0aae 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc-increased.yml @@ -138,8 +138,8 @@ spec: name: pxc-init resources: limits: - cpu: 600m - memory: 1G + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127.yml index 4cb158d90a..26b62a7215 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc-k127.yml @@ -141,8 +141,8 @@ spec: name: pxc-init resources: limits: - cpu: 300m - memory: 600M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc-oc.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc-oc.yml index 732cca90d5..1315355fe0 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc-oc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc-oc.yml @@ -138,8 +138,8 @@ spec: name: pxc-init resources: limits: - cpu: 300m - memory: 600M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/limits/compare/statefulset_no-requests-pxc.yml b/e2e-tests/limits/compare/statefulset_no-requests-pxc.yml index 10b6e60d61..28a810f531 100644 --- a/e2e-tests/limits/compare/statefulset_no-requests-pxc.yml +++ b/e2e-tests/limits/compare/statefulset_no-requests-pxc.yml @@ -138,8 +138,8 @@ spec: name: pxc-init resources: limits: - cpu: 300m - memory: 600M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-k127.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-k127.yml index 831f4244e5..f3e68671ef 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-k127.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy-k127.yml @@ -261,9 +261,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy.yml index b567343964..e80a2fa31e 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-haproxy.yml @@ -258,9 +258,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc-k127.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc-k127.yml index 6d7883afc7..3cbe5bacac 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc-k127.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc-k127.yml @@ -274,9 +274,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc-oc.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc-oc.yml index ace8fd12a5..7db8b0d0f9 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc-oc.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc-oc.yml @@ -271,9 +271,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc.yml b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc.yml index be87bc7fbe..25a57ca830 100644 --- a/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc.yml +++ b/e2e-tests/monitoring-2-0/compare/statefulset_monitoring-pxc.yml @@ -271,9 +271,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-k127.yml b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-k127.yml index 815929da0d..c2ecbba8ca 100644 --- a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-k127.yml +++ b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-k127.yml @@ -147,7 +147,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-oc.yml b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-oc.yml index 3d0735d7c7..4778125ed3 100644 --- a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-oc.yml +++ b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-oc.yml @@ -144,7 +144,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret-k127.yml b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret-k127.yml index eb06502f3b..56babca2bf 100644 --- a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret-k127.yml +++ b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret-k127.yml @@ -147,7 +147,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret-oc.yml b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret-oc.yml index e861026740..2b295b1f7f 100644 --- a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret-oc.yml +++ b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret-oc.yml @@ -144,7 +144,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret.yml b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret.yml index e038dff3e2..eb29275407 100644 --- a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret.yml +++ b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc-secret.yml @@ -144,7 +144,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc.yml b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc.yml index f026ebb164..72e3e55233 100644 --- a/e2e-tests/one-pod/compare/statefulset_one-pod-pxc.yml +++ b/e2e-tests/one-pod/compare/statefulset_one-pod-pxc.yml @@ -144,7 +144,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/operator-self-healing-chaos/conf/operator-chaos.yml b/e2e-tests/operator-self-healing-chaos/conf/operator-chaos.yml index 22f8732659..8f9f4dcc56 100644 --- a/e2e-tests/operator-self-healing-chaos/conf/operator-chaos.yml +++ b/e2e-tests/operator-self-healing-chaos/conf/operator-chaos.yml @@ -6,7 +6,8 @@ spec: secretsName: my-cluster-secrets sslSecretName: some-name-ssl sslInternalSecretName: some-name-ssl-internal - initImage: -init + initContainer: + image: -init pxc: size: 3 image: -pxc diff --git a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-k127.yml b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-k127.yml index 0a3e916400..3de08e0097 100644 --- a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-k127.yml +++ b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy-k127.yml @@ -130,9 +130,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy.yml b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy.yml index 54eb79ca5f..815ad55508 100644 --- a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy.yml +++ b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-haproxy.yml @@ -127,9 +127,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc-k127.yml b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc-k127.yml index 6993187c44..4a7c9e94cf 100644 --- a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc-k127.yml +++ b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc-k127.yml @@ -140,9 +140,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc-oc.yml b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc-oc.yml index df9ccc1dbe..887462f54a 100644 --- a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc-oc.yml +++ b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc-oc.yml @@ -137,9 +137,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc.yml b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc.yml index c5466705ec..e3ac84f604 100644 --- a/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc.yml +++ b/e2e-tests/proxy-protocol/compare/statefulset_proxy-protocol-pxc.yml @@ -137,9 +137,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127.yml b/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127.yml index 8e16bf9cd6..3d5af66d97 100644 --- a/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127.yml +++ b/e2e-tests/proxysql-sidecar-res-limits/compare/statefulset_side-car-proxysql-k127.yml @@ -164,11 +164,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 34578e0973..35ab0320b0 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 @@ -161,11 +161,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 3d2d588260..111b8d675d 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 @@ -161,11 +161,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-k127.yml b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-k127.yml index 9354cdb4d6..6af7639c7d 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-k127.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-changes-k127.yml @@ -154,11 +154,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M securityContext: privileged: true terminationMessagePath: /dev/termination-log 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 e891b041d0..7db679a961 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 @@ -151,11 +151,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M securityContext: privileged: true terminationMessagePath: /dev/termination-log diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-k127.yml b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-k127.yml index 82d38f7fc7..c37ab90a16 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-k127.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql-k127.yml @@ -154,11 +154,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M securityContext: privileged: false terminationMessagePath: /dev/termination-log 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 0ccefc8b18..755a1d30f7 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-proxysql.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-proxysql.yml @@ -151,11 +151,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M securityContext: privileged: false terminationMessagePath: /dev/termination-log diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes-k127.yml b/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes-k127.yml index f865429a3d..4dc84faadd 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes-k127.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes-k127.yml @@ -159,11 +159,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M securityContext: privileged: true terminationMessagePath: /dev/termination-log diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes.yml b/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes.yml index 59ff33e16e..3532d0f4a7 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-pxc-changes.yml @@ -156,11 +156,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M securityContext: privileged: true terminationMessagePath: /dev/termination-log diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-pxc-k127.yml b/e2e-tests/security-context/compare/statefulset_sec-context-pxc-k127.yml index 7bc369ab29..e1910c623d 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-pxc-k127.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-pxc-k127.yml @@ -159,11 +159,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M securityContext: privileged: false terminationMessagePath: /dev/termination-log diff --git a/e2e-tests/security-context/compare/statefulset_sec-context-pxc.yml b/e2e-tests/security-context/compare/statefulset_sec-context-pxc.yml index 37857e45ea..c917c89c54 100644 --- a/e2e-tests/security-context/compare/statefulset_sec-context-pxc.yml +++ b/e2e-tests/security-context/compare/statefulset_sec-context-pxc.yml @@ -156,11 +156,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M securityContext: privileged: false terminationMessagePath: /dev/termination-log diff --git a/e2e-tests/smart-update1/run b/e2e-tests/smart-update1/run index e81c8b8cae..29b21fa741 100755 --- a/e2e-tests/smart-update1/run +++ b/e2e-tests/smart-update1/run @@ -88,7 +88,7 @@ function main() { ################################################## desc 'Updating ProxySQL PXC cluster' cp -f "${test_dir}/conf/${CLUSTER}.yml" "${tmp_dir}/${CLUSTER}.yml" - yq -i eval ".spec.initImage = \"${IMAGE}\"" "${tmp_dir}/${CLUSTER}.yml" + yq -i eval ".spec.initContainer.image = \"${IMAGE}\"" "${tmp_dir}/${CLUSTER}.yml" spinup_pxc "${CLUSTER}" "${tmp_dir}/${CLUSTER}.yml" initial_primary=$(get_proxy_primary "-h127.0.0.1 -P6032 -uproxyadmin -padmin_password" "$(get_proxy ${CLUSTER})-0") @@ -108,7 +108,7 @@ function main() { ################################################## desc 'Updating HAProxy PXC cluster' cp -f "${test_dir}/conf/${CLUSTER}-haproxy.yml" "${tmp_dir}/${CLUSTER}-haproxy.yml" - yq -i eval ".spec.initImage = \"${IMAGE}\"" "${tmp_dir}/${CLUSTER}-haproxy.yml" + yq -i eval ".spec.initContainer.image = \"${IMAGE}\"" "${tmp_dir}/${CLUSTER}-haproxy.yml" spinup_pxc "${CLUSTER}" "${tmp_dir}/${CLUSTER}-haproxy.yml" initial_primary=$(run_mysql 'SELECT @@hostname hostname;' "-h ${CLUSTER}-haproxy -uroot -proot_password") @@ -128,7 +128,7 @@ function main() { ################################################## desc 'Updating PXC cluster with version service available but disabled' cp -f "${test_dir}/conf/${CLUSTER}-version-service-reachable.yml" "${tmp_dir}/${CLUSTER}-version-service-reachable.yml" - yq -i eval ".spec.initImage = \"${IMAGE}\"" "${tmp_dir}/${CLUSTER}-version-service-reachable.yml" + yq -i eval ".spec.initContainer.image = \"${IMAGE}\"" "${tmp_dir}/${CLUSTER}-version-service-reachable.yml" spinup_pxc "${CLUSTER}" "${tmp_dir}/${CLUSTER}-version-service-reachable.yml" initial_primary=$(run_mysql 'SELECT @@hostname hostname;' "-h ${CLUSTER}-haproxy -uroot -proot_password") diff --git a/e2e-tests/smart-update2/run b/e2e-tests/smart-update2/run index 5e987a55bf..bc33b35726 100755 --- a/e2e-tests/smart-update2/run +++ b/e2e-tests/smart-update2/run @@ -96,7 +96,7 @@ function check_telemetry_transfer() { yq "${src_dir}/deploy/cr-minimal.yaml" \ | yq eval ".spec.upgradeOptions.versionServiceEndpoint=\"${cr_vs_uri}\"" \ | yq eval ".spec.upgradeOptions.apply=\"${cr_vs_channel}\"" \ - | yq eval ".spec.initImage=\"$IMAGE\"" \ + | yq eval ".spec.initContainer.image=\"$IMAGE\"" \ | yq eval '.spec.crVersion="9.9.9"' \ | yq eval ".spec.pxc.image=\"$IMAGE_PXC\"" \ | yq eval ".spec.haproxy.image=\"$IMAGE_HAPROXY\"" \ @@ -220,7 +220,7 @@ function main() { ################################################## desc 'PXC cluster with version service offline' cp -f "${test_dir}/conf/${CLUSTER}-version-service-unreachable.yml" "${tmp_dir}/${CLUSTER}-version-service-unreachable.yml" - yq -i eval ".spec.initImage = \"${IMAGE}\"" "${tmp_dir}/${CLUSTER}-version-service-unreachable.yml" + yq -i eval ".spec.initContainer.image = \"${IMAGE}\"" "${tmp_dir}/${CLUSTER}-version-service-unreachable.yml" spinup_pxc "${CLUSTER}" "${tmp_dir}/${CLUSTER}-version-service-unreachable.yml" wait_cluster_consistency "${CLUSTER}" "${CLUSTER_SIZE}" "${PROXY_SIZE}" diff --git a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127.yml b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127.yml index cd0a909d1b..16888a8c88 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-k127.yml @@ -161,8 +161,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - ephemeral-storage: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml index 9afcda3fa3..6bdaaa0a25 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-proxysql-oc.yml @@ -158,8 +158,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - ephemeral-storage: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml b/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml index 964114b4b1..930fd6a377 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-proxysql.yml @@ -158,8 +158,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - ephemeral-storage: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/storage/compare/statefulset_emptydir-pxc-k127.yml b/e2e-tests/storage/compare/statefulset_emptydir-pxc-k127.yml index f041272538..d9a25ffa58 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-pxc-k127.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-pxc-k127.yml @@ -150,8 +150,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - ephemeral-storage: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/storage/compare/statefulset_emptydir-pxc-oc.yml b/e2e-tests/storage/compare/statefulset_emptydir-pxc-oc.yml index 522e1a1f6b..68d3ebb9b7 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-pxc-oc.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-pxc-oc.yml @@ -147,8 +147,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - ephemeral-storage: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/storage/compare/statefulset_emptydir-pxc.yml b/e2e-tests/storage/compare/statefulset_emptydir-pxc.yml index c95d816a85..76697d6535 100644 --- a/e2e-tests/storage/compare/statefulset_emptydir-pxc.yml +++ b/e2e-tests/storage/compare/statefulset_emptydir-pxc.yml @@ -147,8 +147,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - ephemeral-storage: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127.yml b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127.yml index e25e95b7ce..3ff20e7360 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-k127.yml @@ -158,7 +158,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M securityContext: privileged: false terminationMessagePath: /dev/termination-log diff --git a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml index eddfe69241..19045f7dc9 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-proxysql-oc.yml @@ -155,7 +155,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M securityContext: privileged: false terminationMessagePath: /dev/termination-log diff --git a/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml b/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml index ae5701f37b..c89187c014 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-proxysql.yml @@ -155,7 +155,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M securityContext: privileged: false terminationMessagePath: /dev/termination-log diff --git a/e2e-tests/storage/compare/statefulset_hostpath-pxc-k127.yml b/e2e-tests/storage/compare/statefulset_hostpath-pxc-k127.yml index c801ee91b3..09acf3dc04 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-pxc-k127.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-pxc-k127.yml @@ -149,7 +149,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M securityContext: privileged: false terminationMessagePath: /dev/termination-log diff --git a/e2e-tests/storage/compare/statefulset_hostpath-pxc-oc.yml b/e2e-tests/storage/compare/statefulset_hostpath-pxc-oc.yml index 38d06268fc..577667cb5f 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-pxc-oc.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-pxc-oc.yml @@ -143,9 +143,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 300m - memory: 500M + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/storage/compare/statefulset_hostpath-pxc.yml b/e2e-tests/storage/compare/statefulset_hostpath-pxc.yml index 18732ff06f..64f90bef1a 100644 --- a/e2e-tests/storage/compare/statefulset_hostpath-pxc.yml +++ b/e2e-tests/storage/compare/statefulset_hostpath-pxc.yml @@ -146,7 +146,10 @@ spec: - /pxc-init-entrypoint.sh imagePullPolicy: Always name: pxc-init - resources: {} + resources: + limits: + cpu: 50m + memory: 50M securityContext: privileged: false terminationMessagePath: /dev/termination-log diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127.yml index b79ab42082..2db641deb6 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-k127.yml @@ -166,11 +166,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-oc.yml index 9f77a17466..ca83ca729d 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140-oc.yml @@ -163,11 +163,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140.yml index 6f5ab26bb2..0668b6754f 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-proxysql-1140.yml @@ -163,11 +163,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml index ea637fee56..f9c0c3cf84 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-k127.yml @@ -202,11 +202,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-oc.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-oc.yml index a22c4699e5..af4c0cb67b 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-oc.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140-oc.yml @@ -199,11 +199,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140.yml b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140.yml index 7a8a8ebdfe..ca0cb02206 100644 --- a/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140.yml +++ b/e2e-tests/upgrade-consistency/compare/statefulset_some-name-pxc-1140.yml @@ -199,11 +199,8 @@ spec: name: pxc-init resources: limits: - cpu: "1" - memory: 1G - requests: - cpu: 100m - memory: 100M + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-k127.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-k127.yml index cb37565fc3..dce4cb9cd6 100644 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-k127.yml +++ b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy-k127.yml @@ -137,9 +137,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml index b14ac427a9..c214970ab4 100644 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml +++ b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-haproxy.yml @@ -134,9 +134,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127.yml index 4af1c9be7e..3105cfa2af 100644 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127.yml +++ b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-k127.yml @@ -204,9 +204,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-oc.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-oc.yml index 33c2089212..69952b071c 100644 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-oc.yml +++ b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc-oc.yml @@ -201,9 +201,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc.yml b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc.yml index c189938024..c5b05c9ab5 100644 --- a/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc.yml +++ b/e2e-tests/upgrade-haproxy/compare/statefulset_upgrade-haproxy-pxc.yml @@ -201,9 +201,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-haproxy/run b/e2e-tests/upgrade-haproxy/run index 9e778c089f..d5ec61b34a 100755 --- a/e2e-tests/upgrade-haproxy/run +++ b/e2e-tests/upgrade-haproxy/run @@ -33,7 +33,7 @@ INIT_OPERATOR_IMAGES=$(curl -s "https://check.percona.com/versions/v1/pxc-operat OPERATOR_NAME="percona-xtradb-cluster-operator" IMAGE=$(echo "${INIT_OPERATOR_IMAGES}" | jq -r '.versions[].matrix.operator[].imagePath') -# we use the starting image from the same repo so we don't need to use initImage option +# we use the starting image from the same repo so we don't need to use initContainer.image option if [[ "$(echo ${TARGET_IMAGE} | cut -d'/' -f1)" == "perconalab" ]]; then IMAGE="${IMAGE/percona/perconalab}" fi diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127.yml index 37bce22e62..00f03f7b5d 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql-k127.yml @@ -162,9 +162,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 78c865e0a6..b32358f1e3 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 @@ -159,9 +159,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: 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 9623f22a2b..df23375d42 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-proxysql.yml @@ -159,9 +159,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127.yml index af5325d3a7..76b50ca6cf 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-k127.yml @@ -204,9 +204,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-oc.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-oc.yml index 1262d353ad..0d4d3124df 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-oc.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc-oc.yml @@ -201,9 +201,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc.yml b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc.yml index fbc0d95c14..32b8ba9781 100644 --- a/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc.yml +++ b/e2e-tests/upgrade-proxysql/compare/statefulset_upgrade-proxysql-pxc.yml @@ -201,9 +201,9 @@ spec: imagePullPolicy: Always name: pxc-init resources: - requests: - cpu: 600m - memory: 1G + limits: + cpu: 50m + memory: 50M terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: diff --git a/e2e-tests/upgrade-proxysql/run b/e2e-tests/upgrade-proxysql/run index d9df22bec8..59c31e9a3d 100755 --- a/e2e-tests/upgrade-proxysql/run +++ b/e2e-tests/upgrade-proxysql/run @@ -32,7 +32,7 @@ GIT_TAG="v${INIT_OPERATOR_VER}" INIT_OPERATOR_IMAGES=$(curl -s "https://check.percona.com/versions/v1/pxc-operator/${INIT_OPERATOR_VER}/latest?databaseVersion=${PXC_VER}") OPERATOR_NAME="percona-xtradb-cluster-operator" IMAGE=$(echo "${INIT_OPERATOR_IMAGES}" | jq -r '.versions[].matrix.operator[].imagePath') -# we use the starting image from the same repo so we don't need to use initImage option +# we use the starting image from the same repo so we don't need to use initContainer.image option if [[ "$(echo ${TARGET_IMAGE} | cut -d'/' -f1)" == "perconalab" ]]; then IMAGE="${IMAGE/percona/perconalab}" fi diff --git a/go.mod b/go.mod index da3dc6456a..aa4d1db192 100644 --- a/go.mod +++ b/go.mod @@ -26,9 +26,9 @@ require ( github.com/robfig/cron/v3 v3.0.1 go.uber.org/zap v1.24.0 golang.org/x/sync v0.3.0 - k8s.io/api v0.28.2 - k8s.io/apimachinery v0.28.2 - k8s.io/client-go v0.28.2 + k8s.io/api v0.28.3 + k8s.io/apimachinery v0.28.3 + k8s.io/client-go v0.28.3 k8s.io/klog/v2 v2.100.1 sigs.k8s.io/controller-runtime v0.15.0 ) diff --git a/go.sum b/go.sum index 34f2438aaf..2a0cb0f23c 100644 --- a/go.sum +++ b/go.sum @@ -409,14 +409,14 @@ gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.28.2 h1:9mpl5mOb6vXZvqbQmankOfPIGiudghwCoLl1EYfUZbw= -k8s.io/api v0.28.2/go.mod h1:RVnJBsjU8tcMq7C3iaRSGMeaKt2TWEUXcpIt/90fjEg= +k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM= +k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc= k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo= k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ= -k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ= -k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU= -k8s.io/client-go v0.28.2 h1:DNoYI1vGq0slMBN/SWKMZMw0Rq+0EQW6/AK4v9+3VeY= -k8s.io/client-go v0.28.2/go.mod h1:sMkApowspLuc7omj1FOSUxSoqjr+d5Q0Yc0LOFnYFJY= +k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A= +k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8= +k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4= +k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo= k8s.io/component-base v0.27.2 h1:neju+7s/r5O4x4/txeUONNTS9r1HsPbyoPBAtHsDCpo= k8s.io/component-base v0.27.2/go.mod h1:5UPk7EjfgrfgRIuDBFtsEFAe4DAvP3U+M8RTzoSJkpo= k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= diff --git a/pkg/apis/pxc/v1/pxc_types.go b/pkg/apis/pxc/v1/pxc_types.go index 14e213adcb..6d9c934561 100644 --- a/pkg/apis/pxc/v1/pxc_types.go +++ b/pkg/apis/pxc/v1/pxc_types.go @@ -14,6 +14,7 @@ import ( "github.com/pkg/errors" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/intstr" @@ -24,28 +25,37 @@ import ( // PerconaXtraDBClusterSpec defines the desired state of PerconaXtraDBCluster type PerconaXtraDBClusterSpec struct { - Platform version.Platform `json:"platform,omitempty"` - CRVersion string `json:"crVersion,omitempty"` - Pause bool `json:"pause,omitempty"` - SecretsName string `json:"secretsName,omitempty"` - VaultSecretName string `json:"vaultSecretName,omitempty"` - SSLSecretName string `json:"sslSecretName,omitempty"` - SSLInternalSecretName string `json:"sslInternalSecretName,omitempty"` - LogCollectorSecretName string `json:"logCollectorSecretName,omitempty"` - TLS *TLSSpec `json:"tls,omitempty"` - PXC *PXCSpec `json:"pxc,omitempty"` - ProxySQL *PodSpec `json:"proxysql,omitempty"` - HAProxy *HAProxySpec `json:"haproxy,omitempty"` - PMM *PMMSpec `json:"pmm,omitempty"` - LogCollector *LogCollectorSpec `json:"logcollector,omitempty"` - Backup *PXCScheduledBackup `json:"backup,omitempty"` - UpdateStrategy appsv1.StatefulSetUpdateStrategyType `json:"updateStrategy,omitempty"` - UpgradeOptions UpgradeOptions `json:"upgradeOptions,omitempty"` - AllowUnsafeConfig bool `json:"allowUnsafeConfigurations,omitempty"` - InitImage string `json:"initImage,omitempty"` - EnableCRValidationWebhook *bool `json:"enableCRValidationWebhook,omitempty"` - IgnoreAnnotations []string `json:"ignoreAnnotations,omitempty"` - IgnoreLabels []string `json:"ignoreLabels,omitempty"` + Platform version.Platform `json:"platform,omitempty"` + CRVersion string `json:"crVersion,omitempty"` + Pause bool `json:"pause,omitempty"` + SecretsName string `json:"secretsName,omitempty"` + VaultSecretName string `json:"vaultSecretName,omitempty"` + SSLSecretName string `json:"sslSecretName,omitempty"` + SSLInternalSecretName string `json:"sslInternalSecretName,omitempty"` + LogCollectorSecretName string `json:"logCollectorSecretName,omitempty"` + TLS *TLSSpec `json:"tls,omitempty"` + PXC *PXCSpec `json:"pxc,omitempty"` + ProxySQL *PodSpec `json:"proxysql,omitempty"` + HAProxy *HAProxySpec `json:"haproxy,omitempty"` + PMM *PMMSpec `json:"pmm,omitempty"` + LogCollector *LogCollectorSpec `json:"logcollector,omitempty"` + Backup *PXCScheduledBackup `json:"backup,omitempty"` + UpdateStrategy appsv1.StatefulSetUpdateStrategyType `json:"updateStrategy,omitempty"` + UpgradeOptions UpgradeOptions `json:"upgradeOptions,omitempty"` + AllowUnsafeConfig bool `json:"allowUnsafeConfigurations,omitempty"` + + // Deprecated, should be removed in the future. Use InitContainer.Image instead + InitImage string `json:"initImage,omitempty"` + + InitContainer InitContainerSpec `json:"initContainer,omitempty"` + EnableCRValidationWebhook *bool `json:"enableCRValidationWebhook,omitempty"` + IgnoreAnnotations []string `json:"ignoreAnnotations,omitempty"` + IgnoreLabels []string `json:"ignoreLabels,omitempty"` +} + +type InitContainerSpec struct { + Image string `json:"image,omitempty"` + Resources *corev1.ResourceRequirements `json:"resources,omitempty"` } type PXCSpec struct { @@ -903,6 +913,17 @@ func (cr *PerconaXtraDBCluster) CheckNSetDefaults(serverVersion *version.ServerV cr.Spec.UpgradeOptions.VersionServiceEndpoint = DefaultVersionServiceEndpoint } + if cr.CompareVersionWith("1.14.0") >= 0 { + if cr.Spec.InitContainer.Resources == nil { + cr.Spec.InitContainer.Resources = &corev1.ResourceRequirements{ + Limits: corev1.ResourceList{ + corev1.ResourceMemory: resource.MustParse("50M"), + corev1.ResourceCPU: resource.MustParse("50m"), + }, + } + } + } + return nil } diff --git a/pkg/apis/pxc/v1/zz_generated.deepcopy.go b/pkg/apis/pxc/v1/zz_generated.deepcopy.go index aac9ddf1d6..46aad0174b 100644 --- a/pkg/apis/pxc/v1/zz_generated.deepcopy.go +++ b/pkg/apis/pxc/v1/zz_generated.deepcopy.go @@ -200,6 +200,26 @@ func (in *HAProxySpec) DeepCopy() *HAProxySpec { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *InitContainerSpec) DeepCopyInto(out *InitContainerSpec) { + *out = *in + if in.Resources != nil { + in, out := &in.Resources, &out.Resources + *out = new(corev1.ResourceRequirements) + (*in).DeepCopyInto(*out) + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new InitContainerSpec. +func (in *InitContainerSpec) DeepCopy() *InitContainerSpec { + if in == nil { + return nil + } + out := new(InitContainerSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *LogCollectorSpec) DeepCopyInto(out *LogCollectorSpec) { *out = *in @@ -719,6 +739,7 @@ func (in *PerconaXtraDBClusterSpec) DeepCopyInto(out *PerconaXtraDBClusterSpec) (*in).DeepCopyInto(*out) } out.UpgradeOptions = in.UpgradeOptions + in.InitContainer.DeepCopyInto(&out.InitContainer) if in.EnableCRValidationWebhook != nil { in, out := &in.EnableCRValidationWebhook, &out.EnableCRValidationWebhook *out = new(bool) diff --git a/pkg/controller/pxc/controller.go b/pkg/controller/pxc/controller.go index a4d6830cf7..f9362bd5ad 100644 --- a/pkg/controller/pxc/controller.go +++ b/pkg/controller/pxc/controller.go @@ -315,6 +315,9 @@ func (r *ReconcilePerconaXtraDBCluster) Reconcile(ctx context.Context, request r if o.CompareVersionWith("1.6.0") >= 0 { initResources = o.Spec.PXC.Resources } + if o.Spec.InitContainer.Resources != nil { + initResources = *o.Spec.InitContainer.Resources + } initC := statefulset.EntrypointInitContainer(initImageName, app.DataVolumeName, initResources, o.Spec.PXC.ContainerSecurityContext, o.Spec.PXC.ImagePullPolicy) inits = append(inits, initC) } @@ -352,8 +355,12 @@ func (r *ReconcilePerconaXtraDBCluster) Reconcile(ctx context.Context, request r var proxyInits []corev1.Container if o.CompareVersionWith("1.13.0") >= 0 { + initResources := o.Spec.PXC.Resources + if o.Spec.InitContainer.Resources != nil { + initResources = *o.Spec.InitContainer.Resources + } proxyInits = []corev1.Container{ - statefulset.EntrypointInitContainer(initImageName, app.BinVolumeName, o.Spec.PXC.Resources, o.Spec.PXC.ContainerSecurityContext, o.Spec.PXC.ImagePullPolicy), + statefulset.EntrypointInitContainer(initImageName, app.BinVolumeName, initResources, o.Spec.PXC.ContainerSecurityContext, o.Spec.PXC.ImagePullPolicy), } } @@ -506,6 +513,9 @@ func (r *ReconcilePerconaXtraDBCluster) deploy(ctx context.Context, cr *api.Perc if cr.CompareVersionWith("1.6.0") >= 0 { initResources = cr.Spec.PXC.Resources } + if cr.Spec.InitContainer.Resources != nil { + initResources = *cr.Spec.InitContainer.Resources + } initC := statefulset.EntrypointInitContainer(initImageName, app.DataVolumeName, initResources, cr.Spec.PXC.ContainerSecurityContext, cr.Spec.PXC.ImagePullPolicy) inits = append(inits, initC) } @@ -612,8 +622,12 @@ func (r *ReconcilePerconaXtraDBCluster) deploy(ctx context.Context, cr *api.Perc var proxyInits []corev1.Container if cr.CompareVersionWith("1.13.0") >= 0 { + initResources := cr.Spec.PXC.Resources + if cr.Spec.InitContainer.Resources != nil { + initResources = *cr.Spec.InitContainer.Resources + } proxyInits = []corev1.Container{ - statefulset.EntrypointInitContainer(initImageName, app.BinVolumeName, cr.Spec.PXC.Resources, cr.Spec.PXC.ContainerSecurityContext, cr.Spec.PXC.ImagePullPolicy), + statefulset.EntrypointInitContainer(initImageName, app.BinVolumeName, initResources, cr.Spec.PXC.ContainerSecurityContext, cr.Spec.PXC.ImagePullPolicy), } } @@ -1422,6 +1436,9 @@ func (r *ReconcilePerconaXtraDBCluster) getConfigVolume(nsName, cvName, cmName s } func getInitImage(ctx context.Context, cr *api.PerconaXtraDBCluster, cli client.Client) (string, error) { + if len(cr.Spec.InitContainer.Image) > 0 { + return cr.Spec.InitContainer.Image, nil + } if len(cr.Spec.InitImage) > 0 { return cr.Spec.InitImage, nil }