diff --git a/.pipeline/lib/config.js b/.pipeline/lib/config.js index 3c6387b45..d5ef0e7fe 100644 --- a/.pipeline/lib/config.js +++ b/.pipeline/lib/config.js @@ -19,7 +19,7 @@ const phases = { minioCpuRequest: '50m', minioCpuLimit: '200m', minioMemoryRequest: '500M', minioMemoryLimit: '700M', schemaspyCpuRequest: '50m', schemaspyCpuLimit: '200m', schemaspyMemoryRequest: '150M', schemaspyMemoryLimit: '300M', schemaspyHealthCheckDelay: 160, rabbitmqCpuRequest: '250m', rabbitmqCpuLimit: '700m', rabbitmqMemoryRequest: '500M', rabbitmqMemoryLimit: '1G', rabbitmqPvcSize: '1G', rabbitmqReplica: 1, rabbitmqPostStartSleep: 120, - patroniCpuRequest: '200m', patroniCpuLimit: '400m', patroniMemoryRequest: '250M', patroniMemoryLimit: '500M', patroniPvcSize: '2G', patroniReplica: 1}, + patroniCpuRequest: '200m', patroniCpuLimit: '400m', patroniMemoryRequest: '250M', patroniMemoryLimit: '500M', patroniPvcSize: '2G', patroniReplica: 1, storageClass: 'gluster-block'}, test: {namespace:'tbiwaq-test', name: `${name}`, ssoSuffix:'-test', ssoName:'sso-test', phase: 'test' , changeId:changeId, suffix: `-test`, @@ -30,7 +30,7 @@ const phases = { minioCpuRequest: '50m', minioCpuLimit: '200m', minioMemoryRequest: '500M', minioMemoryLimit: '700M', schemaspyCpuRequest: '20m', schemaspyCpuLimit: '200m', schemaspyMemoryRequest: '150M', schemaspyMemoryLimit: '300M', schemaspyHealthCheckDelay: 160, rabbitmqCpuRequest: '250m', rabbitmqCpuLimit: '700m', rabbitmqMemoryRequest: '500M', rabbitmqMemoryLimit: '700', rabbitmqPvcSize: '1G', rabbitmqReplica: 2, rabbitmqPostStartSleep: 120, - patroniCpuRequest: '500m', patroniCpuLimit: '1000m', patroniMemoryRequest: '500M', patroniMemoryLimit: '1G', patroniPvcSize: '5G', patroniReplica: 2}, + patroniCpuRequest: '500m', patroniCpuLimit: '1000m', patroniMemoryRequest: '500M', patroniMemoryLimit: '1G', patroniPvcSize: '5G', patroniReplica: 2, storageClass: 'netapp-block-standard'}, prod: {namespace:'tbiwaq-prod', name: `${name}`, ssoSuffix:'', ssoName:'sso', phase: 'prod' , changeId:changeId, suffix: `-prod`, @@ -41,7 +41,7 @@ const phases = { minioCpuRequest: '100m', minioCpuLimit: '300m', minioMemoryRequest: '500M', minioMemoryLimit: '700M', schemaspyCpuRequest: '50m', schemaspyCpuLimit: '400m', schemaspyMemoryRequest: '150M', schemaspyMemoryLimit: '300M', schemaspyHealthCheckDelay: 160, rabbitmqCpuRequest: '250m', rabbitmqCpuLimit: '700m', rabbitmqMemoryRequest: '500M', rabbitmqMemoryLimit: '1G', rabbitmqPvcSize: '5G', rabbitmqReplica: 3, rabbitmqPostStartSleep: 120, - patroniCpuRequest: '500m', patroniCpuLimit: '1000m', patroniMemoryRequest: '1G', patroniMemoryLimit: '2G', patroniPvcSize: '10G', patroniReplica: 3}, + patroniCpuRequest: '500m', patroniCpuLimit: '1000m', patroniMemoryRequest: '1G', patroniMemoryLimit: '2G', patroniPvcSize: '10G', patroniReplica: 3, storageClass: 'netapp-block-standard'}, }; diff --git a/.pipeline/lib/deploy.js b/.pipeline/lib/deploy.js index f677132ac..5d20f3fff 100755 --- a/.pipeline/lib/deploy.js +++ b/.pipeline/lib/deploy.js @@ -69,7 +69,8 @@ module.exports = settings => { 'IMAGE_STREAM_NAMESPACE': phases[phase].namespace, 'IMAGE_STREAM_TAG': 'patroni:v10-stable', 'REPLICA': phases[phase].patroniReplica, - 'PVC_SIZE': phases[phase].patroniPvcSize + 'PVC_SIZE': phases[phase].patroniPvcSize, + 'STORAGE_CLASS': phases[phase].storageClass } }))