From c0827e5821686eba3c81399dbff4be6b6ef52089 Mon Sep 17 00:00:00 2001 From: Christian Tran Date: Tue, 16 Feb 2021 17:49:26 +0100 Subject: [PATCH] fix(helm test): remove tests in helm deployment (#40) --- .circleci/config.yml | 10 +--------- environments/common.yaml.gotmpl | 11 ----------- environments/default.yaml | 16 ---------------- environments/qa.yaml | 15 --------------- environments/staging.yaml | 15 --------------- values/orchestrate.yaml.gotmpl | 23 ----------------------- values/vault.yaml.gotmpl | 13 ++++++------- 7 files changed, 7 insertions(+), 96 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e11dbeb..f55ba13 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,9 +10,7 @@ commands: [ "<< pipeline.parameters.environment_values >>" ] && echo 'export ENVIRONMENT_VALUES=<< pipeline.parameters.environment_values >>' >> $BASH_ENV [ "<< pipeline.parameters.orchestrate_namespace >>" ] && echo 'export ORCHESTRATE_NAMESPACE=<< pipeline.parameters.orchestrate_namespace >>' >> $BASH_ENV [ "<< pipeline.parameters.orchestrate_tag >>" ] && echo 'export ORCHESTRATE_TAG=<< pipeline.parameters.orchestrate_tag >>' >> $BASH_ENV - [ "<< pipeline.parameters.test_tag >>" ] && echo 'export TEST_TAG=<< pipeline.parameters.test_tag >>' >> $BASH_ENV [ "<< pipeline.parameters.orchestrate_repository >>" ] && echo 'export ORCHESTRATE_REPOSITORY=<< pipeline.parameters.orchestrate_repository >>' >> $BASH_ENV - [ "<< pipeline.parameters.test_repository >>" ] && echo 'export TEST_REPOSITORY=<< pipeline.parameters.test_repository >>' >> $BASH_ENV [ "<< pipeline.parameters.registry_url >>" ] && echo 'export REGISTRY_URL=<< pipeline.parameters.registry_url >>' >> $BASH_ENV [ "<< pipeline.parameters.registry_username >>" ] && echo 'export REGISTRY_USERNAME=<< pipeline.parameters.registry_username >>' >> $BASH_ENV [ "<< pipeline.parameters.registry_password >>" ] && echo 'export REGISTRY_PASSWORD=<< pipeline.parameters.registry_password >>' >> $BASH_ENV @@ -45,15 +43,9 @@ parameters: orchestrate_tag: type: string default: "" - test_tag: - type: string - default: "" orchestrate_repository: type: string default: "" - test_repository: - type: string - default: "" registry_url: type: string default: "" @@ -85,7 +77,7 @@ jobs: - init - run: name: helmfile apply - command: helmfile -e ${ENVIRONMENT_VALUES} -f helmfile-core.yaml apply --include-tests --suppress-secrets --detailed-exitcode=false --concurrency 1 + command: helmfile -e ${ENVIRONMENT_VALUES} -f helmfile-core.yaml apply --suppress-secrets --detailed-exitcode=false --concurrency 1 - when: condition: equal: [ default, << pipeline.parameters.environment_values >> ] diff --git a/environments/common.yaml.gotmpl b/environments/common.yaml.gotmpl index 204e494..c7ed424 100644 --- a/environments/common.yaml.gotmpl +++ b/environments/common.yaml.gotmpl @@ -33,17 +33,6 @@ orchestrate: environment: {} environmentSecrets: {} - test: - image: - repository: {{ env "TEST_REPOSITORY" | default "docker.cloudsmith.io/consensys/docker-private/orchestrate-e2e" }} - tag: {{ env "TEST_TAG" | default $tag | quote }} - cmd: {{ env "TEST_CMD" | default "e2e" }} - environment: {} - environmentSecrets: {} - report: - enabled: {{ env "TEST_REPORT_ENABLED" | default false }} - storageClass: {{ env "TEST_REPORT_STORAGE" }} - vaultOperator: namespace: {{ env "VAULT_OPERATOR_NAMESPACE" | default "vault-operator" }} diff --git a/environments/default.yaml b/environments/default.yaml index 915d209..fd2358d 100644 --- a/environments/default.yaml +++ b/environments/default.yaml @@ -1,19 +1,3 @@ -orchestrate: - test: - environment: - TEST_GLOBAL_DATA: '{"nodes":{"besu_1":{"URLs":["http://besu-validator1.besu:8545"],"privateAddress":"A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=","fundedPublicKeys":["0x7e654d251da770a068413677967f6d3ea2fea9e4","0x93f7274c9059e601be4512f656b57b830e019e41"],"fundedPrivateKeys":["56202652FDFFD802B7252A456DBD8F3ECC0352BBDE76C23B40AFE8AEBD714E2E","1476c66de79a57e8ab4cadceccbe858c99e5edf3bffea5404b15322b5421e18c"]},"besu_2":{"URLs":["http://besu-validator2.besu:8545"],"privateAddress":"Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs="},"besu_3":{"URLs":["http://besu-validator3.besu:8545"],"privateAddress":"k2zXEin4Ip/qBGlRkJejnGWdP9cjkK+DAvKNW31L2C8="},"quorum_1":{"URLs":["http://quorum-node1.quorum:8545"],"privateAddress":"BULeR8JyUWhiuuCMU/HLA0Q5pzkYT+cHII3ZKBey3Bo=","PrivateTxManager":{"url":"http://quorum-node1.quorum:9080","type":"Tessera"},"fundedPublicKeys":["0x6009608a02a7a15fd6689d6dad560c44e9ab61ff"],"fundedPrivateKeys":["86B021CCB810F26A30445B85F71E4C1596A11A97DDF9B9E348AC93D1DA6735BC"]},"quorum_2":{"privateAddress":"QfeDAys9MPDs2XHExtc84jKGHxZg/aj52DTh0vtA3Xc="},"quorum_3":{"privateAddress":"1iTZde/ndBHvzhcl7V68x44Vx7pl8nwx9LqnM/AfJUg="},"geth":{"URLs":["http://geth.geth:8545"],"fundedPublicKeys":["0xdbb881a51CD4023E4400CEF3ef73046743f08da3"],"fundedPrivateKeys":["5FBB50BFF6DFAD35C4A374C9237BA2F7EAED9C6868E0108CB259B62D68029B1A"]}}}' - CUCUMBER_PATHS: "/features" - ARTIFACTS_PATH: "/artifacts" - CUCUMBER_CONCURRENCY: 10 - CUCUMBER_STEPS_TIMEOUT: '50s' - CUCUMBER_FORMAT: "cucumber" - CUCUMBER_OUTPUTPATH: "/report/output/report.json" - STRESS_CONCURRENCY: 20 - STRESS_ITERATIONS: 100 - STRESS_TIMEOUT: 10m - environmentSecrets: - AUTH_JWT_PRIVATE_KEY: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCjQ2paojdNKLW44G8JSq5yVajgtyxhPbW01RdDxjKpVhFKyIG/5kpkEKMPxeSUs+KHjSQVJ76voM1xrn8sf+iRAh1zyexCD4EsKRd4fY0W/5Bi09zMDDhiFLoZXEmTe72x+nw1q9YFxBsPcwwOl6Ew6+FKXTOg/9mUfoSsoc22hCBSk81VAbKw1TbUqkKWYgMP8vV2uxur6sWIOtxVZo4vAbGvxIF3/RvieC1zAfXpElrFwhddPkBWJrUI13OZTn8AiDc5+DO8qfkAasxkGyYYCILKfj8/c+e4XzX9Ye6STkRMufM4f68LZ6VKZnzLzQcIZ6o6JDWuzrov3frBfxwPAgMBAAECggEARNLHg7t8SoeNy4i45hbYYRRhI5G0IK3t6nQl4YkslBvXIEpT//xpgbNNufl3OYR3SyMhgdWGWe0Ujga8T5sABBj7J3OIp/R3RJFx9nYewwIq8K5VFqNUJWyNYuF3lreEKQHp2Io+p6GasrGR9JjQ95mIGFwfxo/0Pdfzv/5ZhMWTmSTcOi504Vger5TaPobPFOnULq4y1A4eX4puiHDtvx09DUAWbAjGHpCYZjDGRdSXQArYQmUOKy7R46qKT/ollGOWivnEOgsFmXuUWs/shmcrDG4cGBkRrkxyIZhpnpNEEF5TYgulMMzwM+314e8W0lj9iiSB2nXzt8JhEwTz8QKBgQDSCouFj2lNSJDg+kz70eWBF9SQLrBTZ8JcMte3Q+CjCL1FpSVYYBRzwJNvWFyNNv7kHhYefqfcxUVSUnQ1eZIqTXtm9BsLXnTY+uEkV92spjVmfzBKZvtN3zzip97sfMT9qeyagHEHwpP+KaR0nyffAK+VPhlwNMKgQ9rzP4je+QKBgQDG/JwVaL2b53vi9CNh2XI8KNUd6rx6NGC6YTZ/xKVIgczGKTVex/w1DRWFTb0neUsdus5ITqaxQJtJDw/pOwoIag7Q0ttlLNpYsurx3mgMxpYY12/wurvp1NoU3Dq6ob7igfowP+ahUBchRwt1tlezn3TYxVoZpu9dZHtoynOtRwKBgB9vFJJYdBns0kHZM8w8DWzUdCtf0WOqE5xYv4/dyLCdjjXuETi4qFbqayYuwysfH+Zj2kuWCOkxXL6FOH8IQqeyENXHkoSRDkuqwCcAP1ynQzajskZwQwvUbPg+x039Hj4YQCCfOEtBA4T2Fnadmwn0wFJFiOkR/E6f2RSuXX2BAoGALvVqODsxk9s7B0IqH2tbZAsW0CqXNBesRA+w9tIHV2caViFfcPCs+jAORhkkbG5ZZbix+apl+CqQ+trNHHNMWNP+jxVTpTrChHAktdOQpoMu5MnipuLKedI7bPTT/zsweu/FhSFvYd4utzG26J6Rb9hPkOBx9N/KWTXfUcmFJv0CgYAUYVUvPe7MHSd5m8MulxRnVirWzUIUL9Pf1RKWOUq7Ue4oMxzE8CZCJstunCPWgyyxYXgj480PdIuL92eTR+LyaUESb6szZQTxaJfu0mEJS0KYWlONz+jKM4oC06dgJcCMvhgjta2KpXCm3qL1pmKwfFbOLWYBe5uMoHIn9FdJFQ== - observability: enabled: true diff --git a/environments/qa.yaml b/environments/qa.yaml index c194f25..f376625 100644 --- a/environments/qa.yaml +++ b/environments/qa.yaml @@ -6,21 +6,6 @@ orchestrate: AUTH_JWT_CERTIFICATE: MIIDYjCCAkoCCQC9pJWk7qdipjANBgkqhkiG9w0BAQsFADBzMQswCQYDVQQGEwJGUjEOMAwGA1UEBwwFUGFyaXMxEjAQBgNVBAoMCUNvbnNlblN5czEQMA4GA1UECwwHUGVnYVN5czEuMCwGA1UEAwwlZTJlLXRlc3RzLm9yY2hlc3RyYXRlLmNvbnNlbnN5cy5wYXJpczAeFw0xOTEyMjcxNjI5MTdaFw0yMDEyMjYxNjI5MTdaMHMxCzAJBgNVBAYTAkZSMQ4wDAYDVQQHDAVQYXJpczESMBAGA1UECgwJQ29uc2VuU3lzMRAwDgYDVQQLDAdQZWdhU3lzMS4wLAYDVQQDDCVlMmUtdGVzdHMub3JjaGVzdHJhdGUuY29uc2Vuc3lzLnBhcmlzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo0NqWqI3TSi1uOBvCUquclWo4LcsYT21tNUXQ8YyqVYRSsiBv+ZKZBCjD8XklLPih40kFSe+r6DNca5/LH/okQIdc8nsQg+BLCkXeH2NFv+QYtPczAw4YhS6GVxJk3u9sfp8NavWBcQbD3MMDpehMOvhSl0zoP/ZlH6ErKHNtoQgUpPNVQGysNU21KpClmIDD/L1drsbq+rFiDrcVWaOLwGxr8SBd/0b4ngtcwH16RJaxcIXXT5AVia1CNdzmU5/AIg3OfgzvKn5AGrMZBsmGAiCyn4/P3PnuF81/WHukk5ETLnzOH+vC2elSmZ8y80HCGeqOiQ1rs66L936wX8cDwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCNcTs3n/Ps+yIZDH7utxTOaqpDTCB10MzPmb22UAal89couIT6R0fAu14p/LTkxdb2STDySsQY2/Lv6rPdFToHGUI9ZYOTYW1GOWkt1EAao9BzdsoJVwmTON6QnOBKy/9RxlhWP+XSWVsY0te6KYzS7rQyzQoJQeeBNMpUnjiQji9kKi5j9rbVMdjIb4HlmYrcE95ps+oFkyJoA1HLVytAeOjJPXGToNlv3k2UPJzOFUM0ujWWeBTyHMCmZ4RhlrfzDNffY5dlW82USjc5dBlzRyZalXSjhcVhK4asUodomVntrvCShp/8C9LpbQZ+ugFNE8J6neStWrhpRU9/sBJx environmentSecrets: AUTH_API_KEY: with-key - test: - enabled: true - environment: - TEST_GLOBAL_DATA: '{"nodes":{"besu_1":{"URLs":["http://besu-validator1.besu:8545"],"privateAddress":"A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=","fundedPublicKeys":["0x7e654d251da770a068413677967f6d3ea2fea9e4","0x93f7274c9059e601be4512f656b57b830e019e41"],"fundedPrivateKeys":["56202652FDFFD802B7252A456DBD8F3ECC0352BBDE76C23B40AFE8AEBD714E2E","1476c66de79a57e8ab4cadceccbe858c99e5edf3bffea5404b15322b5421e18c"]},"besu_2":{"URLs":["http://besu-validator2.besu:8545"],"privateAddress":"Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs="},"besu_3":{"URLs":["http://besu-validator3.besu:8545"],"privateAddress":"k2zXEin4Ip/qBGlRkJejnGWdP9cjkK+DAvKNW31L2C8="},"quorum_1":{"URLs":["http://quorum-node1.quorum:8545"],"privateAddress":"BULeR8JyUWhiuuCMU/HLA0Q5pzkYT+cHII3ZKBey3Bo=","PrivateTxManager":{"url":"http://quorum-node1.quorum:9080","type":"Tessera"},"fundedPublicKeys":["0x6009608a02a7a15fd6689d6dad560c44e9ab61ff"],"fundedPrivateKeys":["86B021CCB810F26A30445B85F71E4C1596A11A97DDF9B9E348AC93D1DA6735BC"]},"quorum_2":{"privateAddress":"QfeDAys9MPDs2XHExtc84jKGHxZg/aj52DTh0vtA3Xc="},"quorum_3":{"privateAddress":"1iTZde/ndBHvzhcl7V68x44Vx7pl8nwx9LqnM/AfJUg="},"geth":{"URLs":["http://geth.geth:8545"],"fundedPublicKeys":["0xdbb881a51CD4023E4400CEF3ef73046743f08da3"],"fundedPrivateKeys":["5FBB50BFF6DFAD35C4A374C9237BA2F7EAED9C6868E0108CB259B62D68029B1A"]}}}' - CUCUMBER_PATHS: "/features" - ARTIFACTS_PATH: "/artifacts" - CUCUMBER_CONCURRENCY: 5 - CUCUMBER_STEPS_TIMEOUT: '1m' - CUCUMBER_FORMAT: "cucumber" - CUCUMBER_OUTPUTPATH: "/report/output/report.json" - STRESS_CONCURRENCY: 25 - STRESS_ITERATIONS: 100 - STRESS_TIMEOUT: 10m - environmentSecrets: - AUTH_JWT_PRIVATE_KEY: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCjQ2paojdNKLW44G8JSq5yVajgtyxhPbW01RdDxjKpVhFKyIG/5kpkEKMPxeSUs+KHjSQVJ76voM1xrn8sf+iRAh1zyexCD4EsKRd4fY0W/5Bi09zMDDhiFLoZXEmTe72x+nw1q9YFxBsPcwwOl6Ew6+FKXTOg/9mUfoSsoc22hCBSk81VAbKw1TbUqkKWYgMP8vV2uxur6sWIOtxVZo4vAbGvxIF3/RvieC1zAfXpElrFwhddPkBWJrUI13OZTn8AiDc5+DO8qfkAasxkGyYYCILKfj8/c+e4XzX9Ye6STkRMufM4f68LZ6VKZnzLzQcIZ6o6JDWuzrov3frBfxwPAgMBAAECggEARNLHg7t8SoeNy4i45hbYYRRhI5G0IK3t6nQl4YkslBvXIEpT//xpgbNNufl3OYR3SyMhgdWGWe0Ujga8T5sABBj7J3OIp/R3RJFx9nYewwIq8K5VFqNUJWyNYuF3lreEKQHp2Io+p6GasrGR9JjQ95mIGFwfxo/0Pdfzv/5ZhMWTmSTcOi504Vger5TaPobPFOnULq4y1A4eX4puiHDtvx09DUAWbAjGHpCYZjDGRdSXQArYQmUOKy7R46qKT/ollGOWivnEOgsFmXuUWs/shmcrDG4cGBkRrkxyIZhpnpNEEF5TYgulMMzwM+314e8W0lj9iiSB2nXzt8JhEwTz8QKBgQDSCouFj2lNSJDg+kz70eWBF9SQLrBTZ8JcMte3Q+CjCL1FpSVYYBRzwJNvWFyNNv7kHhYefqfcxUVSUnQ1eZIqTXtm9BsLXnTY+uEkV92spjVmfzBKZvtN3zzip97sfMT9qeyagHEHwpP+KaR0nyffAK+VPhlwNMKgQ9rzP4je+QKBgQDG/JwVaL2b53vi9CNh2XI8KNUd6rx6NGC6YTZ/xKVIgczGKTVex/w1DRWFTb0neUsdus5ITqaxQJtJDw/pOwoIag7Q0ttlLNpYsurx3mgMxpYY12/wurvp1NoU3Dq6ob7igfowP+ahUBchRwt1tlezn3TYxVoZpu9dZHtoynOtRwKBgB9vFJJYdBns0kHZM8w8DWzUdCtf0WOqE5xYv4/dyLCdjjXuETi4qFbqayYuwysfH+Zj2kuWCOkxXL6FOH8IQqeyENXHkoSRDkuqwCcAP1ynQzajskZwQwvUbPg+x039Hj4YQCCfOEtBA4T2Fnadmwn0wFJFiOkR/E6f2RSuXX2BAoGALvVqODsxk9s7B0IqH2tbZAsW0CqXNBesRA+w9tIHV2caViFfcPCs+jAORhkkbG5ZZbix+apl+CqQ+trNHHNMWNP+jxVTpTrChHAktdOQpoMu5MnipuLKedI7bPTT/zsweu/FhSFvYd4utzG26J6Rb9hPkOBx9N/KWTXfUcmFJv0CgYAUYVUvPe7MHSd5m8MulxRnVirWzUIUL9Pf1RKWOUq7Ue4oMxzE8CZCJstunCPWgyyxYXgj480PdIuL92eTR+LyaUESb6szZQTxaJfu0mEJS0KYWlONz+jKM4oC06dgJcCMvhgjta2KpXCm3qL1pmKwfFbOLWYBe5uMoHIn9FdJFQ== observability: enabled: true diff --git a/environments/staging.yaml b/environments/staging.yaml index efa85e2..7ac4663 100644 --- a/environments/staging.yaml +++ b/environments/staging.yaml @@ -7,21 +7,6 @@ orchestrate: AUTH_JWT_CERTIFICATE: MIIDYjCCAkoCCQC9pJWk7qdipjANBgkqhkiG9w0BAQsFADBzMQswCQYDVQQGEwJGUjEOMAwGA1UEBwwFUGFyaXMxEjAQBgNVBAoMCUNvbnNlblN5czEQMA4GA1UECwwHUGVnYVN5czEuMCwGA1UEAwwlZTJlLXRlc3RzLm9yY2hlc3RyYXRlLmNvbnNlbnN5cy5wYXJpczAeFw0xOTEyMjcxNjI5MTdaFw0yMDEyMjYxNjI5MTdaMHMxCzAJBgNVBAYTAkZSMQ4wDAYDVQQHDAVQYXJpczESMBAGA1UECgwJQ29uc2VuU3lzMRAwDgYDVQQLDAdQZWdhU3lzMS4wLAYDVQQDDCVlMmUtdGVzdHMub3JjaGVzdHJhdGUuY29uc2Vuc3lzLnBhcmlzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo0NqWqI3TSi1uOBvCUquclWo4LcsYT21tNUXQ8YyqVYRSsiBv+ZKZBCjD8XklLPih40kFSe+r6DNca5/LH/okQIdc8nsQg+BLCkXeH2NFv+QYtPczAw4YhS6GVxJk3u9sfp8NavWBcQbD3MMDpehMOvhSl0zoP/ZlH6ErKHNtoQgUpPNVQGysNU21KpClmIDD/L1drsbq+rFiDrcVWaOLwGxr8SBd/0b4ngtcwH16RJaxcIXXT5AVia1CNdzmU5/AIg3OfgzvKn5AGrMZBsmGAiCyn4/P3PnuF81/WHukk5ETLnzOH+vC2elSmZ8y80HCGeqOiQ1rs66L936wX8cDwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCNcTs3n/Ps+yIZDH7utxTOaqpDTCB10MzPmb22UAal89couIT6R0fAu14p/LTkxdb2STDySsQY2/Lv6rPdFToHGUI9ZYOTYW1GOWkt1EAao9BzdsoJVwmTON6QnOBKy/9RxlhWP+XSWVsY0te6KYzS7rQyzQoJQeeBNMpUnjiQji9kKi5j9rbVMdjIb4HlmYrcE95ps+oFkyJoA1HLVytAeOjJPXGToNlv3k2UPJzOFUM0ujWWeBTyHMCmZ4RhlrfzDNffY5dlW82USjc5dBlzRyZalXSjhcVhK4asUodomVntrvCShp/8C9LpbQZ+ugFNE8J6neStWrhpRU9/sBJx environmentSecrets: AUTH_API_KEY: with-key - test: - enabled: true - environment: - TEST_GLOBAL_DATA: '{"nodes":{"besu_1":{"URLs":["http://besu-validator1.besu:8545"],"privateAddress":"A1aVtMxLCUHmBVHXoZzzBgPbW/wj5axDpW9X8l91SGo=","fundedPublicKeys":["0x7e654d251da770a068413677967f6d3ea2fea9e4","0x93f7274c9059e601be4512f656b57b830e019e41"],"fundedPrivateKeys":["56202652FDFFD802B7252A456DBD8F3ECC0352BBDE76C23B40AFE8AEBD714E2E","1476c66de79a57e8ab4cadceccbe858c99e5edf3bffea5404b15322b5421e18c"]},"besu_2":{"URLs":["http://besu-validator2.besu:8545"],"privateAddress":"Ko2bVqD+nNlNYL5EE7y3IdOnviftjiizpjRt+HTuFBs="},"besu_3":{"URLs":["http://besu-validator3.besu:8545"],"privateAddress":"k2zXEin4Ip/qBGlRkJejnGWdP9cjkK+DAvKNW31L2C8="},"quorum_1":{"URLs":["http://quorum-node1.quorum:8545"],"privateAddress":"BULeR8JyUWhiuuCMU/HLA0Q5pzkYT+cHII3ZKBey3Bo=","PrivateTxManager":{"url":"http://quorum-node1.quorum:9080","type":"Tessera"},"fundedPublicKeys":["0x6009608a02a7a15fd6689d6dad560c44e9ab61ff"],"fundedPrivateKeys":["86B021CCB810F26A30445B85F71E4C1596A11A97DDF9B9E348AC93D1DA6735BC"]},"quorum_2":{"privateAddress":"QfeDAys9MPDs2XHExtc84jKGHxZg/aj52DTh0vtA3Xc="},"quorum_3":{"privateAddress":"1iTZde/ndBHvzhcl7V68x44Vx7pl8nwx9LqnM/AfJUg="},"geth":{"URLs":["http://geth.geth:8545"],"fundedPublicKeys":["0xdbb881a51CD4023E4400CEF3ef73046743f08da3"],"fundedPrivateKeys":["5FBB50BFF6DFAD35C4A374C9237BA2F7EAED9C6868E0108CB259B62D68029B1A"]}}}' - CUCUMBER_PATHS: "/features" - ARTIFACTS_PATH: "/artifacts" - CUCUMBER_CONCURRENCY: 5 - CUCUMBER_STEPS_TIMEOUT: '1m' - CUCUMBER_FORMAT: "cucumber" - CUCUMBER_OUTPUTPATH: "/report/output/report.json" - STRESS_CONCURRENCY: 25 - STRESS_ITERATIONS: 2000 - STRESS_TIMEOUT: 10m - environmentSecrets: - AUTH_JWT_PRIVATE_KEY: MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCjQ2paojdNKLW44G8JSq5yVajgtyxhPbW01RdDxjKpVhFKyIG/5kpkEKMPxeSUs+KHjSQVJ76voM1xrn8sf+iRAh1zyexCD4EsKRd4fY0W/5Bi09zMDDhiFLoZXEmTe72x+nw1q9YFxBsPcwwOl6Ew6+FKXTOg/9mUfoSsoc22hCBSk81VAbKw1TbUqkKWYgMP8vV2uxur6sWIOtxVZo4vAbGvxIF3/RvieC1zAfXpElrFwhddPkBWJrUI13OZTn8AiDc5+DO8qfkAasxkGyYYCILKfj8/c+e4XzX9Ye6STkRMufM4f68LZ6VKZnzLzQcIZ6o6JDWuzrov3frBfxwPAgMBAAECggEARNLHg7t8SoeNy4i45hbYYRRhI5G0IK3t6nQl4YkslBvXIEpT//xpgbNNufl3OYR3SyMhgdWGWe0Ujga8T5sABBj7J3OIp/R3RJFx9nYewwIq8K5VFqNUJWyNYuF3lreEKQHp2Io+p6GasrGR9JjQ95mIGFwfxo/0Pdfzv/5ZhMWTmSTcOi504Vger5TaPobPFOnULq4y1A4eX4puiHDtvx09DUAWbAjGHpCYZjDGRdSXQArYQmUOKy7R46qKT/ollGOWivnEOgsFmXuUWs/shmcrDG4cGBkRrkxyIZhpnpNEEF5TYgulMMzwM+314e8W0lj9iiSB2nXzt8JhEwTz8QKBgQDSCouFj2lNSJDg+kz70eWBF9SQLrBTZ8JcMte3Q+CjCL1FpSVYYBRzwJNvWFyNNv7kHhYefqfcxUVSUnQ1eZIqTXtm9BsLXnTY+uEkV92spjVmfzBKZvtN3zzip97sfMT9qeyagHEHwpP+KaR0nyffAK+VPhlwNMKgQ9rzP4je+QKBgQDG/JwVaL2b53vi9CNh2XI8KNUd6rx6NGC6YTZ/xKVIgczGKTVex/w1DRWFTb0neUsdus5ITqaxQJtJDw/pOwoIag7Q0ttlLNpYsurx3mgMxpYY12/wurvp1NoU3Dq6ob7igfowP+ahUBchRwt1tlezn3TYxVoZpu9dZHtoynOtRwKBgB9vFJJYdBns0kHZM8w8DWzUdCtf0WOqE5xYv4/dyLCdjjXuETi4qFbqayYuwysfH+Zj2kuWCOkxXL6FOH8IQqeyENXHkoSRDkuqwCcAP1ynQzajskZwQwvUbPg+x039Hj4YQCCfOEtBA4T2Fnadmwn0wFJFiOkR/E6f2RSuXX2BAoGALvVqODsxk9s7B0IqH2tbZAsW0CqXNBesRA+w9tIHV2caViFfcPCs+jAORhkkbG5ZZbix+apl+CqQ+trNHHNMWNP+jxVTpTrChHAktdOQpoMu5MnipuLKedI7bPTT/zsweu/FhSFvYd4utzG26J6Rb9hPkOBx9N/KWTXfUcmFJv0CgYAUYVUvPe7MHSd5m8MulxRnVirWzUIUL9Pf1RKWOUq7Ue4oMxzE8CZCJstunCPWgyyxYXgj480PdIuL92eTR+LyaUESb6szZQTxaJfu0mEJS0KYWlONz+jKM4oC06dgJcCMvhgjta2KpXCm3qL1pmKwfFbOLWYBe5uMoHIn9FdJFQ== observability: enabled: true diff --git a/values/orchestrate.yaml.gotmpl b/values/orchestrate.yaml.gotmpl index 8df42c0..a9b7066 100644 --- a/values/orchestrate.yaml.gotmpl +++ b/values/orchestrate.yaml.gotmpl @@ -154,26 +154,3 @@ txSender: - tx-sender topologyKey: "topology.kubernetes.io/zone" weight: 30 - -test: - enabled: {{ .Values | get "orchestrate.test.enabled" true }} - image: - {{- .Values.orchestrate.test.image | toYaml | nindent 4 }} - cmd: {{ .Values | get "orchestrate.test.cmd" "e2e" }} - environment: - {{- range $key, $value := $kafkaEnv }} - {{ $key }}: {{ $value }} - {{- end }} - KAFKA_CONSUMER_GROUP_NAME: group-{{ .Values | get "orchestrate.test.cmd" "e2e" }} - {{- range $key,$value := .Values.orchestrate.test.environment }} - {{ $key }}: {{ $value | quote }} - {{- end }} - environmentSecrets: - {{- range $key,$value := .Values.orchestrate.test.environmentSecrets }} - {{ $key }}: {{ $value | quote }} - {{- end }} - report: - enabled: {{ .Values | get "orchestrate.test.report.enabled" false }} - {{- if .Values.orchestrate.test.report.storageClass }} - storageClass: {{ .Values.orchestrate.test.report.storageClass }} - {{- end }} \ No newline at end of file diff --git a/values/vault.yaml.gotmpl b/values/vault.yaml.gotmpl index 2ca9f2c..c7c6c97 100644 --- a/values/vault.yaml.gotmpl +++ b/values/vault.yaml.gotmpl @@ -6,7 +6,7 @@ templates: name: "vault" spec: size: 1 - image: vault:1.6.1 + image: vault:1.6.2 bankVaultsImage: banzaicloud/bank-vaults:1.8.0 # Vault Pods , Services and TLS Secret annotations @@ -27,12 +27,11 @@ templates: vaultInitContainers: - name: orchestrate-plugin - image: alpine:3.12 + image: alpine:3.13 command: - /bin/sh - -c - | - apk add --no-cache wget wget -q --header='Accept:application/octet-stream' \ $PLUGIN_REPO/releases/download/$PLUGIN_VERSION/$PLUGIN_FILE \ -O "${PLUGINS_PATH}/orchestrate" @@ -106,6 +105,10 @@ templates: statsd_address: localhost:9125 {{ end }} + vaultEnvsConfig: + - name: VAULT_STORAGE_FILE + value: "/vault/file" + serviceMonitorEnabled: {{ .Values.observability.enabled }} # See: https://github.com/banzaicloud/bank-vaults#example-external-vault-configuration for more details. @@ -152,10 +155,6 @@ templates: sha256: {{ .Values.vault.plugin.sha256 }} type: secret - vaultEnvsConfig: - - name: VAULT_STORAGE_FILE - value: "/vault/file" - # Marks presence of Istio, which influences things like port namings istioEnabled: false - |