From aa777eecedbfd39b130cf14d6456307ab4730494 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Wed, 22 Jun 2022 13:04:14 +0200 Subject: [PATCH 01/14] Add test for S3 deep storage --- .../kuttl/s3-deep-storage/00-assert.yaml | 19 +++ .../s3-deep-storage/00-install-zk.yaml.j2 | 22 ++++ .../01-install-minio-certificates.yaml.j2 | 24 ++++ .../s3-deep-storage/02-install-minio.yaml.j2 | 20 +++ .../kuttl/s3-deep-storage/03-assert.yaml | 14 +++ .../s3-deep-storage/03-checks-container.yaml | 22 ++++ .../kuttl/s3-deep-storage/10-assert.yaml | 46 +++++++ .../s3-deep-storage/10-install-druid.yaml.j2 | 99 +++++++++++++++ .../kuttl/s3-deep-storage/11-assert.yaml | 8 ++ .../kuttl/s3-deep-storage/11-healthcheck.yaml | 8 ++ .../kuttl/s3-deep-storage/12-assert.yaml | 8 ++ .../s3-deep-storage/12-ingestioncheck.yaml | 6 + .../kuttl/s3-deep-storage/certs/ca.crt | 23 ++++ .../s3-deep-storage/certs/client.crt.pem | 21 ++++ .../s3-deep-storage/certs/client.csr.pem | 17 +++ .../s3-deep-storage/certs/client.key.pem | 27 ++++ .../kuttl/s3-deep-storage/certs/generate.sh | 46 +++++++ .../kuttl/s3-deep-storage/certs/logfile | 50 ++++++++ .../s3-deep-storage/certs/root-ca.crt.pem | 23 ++++ .../s3-deep-storage/certs/root-ca.crt.srl | 1 + .../s3-deep-storage/certs/root-ca.key.pem | 27 ++++ .../kuttl/s3-deep-storage/certs/tls.crt | 21 ++++ .../kuttl/s3-deep-storage/certs/tls.key | 27 ++++ .../druid-quickstartimport.json | 66 ++++++++++ .../kuttl/s3-deep-storage/healthcheck.py | 64 ++++++++++ .../kuttl/s3-deep-storage/ingestioncheck.py | 117 ++++++++++++++++++ .../kuttl/s3-deep-storage/requirements.txt | 1 + tests/test-definition.yaml | 47 ++++--- 28 files changed, 855 insertions(+), 19 deletions(-) create mode 100644 tests/templates/kuttl/s3-deep-storage/00-assert.yaml create mode 100644 tests/templates/kuttl/s3-deep-storage/00-install-zk.yaml.j2 create mode 100644 tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 create mode 100644 tests/templates/kuttl/s3-deep-storage/02-install-minio.yaml.j2 create mode 100644 tests/templates/kuttl/s3-deep-storage/03-assert.yaml create mode 100644 tests/templates/kuttl/s3-deep-storage/03-checks-container.yaml create mode 100644 tests/templates/kuttl/s3-deep-storage/10-assert.yaml create mode 100644 tests/templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2 create mode 100644 tests/templates/kuttl/s3-deep-storage/11-assert.yaml create mode 100644 tests/templates/kuttl/s3-deep-storage/11-healthcheck.yaml create mode 100644 tests/templates/kuttl/s3-deep-storage/12-assert.yaml create mode 100644 tests/templates/kuttl/s3-deep-storage/12-ingestioncheck.yaml create mode 100644 tests/templates/kuttl/s3-deep-storage/certs/ca.crt create mode 100644 tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem create mode 100644 tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem create mode 100644 tests/templates/kuttl/s3-deep-storage/certs/client.key.pem create mode 100755 tests/templates/kuttl/s3-deep-storage/certs/generate.sh create mode 100644 tests/templates/kuttl/s3-deep-storage/certs/logfile create mode 100644 tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem create mode 100644 tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl create mode 100644 tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem create mode 100644 tests/templates/kuttl/s3-deep-storage/certs/tls.crt create mode 100644 tests/templates/kuttl/s3-deep-storage/certs/tls.key create mode 100644 tests/templates/kuttl/s3-deep-storage/druid-quickstartimport.json create mode 100755 tests/templates/kuttl/s3-deep-storage/healthcheck.py create mode 100755 tests/templates/kuttl/s3-deep-storage/ingestioncheck.py create mode 100644 tests/templates/kuttl/s3-deep-storage/requirements.txt diff --git a/tests/templates/kuttl/s3-deep-storage/00-assert.yaml b/tests/templates/kuttl/s3-deep-storage/00-assert.yaml new file mode 100644 index 00000000..9ad851c7 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/00-assert.yaml @@ -0,0 +1,19 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +metadata: + name: install-zk +timeout: 600 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: druid-zk-server-default +status: + readyReplicas: 1 + replicas: 1 +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: druid-znode diff --git a/tests/templates/kuttl/s3-deep-storage/00-install-zk.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/00-install-zk.yaml.j2 new file mode 100644 index 00000000..a5d4cbbd --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/00-install-zk.yaml.j2 @@ -0,0 +1,22 @@ +--- +apiVersion: zookeeper.stackable.tech/v1alpha1 +kind: ZookeeperCluster +metadata: + name: druid-zk +spec: + servers: + roleGroups: + default: + replicas: 1 + config: + myidOffset: 10 + version: {{ test_scenario['values']['zookeeper'] }} + stopped: false +--- +apiVersion: zookeeper.stackable.tech/v1alpha1 +kind: ZookeeperZnode +metadata: + name: druid-znode +spec: + clusterRef: + name: druid-zk diff --git a/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 new file mode 100644 index 00000000..dd701194 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 @@ -0,0 +1,24 @@ +{% if test_scenario['values']['s3-use-tls'] == 'true' %} +--- +apiVersion: secrets.stackable.tech/v1alpha1 +kind: SecretClass +metadata: + name: secret +spec: + backend: + k8sSearch: + searchNamespace: + pod: {} +--- +apiVersion: v1 +kind: Secret +metadata: + name: minio-druid-tls-certificates + labels: + secrets.stackable.tech/class: minio-druid-tls +# Have a look at the folder certs on how to create this +data: + ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQxekNDQXIrZ0F3SUJBZ0lVYjlSUkx0SENYcnVGTEJjdk5iay92ODgxS2xNd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2V6RUxNQWtHQTFVRUJoTUNSRVV4R3pBWkJnTlZCQWdNRWxOamFHeGxjM2RwWnkxSWIyeHpkR1ZwYmpFTwpNQXdHQTFVRUJ3d0ZWMlZrWld3eEtEQW1CZ05WQkFvTUgxTjBZV05yWVdKc1pTQlRhV2R1YVc1bklFRjFkR2h2CmNtbDBlU0JKYm1NeEZUQVRCZ05WQkFNTURITjBZV05yWVdKc1pTNWtaVEFlRncweU1qQTJNakl3TnpNNU1UVmEKRncwME56QTJNakl3TnpNNU1UVmFNSHN4Q3pBSkJnTlZCQVlUQWtSRk1Sc3dHUVlEVlFRSURCSlRZMmhzWlhOMwphV2N0U0c5c2MzUmxhVzR4RGpBTUJnTlZCQWNNQlZkbFpHVnNNU2d3SmdZRFZRUUtEQjlUZEdGamEyRmliR1VnClUybG5ibWx1WnlCQmRYUm9iM0pwZEhrZ1NXNWpNUlV3RXdZRFZRUUREQXh6ZEdGamEyRmliR1V1WkdVd2dnRWkKTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEaG1JWm1ZYW95b2dYZ3FRNW5aR0tGQ1ZPbApLNGQxYlhSQS9nVTRuQ2dOUGt6eTR1cC9NU05zaWsxdHBQRG0rdlIwM2FkTHdNTDNPWnMwTUNZdHVHNG9YU0ZZCk5uKzNWL080Y1RrMWRYY0sxMFB6VllCK25raFhwakZFS05MdGg4ZDY4VUYzWkpCakNmNUhOeFQvMkQ0eXJkWnkKN2dOQ2xWTFZjcnhlMmZCOFpaWDhHeTkwSUdqK0ZWVGU3ZjhEd0g3YnlQYkJSaGp4NUR3VmtDbUU5SDlPVzBVKwpBRkd0djJwa1BFOHpBREdxZC9BTTZXVGhpSEpoQmNmVmwxT3lVMWlUSXR2OUNKcGlscmlJVHVQRlpDeGkza3hYCkU3bkRxYnA5c0o2bXViazNGMUlVQ1RBZjBWM0FKZWxUcjNnOGRNWU9nbGszeVIrMGJMZkUyZ3BiQ1g2UkFnTUIKQUFHalV6QlJNQjBHQTFVZERnUVdCQlNZTjJSK0R0Y3lENUdETXFORjQ4b0NDYU1FNERBZkJnTlZIU01FR0RBVwpnQlNZTjJSK0R0Y3lENUdETXFORjQ4b0NDYU1FNERBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUEwR0NTcUdTSWIzCkRRRUJDd1VBQTRJQkFRQmkzbzNENmtuQzE3cTQySVc2b2ROellqVno4b1RzTUZnbXg2NE41Y2JnUDhDc0RobkYKRXVuU0hRQk90NnRNRWx2RW0wRE1DUmV6NVBlYitnVFVGMEsyVCtIWWxpdXQ5Z1lkWGd2MDZXemtWdGxtenpDZgp0RjRTNnV6d0tEblF0dVRiUFljYVdXeUdNOUl2bWd1b2tZQ3o0WlJEVi9KL3VzNVVFV2tQS1lIeVg0VENTZXRzClpGYzY1NzBQVjIvM3ovMk1aOXY5NGZ5eU1pbThZMG03ZTREdTZ0dnVJMjBRNjh3T2FGcG5GcVdpUzdsQW5ZbDQKbEx1c0ROZTcxOFdBbTc4NjJvZk9NdjRXMUQxT3NUZnJJYm9rdHdnYzkrQW52NTVmck9WVkJaK2RheTU0dzJjVgpsOUI3c1JKNXNEeHVMTDc2ZElmR0Q4KzhycnZYM2ZKYUdyazMKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= + tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURkRENDQWx3Q0ZITWo1QVVORWd3L0dIaGRyZVBrQlVlVS9WNDFNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1Ic3gKQ3pBSkJnTlZCQVlUQWtSRk1Sc3dHUVlEVlFRSURCSlRZMmhzWlhOM2FXY3RTRzlzYzNSbGFXNHhEakFNQmdOVgpCQWNNQlZkbFpHVnNNU2d3SmdZRFZRUUtEQjlUZEdGamEyRmliR1VnVTJsbmJtbHVaeUJCZFhSb2IzSnBkSGtnClNXNWpNUlV3RXdZRFZRUUREQXh6ZEdGamEyRmliR1V1WkdVd0lCY05Nakl3TmpJeU1EY3pPVEUxV2hnUE1qRXkKTWpBMU1qa3dOek01TVRWYU1IQXhDekFKQmdOVkJBWVRBa1JGTVJzd0dRWURWUVFJREJKVFkyaHNaWE4zYVdjdApTRzlzYzNSbGFXNHhEakFNQmdOVkJBY01CVmRsWkdWc01TZ3dKZ1lEVlFRS0RCOVRkR0ZqYTJGaWJHVWdVMmxuCmJtbHVaeUJCZFhSb2IzSnBkSGtnU1c1ak1Rb3dDQVlEVlFRRERBRXFNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUYKQUFPQ0FROEFNSUlCQ2dLQ0FRRUFuWW96YVF6THhCeE1MY3VVcmtQQ2RoMmZPenIwMS9lVU9HbGFIdXlpUklxZQpyL1BWZWY5TU1GbGZEcnVjVmNpTy9NZ2hicEdmd0NLWjVSSi84YlBRYjFrYUp6bmpJNkdTc0tZY1F3dmQrczhvCkpKYmVNUHlKOHBtYnZlSU8wYjV6VWt3ZjhYT21sb2x5cUpqMmUxMkgxcmdkL1BlWGdwR2NoelhhSmxycmVtZk0KWURlMnVHZzh0eHNaMm10bTVZVDVRYW1GSFdUS2pCUDUzVWprK3ZpaVlSc1NCTjhGbUpsUU51N3Vack5Bdm1ragpQYU80dUh3N09BdnI4c3RGenNucHlEQXUvYmlTOVdEZ2xWUzZMWWFlWEx5MUcvL1RCVGJZSlB3ZE5jVEZPbXp5CmhMbjdYSmZVS1VPRVBtclVQWWtUUTZMVDhaU212ZVpRVG04VVZoeTBoUUlEQVFBQk1BMEdDU3FHU0liM0RRRUIKQ3dVQUE0SUJBUUFhQ2VTOVhYbGNYVkxtUlB6ZnhOT2pWSkxQR1ZrWGtZNEdnOVhzb0JDOVFGYlg5Z05IWHpSZQpTUHp6WGNjS3FXS21yUWIyVUU5VSsxOGJTSkU5T0l5L2c4S09sUndFa2g0b1pkamladlVRQktuUDFxL1NjbTMxCm5FMnpjak9mdnJRaUhLUHdPRFdYZWh1NnlKejB0MHR1MFJmdkxpNW9iK2E4Z2g2SG10VzRIQjNyc1FFTnNhYjIKRWNucmZBTEphSi9TSm5tQS9YamQyMVlhNUNpSGlaQVl6VFR0UmlaRVRVOVY3eXIrSkNsT2hZYkF3djltcXBUTApZZnd6R3JsaGhLM25kbkZ1OEZpTDVxWkNWZ1JWNEtQUURFSGV4N1Q1ajNod0pFcU1XS1RQaUVBcERXL2dSR0JZCnJvb085QlNGSmZ5MW9Sb2NucnMra3NYWWpFaFJ5cmxRCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBbllvemFRekx4QnhNTGN1VXJrUENkaDJmT3pyMDEvZVVPR2xhSHV5aVJJcWVyL1BWCmVmOU1NRmxmRHJ1Y1ZjaU8vTWdoYnBHZndDS1o1UkovOGJQUWIxa2FKem5qSTZHU3NLWWNRd3ZkK3M4b0pKYmUKTVB5SjhwbWJ2ZUlPMGI1elVrd2Y4WE9tbG9seXFKajJlMTJIMXJnZC9QZVhncEdjaHpYYUpscnJlbWZNWURlMgp1R2c4dHhzWjJtdG01WVQ1UWFtRkhXVEtqQlA1M1Vqayt2aWlZUnNTQk44Rm1KbFFOdTd1WnJOQXZta2pQYU80CnVIdzdPQXZyOHN0RnpzbnB5REF1L2JpUzlXRGdsVlM2TFlhZVhMeTFHLy9UQlRiWUpQd2ROY1RGT216eWhMbjcKWEpmVUtVT0VQbXJVUFlrVFE2TFQ4WlNtdmVaUVRtOFVWaHkwaFFJREFRQUJBb0lCQURYazFYbVdtdzdYNzJlcgpRWTNzT0ZaWUErVXJZaCtQM3ZEOWVZc2l3TkJaNjdlZDN1WUJaSHNWMStNZVkza2xSMlZLd2NVbHBGVUNnVXRRCmJOeXUreHRjakFublQ4RWN3U1lWYlkyeVBacFR6QlBZV09MQlFoL3dWTXM4em4wS2ZrRWxNYmhVTENWTG1DSDkKVWpVWjVpS2FrZ2U4VytTYkU4VmRzdWQwS3lLUVhseHJWbzdNSHNxQ1hpcW5uZU1OS0MxQVduYWtuby9MSExFcwpBV2gvSTIzWERDQ09IYVlKenVVTlR3aXlGYXU1RzNmL0pZRlIxeFBvYzh1QkFtOVpxcjdKSm9PSGhiQjNPYm1pClNIcUpXaWg3VGpLalpMc2FDKzlraUhUK1hHOVFXdWZzZ09EZTZTMHVmZys1SkpmNEdHN08ycmxtbXY1MzVmMmgKR1hhM0NnRUNnWUVBMGV1V1Q5WGxlcWw5cERIU2VlQ1B0QThlcjZkcVNzM0ZXWFF3MlJ2WUFFZGxWTE56QWFJcApncUN6VFN3NGdTREJjTUhJZm9sWXJ6Y2xwRFRWc2xFWVZmeElxS3p5cjd4Nk5oMnFrQWFuNkczOVNxUFZyYUlqCjdYaFFBWmx0eG1HbWhWT0RqWjIySWMzRzdFaTg1ZEdKV04wQ05FUmxtUkFtRmg2NzVRZjU1U0VDZ1lFQXdCOGMKT3NrVjhoSmFGVjM5L3NHQ1hWVEttT2pFT2FFOVcwSHhtd0d5TWcxWmpFVHRiZFVDaXBqSnoza0tGekp0ZVFPUgpjb280SkI4N2EwYkp0UnBDNHZHS1lhMTNpeW4wa2tBcjJuRTBuVmJkMlhxLzlseElVZTBGV3dpbExCY1FrekI5CkU1SUlXOW5IR0lGYnEzT3FDa0F0c1JNL3VFSEtsd1hyU0Q2OC91VUNnWUVBdzdSNlp5WElFb3B2ZXlPRDBXSmQKTndZZG1xOWU5aXhPdjY0R1dIS1A5dnFZNnRWOTg5am1FRVdYdyt2bEplV08wbnVuV3VqYlNFY0dqY2RBTDBWUgpoZUIxTU9SRVFUaGJTNVp1ekdXWUpxWmNUVGplM2tqYWErc04wOS9ocXVDaEtZMkppUDZ1cldjMS9GVjMzbDV5ClNPbUt3NFc4bm0yaXhGNlUxOXFPekdFQ2dZQUJJKzRoOXpHWEp6NjdvN3d2Tit6VEt2NnMyNnpXZnJ1RGdDZXoKK05XYThITlluc3dkKzhheEZla1V2eTR0SnhKNVJta2xtZVp0YUhZTTAvVzhpblJkTG52WXlwUE1FcXF0OTQyTApGV0x2a0NWdTlnaVBxTXFSR2V3UE4wVHJ0eE5WSEZPUnV5c3JpR1pqSWRsdWNoaFBTVVE4S2RZVi9PWDc4WUFOCkJMcFFkUUtCZ0hpWE9KaUFxKzNWMXhjZUtJOU54Ymh5YWpKSFBhZ3VPY2Jjd0h5WWovTnhvU3dXTnBhNXArM1IKbE0vQWFDWU9TVXZGZ1FOL3FwTkYwMmJWNGlzOWxzajlyUlZGNEwxYk45THNuclZLbnpiMWMrVjdkWEhGOWxkcQprQ093c3A5dG1GS3FseGJlZ2VBSCtyQjgxY1MyeWR5V0J5SzBUUTlWQ2U1ZFRjMFk4R3JyCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== +{% endif %} diff --git a/tests/templates/kuttl/s3-deep-storage/02-install-minio.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/02-install-minio.yaml.j2 new file mode 100644 index 00000000..3780efd6 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/02-install-minio.yaml.j2 @@ -0,0 +1,20 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +commands: + - script: >- + helm install minio-druid + --namespace $NAMESPACE + --set mode=standalone + --set replicas=1 + --set persistence.enabled=false + --set buckets[0].name=druid,buckets[0].policy=none + --set users[0].accessKey=druid,users[0].secretKey=druiddruid,users[0].policy=readwrite + --set resources.requests.memory=1Gi + --set service.type=NodePort,service.nodePort=null + --set consoleService.type=NodePort,consoleService.nodePort=null +{% if test_scenario['values']['s3-use-tls'] == 'true' %} + --set tls.enabled=true,tls.certSecret=minio-druid-tls-certificates,tls.publicCrt=tls.crt,tls.privateKey=tls.key +{% endif %} + --repo https://charts.min.io/ minio + timeout: 600 diff --git a/tests/templates/kuttl/s3-deep-storage/03-assert.yaml b/tests/templates/kuttl/s3-deep-storage/03-assert.yaml new file mode 100644 index 00000000..af6372f9 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/03-assert.yaml @@ -0,0 +1,14 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +metadata: + name: checks +timeout: 300 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: checks +status: + readyReplicas: 1 + replicas: 1 diff --git a/tests/templates/kuttl/s3-deep-storage/03-checks-container.yaml b/tests/templates/kuttl/s3-deep-storage/03-checks-container.yaml new file mode 100644 index 00000000..afe75a6e --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/03-checks-container.yaml @@ -0,0 +1,22 @@ +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: checks + labels: + app: checks +spec: + replicas: 1 + selector: + matchLabels: + app: checks + template: + metadata: + labels: + app: checks + spec: + containers: + - name: checks + image: python:3.10-slim + stdin: true + tty: true diff --git a/tests/templates/kuttl/s3-deep-storage/10-assert.yaml b/tests/templates/kuttl/s3-deep-storage/10-assert.yaml new file mode 100644 index 00000000..8165295f --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/10-assert.yaml @@ -0,0 +1,46 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +metadata: + name: install-druid +timeout: 600 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: druid-s3-deep-storage-broker-default +status: + readyReplicas: 1 + replicas: 1 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: druid-s3-deep-storage-coordinator-default +status: + readyReplicas: 1 + replicas: 1 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: druid-s3-deep-storage-historical-default +status: + readyReplicas: 1 + replicas: 1 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: druid-s3-deep-storage-middlemanager-default +status: + readyReplicas: 1 + replicas: 1 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: druid-s3-deep-storage-router-default +status: + readyReplicas: 1 + replicas: 1 diff --git a/tests/templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2 new file mode 100644 index 00000000..259eaeba --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2 @@ -0,0 +1,99 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +metadata: + name: install-druid +timeout: 180 +--- +apiVersion: secrets.stackable.tech/v1alpha1 +kind: SecretClass +metadata: + name: druid-s3-credentials +spec: + backend: + k8sSearch: + searchNamespace: + pod: {} +--- +apiVersion: v1 +kind: Secret +metadata: + name: druid-s3-credentials + labels: + secrets.stackable.tech/class: druid-s3-credentials +stringData: + accessKey: druid + secretKey: druiddruid +--- +apiVersion: druid.stackable.tech/v1alpha1 +kind: DruidCluster +metadata: + name: druid-s3-deep-storage +spec: + version: {{ test_scenario['values']['druid'] }} + zookeeperConfigMapName: druid-znode + metadataStorageDatabase: + dbType: derby + connString: jdbc:derby://localhost:1527/var/druid/metadata.db;create=true + host: localhost + port: 1527 + deepStorage: + s3: + bucket: + inline: + bucketName: druid + connection: + inline: + host: minio-druid + port: 9000 + accessStyle: Path + credentials: + secretClass: druid-s3-credentials +{% if test_scenario['values']['s3-use-tls'] == 'true' %} + tls: + verification: + server: + caCert: + secretClass: minio-druid-tls-certificates +{% endif %} + baseKey: deep-storage # TODO Rename baseKey to prefix or so + brokers: + roleGroups: + default: + selector: + matchLabels: + kubernetes.io/os: linux + config: {} + replicas: 1 + coordinators: + roleGroups: + default: + selector: + matchLabels: + kubernetes.io/os: linux + config: {} + replicas: 1 + historicals: + roleGroups: + default: + selector: + matchLabels: + kubernetes.io/os: linux + config: {} + replicas: 1 + middleManagers: + roleGroups: + default: + selector: + matchLabels: + kubernetes.io/os: linux + config: {} + replicas: 1 + routers: + roleGroups: + default: + selector: + matchLabels: + kubernetes.io/os: linux + config: {} + replicas: 1 diff --git a/tests/templates/kuttl/s3-deep-storage/11-assert.yaml b/tests/templates/kuttl/s3-deep-storage/11-assert.yaml new file mode 100644 index 00000000..4801f6df --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/11-assert.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +metadata: + name: install-healthcheck-files +commands: + - script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/healthcheck.py druid-s3-deep-storage +timeout: 300 diff --git a/tests/templates/kuttl/s3-deep-storage/11-healthcheck.yaml b/tests/templates/kuttl/s3-deep-storage/11-healthcheck.yaml new file mode 100644 index 00000000..bddb355a --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/11-healthcheck.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +timeout: 600 +commands: + - script: kubectl cp -n $NAMESPACE ./healthcheck.py checks-0:/tmp + - script: kubectl cp -n $NAMESPACE ./requirements.txt checks-0:/tmp + - script: kubectl exec -n $NAMESPACE checks-0 -- pip install --user -r /tmp/requirements.txt diff --git a/tests/templates/kuttl/s3-deep-storage/12-assert.yaml b/tests/templates/kuttl/s3-deep-storage/12-assert.yaml new file mode 100644 index 00000000..91748eb2 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/12-assert.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +metadata: + name: ingestion-check +commands: + - script: kubectl exec -n $NAMESPACE checks-0 -- python /tmp/ingestioncheck.py druid-s3-deep-storage +timeout: 300 diff --git a/tests/templates/kuttl/s3-deep-storage/12-ingestioncheck.yaml b/tests/templates/kuttl/s3-deep-storage/12-ingestioncheck.yaml new file mode 100644 index 00000000..c5b501e7 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/12-ingestioncheck.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +commands: + - script: kubectl cp -n $NAMESPACE ./ingestioncheck.py checks-0:/tmp + - script: kubectl cp -n $NAMESPACE ./druid-quickstartimport.json checks-0:/tmp diff --git a/tests/templates/kuttl/s3-deep-storage/certs/ca.crt b/tests/templates/kuttl/s3-deep-storage/certs/ca.crt new file mode 100644 index 00000000..64cc9ee0 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/certs/ca.crt @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID1zCCAr+gAwIBAgIUJAAClB4u/6WanKnnZB+wuRpsUa4wDQYJKoZIhvcNAQEL +BQAwezELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1Ib2xzdGVpbjEO +MAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJsZSBTaWduaW5nIEF1dGhv +cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAeFw0yMjA2MjIwNzM5NTla +Fw00NzA2MjIwNzM5NTlaMHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3 +aWctSG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUg +U2lnbmluZyBBdXRob3JpdHkgSW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH/LM3NVDW4v/OD2aT/gSNI07I +oss5A2ytpa5Y0YunweqnUzchBbdJG6DX6cC/N5MmSSHQbOspKGFLtTSD/nS8bNGb +4DkIcnmC/suAj2z8dEzrPQizXMDpAnjD93Ip7FkRzTWNWbTtT/djNVkwlMfSu6uk +I+Ppa+9QlqyMz3o2g4R8pYLG6RLb2Es0U9idyouuUj3llUKWYeZfzBSAYLT+VA1D +ErzcqiuwUugZlTFthMpOvg88rMakp7PNspW+EOb9teLCVmlbu4ZneMzmjvjxg4OK +yAc5sVBWbeC95xYfHKivMe/PJxdwNVOAUp4XpB+fe3K87VwDpITgihkCaA/tAgMB +AAGjUzBRMB0GA1UdDgQWBBT22K8IF72JhBBAOl9cr2Ad47UNtTAfBgNVHSMEGDAW +gBT22K8IF72JhBBAOl9cr2Ad47UNtTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 +DQEBCwUAA4IBAQAbfUR/jU1oj3soqres/yikgR8AzT4d89Arbfo6jZIeexvGx386 +TNo3SmyLqhNT0I6IFL1UL+UiImSohx1H1h1dvf1/1/j66tH92Ho48vtacC5vxU9Y +0L10EnOzQicU4CO3Hgk+3jd9w1HE+JeIzVCt4c2FjHM/ybDAD0MW3KazIVq7GFYu +gYX3dJUAJUa11IIySDAnn33Etn7P+h6Sm2wWxtsxziqYBFzg8RZzHXXuDTRMf7+e +IUJ3B9OYNPbQrg+pzvkID066YWeN9lIR6cACFNLxRthUj6O+zilv9Gr4N0mbJCB9 +G4mR7Y8ginVDtUM7g9SRSpyrlxK71SJDeRvJ +-----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem b/tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem new file mode 100644 index 00000000..674dd312 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDdDCCAlwCFHMj5AUNEgw/GHhdrePkBUeU/V42MA0GCSqGSIb3DQEBCwUAMHsx +CzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWctSG9sc3RlaW4xDjAMBgNV +BAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2lnbmluZyBBdXRob3JpdHkg +SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjIyMDczOTU5WhgPMjEy +MjA1MjkwNzM5NTlaMHAxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct +SG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2ln +bmluZyBBdXRob3JpdHkgSW5jMQowCAYDVQQDDAEqMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAyWWZaoXwz8PKiMdaIYtT99pD6miuFTjCM/QcX10r/lWX +Wm6QxAabwyy8P/cLcNzKUKKi2mE49L/hhXb5/vocrP9mQwzWs9a2w9YT1N1fOdtO +ZSU3I5DFzKNhPKHp7hHODhZGqXeimUAR1MIIH2ECjP1juqU4byRB5IHN6rreQ7FA +dGJhjC1XYzkDKZZKZrZCRyqPAw0Wljc19OXxH/wUoJASuuoai0KSqiNmrC95C1vL +crZQDpkZJndGe0pVY2CIHq/zQ093svpR7g7wBgPsi8H7LBffxz9Vzu44ncTN/aSX +HeX3cMr0XqyNfZfHCMaXrPw16COW5jRgfFMUOuUxWwIDAQABMA0GCSqGSIb3DQEB +CwUAA4IBAQCVaRh2+nm5j0rx7B8IrLfDZ+Cj361BVxQKXd7u13U1dQZ9gtZUqCRV +jpB/LEFQ4yHbDdh0R/sZTqY2I/I0+AqqMumSMTK/p6+zq/4dWjXZmcvqseAXqP/D +wybaihGKf+fDa+RCj9DrK0V+ULCt79cds841hSh4oZ2PKs20sK4pm/QCmHX4XQRD +HqJOC4twsRVaY5mEoJTu7/Dce4rV8c9zRyYqnW2dOfn25RlJUHZmrsOhPmIW+g1Y +5aJhUnChZVxkkdQbu3oJ1E8oIvCqj4VlowKkqeeoCwil5DUZCa5f0CKlO5GpnPK8 +7wtPFTfKR77DOeUn7skv3h0YdoE57DUd +-----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem b/tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem new file mode 100644 index 00000000..af15e76c --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem @@ -0,0 +1,17 @@ +-----BEGIN CERTIFICATE REQUEST----- +MIICtTCCAZ0CAQAwcDELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1I +b2xzdGVpbjEOMAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJsZSBTaWdu +aW5nIEF1dGhvcml0eSBJbmMxCjAIBgNVBAMMASowggEiMA0GCSqGSIb3DQEBAQUA +A4IBDwAwggEKAoIBAQDJZZlqhfDPw8qIx1ohi1P32kPqaK4VOMIz9BxfXSv+VZda +bpDEBpvDLLw/9wtw3MpQoqLaYTj0v+GFdvn++hys/2ZDDNaz1rbD1hPU3V85205l +JTcjkMXMo2E8oenuEc4OFkapd6KZQBHUwggfYQKM/WO6pThvJEHkgc3qut5DsUB0 +YmGMLVdjOQMplkpmtkJHKo8DDRaWNzX05fEf/BSgkBK66hqLQpKqI2asL3kLW8ty +tlAOmRkmd0Z7SlVjYIger/NDT3ey+lHuDvAGA+yLwfssF9/HP1XO7jidxM39pJcd +5fdwyvRerI19l8cIxpes/DXoI5bmNGB8UxQ65TFbAgMBAAGgADANBgkqhkiG9w0B +AQsFAAOCAQEAh+ztHTmtEYUYYPPn3NyE5JuQLeZm7aH3Qrpw65GcDQWLZNHdwSdW +gLQYZaGBvNDb1y0Nu2zIpWADnqDfv8D5mpTYEMe7ZpQkuML8fzwlQFZROWPGlNzn +12tMNAXs0pyyzi4we8I/+W10SefWDGbluTfsWWGtAFCIVhIZGqUPcMq6fCWlvzkE +K82I66sz6dayIDQVyUMSLIYKl8qUxUvY6sV0WRVodWqfP8bhOHzUdatwasmhLUg+ +2UTCTx0icmp2txOXOgwxinvN5zHG4a8Ng5vPuBaHjmPpTSQ69qzEQaFtIcdrbQKs +Y9NPBZNZ6I95aliBqnFaykIZClTb09CV7g== +-----END CERTIFICATE REQUEST----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/client.key.pem b/tests/templates/kuttl/s3-deep-storage/certs/client.key.pem new file mode 100644 index 00000000..04fc15b3 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/certs/client.key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAyWWZaoXwz8PKiMdaIYtT99pD6miuFTjCM/QcX10r/lWXWm6Q +xAabwyy8P/cLcNzKUKKi2mE49L/hhXb5/vocrP9mQwzWs9a2w9YT1N1fOdtOZSU3 +I5DFzKNhPKHp7hHODhZGqXeimUAR1MIIH2ECjP1juqU4byRB5IHN6rreQ7FAdGJh +jC1XYzkDKZZKZrZCRyqPAw0Wljc19OXxH/wUoJASuuoai0KSqiNmrC95C1vLcrZQ +DpkZJndGe0pVY2CIHq/zQ093svpR7g7wBgPsi8H7LBffxz9Vzu44ncTN/aSXHeX3 +cMr0XqyNfZfHCMaXrPw16COW5jRgfFMUOuUxWwIDAQABAoIBAQCmMszXJm9i1V1X +YMQVeIgzupBfakF2y98fxqx/WkFK4tFDVIjs69MwzsMPOkzbt6jRwFUKSD8bYxm1 +7UhDTZ3Kef2nCXpI8MDkfc7h1EmYUk2wlHSbSgahaJZ+1dNZnqHf6Cwp/8tUEpZk +cDcJxiG3vgfF6EDZHx+tdh07PzjavH3rrqCj3/5vo/vC7qC92uL4ag64F9+CXDis +2EmitaAOelK/mLbfW6Pog5yQqUAKg4eJ/P2/Wj4OBi3nC/QEEkyXE9gXw0GNCkLX +FkPrMVZJGUhmIn3aPAvFtAE0XJ28Ipvj2+zEv0lXJTWv+QHnhvqjxkAaqd1f+tt6 +f5b0iA9xAoGBAOg4I6ysQaXJ+6SMF0JWt3YOzH3yTYNIoTsci2PhxsnctaANDXw0 +h2YluA499TVyF8MrRk3hJY2XcwdPSRtEox332j5IigJw9OkrYHbAEqlWNf2e5XN/ +OFY9ieZoRWHZG0PGnrxzXa/RCaZmx+b83xkfF1dlvpGKABQgh7PHK3NpAoGBAN4F +a1sVTTwbMyN/1ta8zASYJiPgIMxE64+NJgqHQ2Ow5NxK6BEI+Nq7UgCImAfaoKID +yzbThTG+n+qlNLLMtlIfctL1Xmi1RIfR4B5HlqXFpSCku3Yqh2OHyyCwwg4SLa0T +ZEp6ueNSNIAJNaBXS3M824yv5JBgx8uteYwVpdojAoGAUZBeX2kFieDfBVW7Wa6x +s8LQ6q/vr9wT3XpSL1v/AaoHFVdgVC7zG9rFwiLa/NG9LO0HPZWGJix616duiyhZ +js4elt/NsbvRGhEFSdB+/YFtZ06nUyDtPcVRqV8Yd5zVKcIawSBYWMe4dv0E28oX +5m/4N9dhzybEjk06vNeJGHkCgYEAlcVuIGmESpHGs6HfmciOkGLbB8SAG4w6pAIB +sYSBz1RbbsgROLyms1c+ACIk/NddGS4Z/gg+h8oiMrXzkNJMA6Y3XVwsrdHqQv0v +hP2iAH4N4LF/zDzwTBIk0w6qObfFnEXCmAOmNlUUGXMc++cnfLuHF6boNwUygpGp +tvg7g6UCgYEAhh/0hcCQjLH2Bt+PUf3+NEbxmKeDGMHkCK3qmu5RFpqdOoQLb9Dm +gyLxVTSdQysLaNRTZqJ27CL/7ogANsa4sS6OXI/NvP26iBepe4cC8oZOlrFEVslq +BqqA28bbo6Y+zObkQWFlAGwjZRMaiVDMt3LJF3i/LoztzVnFhoE+OXc= +-----END RSA PRIVATE KEY----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/generate.sh b/tests/templates/kuttl/s3-deep-storage/certs/generate.sh new file mode 100755 index 00000000..ba18b790 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/certs/generate.sh @@ -0,0 +1,46 @@ +#!/bin/bash + +echo "Creating Root Certificate Authority" +openssl genrsa \ + -out root-ca.key.pem \ + 2048 + +echo "Self-signing the Root Certificate Authority" +openssl req \ + -x509 \ + -new \ + -nodes \ + -key root-ca.key.pem \ + -days 9131 \ + -out root-ca.crt.pem \ + -subj "/C=DE/ST=Schleswig-Holstein/L=Wedel/O=Stackable Signing Authority Inc/CN=stackable.de" + +echo "Creating client cert" +FQDN="*" + +openssl genrsa \ + -out client.key.pem \ + 2048 + +echo "Creating the CSR" +openssl req -new \ + -key client.key.pem \ + -out client.csr.pem \ + -subj "/C=DE/ST=Schleswig-Holstein/L=Wedel/O=Stackable/CN=${FQDN}" + +echo "Signing the client cert with the root ca" +openssl x509 \ + -req -in client.csr.pem \ + -CA root-ca.crt.pem \ + -CAkey root-ca.key.pem \ + -CAcreateserial \ + -out client.crt.pem \ + -days 36500 + +echo "Copying the files to match the api of the secret-operator" +cp root-ca.crt.pem ca.crt +cp client.key.pem tls.key +cp client.crt.pem tls.crt + +echo "To create a k8s secret run" +echo "kubectl create secret generic foo --from-file=ca.crt --from-file=tls.crt --from-file=tls.key" diff --git a/tests/templates/kuttl/s3-deep-storage/certs/logfile b/tests/templates/kuttl/s3-deep-storage/certs/logfile new file mode 100644 index 00000000..1c7c3765 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/certs/logfile @@ -0,0 +1,50 @@ +CONNECTED(00000003) +--- +Certificate chain + 0 s:C = DE, ST = Schleswig-Holstein, L = Wedel, O = Stackable Signing Authority Inc, CN = * + i:C = DE, ST = Schleswig-Holstein, L = Wedel, O = Stackable Signing Authority Inc, CN = stackable.de +--- +Server certificate +-----BEGIN CERTIFICATE----- +MIIDdDCCAlwCFHMj5AUNEgw/GHhdrePkBUeU/V41MA0GCSqGSIb3DQEBCwUAMHsx +CzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWctSG9sc3RlaW4xDjAMBgNV +BAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2lnbmluZyBBdXRob3JpdHkg +SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjIyMDczOTE1WhgPMjEy +MjA1MjkwNzM5MTVaMHAxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct +SG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2ln +bmluZyBBdXRob3JpdHkgSW5jMQowCAYDVQQDDAEqMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAnYozaQzLxBxMLcuUrkPCdh2fOzr01/eUOGlaHuyiRIqe +r/PVef9MMFlfDrucVciO/MghbpGfwCKZ5RJ/8bPQb1kaJznjI6GSsKYcQwvd+s8o +JJbeMPyJ8pmbveIO0b5zUkwf8XOmlolyqJj2e12H1rgd/PeXgpGchzXaJlrremfM +YDe2uGg8txsZ2mtm5YT5QamFHWTKjBP53Ujk+viiYRsSBN8FmJlQNu7uZrNAvmkj +PaO4uHw7OAvr8stFzsnpyDAu/biS9WDglVS6LYaeXLy1G//TBTbYJPwdNcTFOmzy +hLn7XJfUKUOEPmrUPYkTQ6LT8ZSmveZQTm8UVhy0hQIDAQABMA0GCSqGSIb3DQEB +CwUAA4IBAQAaCeS9XXlcXVLmRPzfxNOjVJLPGVkXkY4Gg9XsoBC9QFbX9gNHXzRe +SPzzXccKqWKmrQb2UE9U+18bSJE9OIy/g8KOlRwEkh4oZdjiZvUQBKnP1q/Scm31 +nE2zcjOfvrQiHKPwODWXehu6yJz0t0tu0RfvLi5ob+a8gh6HmtW4HB3rsQENsab2 +EcnrfALJaJ/SJnmA/Xjd21Ya5CiHiZAYzTTtRiZETU9V7yr+JClOhYbAwv9mqpTL +YfwzGrlhhK3ndnFu8FiL5qZCVgRV4KPQDEHex7T5j3hwJEqMWKTPiEApDW/gRGBY +rooO9BSFJfy1oRocnrs+ksXYjEhRyrlQ +-----END CERTIFICATE----- +subject=C = DE, ST = Schleswig-Holstein, L = Wedel, O = Stackable Signing Authority Inc, CN = * + +issuer=C = DE, ST = Schleswig-Holstein, L = Wedel, O = Stackable Signing Authority Inc, CN = stackable.de + +--- +No client certificate CA names sent +Peer signing digest: SHA256 +Peer signature type: RSA-PSS +Server Temp Key: X25519, 253 bits +--- +SSL handshake has read 1428 bytes and written 347 bytes +Verification error: unable to verify the first certificate +--- +New, TLSv1.3, Cipher is TLS_AES_128_GCM_SHA256 +Server public key is 2048 bit +Secure Renegotiation IS NOT supported +Compression: NONE +Expansion: NONE +No ALPN negotiated +Early data was not sent +Verify return code: 21 (unable to verify the first certificate) +--- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem new file mode 100644 index 00000000..64cc9ee0 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIID1zCCAr+gAwIBAgIUJAAClB4u/6WanKnnZB+wuRpsUa4wDQYJKoZIhvcNAQEL +BQAwezELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1Ib2xzdGVpbjEO +MAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJsZSBTaWduaW5nIEF1dGhv +cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAeFw0yMjA2MjIwNzM5NTla +Fw00NzA2MjIwNzM5NTlaMHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3 +aWctSG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUg +U2lnbmluZyBBdXRob3JpdHkgSW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH/LM3NVDW4v/OD2aT/gSNI07I +oss5A2ytpa5Y0YunweqnUzchBbdJG6DX6cC/N5MmSSHQbOspKGFLtTSD/nS8bNGb +4DkIcnmC/suAj2z8dEzrPQizXMDpAnjD93Ip7FkRzTWNWbTtT/djNVkwlMfSu6uk +I+Ppa+9QlqyMz3o2g4R8pYLG6RLb2Es0U9idyouuUj3llUKWYeZfzBSAYLT+VA1D +ErzcqiuwUugZlTFthMpOvg88rMakp7PNspW+EOb9teLCVmlbu4ZneMzmjvjxg4OK +yAc5sVBWbeC95xYfHKivMe/PJxdwNVOAUp4XpB+fe3K87VwDpITgihkCaA/tAgMB +AAGjUzBRMB0GA1UdDgQWBBT22K8IF72JhBBAOl9cr2Ad47UNtTAfBgNVHSMEGDAW +gBT22K8IF72JhBBAOl9cr2Ad47UNtTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 +DQEBCwUAA4IBAQAbfUR/jU1oj3soqres/yikgR8AzT4d89Arbfo6jZIeexvGx386 +TNo3SmyLqhNT0I6IFL1UL+UiImSohx1H1h1dvf1/1/j66tH92Ho48vtacC5vxU9Y +0L10EnOzQicU4CO3Hgk+3jd9w1HE+JeIzVCt4c2FjHM/ybDAD0MW3KazIVq7GFYu +gYX3dJUAJUa11IIySDAnn33Etn7P+h6Sm2wWxtsxziqYBFzg8RZzHXXuDTRMf7+e +IUJ3B9OYNPbQrg+pzvkID066YWeN9lIR6cACFNLxRthUj6O+zilv9Gr4N0mbJCB9 +G4mR7Y8ginVDtUM7g9SRSpyrlxK71SJDeRvJ +-----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl new file mode 100644 index 00000000..e8211f57 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl @@ -0,0 +1 @@ +7323E4050D120C3F18785DADE3E4054794FD5E36 diff --git a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem new file mode 100644 index 00000000..52e92273 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAx/yzNzVQ1uL/zg9mk/4EjSNOyKLLOQNsraWuWNGLp8Hqp1M3 +IQW3SRug1+nAvzeTJkkh0GzrKShhS7U0g/50vGzRm+A5CHJ5gv7LgI9s/HRM6z0I +s1zA6QJ4w/dyKexZEc01jVm07U/3YzVZMJTH0rurpCPj6WvvUJasjM96NoOEfKWC +xukS29hLNFPYncqLrlI95ZVClmHmX8wUgGC0/lQNQxK83KorsFLoGZUxbYTKTr4P +PKzGpKezzbKVvhDm/bXiwlZpW7uGZ3jM5o748YODisgHObFQVm3gvecWHxyorzHv +zycXcDVTgFKeF6Qfn3tyvO1cA6SE4IoZAmgP7QIDAQABAoIBAQCEquro8QGTzDsO +o8DU5Gp4hre4+eX/CHqMJ6ElYr1WqJnWLqofyf7xDNcC5Rrsvx1rBJDeB6NpRlRl +OOyBs8gVR8s1sOWk6OwbLpQp0Pvn7e8pDvA6rIl9Chq7RegCT7w2xv+DqcMQuz/O +HJHyXIDDF6Sh2v1S2DuGJq6JKwpUJnbpKmrJt/Cc8DXLk84TnolRYsApXn2/AGUU +FH1cslLCUBeRc/9T0uR3aYe7D+HnEOKw8eV7wIkximHDk7g8kcnH756terRiqO3x +XkjenDJ2bBJCBUQZvA51jnAW2oHKeGFTKlfhZY7gbfDtq1dcyXGIhYoLlYqolxhl +IAnZ5McxAoGBAOhkOUADtCzNifBIMMTLNrkZ5jMz3tmR8YIfWiP3P3qgi5x6vb8h +Dl5GSO5f+mFfXpdCWZfIuGs/hDwOn8bJgffwFAevrVeZAbPbKCWi63yi5OTN/eQG +5OE1XligmRevBNGhRsMCx3T/Y4k5Dv+LIGPLOWT8u9X4jQUbwPdxuNSjAoGBANxN +vVTNsf/pgtbWUTtlN1jbb0JroEaAyZZStpCwy5d37w6Ib0WeS5oaClt9sAdLNNDM +EKxqGO36ZdhHjkCA8nq8vgKQr4MRMo2ABNiOS8pk6NsXkQgwUxY0ywFz/SHDDvAq +LznTJf+I7uTZRNyQU1FzgcAEvFtOIzMB51seLUIvAoGBAKgB7THOe6/4WMUSK8/a +apGfm8FgurfovwUnzW87DPWGo+hZBFztdQnLHmbXlJhY7nXETilhv5IptVwF5pU8 +kW3Cb3ivFU7DG2wAASJUipLs4TZZhjgYk9gNUUwZrxRkP8OeKR5LIBABouBOE/3D +g4MiJThRTyr+KlWLHxLFcK6pAoGAL3YUDvwNmAuPo4cikwA4T01fB9k1+1ptk5QY +Ps3H3sb42pGsHzx+HyHzD0jhroCWTVFZWju1STfDzzeDPwRIuQaGjPjsxvjigjeN +U7Y8P8tDm0fVeAUpMUSIY7TAWRCz3CvKZtPFgOrYRLdGLZpuSMLwthSPG8CWtrt3 +Q1sZ9wMCgYEAsx7rZ6A7IdmQ5AcRPrLjLwWUVe+v1GcKOVCnlEGmMHmPm/Jr8x08 +ujiJSIjGaa24b16TIxwKr2wvzTrDuiO5msx815+0dc0QXF5JH9U78rIdAkYwPXvp +E4V22RcFoLu4/lQhfI1eoi2K1JrQGfMvUH3KbMnTdg8Y83ucjyKT75I= +-----END RSA PRIVATE KEY----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/tls.crt b/tests/templates/kuttl/s3-deep-storage/certs/tls.crt new file mode 100644 index 00000000..674dd312 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/certs/tls.crt @@ -0,0 +1,21 @@ +-----BEGIN CERTIFICATE----- +MIIDdDCCAlwCFHMj5AUNEgw/GHhdrePkBUeU/V42MA0GCSqGSIb3DQEBCwUAMHsx +CzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWctSG9sc3RlaW4xDjAMBgNV +BAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2lnbmluZyBBdXRob3JpdHkg +SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjIyMDczOTU5WhgPMjEy +MjA1MjkwNzM5NTlaMHAxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct +SG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2ln +bmluZyBBdXRob3JpdHkgSW5jMQowCAYDVQQDDAEqMIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEAyWWZaoXwz8PKiMdaIYtT99pD6miuFTjCM/QcX10r/lWX +Wm6QxAabwyy8P/cLcNzKUKKi2mE49L/hhXb5/vocrP9mQwzWs9a2w9YT1N1fOdtO +ZSU3I5DFzKNhPKHp7hHODhZGqXeimUAR1MIIH2ECjP1juqU4byRB5IHN6rreQ7FA +dGJhjC1XYzkDKZZKZrZCRyqPAw0Wljc19OXxH/wUoJASuuoai0KSqiNmrC95C1vL +crZQDpkZJndGe0pVY2CIHq/zQ093svpR7g7wBgPsi8H7LBffxz9Vzu44ncTN/aSX +HeX3cMr0XqyNfZfHCMaXrPw16COW5jRgfFMUOuUxWwIDAQABMA0GCSqGSIb3DQEB +CwUAA4IBAQCVaRh2+nm5j0rx7B8IrLfDZ+Cj361BVxQKXd7u13U1dQZ9gtZUqCRV +jpB/LEFQ4yHbDdh0R/sZTqY2I/I0+AqqMumSMTK/p6+zq/4dWjXZmcvqseAXqP/D +wybaihGKf+fDa+RCj9DrK0V+ULCt79cds841hSh4oZ2PKs20sK4pm/QCmHX4XQRD +HqJOC4twsRVaY5mEoJTu7/Dce4rV8c9zRyYqnW2dOfn25RlJUHZmrsOhPmIW+g1Y +5aJhUnChZVxkkdQbu3oJ1E8oIvCqj4VlowKkqeeoCwil5DUZCa5f0CKlO5GpnPK8 +7wtPFTfKR77DOeUn7skv3h0YdoE57DUd +-----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/tls.key b/tests/templates/kuttl/s3-deep-storage/certs/tls.key new file mode 100644 index 00000000..04fc15b3 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/certs/tls.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpQIBAAKCAQEAyWWZaoXwz8PKiMdaIYtT99pD6miuFTjCM/QcX10r/lWXWm6Q +xAabwyy8P/cLcNzKUKKi2mE49L/hhXb5/vocrP9mQwzWs9a2w9YT1N1fOdtOZSU3 +I5DFzKNhPKHp7hHODhZGqXeimUAR1MIIH2ECjP1juqU4byRB5IHN6rreQ7FAdGJh +jC1XYzkDKZZKZrZCRyqPAw0Wljc19OXxH/wUoJASuuoai0KSqiNmrC95C1vLcrZQ +DpkZJndGe0pVY2CIHq/zQ093svpR7g7wBgPsi8H7LBffxz9Vzu44ncTN/aSXHeX3 +cMr0XqyNfZfHCMaXrPw16COW5jRgfFMUOuUxWwIDAQABAoIBAQCmMszXJm9i1V1X +YMQVeIgzupBfakF2y98fxqx/WkFK4tFDVIjs69MwzsMPOkzbt6jRwFUKSD8bYxm1 +7UhDTZ3Kef2nCXpI8MDkfc7h1EmYUk2wlHSbSgahaJZ+1dNZnqHf6Cwp/8tUEpZk +cDcJxiG3vgfF6EDZHx+tdh07PzjavH3rrqCj3/5vo/vC7qC92uL4ag64F9+CXDis +2EmitaAOelK/mLbfW6Pog5yQqUAKg4eJ/P2/Wj4OBi3nC/QEEkyXE9gXw0GNCkLX +FkPrMVZJGUhmIn3aPAvFtAE0XJ28Ipvj2+zEv0lXJTWv+QHnhvqjxkAaqd1f+tt6 +f5b0iA9xAoGBAOg4I6ysQaXJ+6SMF0JWt3YOzH3yTYNIoTsci2PhxsnctaANDXw0 +h2YluA499TVyF8MrRk3hJY2XcwdPSRtEox332j5IigJw9OkrYHbAEqlWNf2e5XN/ +OFY9ieZoRWHZG0PGnrxzXa/RCaZmx+b83xkfF1dlvpGKABQgh7PHK3NpAoGBAN4F +a1sVTTwbMyN/1ta8zASYJiPgIMxE64+NJgqHQ2Ow5NxK6BEI+Nq7UgCImAfaoKID +yzbThTG+n+qlNLLMtlIfctL1Xmi1RIfR4B5HlqXFpSCku3Yqh2OHyyCwwg4SLa0T +ZEp6ueNSNIAJNaBXS3M824yv5JBgx8uteYwVpdojAoGAUZBeX2kFieDfBVW7Wa6x +s8LQ6q/vr9wT3XpSL1v/AaoHFVdgVC7zG9rFwiLa/NG9LO0HPZWGJix616duiyhZ +js4elt/NsbvRGhEFSdB+/YFtZ06nUyDtPcVRqV8Yd5zVKcIawSBYWMe4dv0E28oX +5m/4N9dhzybEjk06vNeJGHkCgYEAlcVuIGmESpHGs6HfmciOkGLbB8SAG4w6pAIB +sYSBz1RbbsgROLyms1c+ACIk/NddGS4Z/gg+h8oiMrXzkNJMA6Y3XVwsrdHqQv0v +hP2iAH4N4LF/zDzwTBIk0w6qObfFnEXCmAOmNlUUGXMc++cnfLuHF6boNwUygpGp +tvg7g6UCgYEAhh/0hcCQjLH2Bt+PUf3+NEbxmKeDGMHkCK3qmu5RFpqdOoQLb9Dm +gyLxVTSdQysLaNRTZqJ27CL/7ogANsa4sS6OXI/NvP26iBepe4cC8oZOlrFEVslq +BqqA28bbo6Y+zObkQWFlAGwjZRMaiVDMt3LJF3i/LoztzVnFhoE+OXc= +-----END RSA PRIVATE KEY----- diff --git a/tests/templates/kuttl/s3-deep-storage/druid-quickstartimport.json b/tests/templates/kuttl/s3-deep-storage/druid-quickstartimport.json new file mode 100644 index 00000000..909b9008 --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/druid-quickstartimport.json @@ -0,0 +1,66 @@ +{ + "type": "index_parallel", + "spec": { + "ioConfig": { + "type": "index_parallel", + "inputSource": { + "type": "local", + "baseDir": "quickstart/tutorial/", + "filter": "wikiticker-2015-09-12-sampled.json.gz" + }, + "inputFormat": { + "type": "json" + } + }, + "tuningConfig": { + "type": "index_parallel", + "partitionsSpec": { + "type": "dynamic" + } + }, + "dataSchema": { + "dataSource": "wikipedia-2015-09-12", + "timestampSpec": { + "column": "time", + "format": "iso" + }, + "dimensionsSpec": { + "dimensions": [ + "channel", + "cityName", + "comment", + "countryIsoCode", + "countryName", + "isAnonymous", + "isMinor", + "isNew", + "isRobot", + "isUnpatrolled", + "metroCode", + "namespace", + "page", + "regionIsoCode", + "regionName", + "user", + { + "type": "long", + "name": "delta" + }, + { + "type": "long", + "name": "added" + }, + { + "type": "long", + "name": "deleted" + } + ] + }, + "granularitySpec": { + "queryGranularity": "none", + "rollup": false, + "segmentGranularity": "day" + } + } + } +} diff --git a/tests/templates/kuttl/s3-deep-storage/healthcheck.py b/tests/templates/kuttl/s3-deep-storage/healthcheck.py new file mode 100755 index 00000000..95bcea0b --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/healthcheck.py @@ -0,0 +1,64 @@ +import requests +import sys +import logging +import time + +if __name__ == "__main__": + result = 0 + + log_level = 'DEBUG' # if args.debug else 'INFO' + logging.basicConfig(level=log_level, format='%(asctime)s %(levelname)s: %(message)s', stream=sys.stdout) + + druid_cluster_name = sys.argv[1] + + druid_roles = [ + "broker", + "coordinator", + "middlemanager", + "historical", + "router" + ] + druid_ports = { + "broker": 8082, + "coordinator": 8081, + "middlemanager": 8091, + "historical": 8083, + "router": 8888 + } + + for role in druid_roles: + url = f"http://{druid_cluster_name}-{role}-default:{druid_ports[role]}/status/health" + count = 1 + + # As this script is intended to be executed by Kuttl which is in charge of overall test timeouts it is ok + # to loop infinitely here - or until all tests succeed + # The script iterates over all known ports and services and checks that the ports are available + # The timeout for this connection attempt is configured to 5 seconds, to ensure frequent retries that are + # not handled internally by the requests library, because it was unclear when or if dns entries are cached + # internally during retry handling. + # By issuing a new call to .get() we are trying to ensure a new dns lookup for the target. + # + # Any errors are logged and retried until either the test succeeds or Kuttl kills this script due to + # the timeout. + while True: + try: + count = count + 1 + print(f"Checking role [{role}] on url [{url}]") + res = requests.get(url, timeout=5) + code = res.status_code + if res.status_code == 200 and res.text.lower() == "true": + break + else: + print(f"Got non 200 status code [{res.status_code}] or non-true response [{res.text.lower()}], retrying attempt no [{count}] ....") + except requests.exceptions.Timeout: + print(f"Connection timed out, retrying attempt no [{count}] ....") + except requests.ConnectionError as e: + print(f"Connection Error: {str(e)}") + except requests.RequestException as e: + print(f"General Error: {str(e)}") + except Exception: + print(f"Unhandled error occurred, retrying attempt no [{count}] ....") + + # Wait a little bit before retrying + time.sleep(1) + sys.exit(0) diff --git a/tests/templates/kuttl/s3-deep-storage/ingestioncheck.py b/tests/templates/kuttl/s3-deep-storage/ingestioncheck.py new file mode 100755 index 00000000..dd0c1b9e --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/ingestioncheck.py @@ -0,0 +1,117 @@ +import urllib + +import requests +import http +import sys +import json +import time + + +class DruidClient: + def __init__(self): + self.session = requests.Session() + self.session.headers.update({'Accept': 'application/json', 'Content-Type': 'application/json'}) + http.client.HTTPConnection.debuglevel = 1 + + def get(self, url): + response = self.session.get(url) + assert response.status_code == 200 + return response.text + + def get_tasks(self, url): + response = self.session.get(url) + assert response.status_code == 200 + return response.text + + def post_task(self, url, input): + response = self.session.post(url, data=open(input, 'rb')) + assert response.status_code == 200 + return response.text + + def check_rc(self, url): + response = self.session.get(url) + return response.status_code + + def query_datasource(self, url, sql, expected, iterations): + loop = 0 + while True: + response = self.session.post(url, json=sql) + assert response.status_code == 200 + actual = list(json.loads(response.text)[0].values())[0] + if (actual == expected) | (loop == iterations): + break + time.sleep(5) + loop += 1 + return actual + + +druid_cluster_name = sys.argv[1] +druid = DruidClient() + +print(''' +Query tasks +===========''') +tasks = druid.get_tasks( + url=f"http://{druid_cluster_name}-coordinator-default:8081/druid/indexer/v1/tasks", +) +task_count = len(json.loads(tasks)) +print(f'existing tasks: {task_count}') + +print(''' +Start ingestion task +====================''') +ingestion = druid.post_task( + url=f"http://{druid_cluster_name}-coordinator-default:8081/druid/indexer/v1/task", + input='/tmp/druid-quickstartimport.json' +) +task_id = json.loads(ingestion)["task"] +url_encoded_taskid = urllib.parse.quote(task_id, safe='') +print(f"TASKID: [{task_id}]") +print(''' +Re-query tasks +==============''') +tasks = druid.get_tasks( + url=f"http://{druid_cluster_name}-coordinator-default:8081/druid/indexer/v1/tasks", +) +new_task_count = len(json.loads(tasks)) +print(f'new tasks: {new_task_count}') +print(f'assert {new_task_count} == {task_count+1}') +assert new_task_count == task_count + 1 + +print(''' +Wait for ingestion task to succeed +======================================''') +job_finished = False +while not job_finished: + time.sleep(5) + task = druid.get( + url=f"http://{druid_cluster_name}-coordinator-default:8081/druid/indexer/v1/task/{url_encoded_taskid}/status", + ) + task_status = json.loads(task)["status"]["statusCode"] + print(f"Current task status: [{task_status}]") + assert task_status == "RUNNING" or task_status == "SUCCESS", f"Taskstatus not running or succeeeded: {task_status}" + job_finished = task_status == "SUCCESS" + +print(''' +Wait for broker to indicate all segments are fully online +======================================''') +broker_ready = False +while not broker_ready: + time.sleep(2) + broker_ready_rc = druid.check_rc(f"http://{druid_cluster_name}-broker-default:8082/druid/broker/v1/readiness") + broker_ready = broker_ready_rc == 200 + print(f"Broker respondend with [{broker_ready_rc}] to readiness check") + +print(''' +Datasource SQL +==============''') +sample_data_size = 39244 +result = druid.query_datasource( + url=f"http://{druid_cluster_name}-broker-default:8082/druid/v2/sql", + sql={"query": "select count(*) as c from \"wikipedia-2015-09-12\""}, + expected=sample_data_size, + iterations=12 +) +print(f'results: {result}') +print(f'assert {sample_data_size} == {result}') +assert sample_data_size == result diff --git a/tests/templates/kuttl/s3-deep-storage/requirements.txt b/tests/templates/kuttl/s3-deep-storage/requirements.txt new file mode 100644 index 00000000..9cdfca0c --- /dev/null +++ b/tests/templates/kuttl/s3-deep-storage/requirements.txt @@ -0,0 +1 @@ +requests==2.27.1 \ No newline at end of file diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 0044066c..f17f0233 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -5,7 +5,7 @@ dimensions: - 0.22.1-authorizer0.1.0-stackable0.2.0 - name: zookeeper values: - - 3.7.0-stackable0.7.1 + # - 3.7.0-stackable0.7.1 - 3.8.0-stackable0.7.1 - name: opa values: @@ -13,25 +13,34 @@ dimensions: - name: hadoop values: - 3.2.2-stackable0.5.0 + - name: s3-use-tls + values: + - "true" + - "false" tests: - - name: authorizer - dimensions: - - druid - - zookeeper - - opa - - hadoop - - name: ingestion-no-s3-ext - dimensions: - - druid - - zookeeper - - hadoop - - name: ingestion-s3-ext - dimensions: - - druid - - zookeeper - - hadoop - - name: smoke + # - name: authorizer + # dimensions: + # - druid + # - zookeeper + # - opa + # - hadoop + # - name: ingestion-no-s3-ext + # dimensions: + # - druid + # - zookeeper + # - hadoop + # - name: ingestion-s3-ext + # dimensions: + # - druid + # - zookeeper + # - hadoop + # - name: smoke + # dimensions: + # - druid + # - zookeeper + # - hadoop + - name: s3-deep-storage dimensions: - druid - zookeeper - - hadoop + - s3-use-tls From 7a8e52de05bafa1909b2d39a3fa101a4c0a39825 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Thu, 23 Jun 2022 10:28:06 +0200 Subject: [PATCH 02/14] fix s3-deep-storage test --- .../s3-deep-storage/01-install-minio-certificates.yaml.j2 | 4 ++-- .../templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 index dd701194..80d7b792 100644 --- a/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 +++ b/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 @@ -3,7 +3,7 @@ apiVersion: secrets.stackable.tech/v1alpha1 kind: SecretClass metadata: - name: secret + name: minio-druid-tls-certificates spec: backend: k8sSearch: @@ -15,7 +15,7 @@ kind: Secret metadata: name: minio-druid-tls-certificates labels: - secrets.stackable.tech/class: minio-druid-tls + secrets.stackable.tech/class: minio-druid-tls-certificates # Have a look at the folder certs on how to create this data: ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQxekNDQXIrZ0F3SUJBZ0lVYjlSUkx0SENYcnVGTEJjdk5iay92ODgxS2xNd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2V6RUxNQWtHQTFVRUJoTUNSRVV4R3pBWkJnTlZCQWdNRWxOamFHeGxjM2RwWnkxSWIyeHpkR1ZwYmpFTwpNQXdHQTFVRUJ3d0ZWMlZrWld3eEtEQW1CZ05WQkFvTUgxTjBZV05yWVdKc1pTQlRhV2R1YVc1bklFRjFkR2h2CmNtbDBlU0JKYm1NeEZUQVRCZ05WQkFNTURITjBZV05yWVdKc1pTNWtaVEFlRncweU1qQTJNakl3TnpNNU1UVmEKRncwME56QTJNakl3TnpNNU1UVmFNSHN4Q3pBSkJnTlZCQVlUQWtSRk1Sc3dHUVlEVlFRSURCSlRZMmhzWlhOMwphV2N0U0c5c2MzUmxhVzR4RGpBTUJnTlZCQWNNQlZkbFpHVnNNU2d3SmdZRFZRUUtEQjlUZEdGamEyRmliR1VnClUybG5ibWx1WnlCQmRYUm9iM0pwZEhrZ1NXNWpNUlV3RXdZRFZRUUREQXh6ZEdGamEyRmliR1V1WkdVd2dnRWkKTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEaG1JWm1ZYW95b2dYZ3FRNW5aR0tGQ1ZPbApLNGQxYlhSQS9nVTRuQ2dOUGt6eTR1cC9NU05zaWsxdHBQRG0rdlIwM2FkTHdNTDNPWnMwTUNZdHVHNG9YU0ZZCk5uKzNWL080Y1RrMWRYY0sxMFB6VllCK25raFhwakZFS05MdGg4ZDY4VUYzWkpCakNmNUhOeFQvMkQ0eXJkWnkKN2dOQ2xWTFZjcnhlMmZCOFpaWDhHeTkwSUdqK0ZWVGU3ZjhEd0g3YnlQYkJSaGp4NUR3VmtDbUU5SDlPVzBVKwpBRkd0djJwa1BFOHpBREdxZC9BTTZXVGhpSEpoQmNmVmwxT3lVMWlUSXR2OUNKcGlscmlJVHVQRlpDeGkza3hYCkU3bkRxYnA5c0o2bXViazNGMUlVQ1RBZjBWM0FKZWxUcjNnOGRNWU9nbGszeVIrMGJMZkUyZ3BiQ1g2UkFnTUIKQUFHalV6QlJNQjBHQTFVZERnUVdCQlNZTjJSK0R0Y3lENUdETXFORjQ4b0NDYU1FNERBZkJnTlZIU01FR0RBVwpnQlNZTjJSK0R0Y3lENUdETXFORjQ4b0NDYU1FNERBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUEwR0NTcUdTSWIzCkRRRUJDd1VBQTRJQkFRQmkzbzNENmtuQzE3cTQySVc2b2ROellqVno4b1RzTUZnbXg2NE41Y2JnUDhDc0RobkYKRXVuU0hRQk90NnRNRWx2RW0wRE1DUmV6NVBlYitnVFVGMEsyVCtIWWxpdXQ5Z1lkWGd2MDZXemtWdGxtenpDZgp0RjRTNnV6d0tEblF0dVRiUFljYVdXeUdNOUl2bWd1b2tZQ3o0WlJEVi9KL3VzNVVFV2tQS1lIeVg0VENTZXRzClpGYzY1NzBQVjIvM3ovMk1aOXY5NGZ5eU1pbThZMG03ZTREdTZ0dnVJMjBRNjh3T2FGcG5GcVdpUzdsQW5ZbDQKbEx1c0ROZTcxOFdBbTc4NjJvZk9NdjRXMUQxT3NUZnJJYm9rdHdnYzkrQW52NTVmck9WVkJaK2RheTU0dzJjVgpsOUI3c1JKNXNEeHVMTDc2ZElmR0Q4KzhycnZYM2ZKYUdyazMKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= diff --git a/tests/templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2 index 259eaeba..c583ff86 100644 --- a/tests/templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2 +++ b/tests/templates/kuttl/s3-deep-storage/10-install-druid.yaml.j2 @@ -56,7 +56,7 @@ spec: caCert: secretClass: minio-druid-tls-certificates {% endif %} - baseKey: deep-storage # TODO Rename baseKey to prefix or so + baseKey: deep-storage brokers: roleGroups: default: From 7bbdd1f02aa9db7b5ca7f3d7b32fa5539a5fbf8c Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 11:42:30 +0200 Subject: [PATCH 03/14] First working version of S3 TLS verification --- Cargo.lock | 8 ++ rust/crd/Cargo.toml | 1 + rust/crd/src/lib.rs | 66 +++++++++++---- rust/operator-binary/Cargo.toml | 1 + rust/operator-binary/src/config.rs | 81 ++++++++++--------- rust/operator-binary/src/druid_controller.rs | 53 ++++++++---- .../01-install-minio-certificates.yaml.j2 | 6 +- .../kuttl/s3-deep-storage/certs/ca.crt | 34 ++++---- .../s3-deep-storage/certs/client.crt.pem | 34 ++++---- .../s3-deep-storage/certs/client.csr.pem | 30 +++---- .../s3-deep-storage/certs/client.key.pem | 50 ++++++------ .../kuttl/s3-deep-storage/certs/generate.sh | 4 +- .../kuttl/s3-deep-storage/certs/logfile | 50 ------------ .../s3-deep-storage/certs/root-ca.crt.pem | 34 ++++---- .../s3-deep-storage/certs/root-ca.crt.srl | 2 +- .../s3-deep-storage/certs/root-ca.key.pem | 50 ++++++------ .../kuttl/s3-deep-storage/certs/tls.crt | 57 +++++++++---- .../kuttl/s3-deep-storage/certs/tls.key | 50 ++++++------ 18 files changed, 328 insertions(+), 283 deletions(-) delete mode 100644 tests/templates/kuttl/s3-deep-storage/certs/logfile diff --git a/Cargo.lock b/Cargo.lock index e6bba137..5879d0de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -776,6 +776,12 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "indoc" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05a0bd019339e5d968b37855180087b7b9d512c5046fbd244cf8c95687927d6e" + [[package]] name = "instant" version = "0.1.12" @@ -1688,6 +1694,7 @@ dependencies = [ name = "stackable-druid-crd" version = "0.6.0-nightly" dependencies = [ + "indoc", "semver", "serde", "serde_json", @@ -1707,6 +1714,7 @@ dependencies = [ "clap", "fnv", "futures 0.3.21", + "indoc", "pin-project", "semver", "serde", diff --git a/rust/crd/Cargo.toml b/rust/crd/Cargo.toml index af9cc3d0..268cf428 100644 --- a/rust/crd/Cargo.toml +++ b/rust/crd/Cargo.toml @@ -10,6 +10,7 @@ version = "0.6.0-nightly" [dependencies] stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.21.0" } +indoc = "1.0.6" semver = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index bf8925e7..c349efc7 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -1,7 +1,9 @@ +use indoc::formatdoc; use serde::{Deserialize, Serialize}; use snafu::{ResultExt, Snafu}; use stackable_operator::client::Client; use stackable_operator::commons::s3::{InlinedS3BucketSpec, S3BucketDef, S3ConnectionSpec}; +use stackable_operator::commons::tls::{CaCert, Tls, TlsServerVerification, TlsVerification}; use stackable_operator::kube::ResourceExt; use stackable_operator::{ commons::{opa::OpaConfig, s3::S3ConnectionDef}, @@ -21,6 +23,12 @@ pub const JVM_CONFIG: &str = "jvm.config"; pub const RUNTIME_PROPS: &str = "runtime.properties"; pub const LOG4J2_CONFIG: &str = "log4j2.xml"; +pub const SYSTEM_TRUST_STORE: &str = "/etc/pki/java/cacerts"; +pub const SYSTEM_TRUST_STORE_PASSWORD: &str = "changeit"; +pub const STACKABLE_TRUST_STORE: &str = "/stackable/truststore.p12"; +pub const STACKABLE_TRUST_STORE_PASSWORD: &str = "changeit"; +pub const CERTS_DIR: &str = "/stackable/certificates/"; + // port names pub const CONTAINER_HTTP_PORT: &str = "http"; pub const CONTAINER_METRICS_PORT: &str = "metrics"; @@ -64,6 +72,8 @@ pub const MD_ST_HOST: &str = "druid.metadata.storage.connector.host"; pub const MD_ST_PORT: &str = "druid.metadata.storage.connector.port"; pub const MD_ST_USER: &str = "druid.metadata.storage.connector.user"; pub const MD_ST_PASSWORD: &str = "druid.metadata.storage.connector.password"; +// indexer properties +pub const INDEXER_JAVA_OPTS: &str = "druid.indexer.runner.javaOptsArray"; // extra pub const CREDENTIALS_SECRET_PROPERTY: &str = "credentialsSecret"; @@ -178,21 +188,34 @@ impl DruidRole { } /// Returns the start commands for the different server types. - pub fn get_command(&self, mount_s3_credentials: bool) -> Vec { - let mut shell_cmd = vec![]; - if mount_s3_credentials { - shell_cmd.push(format!( - "export {env_var}=$(cat {secret_dir}/{file_name})", - env_var = ENV_S3_ACCESS_KEY, - secret_dir = S3_SECRET_DIR_NAME, - file_name = SECRET_KEY_S3_ACCESS_KEY - )); - shell_cmd.push(format!( - "export {env_var}=$(cat {secret_dir}/{file_name})", - env_var = ENV_S3_SECRET_KEY, - secret_dir = S3_SECRET_DIR_NAME, - file_name = SECRET_KEY_S3_SECRET_KEY - )); + pub fn get_command(&self, s3_connection: Option<&S3ConnectionSpec>) -> Vec { + let mut shell_cmd = vec![format!("keytool -importkeystore -srckeystore {SYSTEM_TRUST_STORE} -srcstoretype jks -srcstorepass {SYSTEM_TRUST_STORE_PASSWORD} -destkeystore {STACKABLE_TRUST_STORE} -deststoretype pkcs12 -deststorepass {STACKABLE_TRUST_STORE_PASSWORD} -noprompt")]; + + if let Some(s3_connection) = s3_connection { + if let Some(Tls { + verification: + TlsVerification::Server(TlsServerVerification { + ca_cert: CaCert::SecretClass(secret_class), + }), + }) = &s3_connection.tls + { + shell_cmd.push(format!("keytool -importcert -file /stackable/certificates/{secret_class}-tls-certificate/ca.crt -alias stackable-{secret_class} -keystore {STACKABLE_TRUST_STORE} -storepass {STACKABLE_TRUST_STORE_PASSWORD} -noprompt")); + } + + if s3_connection.credentials.is_some() { + shell_cmd.push(format!( + "export {env_var}=$(cat {secret_dir}/{file_name})", + env_var = ENV_S3_ACCESS_KEY, + secret_dir = S3_SECRET_DIR_NAME, + file_name = SECRET_KEY_S3_ACCESS_KEY + )); + shell_cmd.push(format!( + "export {env_var}=$(cat {secret_dir}/{file_name})", + env_var = ENV_S3_SECRET_KEY, + secret_dir = S3_SECRET_DIR_NAME, + file_name = SECRET_KEY_S3_SECRET_KEY + )); + } } shell_cmd.push(format!( "{} {} {}", @@ -488,6 +511,19 @@ impl Configuration for DruidConfig { PROMETHEUS_PORT.to_string(), Some(DRUID_METRICS_PORT.to_string()), ); + // Role-specific config + if role == DruidRole::MiddleManager { + result.insert( + INDEXER_JAVA_OPTS.to_string(), + Some(formatdoc! {r#" + [ + "-Djavax.net.ssl.trustStore={STACKABLE_TRUST_STORE}", + "-Djavax.net.ssl.trustStorePassword={STACKABLE_TRUST_STORE_PASSWORD}", + "-Djavax.net.ssl.trustStoreType=pkcs12" + ] + "#}) + ); + } } LOG4J2_CONFIG => {} _ => {} diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index 83982338..cd44db13 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -14,6 +14,7 @@ anyhow = "1.0" clap = "3.2" fnv = "1.0" futures = { version = "0.3", features = ["compat"] } +indoc = "1.0.6" pin-project = "1.0" semver = "1.0" serde = "1.0" diff --git a/rust/operator-binary/src/config.rs b/rust/operator-binary/src/config.rs index 055fbfaa..947ebea7 100644 --- a/rust/operator-binary/src/config.rs +++ b/rust/operator-binary/src/config.rs @@ -1,55 +1,58 @@ -use stackable_druid_crd::DruidRole; +use indoc::formatdoc; +use stackable_druid_crd::{DruidRole, STACKABLE_TRUST_STORE, STACKABLE_TRUST_STORE_PASSWORD}; pub fn get_jvm_config(role: &DruidRole) -> String { - let common_props = " - -server - -Duser.timezone=UTC - -Dfile.encoding=UTF-8 - -Djava.io.tmpdir=/tmp - -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager - -XX:+UseG1GC - -XX:+ExitOnOutOfMemoryError - "; + let common_config = formatdoc! {" + -server + -Duser.timezone=UTC + -Dfile.encoding=UTF-8 + -Djava.io.tmpdir=/tmp + -Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager + -XX:+UseG1GC + -XX:+ExitOnOutOfMemoryError + -Djavax.net.ssl.trustStore={STACKABLE_TRUST_STORE} + -Djavax.net.ssl.trustStorePassword={STACKABLE_TRUST_STORE_PASSWORD} + -Djavax.net.ssl.trustStoreType=pkcs12"}; match role { DruidRole::Broker => { - common_props.to_string() - + " - -Xms512m - -Xmx512m - -XX:MaxDirectMemorySize=400m - " + formatdoc! {" + {common_config} + -Xms512m + -Xmx512m + -XX:MaxDirectMemorySize=400m + "} } DruidRole::Coordinator => { - common_props.to_string() - + " - -Xms256m - -Xmx256m - -Dderby.stream.error.file=/stackable/var/druid/derby.log - " + formatdoc! {" + {common_config} + -Xms256m + -Xmx256m + -Dderby.stream.error.file=/stackable/var/druid/derby.log + "} } DruidRole::Historical => { - common_props.to_string() - + " - -Xms512m - -Xmx512m - -XX:MaxDirectMemorySize=400m - " + formatdoc! {" + {common_config} + -Xms512m + -Xmx512m + -XX:MaxDirectMemorySize=400m + "} } DruidRole::MiddleManager => { - common_props.to_string() - + " - -Xms64m - -Xmx64m - " + formatdoc! {" + {common_config} + -Xms64m + -Xmx64m + "} } DruidRole::Router => { - common_props.to_string() - + " - -Xms128m - -Xmx128m - -XX:MaxDirectMemorySize=128m - " + formatdoc! {" + {common_config} + -Xms128m + -Xmx128m + -XX:MaxDirectMemorySize=128m + "} } } } diff --git a/rust/operator-binary/src/druid_controller.rs b/rust/operator-binary/src/druid_controller.rs index 1aa73a7a..d4092f60 100644 --- a/rust/operator-binary/src/druid_controller.rs +++ b/rust/operator-binary/src/druid_controller.rs @@ -6,7 +6,7 @@ use crate::{ use snafu::{OptionExt, ResultExt, Snafu}; use stackable_druid_crd::{ - DeepStorageSpec, DruidCluster, DruidRole, APP_NAME, AUTH_AUTHORIZER_OPA_URI, + DeepStorageSpec, DruidCluster, DruidRole, APP_NAME, AUTH_AUTHORIZER_OPA_URI, CERTS_DIR, CONTAINER_HTTP_PORT, CONTAINER_METRICS_PORT, CREDENTIALS_SECRET_PROPERTY, DRUID_METRICS_PORT, DS_BUCKET, JVM_CONFIG, LOG4J2_CONFIG, RUNTIME_PROPS, S3_ENDPOINT_URL, S3_PATH_STYLE_ACCESS, S3_SECRET_DIR_NAME, ZOOKEEPER_CONNECTION_STRING, @@ -14,11 +14,12 @@ use stackable_druid_crd::{ use stackable_operator::{ builder::{ ConfigMapBuilder, ContainerBuilder, ObjectMetaBuilder, PodBuilder, - PodSecurityContextBuilder, VolumeBuilder, + PodSecurityContextBuilder, SecretOperatorVolumeSourceBuilder, VolumeBuilder, }, commons::{ opa::OpaApiVersion, s3::{S3AccessStyle, S3ConnectionSpec}, + tls::{CaCert, TlsVerification}, }, k8s_openapi::{ api::{ @@ -142,6 +143,10 @@ pub enum Error { ApplyDiscoveryConfig { source: stackable_operator::error::Error, }, + #[snafu(display( + "Druid does not support skipping the verification of the tls enabled S3 server" + ))] + S3TlsNoVerificationNotSupported, } type Result = std::result::Result; @@ -189,7 +194,7 @@ pub async fn reconcile_druid(druid: Arc, ctx: Context) -> Res }; // Get the s3 connection if one is defined - let s3_conn: Option = druid + let s3_conn = druid .get_s3_connection(client) .await .context(GetS3ConnectionSnafu)?; @@ -368,8 +373,9 @@ fn build_rolegroup_config_map( if let Some(conn) = s3_conn { if let Some(endpoint) = conn.endpoint() { transformed_config.insert(S3_ENDPOINT_URL.to_string(), Some(endpoint)); - } // TODO make code nicer + } + // We did choose a match statement here to detect new access styles in the future let path_style_access = match conn.access_style.clone().unwrap_or_default() { S3AccessStyle::Path => true, S3AccessStyle::VirtualHosted => false, @@ -516,20 +522,37 @@ fn build_rolegroup_statefulset( // add image cb.image(container_image(druid_version)); - let mut load_s3_credentials = false; - // Add s3 credentials secret volume - if let Some(S3ConnectionSpec { - credentials: Some(credentials), - .. - }) = s3_conn - { - load_s3_credentials = true; - pb.add_volume(credentials.to_volume("s3-credentials")); - cb.add_volume_mount("s3-credentials", S3_SECRET_DIR_NAME); + if let Some(s3_conn) = s3_conn { + if let Some(credentials) = &s3_conn.credentials { + pb.add_volume(credentials.to_volume("s3-credentials")); + cb.add_volume_mount("s3-credentials", S3_SECRET_DIR_NAME); + } + + if let Some(tls) = &s3_conn.tls { + match &tls.verification { + TlsVerification::None {} => return S3TlsNoVerificationNotSupportedSnafu.fail(), + TlsVerification::Server(server_verification) => { + match &server_verification.ca_cert { + CaCert::WebPki {} => {} + CaCert::SecretClass(secret_class) => { + let volume_name = format!("{secret_class}-tls-certificate"); + + let volume = VolumeBuilder::new(&volume_name) + .ephemeral( + SecretOperatorVolumeSourceBuilder::new(secret_class).build(), + ) + .build(); + pb.add_volume(volume); + cb.add_volume_mount(&volume_name, format!("{CERTS_DIR}{volume_name}")); + } + } + } + } + } } // add command - cb.command(role.get_command(load_s3_credentials)); + cb.command(role.get_command(s3_conn)); // rest of env let rest_env = rolegroup_config diff --git a/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 index 80d7b792..50ae94f4 100644 --- a/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 +++ b/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 @@ -18,7 +18,7 @@ metadata: secrets.stackable.tech/class: minio-druid-tls-certificates # Have a look at the folder certs on how to create this data: - ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQxekNDQXIrZ0F3SUJBZ0lVYjlSUkx0SENYcnVGTEJjdk5iay92ODgxS2xNd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2V6RUxNQWtHQTFVRUJoTUNSRVV4R3pBWkJnTlZCQWdNRWxOamFHeGxjM2RwWnkxSWIyeHpkR1ZwYmpFTwpNQXdHQTFVRUJ3d0ZWMlZrWld3eEtEQW1CZ05WQkFvTUgxTjBZV05yWVdKc1pTQlRhV2R1YVc1bklFRjFkR2h2CmNtbDBlU0JKYm1NeEZUQVRCZ05WQkFNTURITjBZV05yWVdKc1pTNWtaVEFlRncweU1qQTJNakl3TnpNNU1UVmEKRncwME56QTJNakl3TnpNNU1UVmFNSHN4Q3pBSkJnTlZCQVlUQWtSRk1Sc3dHUVlEVlFRSURCSlRZMmhzWlhOMwphV2N0U0c5c2MzUmxhVzR4RGpBTUJnTlZCQWNNQlZkbFpHVnNNU2d3SmdZRFZRUUtEQjlUZEdGamEyRmliR1VnClUybG5ibWx1WnlCQmRYUm9iM0pwZEhrZ1NXNWpNUlV3RXdZRFZRUUREQXh6ZEdGamEyRmliR1V1WkdVd2dnRWkKTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFEaG1JWm1ZYW95b2dYZ3FRNW5aR0tGQ1ZPbApLNGQxYlhSQS9nVTRuQ2dOUGt6eTR1cC9NU05zaWsxdHBQRG0rdlIwM2FkTHdNTDNPWnMwTUNZdHVHNG9YU0ZZCk5uKzNWL080Y1RrMWRYY0sxMFB6VllCK25raFhwakZFS05MdGg4ZDY4VUYzWkpCakNmNUhOeFQvMkQ0eXJkWnkKN2dOQ2xWTFZjcnhlMmZCOFpaWDhHeTkwSUdqK0ZWVGU3ZjhEd0g3YnlQYkJSaGp4NUR3VmtDbUU5SDlPVzBVKwpBRkd0djJwa1BFOHpBREdxZC9BTTZXVGhpSEpoQmNmVmwxT3lVMWlUSXR2OUNKcGlscmlJVHVQRlpDeGkza3hYCkU3bkRxYnA5c0o2bXViazNGMUlVQ1RBZjBWM0FKZWxUcjNnOGRNWU9nbGszeVIrMGJMZkUyZ3BiQ1g2UkFnTUIKQUFHalV6QlJNQjBHQTFVZERnUVdCQlNZTjJSK0R0Y3lENUdETXFORjQ4b0NDYU1FNERBZkJnTlZIU01FR0RBVwpnQlNZTjJSK0R0Y3lENUdETXFORjQ4b0NDYU1FNERBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUEwR0NTcUdTSWIzCkRRRUJDd1VBQTRJQkFRQmkzbzNENmtuQzE3cTQySVc2b2ROellqVno4b1RzTUZnbXg2NE41Y2JnUDhDc0RobkYKRXVuU0hRQk90NnRNRWx2RW0wRE1DUmV6NVBlYitnVFVGMEsyVCtIWWxpdXQ5Z1lkWGd2MDZXemtWdGxtenpDZgp0RjRTNnV6d0tEblF0dVRiUFljYVdXeUdNOUl2bWd1b2tZQ3o0WlJEVi9KL3VzNVVFV2tQS1lIeVg0VENTZXRzClpGYzY1NzBQVjIvM3ovMk1aOXY5NGZ5eU1pbThZMG03ZTREdTZ0dnVJMjBRNjh3T2FGcG5GcVdpUzdsQW5ZbDQKbEx1c0ROZTcxOFdBbTc4NjJvZk9NdjRXMUQxT3NUZnJJYm9rdHdnYzkrQW52NTVmck9WVkJaK2RheTU0dzJjVgpsOUI3c1JKNXNEeHVMTDc2ZElmR0Q4KzhycnZYM2ZKYUdyazMKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= - tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURkRENDQWx3Q0ZITWo1QVVORWd3L0dIaGRyZVBrQlVlVS9WNDFNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1Ic3gKQ3pBSkJnTlZCQVlUQWtSRk1Sc3dHUVlEVlFRSURCSlRZMmhzWlhOM2FXY3RTRzlzYzNSbGFXNHhEakFNQmdOVgpCQWNNQlZkbFpHVnNNU2d3SmdZRFZRUUtEQjlUZEdGamEyRmliR1VnVTJsbmJtbHVaeUJCZFhSb2IzSnBkSGtnClNXNWpNUlV3RXdZRFZRUUREQXh6ZEdGamEyRmliR1V1WkdVd0lCY05Nakl3TmpJeU1EY3pPVEUxV2hnUE1qRXkKTWpBMU1qa3dOek01TVRWYU1IQXhDekFKQmdOVkJBWVRBa1JGTVJzd0dRWURWUVFJREJKVFkyaHNaWE4zYVdjdApTRzlzYzNSbGFXNHhEakFNQmdOVkJBY01CVmRsWkdWc01TZ3dKZ1lEVlFRS0RCOVRkR0ZqYTJGaWJHVWdVMmxuCmJtbHVaeUJCZFhSb2IzSnBkSGtnU1c1ak1Rb3dDQVlEVlFRRERBRXFNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUYKQUFPQ0FROEFNSUlCQ2dLQ0FRRUFuWW96YVF6THhCeE1MY3VVcmtQQ2RoMmZPenIwMS9lVU9HbGFIdXlpUklxZQpyL1BWZWY5TU1GbGZEcnVjVmNpTy9NZ2hicEdmd0NLWjVSSi84YlBRYjFrYUp6bmpJNkdTc0tZY1F3dmQrczhvCkpKYmVNUHlKOHBtYnZlSU8wYjV6VWt3ZjhYT21sb2x5cUpqMmUxMkgxcmdkL1BlWGdwR2NoelhhSmxycmVtZk0KWURlMnVHZzh0eHNaMm10bTVZVDVRYW1GSFdUS2pCUDUzVWprK3ZpaVlSc1NCTjhGbUpsUU51N3Vack5Bdm1ragpQYU80dUh3N09BdnI4c3RGenNucHlEQXUvYmlTOVdEZ2xWUzZMWWFlWEx5MUcvL1RCVGJZSlB3ZE5jVEZPbXp5CmhMbjdYSmZVS1VPRVBtclVQWWtUUTZMVDhaU212ZVpRVG04VVZoeTBoUUlEQVFBQk1BMEdDU3FHU0liM0RRRUIKQ3dVQUE0SUJBUUFhQ2VTOVhYbGNYVkxtUlB6ZnhOT2pWSkxQR1ZrWGtZNEdnOVhzb0JDOVFGYlg5Z05IWHpSZQpTUHp6WGNjS3FXS21yUWIyVUU5VSsxOGJTSkU5T0l5L2c4S09sUndFa2g0b1pkamladlVRQktuUDFxL1NjbTMxCm5FMnpjak9mdnJRaUhLUHdPRFdYZWh1NnlKejB0MHR1MFJmdkxpNW9iK2E4Z2g2SG10VzRIQjNyc1FFTnNhYjIKRWNucmZBTEphSi9TSm5tQS9YamQyMVlhNUNpSGlaQVl6VFR0UmlaRVRVOVY3eXIrSkNsT2hZYkF3djltcXBUTApZZnd6R3JsaGhLM25kbkZ1OEZpTDVxWkNWZ1JWNEtQUURFSGV4N1Q1ajNod0pFcU1XS1RQaUVBcERXL2dSR0JZCnJvb085QlNGSmZ5MW9Sb2NucnMra3NYWWpFaFJ5cmxRCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K - tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBbllvemFRekx4QnhNTGN1VXJrUENkaDJmT3pyMDEvZVVPR2xhSHV5aVJJcWVyL1BWCmVmOU1NRmxmRHJ1Y1ZjaU8vTWdoYnBHZndDS1o1UkovOGJQUWIxa2FKem5qSTZHU3NLWWNRd3ZkK3M4b0pKYmUKTVB5SjhwbWJ2ZUlPMGI1elVrd2Y4WE9tbG9seXFKajJlMTJIMXJnZC9QZVhncEdjaHpYYUpscnJlbWZNWURlMgp1R2c4dHhzWjJtdG01WVQ1UWFtRkhXVEtqQlA1M1Vqayt2aWlZUnNTQk44Rm1KbFFOdTd1WnJOQXZta2pQYU80CnVIdzdPQXZyOHN0RnpzbnB5REF1L2JpUzlXRGdsVlM2TFlhZVhMeTFHLy9UQlRiWUpQd2ROY1RGT216eWhMbjcKWEpmVUtVT0VQbXJVUFlrVFE2TFQ4WlNtdmVaUVRtOFVWaHkwaFFJREFRQUJBb0lCQURYazFYbVdtdzdYNzJlcgpRWTNzT0ZaWUErVXJZaCtQM3ZEOWVZc2l3TkJaNjdlZDN1WUJaSHNWMStNZVkza2xSMlZLd2NVbHBGVUNnVXRRCmJOeXUreHRjakFublQ4RWN3U1lWYlkyeVBacFR6QlBZV09MQlFoL3dWTXM4em4wS2ZrRWxNYmhVTENWTG1DSDkKVWpVWjVpS2FrZ2U4VytTYkU4VmRzdWQwS3lLUVhseHJWbzdNSHNxQ1hpcW5uZU1OS0MxQVduYWtuby9MSExFcwpBV2gvSTIzWERDQ09IYVlKenVVTlR3aXlGYXU1RzNmL0pZRlIxeFBvYzh1QkFtOVpxcjdKSm9PSGhiQjNPYm1pClNIcUpXaWg3VGpLalpMc2FDKzlraUhUK1hHOVFXdWZzZ09EZTZTMHVmZys1SkpmNEdHN08ycmxtbXY1MzVmMmgKR1hhM0NnRUNnWUVBMGV1V1Q5WGxlcWw5cERIU2VlQ1B0QThlcjZkcVNzM0ZXWFF3MlJ2WUFFZGxWTE56QWFJcApncUN6VFN3NGdTREJjTUhJZm9sWXJ6Y2xwRFRWc2xFWVZmeElxS3p5cjd4Nk5oMnFrQWFuNkczOVNxUFZyYUlqCjdYaFFBWmx0eG1HbWhWT0RqWjIySWMzRzdFaTg1ZEdKV04wQ05FUmxtUkFtRmg2NzVRZjU1U0VDZ1lFQXdCOGMKT3NrVjhoSmFGVjM5L3NHQ1hWVEttT2pFT2FFOVcwSHhtd0d5TWcxWmpFVHRiZFVDaXBqSnoza0tGekp0ZVFPUgpjb280SkI4N2EwYkp0UnBDNHZHS1lhMTNpeW4wa2tBcjJuRTBuVmJkMlhxLzlseElVZTBGV3dpbExCY1FrekI5CkU1SUlXOW5IR0lGYnEzT3FDa0F0c1JNL3VFSEtsd1hyU0Q2OC91VUNnWUVBdzdSNlp5WElFb3B2ZXlPRDBXSmQKTndZZG1xOWU5aXhPdjY0R1dIS1A5dnFZNnRWOTg5am1FRVdYdyt2bEplV08wbnVuV3VqYlNFY0dqY2RBTDBWUgpoZUIxTU9SRVFUaGJTNVp1ekdXWUpxWmNUVGplM2tqYWErc04wOS9ocXVDaEtZMkppUDZ1cldjMS9GVjMzbDV5ClNPbUt3NFc4bm0yaXhGNlUxOXFPekdFQ2dZQUJJKzRoOXpHWEp6NjdvN3d2Tit6VEt2NnMyNnpXZnJ1RGdDZXoKK05XYThITlluc3dkKzhheEZla1V2eTR0SnhKNVJta2xtZVp0YUhZTTAvVzhpblJkTG52WXlwUE1FcXF0OTQyTApGV0x2a0NWdTlnaVBxTXFSR2V3UE4wVHJ0eE5WSEZPUnV5c3JpR1pqSWRsdWNoaFBTVVE4S2RZVi9PWDc4WUFOCkJMcFFkUUtCZ0hpWE9KaUFxKzNWMXhjZUtJOU54Ymh5YWpKSFBhZ3VPY2Jjd0h5WWovTnhvU3dXTnBhNXArM1IKbE0vQWFDWU9TVXZGZ1FOL3FwTkYwMmJWNGlzOWxzajlyUlZGNEwxYk45THNuclZLbnpiMWMrVjdkWEhGOWxkcQprQ093c3A5dG1GS3FseGJlZ2VBSCtyQjgxY1MyeWR5V0J5SzBUUTlWQ2U1ZFRjMFk4R3JyCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== + ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQxekNDQXIrZ0F3SUJBZ0lVRG0zb0gyVDZMVHZaSDd6NkxsS2VpUjJTQ29jd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2V6RUxNQWtHQTFVRUJoTUNSRVV4R3pBWkJnTlZCQWdNRWxOamFHeGxjM2RwWnkxSWIyeHpkR1ZwYmpFTwpNQXdHQTFVRUJ3d0ZWMlZrWld3eEtEQW1CZ05WQkFvTUgxTjBZV05yWVdKc1pTQlRhV2R1YVc1bklFRjFkR2h2CmNtbDBlU0JKYm1NeEZUQVRCZ05WQkFNTURITjBZV05yWVdKc1pTNWtaVEFlRncweU1qQTJNalF3TnpNek16SmEKRncwME56QTJNalF3TnpNek16SmFNSHN4Q3pBSkJnTlZCQVlUQWtSRk1Sc3dHUVlEVlFRSURCSlRZMmhzWlhOMwphV2N0U0c5c2MzUmxhVzR4RGpBTUJnTlZCQWNNQlZkbFpHVnNNU2d3SmdZRFZRUUtEQjlUZEdGamEyRmliR1VnClUybG5ibWx1WnlCQmRYUm9iM0pwZEhrZ1NXNWpNUlV3RXdZRFZRUUREQXh6ZEdGamEyRmliR1V1WkdVd2dnRWkKTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDL2tjcXU1aTRXUDVtcXA1NGVZakNDYXYwbgpTVnN1cWFvZEJvUG4yTmNISkQ3bFVONCtmRUticjhXVkN4UFAxWng0TUJaSUFBa3A2ZlpOUUFROVpsTkJ3bjBWClhua3pmenBkL3h6UHg3K0RFeGN5eFluUnVTbnF2RHlxZVVKdGxLVmhieDZCZ0hsalNDU29rVHVaL25SOXM3bGUKeUZUK29FdVdrQnJSV0locUZHS2ZtK3d0TVBWeVhPMSs0VDlOaHN6a3d4MEdBMUY2dDV4QjliUlRrbk1WNDducAo2R05pUm1CcFl5QlhMQjdxbXZhNmo4ZFlEbG1YSEI5aTMvV3dtVjd5eXlISFJia01WN3RIRGdRVmF5SzlDRDduCnArS3RhNTZVTDNCeXNXeU5UcktSWnJVTWtGMTdlMXVnWWxvUUNMamtPYmwwaXlvN3N2SHRVVFVvd2ExbEFnTUIKQUFHalV6QlJNQjBHQTFVZERnUVdCQlMyRWZqNUxiT00wMjNUQUhUUHpvb281RDkzWnpBZkJnTlZIU01FR0RBVwpnQlMyRWZqNUxiT00wMjNUQUhUUHpvb281RDkzWnpBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUEwR0NTcUdTSWIzCkRRRUJDd1VBQTRJQkFRQ1NKeXpkYy9rRXRrdHkrcXNEVlFsQkUwdVh0SllPMzdpdkMzMzg5Zkg2bUpUbHB3SXoKMVM0dGs5MzBnTElWVUl4NXphMnk0TzhlSFB0UzFOcVg1K0NIWHRieDR2Znl5ZzQ5b1BPUjA0YjZ1RWtaZk81NQo0ZjhJT1BVN05NdFE5QVZITVNsVCtvRjhkN1NtZXdtU3NibTlDb211aHdpNEcrYWZMcWdxcGM5a0FOaU5MaVRtCnI2ZFluTFZ5S0p3TlBta0pVYi9EQnNmMTJiM0VMM24vbFhKbWQ0TTlVNzZ3c3doOWVreU50VXZnQjk0bDBxcDIKSFA1WnRWQm13U2JTOW9FSGdOL3NsbnNFVGw5QjF6L29BWDhUZ1I3ZFdhYWNmb2RLeVRWMW5MUm01YWhaWWwwawp4OFFYY2wzbUNSSzNaVnBoaHZIVjM3Q2J3ZTFrQXdoYmR5RE0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= + tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURhRENDQWxBQ0ZBSS9RWjNXUWtkZ3g4UXArcUF3elBObEcwcmZNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1Ic3gKQ3pBSkJnTlZCQVlUQWtSRk1Sc3dHUVlEVlFRSURCSlRZMmhzWlhOM2FXY3RTRzlzYzNSbGFXNHhEakFNQmdOVgpCQWNNQlZkbFpHVnNNU2d3SmdZRFZRUUtEQjlUZEdGamEyRmliR1VnVTJsbmJtbHVaeUJCZFhSb2IzSnBkSGtnClNXNWpNUlV3RXdZRFZRUUREQXh6ZEdGamEyRmliR1V1WkdVd0lCY05Nakl3TmpJME1EY3pNek15V2hnUE1qRXkKTWpBMU16RXdOek16TXpKYU1HUXhDekFKQmdOVkJBWVRBa1JGTVJzd0dRWURWUVFJREJKVFkyaHNaWE4zYVdjdApTRzlzYzNSbGFXNHhEakFNQmdOVkJBY01CVmRsWkdWc01SSXdFQVlEVlFRS0RBbFRkR0ZqYTJGaWJHVXhGREFTCkJnTlZCQU1NQzIxcGJtbHZMV1J5ZFdsa01JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0MKQVFFQXE2b3ZZdkU0SE5WQ1owZkVWWTV6N1ZGZHprdzUyNkE2QW5wOGozMjM1WCtWS1cyQkdDdklOY3pvOG4zUApOTFc1S210ZFlWYW5zTlM1Z2J1QjZXV0xPYkthdzB0d2dQV1JBbzdHZGN0TkQ5QXEyTmlCYllINGRrVWxCUXJmCi9DRVVkYjYrLzd1ZUsvUlRGa0JnS0NMY21qN3ZtUmhidVMwV040MFQxR3lRN2RmVUliVmQ0bDl6UFBWYmgwV3UKaU9PSDJLRkVtSlNRQWlmNmZqdnVxZ2czZTV2bEpwMm9sUk9rcmQwTmlmNmw2Nm8rTlkwOWprWmtISENXTmloSApBUndDdDZJRG5CUFhoNjJRQ1hVOXlLNkNnNll5VjBWbXdSbmV4aUdENVpGd2lTNzZ4VTRXOUNUc2JwbFdLRjJzClhOb1oxb29HWDJNaHZDV2dLejZiRk1jVFB3SURBUUFCTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFCZzZMem4KbTVFWVhiOVR2RU84dEhUVFRUTm1DYzhTb1B5eFFKaWdMaFllOFNsSktyajUzRUhXbUI2NTZxUzZaQXZHcW43UApBL1ozOVZtbm5GajhHamJXZzdIM2JVSkVNeVUvek8zL3h4MUVpTU56RzFIbitzL3lSOTV5bkN2TXZocHI4QlBLCmh3YWs1T0c5TGlybTV5OHIxTW9YWGRmZWpRTGdkWEoxWFcxdWZoQXg4RnhUQXpMSXBFQThyTVhpWllGTXR6czcKNGM2dU8yVjl0WkJPcnc0dXY3Y3d4YnpRVXpNYU1pOVh6M1dSRGpmaDQwVGRBRVEzeFRLRTU0Zld4L1pBdUZ2ZgpEalZSVTY0QSs2NlcyNzU2dGdHQTdXaFBPRG1BS3RjdzBpaTRtYUM4VUZUdHIvTVB5YkZ3OVBRMUJNWUxKYWUyCmxzTWRPUzgvK2l1RklXT0wKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJRDF6Q0NBcitnQXdJQkFnSVVEbTNvSDJUNkxUdlpIN3o2TGxLZWlSMlNDb2N3RFFZSktvWklodmNOQVFFTApCUUF3ZXpFTE1Ba0dBMVVFQmhNQ1JFVXhHekFaQmdOVkJBZ01FbE5qYUd4bGMzZHBaeTFJYjJ4emRHVnBiakVPCk1Bd0dBMVVFQnd3RlYyVmtaV3d4S0RBbUJnTlZCQW9NSDFOMFlXTnJZV0pzWlNCVGFXZHVhVzVuSUVGMWRHaHYKY21sMGVTQkpibU14RlRBVEJnTlZCQU1NREhOMFlXTnJZV0pzWlM1a1pUQWVGdzB5TWpBMk1qUXdOek16TXpKYQpGdzAwTnpBMk1qUXdOek16TXpKYU1Ic3hDekFKQmdOVkJBWVRBa1JGTVJzd0dRWURWUVFJREJKVFkyaHNaWE4zCmFXY3RTRzlzYzNSbGFXNHhEakFNQmdOVkJBY01CVmRsWkdWc01TZ3dKZ1lEVlFRS0RCOVRkR0ZqYTJGaWJHVWcKVTJsbmJtbHVaeUJCZFhSb2IzSnBkSGtnU1c1ak1SVXdFd1lEVlFRRERBeHpkR0ZqYTJGaWJHVXVaR1V3Z2dFaQpNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUUMva2NxdTVpNFdQNW1xcDU0ZVlqQ0NhdjBuClNWc3VxYW9kQm9QbjJOY0hKRDdsVU40K2ZFS2JyOFdWQ3hQUDFaeDRNQlpJQUFrcDZmWk5RQVE5WmxOQnduMFYKWG5remZ6cGQveHpQeDcrREV4Y3l4WW5SdVNucXZEeXFlVUp0bEtWaGJ4NkJnSGxqU0NTb2tUdVovblI5czdsZQp5RlQrb0V1V2tCclJXSWhxRkdLZm0rd3RNUFZ5WE8xKzRUOU5oc3prd3gwR0ExRjZ0NXhCOWJSVGtuTVY0N25wCjZHTmlSbUJwWXlCWExCN3FtdmE2ajhkWURsbVhIQjlpMy9Xd21WN3l5eUhIUmJrTVY3dEhEZ1FWYXlLOUNEN24KcCtLdGE1NlVMM0J5c1d5TlRyS1JaclVNa0YxN2UxdWdZbG9RQ0xqa09ibDBpeW83c3ZIdFVUVW93YTFsQWdNQgpBQUdqVXpCUk1CMEdBMVVkRGdRV0JCUzJFZmo1TGJPTTAyM1RBSFRQem9vbzVEOTNaekFmQmdOVkhTTUVHREFXCmdCUzJFZmo1TGJPTTAyM1RBSFRQem9vbzVEOTNaekFQQmdOVkhSTUJBZjhFQlRBREFRSC9NQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFDU0p5emRjL2tFdGt0eStxc0RWUWxCRTB1WHRKWU8zN2l2QzMzODlmSDZtSlRscHdJegoxUzR0azkzMGdMSVZVSXg1emEyeTRPOGVIUHRTMU5xWDUrQ0hYdGJ4NHZmeXlnNDlvUE9SMDRiNnVFa1pmTzU1CjRmOElPUFU3Tk10UTlBVkhNU2xUK29GOGQ3U21ld21Tc2JtOUNvbXVod2k0RythZkxxZ3FwYzlrQU5pTkxpVG0KcjZkWW5MVnlLSndOUG1rSlViL0RCc2YxMmIzRUwzbi9sWEptZDRNOVU3Nndzd2g5ZWt5TnRVdmdCOTRsMHFwMgpIUDVadFZCbXdTYlM5b0VIZ04vc2xuc0VUbDlCMXovb0FYOFRnUjdkV2FhY2ZvZEt5VFYxbkxSbTVhaFpZbDBrCng4UVhjbDNtQ1JLM1pWcGhodkhWMzdDYndlMWtBd2hiZHlETQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== + tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBcTZvdll2RTRITlZDWjBmRVZZNXo3VkZkemt3NTI2QTZBbnA4ajMyMzVYK1ZLVzJCCkdDdklOY3pvOG4zUE5MVzVLbXRkWVZhbnNOUzVnYnVCNldXTE9iS2F3MHR3Z1BXUkFvN0dkY3RORDlBcTJOaUIKYllINGRrVWxCUXJmL0NFVWRiNisvN3VlSy9SVEZrQmdLQ0xjbWo3dm1SaGJ1UzBXTjQwVDFHeVE3ZGZVSWJWZAo0bDl6UFBWYmgwV3VpT09IMktGRW1KU1FBaWY2Zmp2dXFnZzNlNXZsSnAyb2xST2tyZDBOaWY2bDY2bytOWTA5CmprWmtISENXTmloSEFSd0N0NklEbkJQWGg2MlFDWFU5eUs2Q2c2WXlWMFZtd1JuZXhpR0Q1WkZ3aVM3NnhVNFcKOUNUc2JwbFdLRjJzWE5vWjFvb0dYMk1odkNXZ0t6NmJGTWNUUHdJREFRQUJBb0lCQVFDbEdjWC9mQTVDdE56cgpwanR2S2RYWEhsV0JEeERxYVR6Qm0zcG5LenVOejFudmdURVN4VEVHaFhCWm9LU0RobTl6RzlXd3czMytkV21CCkc0MERvN1QycGc5dzJ3SjJGVGdGWkxuOUdxMmdFczdTeGRBZE9VNTB1V1cwWnRRcmtza3h3V1hEWVhmcndFMlUKN2c5Tkt0Sk95MDczU0ZVWFVRUzRJc2c2bXJ2ODh1OEY1KzZublhKTXAraE5jaUVQdHh6djJ5MFRyT29jRUxHZwp1QVhnNmdkd0xNamZobHpQckxDdTRMNnJsRkREbGxOejFIaWRza2pYVGk3MmNqaHpzQkF3SWJWU1oyS1E5K0d0CmE0S1VPU2hzUUJYS1lBNTlFdnQxV2tkT2h3L29HN2padFV0Yks3UGlMak52cU5RbWNwYWN6bFZhLzY0TjEzdDMKUzJ2c3hrdlJBb0dCQU5JMkRrM0N0R3VaREg0ZWE2MWZTQXZid2IxV0EzUlNXdHRQUFlQU1RYRi9uaDVBVGoxZwpvbWRYYzBRTzc4Rm5QdUVJZGltMFVWVzV5Q0RXNHIvZW5RcW5OSjJOMFNYSFFrZ2paSlpXbVIzcjFoLzZtbnVRCjQ5WjFqUnVMZDRJY24ySHMrOUo4N2hUZmgrN2FtcXVDa3Y5a3lRMzcwSTdZOWVlQmFyZXV4UFRKQW9HQkFORU8KcmRqelBTN2JqaWpqRGx6K1YvZXNMYzlTM3FTWGRSeEpPbm51Y0JHakQxakdhaE81Wks4ZlBvV1RSTS9IbUp2ZApXZVU2bEtGTnJ6UWEvMFM4NGlqSDd5VXhkV2dCY3l0eVd6MUdkTUVTVWxUdnBVWVdqSE5tRkFtUjFlNmJMQkQyClFRU2M4UEtUampza3ljNmVkUUtXNzk0Z1FNNjlVN21veStrZHd2UEhBb0dCQUlROVZVbzl6bHBSOGJYMVZTKy8KM1FiNHZDeHJ5OGlGZG5xNG9xNG13bWxBS3l4RXIvT1VzeFhud2E5eTVnajQ5bW1DZFROUEtFdVJrQUI0cmpTZAp5cFZGRXFoNjZyT2xZbUVYUXRRQXJscFFYbWZIc3g5QXl0UERKMzNJZ3Vuckw2amUrSncxMDJCMkxvRm9MQnp4CkM2QjJ1clI5VVhwTHFvWjB0N25OekVGaEFvR0JBSVdpa1lTZU1CMFU0ZkhHK3JaOUszUTV6dXE1ZVhMVEVseHIKZndMVVpUVVErODF1di80dHcydWlXRkFBakxzWlJyZFRycFEyZHk0SlA1YmFMeFVjZktFKzlPTGNrOFZSTC9LMAozaGYwUXN2c1QwN1dCZHNnck5WVGlqbDN6TDRDMlE5YXFzTXRJMlNjNkExc2ZjZ2pTSDdJUnpyQmVVdnVnR2VzCnUvUWZQekNmQW9HQVQ4WXh0ckxkUFVuRUdOTko5VVdUd2R6RkRHT2d0T1BKOWVEWHJRV1ZjODRMVGxjWnpLYnMKMTlMT3ltMFMwTlU2WTFUVmlJcEFTYkxhWXRpd3EzWEF4V3VJb21DUmhxWjc2c01oNks0ZWpWcU84WEorcGpNUQpUbStndTFySEc4VEFmZDNqdFRUdFEvTGp3Si9SWkFSNStYeEUxcnBhODZUc3lVZW05ZmJIdTdFPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo= {% endif %} diff --git a/tests/templates/kuttl/s3-deep-storage/certs/ca.crt b/tests/templates/kuttl/s3-deep-storage/certs/ca.crt index 64cc9ee0..3322b9dd 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/ca.crt +++ b/tests/templates/kuttl/s3-deep-storage/certs/ca.crt @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -MIID1zCCAr+gAwIBAgIUJAAClB4u/6WanKnnZB+wuRpsUa4wDQYJKoZIhvcNAQEL +MIID1zCCAr+gAwIBAgIUDm3oH2T6LTvZH7z6LlKeiR2SCocwDQYJKoZIhvcNAQEL BQAwezELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1Ib2xzdGVpbjEO MAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJsZSBTaWduaW5nIEF1dGhv -cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAeFw0yMjA2MjIwNzM5NTla -Fw00NzA2MjIwNzM5NTlaMHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3 +cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAeFw0yMjA2MjQwNzMzMzJa +Fw00NzA2MjQwNzMzMzJaMHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3 aWctSG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUg U2lnbmluZyBBdXRob3JpdHkgSW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH/LM3NVDW4v/OD2aT/gSNI07I -oss5A2ytpa5Y0YunweqnUzchBbdJG6DX6cC/N5MmSSHQbOspKGFLtTSD/nS8bNGb -4DkIcnmC/suAj2z8dEzrPQizXMDpAnjD93Ip7FkRzTWNWbTtT/djNVkwlMfSu6uk -I+Ppa+9QlqyMz3o2g4R8pYLG6RLb2Es0U9idyouuUj3llUKWYeZfzBSAYLT+VA1D -ErzcqiuwUugZlTFthMpOvg88rMakp7PNspW+EOb9teLCVmlbu4ZneMzmjvjxg4OK -yAc5sVBWbeC95xYfHKivMe/PJxdwNVOAUp4XpB+fe3K87VwDpITgihkCaA/tAgMB -AAGjUzBRMB0GA1UdDgQWBBT22K8IF72JhBBAOl9cr2Ad47UNtTAfBgNVHSMEGDAW -gBT22K8IF72JhBBAOl9cr2Ad47UNtTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 -DQEBCwUAA4IBAQAbfUR/jU1oj3soqres/yikgR8AzT4d89Arbfo6jZIeexvGx386 -TNo3SmyLqhNT0I6IFL1UL+UiImSohx1H1h1dvf1/1/j66tH92Ho48vtacC5vxU9Y -0L10EnOzQicU4CO3Hgk+3jd9w1HE+JeIzVCt4c2FjHM/ybDAD0MW3KazIVq7GFYu -gYX3dJUAJUa11IIySDAnn33Etn7P+h6Sm2wWxtsxziqYBFzg8RZzHXXuDTRMf7+e -IUJ3B9OYNPbQrg+pzvkID066YWeN9lIR6cACFNLxRthUj6O+zilv9Gr4N0mbJCB9 -G4mR7Y8ginVDtUM7g9SRSpyrlxK71SJDeRvJ +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/kcqu5i4WP5mqp54eYjCCav0n +SVsuqaodBoPn2NcHJD7lUN4+fEKbr8WVCxPP1Zx4MBZIAAkp6fZNQAQ9ZlNBwn0V +Xnkzfzpd/xzPx7+DExcyxYnRuSnqvDyqeUJtlKVhbx6BgHljSCSokTuZ/nR9s7le +yFT+oEuWkBrRWIhqFGKfm+wtMPVyXO1+4T9Nhszkwx0GA1F6t5xB9bRTknMV47np +6GNiRmBpYyBXLB7qmva6j8dYDlmXHB9i3/WwmV7yyyHHRbkMV7tHDgQVayK9CD7n +p+Kta56UL3BysWyNTrKRZrUMkF17e1ugYloQCLjkObl0iyo7svHtUTUowa1lAgMB +AAGjUzBRMB0GA1UdDgQWBBS2Efj5LbOM023TAHTPzooo5D93ZzAfBgNVHSMEGDAW +gBS2Efj5LbOM023TAHTPzooo5D93ZzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 +DQEBCwUAA4IBAQCSJyzdc/kEtkty+qsDVQlBE0uXtJYO37ivC3389fH6mJTlpwIz +1S4tk930gLIVUIx5za2y4O8eHPtS1NqX5+CHXtbx4vfyyg49oPOR04b6uEkZfO55 +4f8IOPU7NMtQ9AVHMSlT+oF8d7SmewmSsbm9Comuhwi4G+afLqgqpc9kANiNLiTm +r6dYnLVyKJwNPmkJUb/DBsf12b3EL3n/lXJmd4M9U76wswh9ekyNtUvgB94l0qp2 +HP5ZtVBmwSbS9oEHgN/slnsETl9B1z/oAX8TgR7dWaacfodKyTV1nLRm5ahZYl0k +x8QXcl3mCRK3ZVphhvHV37Cbwe1kAwhbdyDM -----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem b/tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem index 674dd312..6dabab13 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem +++ b/tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDdDCCAlwCFHMj5AUNEgw/GHhdrePkBUeU/V42MA0GCSqGSIb3DQEBCwUAMHsx +MIIDaDCCAlACFAI/QZ3WQkdgx8Qp+qAwzPNlG0rfMA0GCSqGSIb3DQEBCwUAMHsx CzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWctSG9sc3RlaW4xDjAMBgNV BAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2lnbmluZyBBdXRob3JpdHkg -SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjIyMDczOTU5WhgPMjEy -MjA1MjkwNzM5NTlaMHAxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct -SG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2ln -bmluZyBBdXRob3JpdHkgSW5jMQowCAYDVQQDDAEqMIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAyWWZaoXwz8PKiMdaIYtT99pD6miuFTjCM/QcX10r/lWX -Wm6QxAabwyy8P/cLcNzKUKKi2mE49L/hhXb5/vocrP9mQwzWs9a2w9YT1N1fOdtO -ZSU3I5DFzKNhPKHp7hHODhZGqXeimUAR1MIIH2ECjP1juqU4byRB5IHN6rreQ7FA -dGJhjC1XYzkDKZZKZrZCRyqPAw0Wljc19OXxH/wUoJASuuoai0KSqiNmrC95C1vL -crZQDpkZJndGe0pVY2CIHq/zQ093svpR7g7wBgPsi8H7LBffxz9Vzu44ncTN/aSX -HeX3cMr0XqyNfZfHCMaXrPw16COW5jRgfFMUOuUxWwIDAQABMA0GCSqGSIb3DQEB -CwUAA4IBAQCVaRh2+nm5j0rx7B8IrLfDZ+Cj361BVxQKXd7u13U1dQZ9gtZUqCRV -jpB/LEFQ4yHbDdh0R/sZTqY2I/I0+AqqMumSMTK/p6+zq/4dWjXZmcvqseAXqP/D -wybaihGKf+fDa+RCj9DrK0V+ULCt79cds841hSh4oZ2PKs20sK4pm/QCmHX4XQRD -HqJOC4twsRVaY5mEoJTu7/Dce4rV8c9zRyYqnW2dOfn25RlJUHZmrsOhPmIW+g1Y -5aJhUnChZVxkkdQbu3oJ1E8oIvCqj4VlowKkqeeoCwil5DUZCa5f0CKlO5GpnPK8 -7wtPFTfKR77DOeUn7skv3h0YdoE57DUd +SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjI0MDczMzMyWhgPMjEy +MjA1MzEwNzMzMzJaMGQxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct +SG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMRIwEAYDVQQKDAlTdGFja2FibGUxFDAS +BgNVBAMMC21pbmlvLWRydWlkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAq6ovYvE4HNVCZ0fEVY5z7VFdzkw526A6Anp8j3235X+VKW2BGCvINczo8n3P +NLW5KmtdYVansNS5gbuB6WWLObKaw0twgPWRAo7GdctND9Aq2NiBbYH4dkUlBQrf +/CEUdb6+/7ueK/RTFkBgKCLcmj7vmRhbuS0WN40T1GyQ7dfUIbVd4l9zPPVbh0Wu +iOOH2KFEmJSQAif6fjvuqgg3e5vlJp2olROkrd0Nif6l66o+NY09jkZkHHCWNihH +ARwCt6IDnBPXh62QCXU9yK6Cg6YyV0VmwRnexiGD5ZFwiS76xU4W9CTsbplWKF2s +XNoZ1ooGX2MhvCWgKz6bFMcTPwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBg6Lzn +m5EYXb9TvEO8tHTTTTNmCc8SoPyxQJigLhYe8SlJKrj53EHWmB656qS6ZAvGqn7P +A/Z39VmnnFj8GjbWg7H3bUJEMyU/zO3/xx1EiMNzG1Hn+s/yR95ynCvMvhpr8BPK +hwak5OG9Lirm5y8r1MoXXdfejQLgdXJ1XW1ufhAx8FxTAzLIpEA8rMXiZYFMtzs7 +4c6uO2V9tZBOrw4uv7cwxbzQUzMaMi9Xz3WRDjfh40TdAEQ3xTKE54fWx/ZAuFvf +DjVRU64A+66W2756tgGA7WhPODmAKtcw0ii4maC8UFTtr/MPybFw9PQ1BMYLJae2 +lsMdOS8/+iuFIWOL -----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem b/tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem index af15e76c..72289cdb 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem +++ b/tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem @@ -1,17 +1,17 @@ -----BEGIN CERTIFICATE REQUEST----- -MIICtTCCAZ0CAQAwcDELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1I -b2xzdGVpbjEOMAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJsZSBTaWdu -aW5nIEF1dGhvcml0eSBJbmMxCjAIBgNVBAMMASowggEiMA0GCSqGSIb3DQEBAQUA -A4IBDwAwggEKAoIBAQDJZZlqhfDPw8qIx1ohi1P32kPqaK4VOMIz9BxfXSv+VZda -bpDEBpvDLLw/9wtw3MpQoqLaYTj0v+GFdvn++hys/2ZDDNaz1rbD1hPU3V85205l -JTcjkMXMo2E8oenuEc4OFkapd6KZQBHUwggfYQKM/WO6pThvJEHkgc3qut5DsUB0 -YmGMLVdjOQMplkpmtkJHKo8DDRaWNzX05fEf/BSgkBK66hqLQpKqI2asL3kLW8ty -tlAOmRkmd0Z7SlVjYIger/NDT3ey+lHuDvAGA+yLwfssF9/HP1XO7jidxM39pJcd -5fdwyvRerI19l8cIxpes/DXoI5bmNGB8UxQ65TFbAgMBAAGgADANBgkqhkiG9w0B -AQsFAAOCAQEAh+ztHTmtEYUYYPPn3NyE5JuQLeZm7aH3Qrpw65GcDQWLZNHdwSdW -gLQYZaGBvNDb1y0Nu2zIpWADnqDfv8D5mpTYEMe7ZpQkuML8fzwlQFZROWPGlNzn -12tMNAXs0pyyzi4we8I/+W10SefWDGbluTfsWWGtAFCIVhIZGqUPcMq6fCWlvzkE -K82I66sz6dayIDQVyUMSLIYKl8qUxUvY6sV0WRVodWqfP8bhOHzUdatwasmhLUg+ -2UTCTx0icmp2txOXOgwxinvN5zHG4a8Ng5vPuBaHjmPpTSQ69qzEQaFtIcdrbQKs -Y9NPBZNZ6I95aliBqnFaykIZClTb09CV7g== +MIICqTCCAZECAQAwZDELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1I +b2xzdGVpbjEOMAwGA1UEBwwFV2VkZWwxEjAQBgNVBAoMCVN0YWNrYWJsZTEUMBIG +A1UEAwwLbWluaW8tZHJ1aWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB +AQCrqi9i8Tgc1UJnR8RVjnPtUV3OTDnboDoCenyPfbflf5UpbYEYK8g1zOjyfc80 +tbkqa11hVqew1LmBu4HpZYs5sprDS3CA9ZECjsZ1y00P0CrY2IFtgfh2RSUFCt/8 +IRR1vr7/u54r9FMWQGAoItyaPu+ZGFu5LRY3jRPUbJDt19QhtV3iX3M89VuHRa6I +44fYoUSYlJACJ/p+O+6qCDd7m+UmnaiVE6St3Q2J/qXrqj41jT2ORmQccJY2KEcB +HAK3ogOcE9eHrZAJdT3IroKDpjJXRWbBGd7GIYPlkXCJLvrFThb0JOxumVYoXaxc +2hnWigZfYyG8JaArPpsUxxM/AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAVpwh +aM91YAlykwxJB5E5cIkhhfGZrMcNiWR/aGQAtPtfR49hkQRseLykHuWyC8ts91o+ +kgZz+pRUu4p4bptpKGDEUTqwPipJajg4/AbnD1YAZWJAG5uMf3UX4e1SZSNbSTxw +CKPIrhhHdfGu+W8fV7Idna6Q3d9AO8hZE8BQBFuAzclN78WPUoIoecbMlVNzHuDS +WpR3vUpKCyN3j0NjKz/6OCkOV6IgxesjKC/o5nCjpI8GLJ9+0vOBiPCXfHyeH7ap +adEXAQ+v4Drcad67H35N1oT8YSd+D/CguQJGGb15nU5dxf4P6rawbfNTay5zhZVW +lDvDTJ0HjNoJ2g6ekg== -----END CERTIFICATE REQUEST----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/client.key.pem b/tests/templates/kuttl/s3-deep-storage/certs/client.key.pem index 04fc15b3..df67e08f 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/client.key.pem +++ b/tests/templates/kuttl/s3-deep-storage/certs/client.key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/generate.sh b/tests/templates/kuttl/s3-deep-storage/certs/generate.sh index ba18b790..faa56c38 100755 --- a/tests/templates/kuttl/s3-deep-storage/certs/generate.sh +++ b/tests/templates/kuttl/s3-deep-storage/certs/generate.sh @@ -11,12 +11,12 @@ openssl req \ -new \ -nodes \ -key root-ca.key.pem \ - -days 9131 \ + -days 36500 \ -out root-ca.crt.pem \ -subj "/C=DE/ST=Schleswig-Holstein/L=Wedel/O=Stackable Signing Authority Inc/CN=stackable.de" echo "Creating client cert" -FQDN="*" +FQDN="minio-druid" openssl genrsa \ -out client.key.pem \ diff --git a/tests/templates/kuttl/s3-deep-storage/certs/logfile b/tests/templates/kuttl/s3-deep-storage/certs/logfile deleted file mode 100644 index 1c7c3765..00000000 --- a/tests/templates/kuttl/s3-deep-storage/certs/logfile +++ /dev/null @@ -1,50 +0,0 @@ -CONNECTED(00000003) ---- -Certificate chain - 0 s:C = DE, ST = Schleswig-Holstein, L = Wedel, O = Stackable Signing Authority Inc, CN = * - i:C = DE, ST = Schleswig-Holstein, L = Wedel, O = Stackable Signing Authority Inc, CN = stackable.de ---- -Server certificate ------BEGIN CERTIFICATE----- -MIIDdDCCAlwCFHMj5AUNEgw/GHhdrePkBUeU/V41MA0GCSqGSIb3DQEBCwUAMHsx -CzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWctSG9sc3RlaW4xDjAMBgNV -BAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2lnbmluZyBBdXRob3JpdHkg -SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjIyMDczOTE1WhgPMjEy -MjA1MjkwNzM5MTVaMHAxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct -SG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2ln -bmluZyBBdXRob3JpdHkgSW5jMQowCAYDVQQDDAEqMIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAnYozaQzLxBxMLcuUrkPCdh2fOzr01/eUOGlaHuyiRIqe -r/PVef9MMFlfDrucVciO/MghbpGfwCKZ5RJ/8bPQb1kaJznjI6GSsKYcQwvd+s8o -JJbeMPyJ8pmbveIO0b5zUkwf8XOmlolyqJj2e12H1rgd/PeXgpGchzXaJlrremfM -YDe2uGg8txsZ2mtm5YT5QamFHWTKjBP53Ujk+viiYRsSBN8FmJlQNu7uZrNAvmkj -PaO4uHw7OAvr8stFzsnpyDAu/biS9WDglVS6LYaeXLy1G//TBTbYJPwdNcTFOmzy -hLn7XJfUKUOEPmrUPYkTQ6LT8ZSmveZQTm8UVhy0hQIDAQABMA0GCSqGSIb3DQEB -CwUAA4IBAQAaCeS9XXlcXVLmRPzfxNOjVJLPGVkXkY4Gg9XsoBC9QFbX9gNHXzRe -SPzzXccKqWKmrQb2UE9U+18bSJE9OIy/g8KOlRwEkh4oZdjiZvUQBKnP1q/Scm31 -nE2zcjOfvrQiHKPwODWXehu6yJz0t0tu0RfvLi5ob+a8gh6HmtW4HB3rsQENsab2 -EcnrfALJaJ/SJnmA/Xjd21Ya5CiHiZAYzTTtRiZETU9V7yr+JClOhYbAwv9mqpTL -YfwzGrlhhK3ndnFu8FiL5qZCVgRV4KPQDEHex7T5j3hwJEqMWKTPiEApDW/gRGBY -rooO9BSFJfy1oRocnrs+ksXYjEhRyrlQ ------END CERTIFICATE----- -subject=C = DE, ST = Schleswig-Holstein, L = Wedel, O = Stackable Signing Authority Inc, CN = * - -issuer=C = DE, ST = Schleswig-Holstein, L = Wedel, O = Stackable Signing Authority Inc, CN = stackable.de - ---- -No client certificate CA names sent -Peer signing digest: SHA256 -Peer signature type: RSA-PSS -Server Temp Key: X25519, 253 bits ---- -SSL handshake has read 1428 bytes and written 347 bytes -Verification error: unable to verify the first certificate ---- -New, TLSv1.3, Cipher is TLS_AES_128_GCM_SHA256 -Server public key is 2048 bit -Secure Renegotiation IS NOT supported -Compression: NONE -Expansion: NONE -No ALPN negotiated -Early data was not sent -Verify return code: 21 (unable to verify the first certificate) ---- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem index 64cc9ee0..3322b9dd 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem +++ b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -MIID1zCCAr+gAwIBAgIUJAAClB4u/6WanKnnZB+wuRpsUa4wDQYJKoZIhvcNAQEL +MIID1zCCAr+gAwIBAgIUDm3oH2T6LTvZH7z6LlKeiR2SCocwDQYJKoZIhvcNAQEL BQAwezELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1Ib2xzdGVpbjEO MAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJsZSBTaWduaW5nIEF1dGhv -cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAeFw0yMjA2MjIwNzM5NTla -Fw00NzA2MjIwNzM5NTlaMHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3 +cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAeFw0yMjA2MjQwNzMzMzJa +Fw00NzA2MjQwNzMzMzJaMHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3 aWctSG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUg U2lnbmluZyBBdXRob3JpdHkgSW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDH/LM3NVDW4v/OD2aT/gSNI07I -oss5A2ytpa5Y0YunweqnUzchBbdJG6DX6cC/N5MmSSHQbOspKGFLtTSD/nS8bNGb -4DkIcnmC/suAj2z8dEzrPQizXMDpAnjD93Ip7FkRzTWNWbTtT/djNVkwlMfSu6uk -I+Ppa+9QlqyMz3o2g4R8pYLG6RLb2Es0U9idyouuUj3llUKWYeZfzBSAYLT+VA1D -ErzcqiuwUugZlTFthMpOvg88rMakp7PNspW+EOb9teLCVmlbu4ZneMzmjvjxg4OK -yAc5sVBWbeC95xYfHKivMe/PJxdwNVOAUp4XpB+fe3K87VwDpITgihkCaA/tAgMB -AAGjUzBRMB0GA1UdDgQWBBT22K8IF72JhBBAOl9cr2Ad47UNtTAfBgNVHSMEGDAW -gBT22K8IF72JhBBAOl9cr2Ad47UNtTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 -DQEBCwUAA4IBAQAbfUR/jU1oj3soqres/yikgR8AzT4d89Arbfo6jZIeexvGx386 -TNo3SmyLqhNT0I6IFL1UL+UiImSohx1H1h1dvf1/1/j66tH92Ho48vtacC5vxU9Y -0L10EnOzQicU4CO3Hgk+3jd9w1HE+JeIzVCt4c2FjHM/ybDAD0MW3KazIVq7GFYu -gYX3dJUAJUa11IIySDAnn33Etn7P+h6Sm2wWxtsxziqYBFzg8RZzHXXuDTRMf7+e -IUJ3B9OYNPbQrg+pzvkID066YWeN9lIR6cACFNLxRthUj6O+zilv9Gr4N0mbJCB9 -G4mR7Y8ginVDtUM7g9SRSpyrlxK71SJDeRvJ +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/kcqu5i4WP5mqp54eYjCCav0n +SVsuqaodBoPn2NcHJD7lUN4+fEKbr8WVCxPP1Zx4MBZIAAkp6fZNQAQ9ZlNBwn0V +Xnkzfzpd/xzPx7+DExcyxYnRuSnqvDyqeUJtlKVhbx6BgHljSCSokTuZ/nR9s7le +yFT+oEuWkBrRWIhqFGKfm+wtMPVyXO1+4T9Nhszkwx0GA1F6t5xB9bRTknMV47np +6GNiRmBpYyBXLB7qmva6j8dYDlmXHB9i3/WwmV7yyyHHRbkMV7tHDgQVayK9CD7n +p+Kta56UL3BysWyNTrKRZrUMkF17e1ugYloQCLjkObl0iyo7svHtUTUowa1lAgMB +AAGjUzBRMB0GA1UdDgQWBBS2Efj5LbOM023TAHTPzooo5D93ZzAfBgNVHSMEGDAW +gBS2Efj5LbOM023TAHTPzooo5D93ZzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 +DQEBCwUAA4IBAQCSJyzdc/kEtkty+qsDVQlBE0uXtJYO37ivC3389fH6mJTlpwIz +1S4tk930gLIVUIx5za2y4O8eHPtS1NqX5+CHXtbx4vfyyg49oPOR04b6uEkZfO55 +4f8IOPU7NMtQ9AVHMSlT+oF8d7SmewmSsbm9Comuhwi4G+afLqgqpc9kANiNLiTm +r6dYnLVyKJwNPmkJUb/DBsf12b3EL3n/lXJmd4M9U76wswh9ekyNtUvgB94l0qp2 +HP5ZtVBmwSbS9oEHgN/slnsETl9B1z/oAX8TgR7dWaacfodKyTV1nLRm5ahZYl0k +x8QXcl3mCRK3ZVphhvHV37Cbwe1kAwhbdyDM -----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl index e8211f57..c59acdcc 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl +++ b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl @@ -1 +1 @@ -7323E4050D120C3F18785DADE3E4054794FD5E36 +023F419DD6424760C7C429FAA030CCF3651B4ADF diff --git a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem index 52e92273..57e83f5f 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem +++ b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/tls.crt b/tests/templates/kuttl/s3-deep-storage/certs/tls.crt index 674dd312..8ce1c1d1 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/tls.crt +++ b/tests/templates/kuttl/s3-deep-storage/certs/tls.crt @@ -1,21 +1,44 @@ -----BEGIN CERTIFICATE----- -MIIDdDCCAlwCFHMj5AUNEgw/GHhdrePkBUeU/V42MA0GCSqGSIb3DQEBCwUAMHsx +MIIDaDCCAlACFAI/QZ3WQkdgx8Qp+qAwzPNlG0rfMA0GCSqGSIb3DQEBCwUAMHsx CzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWctSG9sc3RlaW4xDjAMBgNV BAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2lnbmluZyBBdXRob3JpdHkg -SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjIyMDczOTU5WhgPMjEy -MjA1MjkwNzM5NTlaMHAxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct -SG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2ln -bmluZyBBdXRob3JpdHkgSW5jMQowCAYDVQQDDAEqMIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAyWWZaoXwz8PKiMdaIYtT99pD6miuFTjCM/QcX10r/lWX -Wm6QxAabwyy8P/cLcNzKUKKi2mE49L/hhXb5/vocrP9mQwzWs9a2w9YT1N1fOdtO -ZSU3I5DFzKNhPKHp7hHODhZGqXeimUAR1MIIH2ECjP1juqU4byRB5IHN6rreQ7FA -dGJhjC1XYzkDKZZKZrZCRyqPAw0Wljc19OXxH/wUoJASuuoai0KSqiNmrC95C1vL -crZQDpkZJndGe0pVY2CIHq/zQ093svpR7g7wBgPsi8H7LBffxz9Vzu44ncTN/aSX -HeX3cMr0XqyNfZfHCMaXrPw16COW5jRgfFMUOuUxWwIDAQABMA0GCSqGSIb3DQEB -CwUAA4IBAQCVaRh2+nm5j0rx7B8IrLfDZ+Cj361BVxQKXd7u13U1dQZ9gtZUqCRV -jpB/LEFQ4yHbDdh0R/sZTqY2I/I0+AqqMumSMTK/p6+zq/4dWjXZmcvqseAXqP/D -wybaihGKf+fDa+RCj9DrK0V+ULCt79cds841hSh4oZ2PKs20sK4pm/QCmHX4XQRD -HqJOC4twsRVaY5mEoJTu7/Dce4rV8c9zRyYqnW2dOfn25RlJUHZmrsOhPmIW+g1Y -5aJhUnChZVxkkdQbu3oJ1E8oIvCqj4VlowKkqeeoCwil5DUZCa5f0CKlO5GpnPK8 -7wtPFTfKR77DOeUn7skv3h0YdoE57DUd +SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjI0MDczMzMyWhgPMjEy +MjA1MzEwNzMzMzJaMGQxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct +SG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMRIwEAYDVQQKDAlTdGFja2FibGUxFDAS +BgNVBAMMC21pbmlvLWRydWlkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC +AQEAq6ovYvE4HNVCZ0fEVY5z7VFdzkw526A6Anp8j3235X+VKW2BGCvINczo8n3P +NLW5KmtdYVansNS5gbuB6WWLObKaw0twgPWRAo7GdctND9Aq2NiBbYH4dkUlBQrf +/CEUdb6+/7ueK/RTFkBgKCLcmj7vmRhbuS0WN40T1GyQ7dfUIbVd4l9zPPVbh0Wu +iOOH2KFEmJSQAif6fjvuqgg3e5vlJp2olROkrd0Nif6l66o+NY09jkZkHHCWNihH +ARwCt6IDnBPXh62QCXU9yK6Cg6YyV0VmwRnexiGD5ZFwiS76xU4W9CTsbplWKF2s +XNoZ1ooGX2MhvCWgKz6bFMcTPwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBg6Lzn +m5EYXb9TvEO8tHTTTTNmCc8SoPyxQJigLhYe8SlJKrj53EHWmB656qS6ZAvGqn7P +A/Z39VmnnFj8GjbWg7H3bUJEMyU/zO3/xx1EiMNzG1Hn+s/yR95ynCvMvhpr8BPK +hwak5OG9Lirm5y8r1MoXXdfejQLgdXJ1XW1ufhAx8FxTAzLIpEA8rMXiZYFMtzs7 +4c6uO2V9tZBOrw4uv7cwxbzQUzMaMi9Xz3WRDjfh40TdAEQ3xTKE54fWx/ZAuFvf +DjVRU64A+66W2756tgGA7WhPODmAKtcw0ii4maC8UFTtr/MPybFw9PQ1BMYLJae2 +lsMdOS8/+iuFIWOL +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIID1zCCAr+gAwIBAgIUDm3oH2T6LTvZH7z6LlKeiR2SCocwDQYJKoZIhvcNAQEL +BQAwezELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1Ib2xzdGVpbjEO +MAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJsZSBTaWduaW5nIEF1dGhv +cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAeFw0yMjA2MjQwNzMzMzJa +Fw00NzA2MjQwNzMzMzJaMHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3 +aWctSG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUg +U2lnbmluZyBBdXRob3JpdHkgSW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwggEi +MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/kcqu5i4WP5mqp54eYjCCav0n +SVsuqaodBoPn2NcHJD7lUN4+fEKbr8WVCxPP1Zx4MBZIAAkp6fZNQAQ9ZlNBwn0V +Xnkzfzpd/xzPx7+DExcyxYnRuSnqvDyqeUJtlKVhbx6BgHljSCSokTuZ/nR9s7le +yFT+oEuWkBrRWIhqFGKfm+wtMPVyXO1+4T9Nhszkwx0GA1F6t5xB9bRTknMV47np +6GNiRmBpYyBXLB7qmva6j8dYDlmXHB9i3/WwmV7yyyHHRbkMV7tHDgQVayK9CD7n +p+Kta56UL3BysWyNTrKRZrUMkF17e1ugYloQCLjkObl0iyo7svHtUTUowa1lAgMB +AAGjUzBRMB0GA1UdDgQWBBS2Efj5LbOM023TAHTPzooo5D93ZzAfBgNVHSMEGDAW +gBS2Efj5LbOM023TAHTPzooo5D93ZzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 +DQEBCwUAA4IBAQCSJyzdc/kEtkty+qsDVQlBE0uXtJYO37ivC3389fH6mJTlpwIz +1S4tk930gLIVUIx5za2y4O8eHPtS1NqX5+CHXtbx4vfyyg49oPOR04b6uEkZfO55 +4f8IOPU7NMtQ9AVHMSlT+oF8d7SmewmSsbm9Comuhwi4G+afLqgqpc9kANiNLiTm +r6dYnLVyKJwNPmkJUb/DBsf12b3EL3n/lXJmd4M9U76wswh9ekyNtUvgB94l0qp2 +HP5ZtVBmwSbS9oEHgN/slnsETl9B1z/oAX8TgR7dWaacfodKyTV1nLRm5ahZYl0k +x8QXcl3mCRK3ZVphhvHV37Cbwe1kAwhbdyDM -----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/tls.key b/tests/templates/kuttl/s3-deep-storage/certs/tls.key index 04fc15b3..df67e08f 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/tls.key +++ b/tests/templates/kuttl/s3-deep-storage/certs/tls.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- From be0d9351305f4efdb7300e69d0823e1af6a4294e Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 11:56:37 +0200 Subject: [PATCH 04/14] Re-enable all tests --- tests/test-definition.yaml | 42 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index f17f0233..04d06d5e 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -18,27 +18,27 @@ dimensions: - "true" - "false" tests: - # - name: authorizer - # dimensions: - # - druid - # - zookeeper - # - opa - # - hadoop - # - name: ingestion-no-s3-ext - # dimensions: - # - druid - # - zookeeper - # - hadoop - # - name: ingestion-s3-ext - # dimensions: - # - druid - # - zookeeper - # - hadoop - # - name: smoke - # dimensions: - # - druid - # - zookeeper - # - hadoop + - name: authorizer + dimensions: + - druid + - zookeeper + - opa + - hadoop + - name: ingestion-no-s3-ext + dimensions: + - druid + - zookeeper + - hadoop + - name: ingestion-s3-ext + dimensions: + - druid + - zookeeper + - hadoop + - name: smoke + dimensions: + - druid + - zookeeper + - hadoop - name: s3-deep-storage dimensions: - druid From 14b9424522168780087c997761ff5109bbf4d043 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 14:48:05 +0200 Subject: [PATCH 05/14] test: Remove availableReplicas from sts assertions --- tests/templates/kuttl/authorizer/00-assert.yaml | 1 - tests/templates/kuttl/ingestion-no-s3-ext/00-assert.yaml | 1 - tests/templates/kuttl/ingestion-s3-ext/00-assert.yaml | 1 - tests/templates/kuttl/smoke/00-assert.yaml | 1 - 4 files changed, 4 deletions(-) diff --git a/tests/templates/kuttl/authorizer/00-assert.yaml b/tests/templates/kuttl/authorizer/00-assert.yaml index db095416..dd2e29a7 100644 --- a/tests/templates/kuttl/authorizer/00-assert.yaml +++ b/tests/templates/kuttl/authorizer/00-assert.yaml @@ -10,7 +10,6 @@ kind: StatefulSet metadata: name: druid-zk-server-default status: - availableReplicas: 1 readyReplicas: 1 replicas: 1 --- diff --git a/tests/templates/kuttl/ingestion-no-s3-ext/00-assert.yaml b/tests/templates/kuttl/ingestion-no-s3-ext/00-assert.yaml index db095416..dd2e29a7 100644 --- a/tests/templates/kuttl/ingestion-no-s3-ext/00-assert.yaml +++ b/tests/templates/kuttl/ingestion-no-s3-ext/00-assert.yaml @@ -10,7 +10,6 @@ kind: StatefulSet metadata: name: druid-zk-server-default status: - availableReplicas: 1 readyReplicas: 1 replicas: 1 --- diff --git a/tests/templates/kuttl/ingestion-s3-ext/00-assert.yaml b/tests/templates/kuttl/ingestion-s3-ext/00-assert.yaml index db095416..dd2e29a7 100644 --- a/tests/templates/kuttl/ingestion-s3-ext/00-assert.yaml +++ b/tests/templates/kuttl/ingestion-s3-ext/00-assert.yaml @@ -10,7 +10,6 @@ kind: StatefulSet metadata: name: druid-zk-server-default status: - availableReplicas: 1 readyReplicas: 1 replicas: 1 --- diff --git a/tests/templates/kuttl/smoke/00-assert.yaml b/tests/templates/kuttl/smoke/00-assert.yaml index db095416..dd2e29a7 100644 --- a/tests/templates/kuttl/smoke/00-assert.yaml +++ b/tests/templates/kuttl/smoke/00-assert.yaml @@ -10,7 +10,6 @@ kind: StatefulSet metadata: name: druid-zk-server-default status: - availableReplicas: 1 readyReplicas: 1 replicas: 1 --- From 4704337a382a42dbe801d48975b57224b6a0478d Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 15:17:17 +0200 Subject: [PATCH 06/14] Add new druid version 0.23.0-stackable0.3.0 --- tests/test-definition.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 04d06d5e..8a46e0a5 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -3,9 +3,10 @@ dimensions: - name: druid values: - 0.22.1-authorizer0.1.0-stackable0.2.0 + - 0.23.0-stackable0.3.0 - name: zookeeper values: - # - 3.7.0-stackable0.7.1 + - 3.7.0-stackable0.7.1 - 3.8.0-stackable0.7.1 - name: opa values: @@ -18,23 +19,23 @@ dimensions: - "true" - "false" tests: - - name: authorizer + - name: smoke dimensions: - druid - zookeeper - - opa - hadoop - - name: ingestion-no-s3-ext + - name: authorizer dimensions: - druid - zookeeper + - opa - hadoop - - name: ingestion-s3-ext + - name: ingestion-no-s3-ext dimensions: - druid - zookeeper - hadoop - - name: smoke + - name: ingestion-s3-ext dimensions: - druid - zookeeper From 441caec5fe76f387506a41989a89f50ac29b49cd Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 15:22:07 +0200 Subject: [PATCH 07/14] Changelog --- CHANGELOG.md | 6 +++++- docs/modules/ROOT/partials/supported-versions.adoc | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 84d2efff..58bd7414 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,13 +7,16 @@ All notable changes to this project will be documented in this file. ### Added - Readiness probe added ([#241]) -- Support s3 path style access ([#245]) +- Support S3 path style access ([#245]) +- Support S3 TLS verification ([#255]) +- Support Druid 0.23.0 ([#255]) ### Changed - BREAKING: The deep storage on s3 and the s3 config for ingestion have been changed to use the operator-rs commons::s3 structs ([#228]) - `operator-rs` `0.15.0` -> `0.21.0` ([#228]) - [BREAKING] Specifying the product version has been changed to adhere to [ADR018](https://docs.stackable.tech/home/contributor/adr/ADR018-product_image_versioning.html) instead of just specifying the product version you will now have to add the Stackable image version as well, so `version: 3.5.8` becomes (for example) `version: 3.5.8-stackable0.1.0` ([#238]) +- Removed support for Druid 0.22.1 ([#255]) ### Fixed @@ -24,6 +27,7 @@ All notable changes to this project will be documented in this file. [#241]: https://github.com/stackabletech/druid-operator/pull/241 [#244]: https://github.com/stackabletech/druid-operator/pull/244 [#245]: https://github.com/stackabletech/druid-operator/pull/245 +[#255]: https://github.com/stackabletech/druid-operator/pull/255 ## [0.5.0] - 2022-03-15 diff --git a/docs/modules/ROOT/partials/supported-versions.adoc b/docs/modules/ROOT/partials/supported-versions.adoc index 0975602c..38882e25 100644 --- a/docs/modules/ROOT/partials/supported-versions.adoc +++ b/docs/modules/ROOT/partials/supported-versions.adoc @@ -2,4 +2,4 @@ // This is a separate file, since it is used by both the direct Druid documentation, and the overarching // Stackable Platform documentation. -- 0.22.1 +- 0.23.0 From 5df2a9c8d8371fe8df6a86750c6515c5d54f8671 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 15:28:20 +0200 Subject: [PATCH 08/14] Improve format!() usage --- Cargo.lock | 1 - rust/crd/Cargo.toml | 1 - rust/crd/src/lib.rs | 27 +++++++-------------------- 3 files changed, 7 insertions(+), 22 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5879d0de..c42e7bb0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1694,7 +1694,6 @@ dependencies = [ name = "stackable-druid-crd" version = "0.6.0-nightly" dependencies = [ - "indoc", "semver", "serde", "serde_json", diff --git a/rust/crd/Cargo.toml b/rust/crd/Cargo.toml index 268cf428..af9cc3d0 100644 --- a/rust/crd/Cargo.toml +++ b/rust/crd/Cargo.toml @@ -10,7 +10,6 @@ version = "0.6.0-nightly" [dependencies] stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.21.0" } -indoc = "1.0.6" semver = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index c349efc7..570d07ea 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -1,4 +1,3 @@ -use indoc::formatdoc; use serde::{Deserialize, Serialize}; use snafu::{ResultExt, Snafu}; use stackable_operator::client::Client; @@ -203,18 +202,8 @@ impl DruidRole { } if s3_connection.credentials.is_some() { - shell_cmd.push(format!( - "export {env_var}=$(cat {secret_dir}/{file_name})", - env_var = ENV_S3_ACCESS_KEY, - secret_dir = S3_SECRET_DIR_NAME, - file_name = SECRET_KEY_S3_ACCESS_KEY - )); - shell_cmd.push(format!( - "export {env_var}=$(cat {secret_dir}/{file_name})", - env_var = ENV_S3_SECRET_KEY, - secret_dir = S3_SECRET_DIR_NAME, - file_name = SECRET_KEY_S3_SECRET_KEY - )); + shell_cmd.push(format!("export {ENV_S3_ACCESS_KEY}=$(cat {S3_SECRET_DIR_NAME}/{SECRET_KEY_S3_ACCESS_KEY})")); + shell_cmd.push(format!("export {ENV_S3_SECRET_KEY}=$(cat {S3_SECRET_DIR_NAME}/{SECRET_KEY_S3_SECRET_KEY})")); } } shell_cmd.push(format!( @@ -515,13 +504,11 @@ impl Configuration for DruidConfig { if role == DruidRole::MiddleManager { result.insert( INDEXER_JAVA_OPTS.to_string(), - Some(formatdoc! {r#" - [ - "-Djavax.net.ssl.trustStore={STACKABLE_TRUST_STORE}", - "-Djavax.net.ssl.trustStorePassword={STACKABLE_TRUST_STORE_PASSWORD}", - "-Djavax.net.ssl.trustStoreType=pkcs12" - ] - "#}) + Some(build_string_list(&[ + format!("-Djavax.net.ssl.trustStore={STACKABLE_TRUST_STORE}"), + format!("-Djavax.net.ssl.trustStorePassword={STACKABLE_TRUST_STORE_PASSWORD}"), + "-Djavax.net.ssl.trustStoreType=pkcs12".to_string() + ])) ); } } From 61634aa2f818b9abfb37824efe9d1f0413707e56 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 16:00:22 +0200 Subject: [PATCH 09/14] Update MinIO certs --- .../01-install-minio-certificates.yaml.j2 | 6 +-- .../kuttl/s3-deep-storage/certs/ca.crt | 38 ++++++------- .../s3-deep-storage/certs/client.crt.pem | 30 +++++------ .../s3-deep-storage/certs/client.csr.pem | 24 ++++----- .../s3-deep-storage/certs/client.key.pem | 50 ++++++++--------- .../s3-deep-storage/certs/root-ca.crt.pem | 38 ++++++------- .../s3-deep-storage/certs/root-ca.crt.srl | 2 +- .../s3-deep-storage/certs/root-ca.key.pem | 50 ++++++++--------- .../kuttl/s3-deep-storage/certs/tls.crt | 53 ++++++------------- .../kuttl/s3-deep-storage/certs/tls.key | 50 ++++++++--------- 10 files changed, 159 insertions(+), 182 deletions(-) diff --git a/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 b/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 index 50ae94f4..4bcaac88 100644 --- a/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 +++ b/tests/templates/kuttl/s3-deep-storage/01-install-minio-certificates.yaml.j2 @@ -18,7 +18,7 @@ metadata: secrets.stackable.tech/class: minio-druid-tls-certificates # Have a look at the folder certs on how to create this data: - ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQxekNDQXIrZ0F3SUJBZ0lVRG0zb0gyVDZMVHZaSDd6NkxsS2VpUjJTQ29jd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2V6RUxNQWtHQTFVRUJoTUNSRVV4R3pBWkJnTlZCQWdNRWxOamFHeGxjM2RwWnkxSWIyeHpkR1ZwYmpFTwpNQXdHQTFVRUJ3d0ZWMlZrWld3eEtEQW1CZ05WQkFvTUgxTjBZV05yWVdKc1pTQlRhV2R1YVc1bklFRjFkR2h2CmNtbDBlU0JKYm1NeEZUQVRCZ05WQkFNTURITjBZV05yWVdKc1pTNWtaVEFlRncweU1qQTJNalF3TnpNek16SmEKRncwME56QTJNalF3TnpNek16SmFNSHN4Q3pBSkJnTlZCQVlUQWtSRk1Sc3dHUVlEVlFRSURCSlRZMmhzWlhOMwphV2N0U0c5c2MzUmxhVzR4RGpBTUJnTlZCQWNNQlZkbFpHVnNNU2d3SmdZRFZRUUtEQjlUZEdGamEyRmliR1VnClUybG5ibWx1WnlCQmRYUm9iM0pwZEhrZ1NXNWpNUlV3RXdZRFZRUUREQXh6ZEdGamEyRmliR1V1WkdVd2dnRWkKTUEwR0NTcUdTSWIzRFFFQkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDL2tjcXU1aTRXUDVtcXA1NGVZakNDYXYwbgpTVnN1cWFvZEJvUG4yTmNISkQ3bFVONCtmRUticjhXVkN4UFAxWng0TUJaSUFBa3A2ZlpOUUFROVpsTkJ3bjBWClhua3pmenBkL3h6UHg3K0RFeGN5eFluUnVTbnF2RHlxZVVKdGxLVmhieDZCZ0hsalNDU29rVHVaL25SOXM3bGUKeUZUK29FdVdrQnJSV0locUZHS2ZtK3d0TVBWeVhPMSs0VDlOaHN6a3d4MEdBMUY2dDV4QjliUlRrbk1WNDducAo2R05pUm1CcFl5QlhMQjdxbXZhNmo4ZFlEbG1YSEI5aTMvV3dtVjd5eXlISFJia01WN3RIRGdRVmF5SzlDRDduCnArS3RhNTZVTDNCeXNXeU5UcktSWnJVTWtGMTdlMXVnWWxvUUNMamtPYmwwaXlvN3N2SHRVVFVvd2ExbEFnTUIKQUFHalV6QlJNQjBHQTFVZERnUVdCQlMyRWZqNUxiT00wMjNUQUhUUHpvb281RDkzWnpBZkJnTlZIU01FR0RBVwpnQlMyRWZqNUxiT00wMjNUQUhUUHpvb281RDkzWnpBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUEwR0NTcUdTSWIzCkRRRUJDd1VBQTRJQkFRQ1NKeXpkYy9rRXRrdHkrcXNEVlFsQkUwdVh0SllPMzdpdkMzMzg5Zkg2bUpUbHB3SXoKMVM0dGs5MzBnTElWVUl4NXphMnk0TzhlSFB0UzFOcVg1K0NIWHRieDR2Znl5ZzQ5b1BPUjA0YjZ1RWtaZk81NQo0ZjhJT1BVN05NdFE5QVZITVNsVCtvRjhkN1NtZXdtU3NibTlDb211aHdpNEcrYWZMcWdxcGM5a0FOaU5MaVRtCnI2ZFluTFZ5S0p3TlBta0pVYi9EQnNmMTJiM0VMM24vbFhKbWQ0TTlVNzZ3c3doOWVreU50VXZnQjk0bDBxcDIKSFA1WnRWQm13U2JTOW9FSGdOL3NsbnNFVGw5QjF6L29BWDhUZ1I3ZFdhYWNmb2RLeVRWMW5MUm01YWhaWWwwawp4OFFYY2wzbUNSSzNaVnBoaHZIVjM3Q2J3ZTFrQXdoYmR5RE0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= - tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURhRENDQWxBQ0ZBSS9RWjNXUWtkZ3g4UXArcUF3elBObEcwcmZNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1Ic3gKQ3pBSkJnTlZCQVlUQWtSRk1Sc3dHUVlEVlFRSURCSlRZMmhzWlhOM2FXY3RTRzlzYzNSbGFXNHhEakFNQmdOVgpCQWNNQlZkbFpHVnNNU2d3SmdZRFZRUUtEQjlUZEdGamEyRmliR1VnVTJsbmJtbHVaeUJCZFhSb2IzSnBkSGtnClNXNWpNUlV3RXdZRFZRUUREQXh6ZEdGamEyRmliR1V1WkdVd0lCY05Nakl3TmpJME1EY3pNek15V2hnUE1qRXkKTWpBMU16RXdOek16TXpKYU1HUXhDekFKQmdOVkJBWVRBa1JGTVJzd0dRWURWUVFJREJKVFkyaHNaWE4zYVdjdApTRzlzYzNSbGFXNHhEakFNQmdOVkJBY01CVmRsWkdWc01SSXdFQVlEVlFRS0RBbFRkR0ZqYTJGaWJHVXhGREFTCkJnTlZCQU1NQzIxcGJtbHZMV1J5ZFdsa01JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0MKQVFFQXE2b3ZZdkU0SE5WQ1owZkVWWTV6N1ZGZHprdzUyNkE2QW5wOGozMjM1WCtWS1cyQkdDdklOY3pvOG4zUApOTFc1S210ZFlWYW5zTlM1Z2J1QjZXV0xPYkthdzB0d2dQV1JBbzdHZGN0TkQ5QXEyTmlCYllINGRrVWxCUXJmCi9DRVVkYjYrLzd1ZUsvUlRGa0JnS0NMY21qN3ZtUmhidVMwV040MFQxR3lRN2RmVUliVmQ0bDl6UFBWYmgwV3UKaU9PSDJLRkVtSlNRQWlmNmZqdnVxZ2czZTV2bEpwMm9sUk9rcmQwTmlmNmw2Nm8rTlkwOWprWmtISENXTmloSApBUndDdDZJRG5CUFhoNjJRQ1hVOXlLNkNnNll5VjBWbXdSbmV4aUdENVpGd2lTNzZ4VTRXOUNUc2JwbFdLRjJzClhOb1oxb29HWDJNaHZDV2dLejZiRk1jVFB3SURBUUFCTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFCZzZMem4KbTVFWVhiOVR2RU84dEhUVFRUTm1DYzhTb1B5eFFKaWdMaFllOFNsSktyajUzRUhXbUI2NTZxUzZaQXZHcW43UApBL1ozOVZtbm5GajhHamJXZzdIM2JVSkVNeVUvek8zL3h4MUVpTU56RzFIbitzL3lSOTV5bkN2TXZocHI4QlBLCmh3YWs1T0c5TGlybTV5OHIxTW9YWGRmZWpRTGdkWEoxWFcxdWZoQXg4RnhUQXpMSXBFQThyTVhpWllGTXR6czcKNGM2dU8yVjl0WkJPcnc0dXY3Y3d4YnpRVXpNYU1pOVh6M1dSRGpmaDQwVGRBRVEzeFRLRTU0Zld4L1pBdUZ2ZgpEalZSVTY0QSs2NlcyNzU2dGdHQTdXaFBPRG1BS3RjdzBpaTRtYUM4VUZUdHIvTVB5YkZ3OVBRMUJNWUxKYWUyCmxzTWRPUzgvK2l1RklXT0wKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJRDF6Q0NBcitnQXdJQkFnSVVEbTNvSDJUNkxUdlpIN3o2TGxLZWlSMlNDb2N3RFFZSktvWklodmNOQVFFTApCUUF3ZXpFTE1Ba0dBMVVFQmhNQ1JFVXhHekFaQmdOVkJBZ01FbE5qYUd4bGMzZHBaeTFJYjJ4emRHVnBiakVPCk1Bd0dBMVVFQnd3RlYyVmtaV3d4S0RBbUJnTlZCQW9NSDFOMFlXTnJZV0pzWlNCVGFXZHVhVzVuSUVGMWRHaHYKY21sMGVTQkpibU14RlRBVEJnTlZCQU1NREhOMFlXTnJZV0pzWlM1a1pUQWVGdzB5TWpBMk1qUXdOek16TXpKYQpGdzAwTnpBMk1qUXdOek16TXpKYU1Ic3hDekFKQmdOVkJBWVRBa1JGTVJzd0dRWURWUVFJREJKVFkyaHNaWE4zCmFXY3RTRzlzYzNSbGFXNHhEakFNQmdOVkJBY01CVmRsWkdWc01TZ3dKZ1lEVlFRS0RCOVRkR0ZqYTJGaWJHVWcKVTJsbmJtbHVaeUJCZFhSb2IzSnBkSGtnU1c1ak1SVXdFd1lEVlFRRERBeHpkR0ZqYTJGaWJHVXVaR1V3Z2dFaQpNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUUMva2NxdTVpNFdQNW1xcDU0ZVlqQ0NhdjBuClNWc3VxYW9kQm9QbjJOY0hKRDdsVU40K2ZFS2JyOFdWQ3hQUDFaeDRNQlpJQUFrcDZmWk5RQVE5WmxOQnduMFYKWG5remZ6cGQveHpQeDcrREV4Y3l4WW5SdVNucXZEeXFlVUp0bEtWaGJ4NkJnSGxqU0NTb2tUdVovblI5czdsZQp5RlQrb0V1V2tCclJXSWhxRkdLZm0rd3RNUFZ5WE8xKzRUOU5oc3prd3gwR0ExRjZ0NXhCOWJSVGtuTVY0N25wCjZHTmlSbUJwWXlCWExCN3FtdmE2ajhkWURsbVhIQjlpMy9Xd21WN3l5eUhIUmJrTVY3dEhEZ1FWYXlLOUNEN24KcCtLdGE1NlVMM0J5c1d5TlRyS1JaclVNa0YxN2UxdWdZbG9RQ0xqa09ibDBpeW83c3ZIdFVUVW93YTFsQWdNQgpBQUdqVXpCUk1CMEdBMVVkRGdRV0JCUzJFZmo1TGJPTTAyM1RBSFRQem9vbzVEOTNaekFmQmdOVkhTTUVHREFXCmdCUzJFZmo1TGJPTTAyM1RBSFRQem9vbzVEOTNaekFQQmdOVkhSTUJBZjhFQlRBREFRSC9NQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFDU0p5emRjL2tFdGt0eStxc0RWUWxCRTB1WHRKWU8zN2l2QzMzODlmSDZtSlRscHdJegoxUzR0azkzMGdMSVZVSXg1emEyeTRPOGVIUHRTMU5xWDUrQ0hYdGJ4NHZmeXlnNDlvUE9SMDRiNnVFa1pmTzU1CjRmOElPUFU3Tk10UTlBVkhNU2xUK29GOGQ3U21ld21Tc2JtOUNvbXVod2k0RythZkxxZ3FwYzlrQU5pTkxpVG0KcjZkWW5MVnlLSndOUG1rSlViL0RCc2YxMmIzRUwzbi9sWEptZDRNOVU3Nndzd2g5ZWt5TnRVdmdCOTRsMHFwMgpIUDVadFZCbXdTYlM5b0VIZ04vc2xuc0VUbDlCMXovb0FYOFRnUjdkV2FhY2ZvZEt5VFYxbkxSbTVhaFpZbDBrCng4UVhjbDNtQ1JLM1pWcGhodkhWMzdDYndlMWtBd2hiZHlETQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBcTZvdll2RTRITlZDWjBmRVZZNXo3VkZkemt3NTI2QTZBbnA4ajMyMzVYK1ZLVzJCCkdDdklOY3pvOG4zUE5MVzVLbXRkWVZhbnNOUzVnYnVCNldXTE9iS2F3MHR3Z1BXUkFvN0dkY3RORDlBcTJOaUIKYllINGRrVWxCUXJmL0NFVWRiNisvN3VlSy9SVEZrQmdLQ0xjbWo3dm1SaGJ1UzBXTjQwVDFHeVE3ZGZVSWJWZAo0bDl6UFBWYmgwV3VpT09IMktGRW1KU1FBaWY2Zmp2dXFnZzNlNXZsSnAyb2xST2tyZDBOaWY2bDY2bytOWTA5CmprWmtISENXTmloSEFSd0N0NklEbkJQWGg2MlFDWFU5eUs2Q2c2WXlWMFZtd1JuZXhpR0Q1WkZ3aVM3NnhVNFcKOUNUc2JwbFdLRjJzWE5vWjFvb0dYMk1odkNXZ0t6NmJGTWNUUHdJREFRQUJBb0lCQVFDbEdjWC9mQTVDdE56cgpwanR2S2RYWEhsV0JEeERxYVR6Qm0zcG5LenVOejFudmdURVN4VEVHaFhCWm9LU0RobTl6RzlXd3czMytkV21CCkc0MERvN1QycGc5dzJ3SjJGVGdGWkxuOUdxMmdFczdTeGRBZE9VNTB1V1cwWnRRcmtza3h3V1hEWVhmcndFMlUKN2c5Tkt0Sk95MDczU0ZVWFVRUzRJc2c2bXJ2ODh1OEY1KzZublhKTXAraE5jaUVQdHh6djJ5MFRyT29jRUxHZwp1QVhnNmdkd0xNamZobHpQckxDdTRMNnJsRkREbGxOejFIaWRza2pYVGk3MmNqaHpzQkF3SWJWU1oyS1E5K0d0CmE0S1VPU2hzUUJYS1lBNTlFdnQxV2tkT2h3L29HN2padFV0Yks3UGlMak52cU5RbWNwYWN6bFZhLzY0TjEzdDMKUzJ2c3hrdlJBb0dCQU5JMkRrM0N0R3VaREg0ZWE2MWZTQXZid2IxV0EzUlNXdHRQUFlQU1RYRi9uaDVBVGoxZwpvbWRYYzBRTzc4Rm5QdUVJZGltMFVWVzV5Q0RXNHIvZW5RcW5OSjJOMFNYSFFrZ2paSlpXbVIzcjFoLzZtbnVRCjQ5WjFqUnVMZDRJY24ySHMrOUo4N2hUZmgrN2FtcXVDa3Y5a3lRMzcwSTdZOWVlQmFyZXV4UFRKQW9HQkFORU8KcmRqelBTN2JqaWpqRGx6K1YvZXNMYzlTM3FTWGRSeEpPbm51Y0JHakQxakdhaE81Wks4ZlBvV1RSTS9IbUp2ZApXZVU2bEtGTnJ6UWEvMFM4NGlqSDd5VXhkV2dCY3l0eVd6MUdkTUVTVWxUdnBVWVdqSE5tRkFtUjFlNmJMQkQyClFRU2M4UEtUampza3ljNmVkUUtXNzk0Z1FNNjlVN21veStrZHd2UEhBb0dCQUlROVZVbzl6bHBSOGJYMVZTKy8KM1FiNHZDeHJ5OGlGZG5xNG9xNG13bWxBS3l4RXIvT1VzeFhud2E5eTVnajQ5bW1DZFROUEtFdVJrQUI0cmpTZAp5cFZGRXFoNjZyT2xZbUVYUXRRQXJscFFYbWZIc3g5QXl0UERKMzNJZ3Vuckw2amUrSncxMDJCMkxvRm9MQnp4CkM2QjJ1clI5VVhwTHFvWjB0N25OekVGaEFvR0JBSVdpa1lTZU1CMFU0ZkhHK3JaOUszUTV6dXE1ZVhMVEVseHIKZndMVVpUVVErODF1di80dHcydWlXRkFBakxzWlJyZFRycFEyZHk0SlA1YmFMeFVjZktFKzlPTGNrOFZSTC9LMAozaGYwUXN2c1QwN1dCZHNnck5WVGlqbDN6TDRDMlE5YXFzTXRJMlNjNkExc2ZjZ2pTSDdJUnpyQmVVdnVnR2VzCnUvUWZQekNmQW9HQVQ4WXh0ckxkUFVuRUdOTko5VVdUd2R6RkRHT2d0T1BKOWVEWHJRV1ZjODRMVGxjWnpLYnMKMTlMT3ltMFMwTlU2WTFUVmlJcEFTYkxhWXRpd3EzWEF4V3VJb21DUmhxWjc2c01oNks0ZWpWcU84WEorcGpNUQpUbStndTFySEc4VEFmZDNqdFRUdFEvTGp3Si9SWkFSNStYeEUxcnBhODZUc3lVZW05ZmJIdTdFPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo= + ca.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUQyVENDQXNHZ0F3SUJBZ0lVYTRSeWtzbzNHRWZsNnZuSlk4NFN6Lzk0MFI4d0RRWUpLb1pJaHZjTkFRRUwKQlFBd2V6RUxNQWtHQTFVRUJoTUNSRVV4R3pBWkJnTlZCQWdNRWxOamFHeGxjM2RwWnkxSWIyeHpkR1ZwYmpFTwpNQXdHQTFVRUJ3d0ZWMlZrWld3eEtEQW1CZ05WQkFvTUgxTjBZV05yWVdKc1pTQlRhV2R1YVc1bklFRjFkR2h2CmNtbDBlU0JKYm1NeEZUQVRCZ05WQkFNTURITjBZV05yWVdKc1pTNWtaVEFnRncweU1qQTJNamN4TXpVNU16TmEKR0E4eU1USXlNRFl3TXpFek5Ua3pNMW93ZXpFTE1Ba0dBMVVFQmhNQ1JFVXhHekFaQmdOVkJBZ01FbE5qYUd4bApjM2RwWnkxSWIyeHpkR1ZwYmpFT01Bd0dBMVVFQnd3RlYyVmtaV3d4S0RBbUJnTlZCQW9NSDFOMFlXTnJZV0pzClpTQlRhV2R1YVc1bklFRjFkR2h2Y21sMGVTQkpibU14RlRBVEJnTlZCQU1NREhOMFlXTnJZV0pzWlM1a1pUQ0MKQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFLTnVOZVBDOVdKckh0OTdNL3BhaVdUaApvbi9RY1ZETGgrUWVjY0w3cWpkaWk0d1NxcU8xUjNwQWZvdGl0UVl2RFd5MFlIaXZYNFNMV2Qyc08rRmU1OXNmCkIyMmdJbHBDR1VMQ2l4MGV1NW5BTEFNbzk4eHMwME42RmwvRFRFb2tndUprVWloYzZsVzd3c3NKQ25QMFN5Y1UKZjArMDF1enV3SjZOZHVLSFhNV0U0V0JFR21tMjJiN3lQeWFWRzRNZWhmWTU2MUkrUzdlSGVpSkN4WWl2Vmc0QQpFRldDZHRxcjdXUXpsdnRkVFpZTGhUVUNhTFdqOTBySzV1V3AxOWxRSlZCVmJPQUZjQ0RhTVg1ZkVBam8xM0Q0CmRNNTgvNm9VTVhFRDlxa2VJQkJFZi9RaFNnZTA4N04yejA0RFJYaHlLWGF3WVdBb1MxeFZncGZkOGkzMVVXRUMKQXdFQUFhTlRNRkV3SFFZRFZSME9CQllFRkRINzF3dGxkZEE4QVBwSktGVTlpZ2RDeWVZNk1COEdBMVVkSXdRWQpNQmFBRkRINzF3dGxkZEE4QVBwSktGVTlpZ2RDeWVZNk1BOEdBMVVkRXdFQi93UUZNQU1CQWY4d0RRWUpLb1pJCmh2Y05BUUVMQlFBRGdnRUJBQi9MUUd2eXRIN3RRa1JNMUEzZzhKeUN2T2lacm5CTU5Ga3E2UzBCNXpDaVgyL28KRXpHd1ZzSDB0TzJsSE5Gd0dsK1dvbmtDWEdqKzVudGF4VzYwMlBUMjZHSFVZb2xnbzhYank1YXE5bXAwSTY1SApENCtKVkxaOU1JU2xUNjFHaTZwTHN5aElNOUlFM1pHdDBqankzK2tOY0FkcHJmS3BTU3M2R0FXd1hGMFlPUUVoCjNqaVZNazh2TzZRYlNzOUIydVhGWVRyRmhQcUxpSDZMRDA0L1V2QmF0Y0FDcEVEcWVoenNhU0xoc3BwemxLQ1EKQ1Mxb2x4aGw0dzhlSWFOcEU5UGVjVlFvSXMxM3hhajAwK1h4emlRZkVRcXJWTEZaK2JsaEJSbm9uZlF2WTV4VApUS2VhNVNwek5OR1crbCtxTEhHcVUxZGFzU0dTM1ZXMVVEKzBzSGs9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K + tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURhRENDQWxBQ0ZIS21SV0NJbTJ2ZVI1ZEllL3ZUT3VueU5CUnVNQTBHQ1NxR1NJYjNEUUVCQ3dVQU1Ic3gKQ3pBSkJnTlZCQVlUQWtSRk1Sc3dHUVlEVlFRSURCSlRZMmhzWlhOM2FXY3RTRzlzYzNSbGFXNHhEakFNQmdOVgpCQWNNQlZkbFpHVnNNU2d3SmdZRFZRUUtEQjlUZEdGamEyRmliR1VnVTJsbmJtbHVaeUJCZFhSb2IzSnBkSGtnClNXNWpNUlV3RXdZRFZRUUREQXh6ZEdGamEyRmliR1V1WkdVd0lCY05Nakl3TmpJM01UTTFPVE0wV2hnUE1qRXkKTWpBMk1ETXhNelU1TXpSYU1HUXhDekFKQmdOVkJBWVRBa1JGTVJzd0dRWURWUVFJREJKVFkyaHNaWE4zYVdjdApTRzlzYzNSbGFXNHhEakFNQmdOVkJBY01CVmRsWkdWc01SSXdFQVlEVlFRS0RBbFRkR0ZqYTJGaWJHVXhGREFTCkJnTlZCQU1NQzIxcGJtbHZMV1J5ZFdsa01JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0MKQVFFQXAzOGZmeGovNlJZbzdXNldReVFISFNhRXNyaVcrK3QwTTJUSDB5WVFnZkpVb1dWbWNKWHdwQVQyTHRSZQp4dDBXUjc2Nmkwcjk4VTB0Rnpva1d2NFk0K21TZnZ6eXc1dnFOOVJ3S2FOVlk4Sk9WRTdNUkkxTGhzRG1oQ3hYCnozbmxPdnRWelFiblpkbHVXSWZmc29tV1ljSStlK0M5elJjOVNYbkhucTZoRWJVS2RVV3JCLzRWaXM3UXB6a3QKUWYrQ2FmU2JXRExDZFBTMjduRDVwSTBxUFFXOWNlZ1ZzOEdBbW9Nb1BtVEZqOWtmOWFmaVg2QzF4ZldVUi9HcApWOHA5OFNtYm5KSXF5V1FhMlVMcDJ6Y3BTSGFjd045d1Q3QnF1QVJqZHUrU3c3TmNqQ29xK2YxaTFCRkdPdGFxCnlDZ1dRYkF2VVdTV0NZTzZwb1pCSXRuckFRSURBUUFCTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFBNDJMYSsKTFN0aEVJYUJTYU9WNmJXMk1GMzVqZTZzRUdOaDE3K1hNMHhlQW41VktJeVBGQ0hKZENnandveDdaWWFjemxacwpKTW5kZkJnV09oM3E1TW9TSjJkQkR0QnNkVStvKzNwdHo5aDg4ejE0WTVRdXRwTWxTbWxWcU5kNkQzaWJLMWFvCmVrR3NkOGZSY0RVcFMyR0F2bnlaU1E3YTlxaStmaDFHb2FqdGtGOGdraDZkNm9xbGVnRDJoWDNTeU8zeFpXa2MKREtKR3FxY3lIQmY1a3AxanFIUHhEMGlLNlR1YjNwOTBReisxZUNXdlV5QU00MUE0TDc2Q2Rhb01TdGtCWlh6ZAo4SW9wdGVqOGI1SWRidm9XeUlWdFE1MmZBUy81WTIvL00zcURSUitRWU9RTmExSWluTk1xNVJsYUhxRlAwUWJpCjkvbmMyMXFadDArbVp5WEIKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo= + tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBcDM4ZmZ4ai82UllvN1c2V1F5UUhIU2FFc3JpVysrdDBNMlRIMHlZUWdmSlVvV1ZtCmNKWHdwQVQyTHRSZXh0MFdSNzY2aTByOThVMHRGem9rV3Y0WTQrbVNmdnp5dzV2cU45UndLYU5WWThKT1ZFN00KUkkxTGhzRG1oQ3hYejNubE92dFZ6UWJuWmRsdVdJZmZzb21XWWNJK2UrQzl6UmM5U1huSG5xNmhFYlVLZFVXcgpCLzRWaXM3UXB6a3RRZitDYWZTYldETENkUFMyN25ENXBJMHFQUVc5Y2VnVnM4R0Ftb01vUG1URmo5a2Y5YWZpClg2QzF4ZldVUi9HcFY4cDk4U21ibkpJcXlXUWEyVUxwMnpjcFNIYWN3Tjl3VDdCcXVBUmpkdStTdzdOY2pDb3EKK2YxaTFCRkdPdGFxeUNnV1FiQXZVV1NXQ1lPNnBvWkJJdG5yQVFJREFRQUJBb0lCQUM4clJadHRWdVExTVdGcgorelQ5T0dPbExVbUhZajJmbVNIQUIrWVdtaDkrTndjY256U2xoUmNycm9pUmxmODYwOE53bXVnUFBtUnQ3M3pUCkN0bjFKTjFLTWM5QlBMeUpjL1ExQjBFeWxpRjUzc1V2UzZjaWcxcDNpSE5BYVpvc0libnlmYjgzYW9Mc01IOE8KQkprcTFnYkJ4UWJ0eTRXdVBid3JaMlB3bWJ0Nlk0RmZxNXlrTmU0OVcxYVNGazhzMFcyNjRzNDNjQmhNNjhBVwpFbWdaeDdFeUlaR1EzWlN1MTJXbVFwTXdUWjArMjlBb3dsWGhSM2J1MVg4UlAyYzloKzk5Q2NHZUZrWW9NL2lMCm1WU2tsNjZmRjdTNVV0T0E3OEZxaFViWXJnY1F3dkZUSXNmK0tyT2VLcktmRkViVlBxWHAzK0E2RGxhTVJ3VzMKNzczMUFBRUNnWUVBM25vODExWjNuNHlJcWN2MXFtZHZkajBDeURsaWxuMFRhNUI4OXFVTjZLc0pQaUt4U0tzYQpaVW0zZlg3c1VMYm9Vd0lyVmE4Y0tTVjcxYkxhRUUvUXgrUzBJQU9TZUZhcHAxeThjb2tZVEtPRzk1NlhVKzA4CmxjZ29PalEzUmVZZEFpRk5XamM4bWFCNlcwMTBFMTEveTAvclFQRi9TUTUyblNuUGhjdEV2NEVDZ1lFQXdMd1MKaGRpV2cvRHBsVytOQTZzaTlZREdpaytiZkd3MjU0bmU1THJBTEtyUlN2NHN0dnhHTFI1ekFHVGh3S3Z2NWU2bQp5eEpYRnYvUnlsKzhFaytYWi9neHFqam5aWm15NERrc3F3Y2l5L1JudS9DcVVwU09vL2ZSYW1FS3lyU0w1UHhkCjBBMHkwbjk2aUptVXB4ZUZ0TU5FV2Z1cWdpQVQ2dmc3N1U1cTY0RUNnWUFhaStOdW5uYXZwd2szbVlxNnhwVGEKT3ZWMkJzTG95Z3ZqTGQ1N1g3NkZJTU45a280czZaM0FzRWNneG1CVVVUN3ZpTGE3QnFZSmt0dHY2R04weHRGVwp5TWRsZW9lanJGT2FFTXE3ci9naVRQRHg0dzZUaVI5TmtCQ2N3VlpIRk9vcE11Z1Q5N3RYYVhxd0lsSFRiYml0Ci9kOUlaSWlYb3c0c09xejBmZ2k2QVFLQmdIWitLbFVueDhIdWgyMWNXN0g1c1ZDR2o0blJUNks3VlRZY3lYQ08KY0VBRjlRN0tIZXVTUmdMUFNaemdhUHJ2dWxuKzA0VGVEYlVTS29UbFB0ZHpIMzdJVktCMnc2enZSYzRjMkoxOQprYU1hNi92Y0Jwc213bHVFckxkZVdpZ3R3Q1JVRThrcGxDbGVQcE5rK01PUjdwNG52d29qYzd6MHc4b2VPNW0yCk1INEJBb0dBQUxCbEN1OStNc1dsWEMxQkJ5YkZMSXZnMHcwaDU1elVqTW5TdlNpYjVMMGQ3THlaSHFjQmluWmMKUU5RdFBoSU5kU2FLWGNVRGJQY0xtVEtKZ3UxenhzZlBWZjlKRDg4eUlzQms3dFg4QkprNVdEc21OdU44UDZwbAo2cjIyeU4wTkZ3VEMxWmRMZ1RjbDV3MVNJbWpoQjNkaG9ucEFmcmM1WmRHKytvMmppRGs9Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== {% endif %} diff --git a/tests/templates/kuttl/s3-deep-storage/certs/ca.crt b/tests/templates/kuttl/s3-deep-storage/certs/ca.crt index 3322b9dd..f038e8f0 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/ca.crt +++ b/tests/templates/kuttl/s3-deep-storage/certs/ca.crt @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -MIID1zCCAr+gAwIBAgIUDm3oH2T6LTvZH7z6LlKeiR2SCocwDQYJKoZIhvcNAQEL +MIID2TCCAsGgAwIBAgIUa4Rykso3GEfl6vnJY84Sz/940R8wDQYJKoZIhvcNAQEL BQAwezELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1Ib2xzdGVpbjEO MAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJsZSBTaWduaW5nIEF1dGhv -cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAeFw0yMjA2MjQwNzMzMzJa -Fw00NzA2MjQwNzMzMzJaMHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3 -aWctSG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUg -U2lnbmluZyBBdXRob3JpdHkgSW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/kcqu5i4WP5mqp54eYjCCav0n -SVsuqaodBoPn2NcHJD7lUN4+fEKbr8WVCxPP1Zx4MBZIAAkp6fZNQAQ9ZlNBwn0V -Xnkzfzpd/xzPx7+DExcyxYnRuSnqvDyqeUJtlKVhbx6BgHljSCSokTuZ/nR9s7le -yFT+oEuWkBrRWIhqFGKfm+wtMPVyXO1+4T9Nhszkwx0GA1F6t5xB9bRTknMV47np -6GNiRmBpYyBXLB7qmva6j8dYDlmXHB9i3/WwmV7yyyHHRbkMV7tHDgQVayK9CD7n -p+Kta56UL3BysWyNTrKRZrUMkF17e1ugYloQCLjkObl0iyo7svHtUTUowa1lAgMB -AAGjUzBRMB0GA1UdDgQWBBS2Efj5LbOM023TAHTPzooo5D93ZzAfBgNVHSMEGDAW -gBS2Efj5LbOM023TAHTPzooo5D93ZzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 -DQEBCwUAA4IBAQCSJyzdc/kEtkty+qsDVQlBE0uXtJYO37ivC3389fH6mJTlpwIz -1S4tk930gLIVUIx5za2y4O8eHPtS1NqX5+CHXtbx4vfyyg49oPOR04b6uEkZfO55 -4f8IOPU7NMtQ9AVHMSlT+oF8d7SmewmSsbm9Comuhwi4G+afLqgqpc9kANiNLiTm -r6dYnLVyKJwNPmkJUb/DBsf12b3EL3n/lXJmd4M9U76wswh9ekyNtUvgB94l0qp2 -HP5ZtVBmwSbS9oEHgN/slnsETl9B1z/oAX8TgR7dWaacfodKyTV1nLRm5ahZYl0k -x8QXcl3mCRK3ZVphhvHV37Cbwe1kAwhbdyDM +cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAgFw0yMjA2MjcxMzU5MzNa +GA8yMTIyMDYwMzEzNTkzM1owezELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxl +c3dpZy1Ib2xzdGVpbjEOMAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJs +ZSBTaWduaW5nIEF1dGhvcml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKNuNePC9WJrHt97M/paiWTh +on/QcVDLh+QeccL7qjdii4wSqqO1R3pAfotitQYvDWy0YHivX4SLWd2sO+Fe59sf +B22gIlpCGULCix0eu5nALAMo98xs00N6Fl/DTEokguJkUihc6lW7wssJCnP0SycU +f0+01uzuwJ6NduKHXMWE4WBEGmm22b7yPyaVG4MehfY561I+S7eHeiJCxYivVg4A +EFWCdtqr7WQzlvtdTZYLhTUCaLWj90rK5uWp19lQJVBVbOAFcCDaMX5fEAjo13D4 +dM58/6oUMXED9qkeIBBEf/QhSge087N2z04DRXhyKXawYWAoS1xVgpfd8i31UWEC +AwEAAaNTMFEwHQYDVR0OBBYEFDH71wtlddA8APpJKFU9igdCyeY6MB8GA1UdIwQY +MBaAFDH71wtlddA8APpJKFU9igdCyeY6MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI +hvcNAQELBQADggEBAB/LQGvytH7tQkRM1A3g8JyCvOiZrnBMNFkq6S0B5zCiX2/o +EzGwVsH0tO2lHNFwGl+WonkCXGj+5ntaxW602PT26GHUYolgo8Xjy5aq9mp0I65H +D4+JVLZ9MISlT61Gi6pLsyhIM9IE3ZGt0jjy3+kNcAdprfKpSSs6GAWwXF0YOQEh +3jiVMk8vO6QbSs9B2uXFYTrFhPqLiH6LD04/UvBatcACpEDqehzsaSLhsppzlKCQ +CS1olxhl4w8eIaNpE9PecVQoIs13xaj00+XxziQfEQqrVLFZ+blhBRnonfQvY5xT +TKea5SpzNNGW+l+qLHGqU1dasSGS3VW1UD+0sHk= -----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem b/tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem index 6dabab13..c2418a5a 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem +++ b/tests/templates/kuttl/s3-deep-storage/certs/client.crt.pem @@ -1,21 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDaDCCAlACFAI/QZ3WQkdgx8Qp+qAwzPNlG0rfMA0GCSqGSIb3DQEBCwUAMHsx +MIIDaDCCAlACFHKmRWCIm2veR5dIe/vTOunyNBRuMA0GCSqGSIb3DQEBCwUAMHsx CzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWctSG9sc3RlaW4xDjAMBgNV BAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2lnbmluZyBBdXRob3JpdHkg -SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjI0MDczMzMyWhgPMjEy -MjA1MzEwNzMzMzJaMGQxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct +SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjI3MTM1OTM0WhgPMjEy +MjA2MDMxMzU5MzRaMGQxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct SG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMRIwEAYDVQQKDAlTdGFja2FibGUxFDAS BgNVBAMMC21pbmlvLWRydWlkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAq6ovYvE4HNVCZ0fEVY5z7VFdzkw526A6Anp8j3235X+VKW2BGCvINczo8n3P -NLW5KmtdYVansNS5gbuB6WWLObKaw0twgPWRAo7GdctND9Aq2NiBbYH4dkUlBQrf -/CEUdb6+/7ueK/RTFkBgKCLcmj7vmRhbuS0WN40T1GyQ7dfUIbVd4l9zPPVbh0Wu -iOOH2KFEmJSQAif6fjvuqgg3e5vlJp2olROkrd0Nif6l66o+NY09jkZkHHCWNihH -ARwCt6IDnBPXh62QCXU9yK6Cg6YyV0VmwRnexiGD5ZFwiS76xU4W9CTsbplWKF2s -XNoZ1ooGX2MhvCWgKz6bFMcTPwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBg6Lzn -m5EYXb9TvEO8tHTTTTNmCc8SoPyxQJigLhYe8SlJKrj53EHWmB656qS6ZAvGqn7P -A/Z39VmnnFj8GjbWg7H3bUJEMyU/zO3/xx1EiMNzG1Hn+s/yR95ynCvMvhpr8BPK -hwak5OG9Lirm5y8r1MoXXdfejQLgdXJ1XW1ufhAx8FxTAzLIpEA8rMXiZYFMtzs7 -4c6uO2V9tZBOrw4uv7cwxbzQUzMaMi9Xz3WRDjfh40TdAEQ3xTKE54fWx/ZAuFvf -DjVRU64A+66W2756tgGA7WhPODmAKtcw0ii4maC8UFTtr/MPybFw9PQ1BMYLJae2 -lsMdOS8/+iuFIWOL +AQEAp38ffxj/6RYo7W6WQyQHHSaEsriW++t0M2TH0yYQgfJUoWVmcJXwpAT2LtRe +xt0WR766i0r98U0tFzokWv4Y4+mSfvzyw5vqN9RwKaNVY8JOVE7MRI1LhsDmhCxX +z3nlOvtVzQbnZdluWIffsomWYcI+e+C9zRc9SXnHnq6hEbUKdUWrB/4Vis7Qpzkt +Qf+CafSbWDLCdPS27nD5pI0qPQW9cegVs8GAmoMoPmTFj9kf9afiX6C1xfWUR/Gp +V8p98SmbnJIqyWQa2ULp2zcpSHacwN9wT7BquARjdu+Sw7NcjCoq+f1i1BFGOtaq +yCgWQbAvUWSWCYO6poZBItnrAQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA42La+ +LSthEIaBSaOV6bW2MF35je6sEGNh17+XM0xeAn5VKIyPFCHJdCgjwox7ZYaczlZs +JMndfBgWOh3q5MoSJ2dBDtBsdU+o+3ptz9h88z14Y5QutpMlSmlVqNd6D3ibK1ao +ekGsd8fRcDUpS2GAvnyZSQ7a9qi+fh1GoajtkF8gkh6d6oqlegD2hX3SyO3xZWkc +DKJGqqcyHBf5kp1jqHPxD0iK6Tub3p90Qz+1eCWvUyAM41A4L76CdaoMStkBZXzd +8Ioptej8b5IdbvoWyIVtQ52fAS/5Y2//M3qDRR+QYOQNa1IinNMq5RlaHqFP0Qbi +9/nc21qZt0+mZyXB -----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem b/tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem index 72289cdb..9beb52eb 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem +++ b/tests/templates/kuttl/s3-deep-storage/certs/client.csr.pem @@ -2,16 +2,16 @@ MIICqTCCAZECAQAwZDELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1I b2xzdGVpbjEOMAwGA1UEBwwFV2VkZWwxEjAQBgNVBAoMCVN0YWNrYWJsZTEUMBIG A1UEAwwLbWluaW8tZHJ1aWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -AQCrqi9i8Tgc1UJnR8RVjnPtUV3OTDnboDoCenyPfbflf5UpbYEYK8g1zOjyfc80 -tbkqa11hVqew1LmBu4HpZYs5sprDS3CA9ZECjsZ1y00P0CrY2IFtgfh2RSUFCt/8 -IRR1vr7/u54r9FMWQGAoItyaPu+ZGFu5LRY3jRPUbJDt19QhtV3iX3M89VuHRa6I -44fYoUSYlJACJ/p+O+6qCDd7m+UmnaiVE6St3Q2J/qXrqj41jT2ORmQccJY2KEcB -HAK3ogOcE9eHrZAJdT3IroKDpjJXRWbBGd7GIYPlkXCJLvrFThb0JOxumVYoXaxc -2hnWigZfYyG8JaArPpsUxxM/AgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEAVpwh -aM91YAlykwxJB5E5cIkhhfGZrMcNiWR/aGQAtPtfR49hkQRseLykHuWyC8ts91o+ -kgZz+pRUu4p4bptpKGDEUTqwPipJajg4/AbnD1YAZWJAG5uMf3UX4e1SZSNbSTxw -CKPIrhhHdfGu+W8fV7Idna6Q3d9AO8hZE8BQBFuAzclN78WPUoIoecbMlVNzHuDS -WpR3vUpKCyN3j0NjKz/6OCkOV6IgxesjKC/o5nCjpI8GLJ9+0vOBiPCXfHyeH7ap -adEXAQ+v4Drcad67H35N1oT8YSd+D/CguQJGGb15nU5dxf4P6rawbfNTay5zhZVW -lDvDTJ0HjNoJ2g6ekg== +AQCnfx9/GP/pFijtbpZDJAcdJoSyuJb763QzZMfTJhCB8lShZWZwlfCkBPYu1F7G +3RZHvrqLSv3xTS0XOiRa/hjj6ZJ+/PLDm+o31HApo1Vjwk5UTsxEjUuGwOaELFfP +eeU6+1XNBudl2W5Yh9+yiZZhwj574L3NFz1JeceerqERtQp1RasH/hWKztCnOS1B +/4Jp9JtYMsJ09LbucPmkjSo9Bb1x6BWzwYCagyg+ZMWP2R/1p+JfoLXF9ZRH8alX +yn3xKZuckirJZBrZQunbNylIdpzA33BPsGq4BGN275LDs1yMKir5/WLUEUY61qrI +KBZBsC9RZJYJg7qmhkEi2esBAgMBAAGgADANBgkqhkiG9w0BAQsFAAOCAQEATon2 +C0HCXS9d+KYJstN7ZZzHht/S2FiaXxldfqYwLwpr3co0NbFKGSQZ7Rhj75BOVsSn +GfYO3z7tdkCMUAANW1nnT4O8DaCQpkRcqZZmXJVavXcfy4lMAj62k6mMjorQcMhb +3ZGy0MSB5m/3b6tv2cza6nhuoVmOifcWq5ky9JdZC3xuoaUqHwAcE+uYRubvNXyC +3ggjU80xQLA+tZocvEljlaRIAvuyEf2yj4NOIWJj5n+fg9z+Y1rfI7I8fnrBg2CH +HAnjH1y42+Sdf/nLETqzPQ0YVWA5BQXxD4S6uTZHO1uJOiwTZkQkvz41Chx2isEd +Kuwht9VgXiwrPnX7Gw== -----END CERTIFICATE REQUEST----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/client.key.pem b/tests/templates/kuttl/s3-deep-storage/certs/client.key.pem index df67e08f..aad97472 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/client.key.pem +++ b/tests/templates/kuttl/s3-deep-storage/certs/client.key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem index 3322b9dd..f038e8f0 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem +++ b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.pem @@ -1,23 +1,23 @@ -----BEGIN CERTIFICATE----- -MIID1zCCAr+gAwIBAgIUDm3oH2T6LTvZH7z6LlKeiR2SCocwDQYJKoZIhvcNAQEL +MIID2TCCAsGgAwIBAgIUa4Rykso3GEfl6vnJY84Sz/940R8wDQYJKoZIhvcNAQEL BQAwezELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1Ib2xzdGVpbjEO MAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJsZSBTaWduaW5nIEF1dGhv -cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAeFw0yMjA2MjQwNzMzMzJa -Fw00NzA2MjQwNzMzMzJaMHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3 -aWctSG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUg -U2lnbmluZyBBdXRob3JpdHkgSW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/kcqu5i4WP5mqp54eYjCCav0n -SVsuqaodBoPn2NcHJD7lUN4+fEKbr8WVCxPP1Zx4MBZIAAkp6fZNQAQ9ZlNBwn0V -Xnkzfzpd/xzPx7+DExcyxYnRuSnqvDyqeUJtlKVhbx6BgHljSCSokTuZ/nR9s7le -yFT+oEuWkBrRWIhqFGKfm+wtMPVyXO1+4T9Nhszkwx0GA1F6t5xB9bRTknMV47np -6GNiRmBpYyBXLB7qmva6j8dYDlmXHB9i3/WwmV7yyyHHRbkMV7tHDgQVayK9CD7n -p+Kta56UL3BysWyNTrKRZrUMkF17e1ugYloQCLjkObl0iyo7svHtUTUowa1lAgMB -AAGjUzBRMB0GA1UdDgQWBBS2Efj5LbOM023TAHTPzooo5D93ZzAfBgNVHSMEGDAW -gBS2Efj5LbOM023TAHTPzooo5D93ZzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 -DQEBCwUAA4IBAQCSJyzdc/kEtkty+qsDVQlBE0uXtJYO37ivC3389fH6mJTlpwIz -1S4tk930gLIVUIx5za2y4O8eHPtS1NqX5+CHXtbx4vfyyg49oPOR04b6uEkZfO55 -4f8IOPU7NMtQ9AVHMSlT+oF8d7SmewmSsbm9Comuhwi4G+afLqgqpc9kANiNLiTm -r6dYnLVyKJwNPmkJUb/DBsf12b3EL3n/lXJmd4M9U76wswh9ekyNtUvgB94l0qp2 -HP5ZtVBmwSbS9oEHgN/slnsETl9B1z/oAX8TgR7dWaacfodKyTV1nLRm5ahZYl0k -x8QXcl3mCRK3ZVphhvHV37Cbwe1kAwhbdyDM +cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAgFw0yMjA2MjcxMzU5MzNa +GA8yMTIyMDYwMzEzNTkzM1owezELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxl +c3dpZy1Ib2xzdGVpbjEOMAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJs +ZSBTaWduaW5nIEF1dGhvcml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTCC +ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKNuNePC9WJrHt97M/paiWTh +on/QcVDLh+QeccL7qjdii4wSqqO1R3pAfotitQYvDWy0YHivX4SLWd2sO+Fe59sf +B22gIlpCGULCix0eu5nALAMo98xs00N6Fl/DTEokguJkUihc6lW7wssJCnP0SycU +f0+01uzuwJ6NduKHXMWE4WBEGmm22b7yPyaVG4MehfY561I+S7eHeiJCxYivVg4A +EFWCdtqr7WQzlvtdTZYLhTUCaLWj90rK5uWp19lQJVBVbOAFcCDaMX5fEAjo13D4 +dM58/6oUMXED9qkeIBBEf/QhSge087N2z04DRXhyKXawYWAoS1xVgpfd8i31UWEC +AwEAAaNTMFEwHQYDVR0OBBYEFDH71wtlddA8APpJKFU9igdCyeY6MB8GA1UdIwQY +MBaAFDH71wtlddA8APpJKFU9igdCyeY6MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI +hvcNAQELBQADggEBAB/LQGvytH7tQkRM1A3g8JyCvOiZrnBMNFkq6S0B5zCiX2/o +EzGwVsH0tO2lHNFwGl+WonkCXGj+5ntaxW602PT26GHUYolgo8Xjy5aq9mp0I65H +D4+JVLZ9MISlT61Gi6pLsyhIM9IE3ZGt0jjy3+kNcAdprfKpSSs6GAWwXF0YOQEh +3jiVMk8vO6QbSs9B2uXFYTrFhPqLiH6LD04/UvBatcACpEDqehzsaSLhsppzlKCQ +CS1olxhl4w8eIaNpE9PecVQoIs13xaj00+XxziQfEQqrVLFZ+blhBRnonfQvY5xT +TKea5SpzNNGW+l+qLHGqU1dasSGS3VW1UD+0sHk= -----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl index c59acdcc..4260ff05 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl +++ b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.crt.srl @@ -1 +1 @@ -023F419DD6424760C7C429FAA030CCF3651B4ADF +72A64560889B6BDE4797487BFBD33AE9F234146E diff --git a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem index 57e83f5f..599f02ea 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem +++ b/tests/templates/kuttl/s3-deep-storage/certs/root-ca.key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/tls.crt b/tests/templates/kuttl/s3-deep-storage/certs/tls.crt index 8ce1c1d1..c2418a5a 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/tls.crt +++ b/tests/templates/kuttl/s3-deep-storage/certs/tls.crt @@ -1,44 +1,21 @@ -----BEGIN CERTIFICATE----- -MIIDaDCCAlACFAI/QZ3WQkdgx8Qp+qAwzPNlG0rfMA0GCSqGSIb3DQEBCwUAMHsx +MIIDaDCCAlACFHKmRWCIm2veR5dIe/vTOunyNBRuMA0GCSqGSIb3DQEBCwUAMHsx CzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWctSG9sc3RlaW4xDjAMBgNV BAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUgU2lnbmluZyBBdXRob3JpdHkg -SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjI0MDczMzMyWhgPMjEy -MjA1MzEwNzMzMzJaMGQxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct +SW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwIBcNMjIwNjI3MTM1OTM0WhgPMjEy +MjA2MDMxMzU5MzRaMGQxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3aWct SG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMRIwEAYDVQQKDAlTdGFja2FibGUxFDAS BgNVBAMMC21pbmlvLWRydWlkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAq6ovYvE4HNVCZ0fEVY5z7VFdzkw526A6Anp8j3235X+VKW2BGCvINczo8n3P -NLW5KmtdYVansNS5gbuB6WWLObKaw0twgPWRAo7GdctND9Aq2NiBbYH4dkUlBQrf -/CEUdb6+/7ueK/RTFkBgKCLcmj7vmRhbuS0WN40T1GyQ7dfUIbVd4l9zPPVbh0Wu -iOOH2KFEmJSQAif6fjvuqgg3e5vlJp2olROkrd0Nif6l66o+NY09jkZkHHCWNihH -ARwCt6IDnBPXh62QCXU9yK6Cg6YyV0VmwRnexiGD5ZFwiS76xU4W9CTsbplWKF2s -XNoZ1ooGX2MhvCWgKz6bFMcTPwIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBg6Lzn -m5EYXb9TvEO8tHTTTTNmCc8SoPyxQJigLhYe8SlJKrj53EHWmB656qS6ZAvGqn7P -A/Z39VmnnFj8GjbWg7H3bUJEMyU/zO3/xx1EiMNzG1Hn+s/yR95ynCvMvhpr8BPK -hwak5OG9Lirm5y8r1MoXXdfejQLgdXJ1XW1ufhAx8FxTAzLIpEA8rMXiZYFMtzs7 -4c6uO2V9tZBOrw4uv7cwxbzQUzMaMi9Xz3WRDjfh40TdAEQ3xTKE54fWx/ZAuFvf -DjVRU64A+66W2756tgGA7WhPODmAKtcw0ii4maC8UFTtr/MPybFw9PQ1BMYLJae2 -lsMdOS8/+iuFIWOL ------END CERTIFICATE----- ------BEGIN CERTIFICATE----- -MIID1zCCAr+gAwIBAgIUDm3oH2T6LTvZH7z6LlKeiR2SCocwDQYJKoZIhvcNAQEL -BQAwezELMAkGA1UEBhMCREUxGzAZBgNVBAgMElNjaGxlc3dpZy1Ib2xzdGVpbjEO -MAwGA1UEBwwFV2VkZWwxKDAmBgNVBAoMH1N0YWNrYWJsZSBTaWduaW5nIEF1dGhv -cml0eSBJbmMxFTATBgNVBAMMDHN0YWNrYWJsZS5kZTAeFw0yMjA2MjQwNzMzMzJa -Fw00NzA2MjQwNzMzMzJaMHsxCzAJBgNVBAYTAkRFMRswGQYDVQQIDBJTY2hsZXN3 -aWctSG9sc3RlaW4xDjAMBgNVBAcMBVdlZGVsMSgwJgYDVQQKDB9TdGFja2FibGUg -U2lnbmluZyBBdXRob3JpdHkgSW5jMRUwEwYDVQQDDAxzdGFja2FibGUuZGUwggEi -MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/kcqu5i4WP5mqp54eYjCCav0n -SVsuqaodBoPn2NcHJD7lUN4+fEKbr8WVCxPP1Zx4MBZIAAkp6fZNQAQ9ZlNBwn0V -Xnkzfzpd/xzPx7+DExcyxYnRuSnqvDyqeUJtlKVhbx6BgHljSCSokTuZ/nR9s7le -yFT+oEuWkBrRWIhqFGKfm+wtMPVyXO1+4T9Nhszkwx0GA1F6t5xB9bRTknMV47np -6GNiRmBpYyBXLB7qmva6j8dYDlmXHB9i3/WwmV7yyyHHRbkMV7tHDgQVayK9CD7n -p+Kta56UL3BysWyNTrKRZrUMkF17e1ugYloQCLjkObl0iyo7svHtUTUowa1lAgMB -AAGjUzBRMB0GA1UdDgQWBBS2Efj5LbOM023TAHTPzooo5D93ZzAfBgNVHSMEGDAW -gBS2Efj5LbOM023TAHTPzooo5D93ZzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3 -DQEBCwUAA4IBAQCSJyzdc/kEtkty+qsDVQlBE0uXtJYO37ivC3389fH6mJTlpwIz -1S4tk930gLIVUIx5za2y4O8eHPtS1NqX5+CHXtbx4vfyyg49oPOR04b6uEkZfO55 -4f8IOPU7NMtQ9AVHMSlT+oF8d7SmewmSsbm9Comuhwi4G+afLqgqpc9kANiNLiTm -r6dYnLVyKJwNPmkJUb/DBsf12b3EL3n/lXJmd4M9U76wswh9ekyNtUvgB94l0qp2 -HP5ZtVBmwSbS9oEHgN/slnsETl9B1z/oAX8TgR7dWaacfodKyTV1nLRm5ahZYl0k -x8QXcl3mCRK3ZVphhvHV37Cbwe1kAwhbdyDM +AQEAp38ffxj/6RYo7W6WQyQHHSaEsriW++t0M2TH0yYQgfJUoWVmcJXwpAT2LtRe +xt0WR766i0r98U0tFzokWv4Y4+mSfvzyw5vqN9RwKaNVY8JOVE7MRI1LhsDmhCxX +z3nlOvtVzQbnZdluWIffsomWYcI+e+C9zRc9SXnHnq6hEbUKdUWrB/4Vis7Qpzkt +Qf+CafSbWDLCdPS27nD5pI0qPQW9cegVs8GAmoMoPmTFj9kf9afiX6C1xfWUR/Gp +V8p98SmbnJIqyWQa2ULp2zcpSHacwN9wT7BquARjdu+Sw7NcjCoq+f1i1BFGOtaq +yCgWQbAvUWSWCYO6poZBItnrAQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQA42La+ +LSthEIaBSaOV6bW2MF35je6sEGNh17+XM0xeAn5VKIyPFCHJdCgjwox7ZYaczlZs +JMndfBgWOh3q5MoSJ2dBDtBsdU+o+3ptz9h88z14Y5QutpMlSmlVqNd6D3ibK1ao +ekGsd8fRcDUpS2GAvnyZSQ7a9qi+fh1GoajtkF8gkh6d6oqlegD2hX3SyO3xZWkc +DKJGqqcyHBf5kp1jqHPxD0iK6Tub3p90Qz+1eCWvUyAM41A4L76CdaoMStkBZXzd +8Ioptej8b5IdbvoWyIVtQ52fAS/5Y2//M3qDRR+QYOQNa1IinNMq5RlaHqFP0Qbi +9/nc21qZt0+mZyXB -----END CERTIFICATE----- diff --git a/tests/templates/kuttl/s3-deep-storage/certs/tls.key b/tests/templates/kuttl/s3-deep-storage/certs/tls.key index df67e08f..aad97472 100644 --- a/tests/templates/kuttl/s3-deep-storage/certs/tls.key +++ b/tests/templates/kuttl/s3-deep-storage/certs/tls.key @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY----- From bd87017969a9cbbc22d5bb44c7817d25604dde64 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 16:02:03 +0200 Subject: [PATCH 10/14] docs --- docs/modules/ROOT/partials/supported-versions.adoc | 1 + rust/crd/src/lib.rs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/docs/modules/ROOT/partials/supported-versions.adoc b/docs/modules/ROOT/partials/supported-versions.adoc index 38882e25..d8760fb3 100644 --- a/docs/modules/ROOT/partials/supported-versions.adoc +++ b/docs/modules/ROOT/partials/supported-versions.adoc @@ -2,4 +2,5 @@ // This is a separate file, since it is used by both the direct Druid documentation, and the overarching // Stackable Platform documentation. +- 0.22.1 - 0.23.0 diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 570d07ea..02ac4ae1 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -502,6 +502,8 @@ impl Configuration for DruidConfig { ); // Role-specific config if role == DruidRole::MiddleManager { + // When we start ingestion jobs they will run as new JVM processes. + // We need to set this config to pass the custom truststore not only to the Druid roles but also to the started ingestion jobs. result.insert( INDEXER_JAVA_OPTS.to_string(), Some(build_string_list(&[ From f784cd71580ab48cb3073023e96605e0d33d5238 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 16:06:45 +0200 Subject: [PATCH 11/14] bump operator-rs to 0.21.1 --- Cargo.lock | 8 ++++---- rust/crd/Cargo.toml | 2 +- rust/operator-binary/Cargo.toml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c42e7bb0..16e1bfb8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1729,8 +1729,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.21.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.21.0#dbfa6d45fb59fadd17f9b571255c0fdc4c522671" +version = "0.21.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.21.1#01b0aa2069580b9f2088a4409a63436f9917004b" dependencies = [ "backoff", "chrono", @@ -1763,8 +1763,8 @@ dependencies = [ [[package]] name = "stackable-operator-derive" -version = "0.21.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.21.0#dbfa6d45fb59fadd17f9b571255c0fdc4c522671" +version = "0.21.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.21.1#01b0aa2069580b9f2088a4409a63436f9917004b" dependencies = [ "darling 0.14.1", "proc-macro2", diff --git a/rust/crd/Cargo.toml b/rust/crd/Cargo.toml index af9cc3d0..825d486c 100644 --- a/rust/crd/Cargo.toml +++ b/rust/crd/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/stackabletech/druid-operator" version = "0.6.0-nightly" [dependencies] -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.21.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.21.1" } semver = "1.0" serde = { version = "1.0", features = ["derive"] } diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml index cd44db13..64402377 100644 --- a/rust/operator-binary/Cargo.toml +++ b/rust/operator-binary/Cargo.toml @@ -8,7 +8,7 @@ repository = "https://github.com/stackabletech/druid-operator" version = "0.6.0-nightly" [dependencies] -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.21.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.21.1" } stackable-druid-crd = { path = "../crd" } anyhow = "1.0" clap = "3.2" @@ -27,5 +27,5 @@ tracing = "0.1" [build-dependencies] built = { version = "0.5", features = ["chrono", "git2"] } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.21.0" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.21.1" } stackable-druid-crd = { path = "../crd" } From 6ea011e96168722bc67877fdb0c0f273b4ce4c7f Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 16:07:41 +0200 Subject: [PATCH 12/14] Changelog --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58bd7414..d94cf295 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,6 @@ All notable changes to this project will be documented in this file. - BREAKING: The deep storage on s3 and the s3 config for ingestion have been changed to use the operator-rs commons::s3 structs ([#228]) - `operator-rs` `0.15.0` -> `0.21.0` ([#228]) - [BREAKING] Specifying the product version has been changed to adhere to [ADR018](https://docs.stackable.tech/home/contributor/adr/ADR018-product_image_versioning.html) instead of just specifying the product version you will now have to add the Stackable image version as well, so `version: 3.5.8` becomes (for example) `version: 3.5.8-stackable0.1.0` ([#238]) -- Removed support for Druid 0.22.1 ([#255]) ### Fixed From 0c2fa07270a857b985e00598289598c44ba52502 Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 16:11:36 +0200 Subject: [PATCH 13/14] bump Druid version in docs and examples --- docs/modules/ROOT/pages/usage.adoc | 2 +- examples/psql-s3/psql-s3-druid-cluster.yaml | 2 +- examples/psql/psql-hdfs-druid-cluster.yaml | 2 +- examples/simple-druid-cluster.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/modules/ROOT/pages/usage.adoc b/docs/modules/ROOT/pages/usage.adoc index 0fac6f50..17447037 100644 --- a/docs/modules/ROOT/pages/usage.adoc +++ b/docs/modules/ROOT/pages/usage.adoc @@ -53,7 +53,7 @@ kind: DruidCluster metadata: name: simple-druid spec: - version: 0.22.1-authorizer0.1.0-stackable0.2.0 + version: 0.23.0-stackable0.3.0 zookeeperConfigMapName: simple-zk metadataStorageDatabase: dbType: postgresql diff --git a/examples/psql-s3/psql-s3-druid-cluster.yaml b/examples/psql-s3/psql-s3-druid-cluster.yaml index 056ac1a2..987bd5fb 100644 --- a/examples/psql-s3/psql-s3-druid-cluster.yaml +++ b/examples/psql-s3/psql-s3-druid-cluster.yaml @@ -35,7 +35,7 @@ kind: DruidCluster metadata: name: psql-s3-druid spec: - version: 0.22.1-authorizer0.1.0-stackable0.2.0 + version: 0.23.0-stackable0.3.0 zookeeperConfigMapName: simple-druid-znode metadataStorageDatabase: dbType: postgresql diff --git a/examples/psql/psql-hdfs-druid-cluster.yaml b/examples/psql/psql-hdfs-druid-cluster.yaml index 60ed396e..a974c566 100644 --- a/examples/psql/psql-hdfs-druid-cluster.yaml +++ b/examples/psql/psql-hdfs-druid-cluster.yaml @@ -27,7 +27,7 @@ kind: DruidCluster metadata: name: psql-druid spec: - version: 0.22.1-authorizer0.1.0-stackable0.2.0 + version: 0.23.0-stackable0.3.0 zookeeperConfigMapName: simple-druid-znode metadataStorageDatabase: dbType: postgresql diff --git a/examples/simple-druid-cluster.yaml b/examples/simple-druid-cluster.yaml index 57fdcb93..a05c5b7c 100644 --- a/examples/simple-druid-cluster.yaml +++ b/examples/simple-druid-cluster.yaml @@ -47,7 +47,7 @@ kind: DruidCluster metadata: name: simple-derby-druid spec: - version: 0.22.1-authorizer0.1.0-stackable0.2.0 + version: 0.23.0-stackable0.3.0 zookeeperConfigMapName: simple-druid-znode metadataStorageDatabase: dbType: derby From 60696ba50f0635299624a987a8743093075dad9c Mon Sep 17 00:00:00 2001 From: Sebastian Bernauer Date: Mon, 27 Jun 2022 16:25:54 +0200 Subject: [PATCH 14/14] fmt --- rust/crd/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs index 02ac4ae1..0508c246 100644 --- a/rust/crd/src/lib.rs +++ b/rust/crd/src/lib.rs @@ -503,7 +503,7 @@ impl Configuration for DruidConfig { // Role-specific config if role == DruidRole::MiddleManager { // When we start ingestion jobs they will run as new JVM processes. - // We need to set this config to pass the custom truststore not only to the Druid roles but also to the started ingestion jobs. + // We need to set this config to pass the custom truststore not only to the Druid roles but also to the started ingestion jobs. result.insert( INDEXER_JAVA_OPTS.to_string(), Some(build_string_list(&[