diff --git a/tests/templates/kuttl/data-hub-resource-info/01-grant-scc.yaml.j2 b/tests/templates/kuttl/data-hub-resource-info/01-grant-scc.yaml.j2 new file mode 100644 index 00000000..565729aa --- /dev/null +++ b/tests/templates/kuttl/data-hub-resource-info/01-grant-scc.yaml.j2 @@ -0,0 +1,47 @@ +{% if test_scenario['values']['openshift'] == 'true' %} +# This test's Pods hardcode runAsUser/fsGroup 1000 (OpenSearch, DataHub) and +# 1001 (Bitnami MySQL/Kafka), and three init containers run as root -- all +# outside the UID range OpenShift assigns to the namespace, so `restricted-v2` +# rejects every Pod. +--- +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: use-integration-tests-scc +rules: + - apiGroups: + - security.openshift.io + resources: + - securitycontextconstraints + resourceNames: + - privileged + verbs: + - use +--- +# The charts create their own ServiceAccounts, so most subjects below name +# accounts that do not exist yet: the grant must precede `helm install`, which +# starts workloads right away (`datahub-system-update` runs as a pre-install +# hook). +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: use-integration-tests-scc +subjects: + # OpenSearch and the test's own Jobs run as `default`. + - kind: ServiceAccount + name: default + - kind: ServiceAccount + name: prerequisites-kafka + - kind: ServiceAccount + name: prerequisites-mysql + # datahub-frontend and datahub-gms. + - kind: ServiceAccount + name: datahub-app-sa + # datahub-system-update and datahub-system-update-nonblk. + - kind: ServiceAccount + name: datahub-operator-sa +roleRef: + kind: Role + name: use-integration-tests-scc + apiGroup: rbac.authorization.k8s.io +{% endif %} diff --git a/tests/templates/kuttl/data-hub-resource-info/02-assert.yaml b/tests/templates/kuttl/data-hub-resource-info/02-assert.yaml deleted file mode 100644 index 19771a3c..00000000 --- a/tests/templates/kuttl/data-hub-resource-info/02-assert.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -# OpenSearch + Kafka can be slow to become ready on a cold cluster (image pulls, JVM start). -timeout: 900 -commands: - # Wait for the stateful prerequisites to be ready before installing DataHub itself. - # (Pod/StatefulSet names come from the `prerequisites` release; adjust if a chart bump - # renames them.) - - script: kubectl -n $NAMESPACE rollout status --timeout=590s statefulset/opensearch-cluster-master - - script: kubectl -n $NAMESPACE rollout status --timeout=590s statefulset/prerequisites-mysql - - script: kubectl -n $NAMESPACE rollout status --timeout=590s statefulset/prerequisites-kafka-controller diff --git a/tests/templates/kuttl/data-hub-resource-info/01-assert.yaml.j2 b/tests/templates/kuttl/data-hub-resource-info/02-assert.yaml.j2 similarity index 100% rename from tests/templates/kuttl/data-hub-resource-info/01-assert.yaml.j2 rename to tests/templates/kuttl/data-hub-resource-info/02-assert.yaml.j2 diff --git a/tests/templates/kuttl/data-hub-resource-info/01-install-vector-aggregator-discovery-configmap.yaml.j2 b/tests/templates/kuttl/data-hub-resource-info/02-install-vector-aggregator-discovery-configmap.yaml.j2 similarity index 100% rename from tests/templates/kuttl/data-hub-resource-info/01-install-vector-aggregator-discovery-configmap.yaml.j2 rename to tests/templates/kuttl/data-hub-resource-info/02-install-vector-aggregator-discovery-configmap.yaml.j2 diff --git a/tests/templates/kuttl/data-hub-resource-info/03-assert.yaml b/tests/templates/kuttl/data-hub-resource-info/03-assert.yaml index ad6615ba..19771a3c 100644 --- a/tests/templates/kuttl/data-hub-resource-info/03-assert.yaml +++ b/tests/templates/kuttl/data-hub-resource-info/03-assert.yaml @@ -1,9 +1,12 @@ --- apiVersion: kuttl.dev/v1beta1 kind: TestAssert -# GMS waits for the system-update bootstrap job (schema + indices) before it goes ready, -# so give this plenty of headroom. +# OpenSearch + Kafka can be slow to become ready on a cold cluster (image pulls, JVM start). timeout: 900 commands: - - script: kubectl -n $NAMESPACE rollout status --timeout=890s deployment/datahub-datahub-gms - - script: kubectl -n $NAMESPACE rollout status --timeout=890s deployment/datahub-datahub-frontend + # Wait for the stateful prerequisites to be ready before installing DataHub itself. + # (Pod/StatefulSet names come from the `prerequisites` release; adjust if a chart bump + # renames them.) + - script: kubectl -n $NAMESPACE rollout status --timeout=590s statefulset/opensearch-cluster-master + - script: kubectl -n $NAMESPACE rollout status --timeout=590s statefulset/prerequisites-mysql + - script: kubectl -n $NAMESPACE rollout status --timeout=590s statefulset/prerequisites-kafka-controller diff --git a/tests/templates/kuttl/data-hub-resource-info/02-install-datahub-prerequisites.yaml.j2 b/tests/templates/kuttl/data-hub-resource-info/03-install-datahub-prerequisites.yaml.j2 similarity index 95% rename from tests/templates/kuttl/data-hub-resource-info/02-install-datahub-prerequisites.yaml.j2 rename to tests/templates/kuttl/data-hub-resource-info/03-install-datahub-prerequisites.yaml.j2 index b8a1edee..4831f40f 100644 --- a/tests/templates/kuttl/data-hub-resource-info/02-install-datahub-prerequisites.yaml.j2 +++ b/tests/templates/kuttl/data-hub-resource-info/03-install-datahub-prerequisites.yaml.j2 @@ -28,4 +28,4 @@ commands: --namespace $NAMESPACE --version {{ test_scenario['values']['data-hub-prerequisites'] }} --repo https://helm.datahubproject.io - --values 02_datahub-prerequisites-values.yaml + --values 03_datahub-prerequisites-values.yaml diff --git a/tests/templates/kuttl/data-hub-resource-info/02_datahub-prerequisites-values.yaml b/tests/templates/kuttl/data-hub-resource-info/03_datahub-prerequisites-values.yaml similarity index 98% rename from tests/templates/kuttl/data-hub-resource-info/02_datahub-prerequisites-values.yaml rename to tests/templates/kuttl/data-hub-resource-info/03_datahub-prerequisites-values.yaml index e842656a..0f5b4f70 100644 --- a/tests/templates/kuttl/data-hub-resource-info/02_datahub-prerequisites-values.yaml +++ b/tests/templates/kuttl/data-hub-resource-info/03_datahub-prerequisites-values.yaml @@ -53,7 +53,7 @@ opensearch: mysql: auth: - # Root password is read from the `mysql-secrets` Secret created in 02-install-datahub-prerequisites. + # Root password is read from the `mysql-secrets` Secret created in 03-install-datahub-prerequisites. # This is the same Secret the datahub chart reads (its default global.sql.datasource.password). existingSecret: mysql-secrets database: datahub diff --git a/tests/templates/kuttl/data-hub-resource-info/04-assert.yaml b/tests/templates/kuttl/data-hub-resource-info/04-assert.yaml index d96f2315..ad6615ba 100644 --- a/tests/templates/kuttl/data-hub-resource-info/04-assert.yaml +++ b/tests/templates/kuttl/data-hub-resource-info/04-assert.yaml @@ -1,6 +1,9 @@ --- -# The credentials Secret for the resource-info-fetcher exists. -apiVersion: v1 -kind: Secret -metadata: - name: datahub-rif-credentials +apiVersion: kuttl.dev/v1beta1 +kind: TestAssert +# GMS waits for the system-update bootstrap job (schema + indices) before it goes ready, +# so give this plenty of headroom. +timeout: 900 +commands: + - script: kubectl -n $NAMESPACE rollout status --timeout=890s deployment/datahub-datahub-gms + - script: kubectl -n $NAMESPACE rollout status --timeout=890s deployment/datahub-datahub-frontend diff --git a/tests/templates/kuttl/data-hub-resource-info/03-install-datahub.yaml.j2 b/tests/templates/kuttl/data-hub-resource-info/04-install-datahub.yaml.j2 similarity index 89% rename from tests/templates/kuttl/data-hub-resource-info/03-install-datahub.yaml.j2 rename to tests/templates/kuttl/data-hub-resource-info/04-install-datahub.yaml.j2 index f8a4fd37..149c6fe0 100644 --- a/tests/templates/kuttl/data-hub-resource-info/03-install-datahub.yaml.j2 +++ b/tests/templates/kuttl/data-hub-resource-info/04-install-datahub.yaml.j2 @@ -4,7 +4,7 @@ kind: TestStep commands: # The chart installs its bootstrap jobs (MySQL schema, Kafka topics, OpenSearch indices, # `datahub-system-update`) as Helm hooks, so `helm install` only returns once all of them - # have run; 03-assert then waits for GMS to become ready. + # have run; 04-assert then waits for GMS to become ready. # # Two timeouts are needed here: # * `--timeout` is Helm's wait per individual hook. The default (5m) is not enough for @@ -17,6 +17,6 @@ commands: --namespace $NAMESPACE --version {{ test_scenario['values']['data-hub'] }} --repo https://helm.datahubproject.io - --values 03_datahub-values.yaml + --values 04_datahub-values.yaml --timeout 10m timeout: 1200 diff --git a/tests/templates/kuttl/data-hub-resource-info/03_datahub-values.yaml b/tests/templates/kuttl/data-hub-resource-info/04_datahub-values.yaml similarity index 96% rename from tests/templates/kuttl/data-hub-resource-info/03_datahub-values.yaml rename to tests/templates/kuttl/data-hub-resource-info/04_datahub-values.yaml index 59b1663f..78d85ad4 100644 --- a/tests/templates/kuttl/data-hub-resource-info/03_datahub-values.yaml +++ b/tests/templates/kuttl/data-hub-resource-info/04_datahub-values.yaml @@ -15,11 +15,11 @@ global: datahub: # THE point of this test: require authentication on every GMS request. # With this on, GMS returns 401 for unauthenticated calls and only accepts a valid - # bearer token (a DataHub Personal Access Token, minted in 04-mint-pat). + # bearer token (a DataHub Personal Access Token, minted in 05-mint-pat). metadata_service_authentication: enabled: true # Signing key + system client secret are read from `datahub-auth-secrets` - # (created in 02-install-datahub-prerequisites). These are the chart's default + # (created in 03-install-datahub-prerequisites). These are the chart's default # secretRef names/keys; kept explicit for clarity. systemClientSecret: secretRef: datahub-auth-secrets diff --git a/tests/templates/kuttl/data-hub-resource-info/05-assert.yaml b/tests/templates/kuttl/data-hub-resource-info/05-assert.yaml new file mode 100644 index 00000000..d96f2315 --- /dev/null +++ b/tests/templates/kuttl/data-hub-resource-info/05-assert.yaml @@ -0,0 +1,6 @@ +--- +# The credentials Secret for the resource-info-fetcher exists. +apiVersion: v1 +kind: Secret +metadata: + name: datahub-rif-credentials diff --git a/tests/templates/kuttl/data-hub-resource-info/04-mint-pat.yaml b/tests/templates/kuttl/data-hub-resource-info/05-mint-pat.yaml similarity index 100% rename from tests/templates/kuttl/data-hub-resource-info/04-mint-pat.yaml rename to tests/templates/kuttl/data-hub-resource-info/05-mint-pat.yaml diff --git a/tests/templates/kuttl/data-hub-resource-info/31-ingest-trino.yaml b/tests/templates/kuttl/data-hub-resource-info/31-ingest-trino.yaml index e94ea2e2..d41b6245 100644 --- a/tests/templates/kuttl/data-hub-resource-info/31-ingest-trino.yaml +++ b/tests/templates/kuttl/data-hub-resource-info/31-ingest-trino.yaml @@ -42,7 +42,7 @@ data: type: datahub-rest config: server: 'http://datahub-datahub-gms:8080' - # Same DataHub PAT the RIF sidecar uses, minted in 04-mint-pat. + # Same DataHub PAT the RIF sidecar uses, minted in 05-mint-pat. token: '${DATAHUB_GMS_TOKEN}' --- apiVersion: batch/v1 diff --git a/tests/templates/kuttl/data-hub-resource-info/32-ingest-kafka.yaml b/tests/templates/kuttl/data-hub-resource-info/32-ingest-kafka.yaml index ecccb88b..11eb3bcb 100644 --- a/tests/templates/kuttl/data-hub-resource-info/32-ingest-kafka.yaml +++ b/tests/templates/kuttl/data-hub-resource-info/32-ingest-kafka.yaml @@ -36,7 +36,7 @@ data: type: datahub-rest config: server: 'http://datahub-datahub-gms:8080' - # Same DataHub PAT the RIF sidecar uses, minted in 04-mint-pat. + # Same DataHub PAT the RIF sidecar uses, minted in 05-mint-pat. token: '${DATAHUB_GMS_TOKEN}' --- apiVersion: batch/v1 diff --git a/tests/templates/kuttl/data-hub-resource-info/33-ingest-superset.yaml b/tests/templates/kuttl/data-hub-resource-info/33-ingest-superset.yaml index bb0bc99b..7b064660 100644 --- a/tests/templates/kuttl/data-hub-resource-info/33-ingest-superset.yaml +++ b/tests/templates/kuttl/data-hub-resource-info/33-ingest-superset.yaml @@ -29,7 +29,7 @@ data: type: datahub-rest config: server: 'http://datahub-datahub-gms:8080' - # Same DataHub PAT the RIF sidecar uses, minted in 04-mint-pat. + # Same DataHub PAT the RIF sidecar uses, minted in 05-mint-pat. token: '${DATAHUB_GMS_TOKEN}' --- apiVersion: batch/v1 diff --git a/tests/templates/kuttl/data-hub-resource-info/34-create-metadata.yaml b/tests/templates/kuttl/data-hub-resource-info/34-create-metadata.yaml index 341bef10..e3c1c127 100644 --- a/tests/templates/kuttl/data-hub-resource-info/34-create-metadata.yaml +++ b/tests/templates/kuttl/data-hub-resource-info/34-create-metadata.yaml @@ -32,7 +32,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - # Same DataHub PAT the RIF sidecar uses, minted in 04-mint-pat. + # Same DataHub PAT the RIF sidecar uses, minted in 05-mint-pat. - name: DATAHUB_GMS_TOKEN valueFrom: secretKeyRef: