From 3d091fda6b1d0f9bc716422b57b4ebb701adb02d Mon Sep 17 00:00:00 2001 From: diwakar thyagaraj Date: Wed, 3 Jun 2020 16:28:15 +0000 Subject: [PATCH] Radosgw: Enable Container name for test pods. Change-Id: Ic54cc17dea7d1793d63f3db529d1122c71ae01e6 Signed-off-by: diwakar thyagaraj --- ceph-rgw/templates/pod-helm-tests.yaml | 2 +- ceph-rgw/values_overrides/apparmor.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ceph-rgw/templates/pod-helm-tests.yaml b/ceph-rgw/templates/pod-helm-tests.yaml index 0508c81414..a973694b85 100644 --- a/ceph-rgw/templates/pod-helm-tests.yaml +++ b/ceph-rgw/templates/pod-helm-tests.yaml @@ -25,7 +25,7 @@ metadata: {{ tuple $envAll "ceph" "rgw-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} annotations: "helm.sh/hook": test-success -{{ dict "envAll" $envAll "podName" "ceph-rgw-test" "containerNames" (list "ceph-rgw-ks-validation") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }} +{{ dict "envAll" $envAll "podName" "ceph-rgw-test" "containerNames" (list "ceph-rgw-ks-validation" "ceph-rgw-s3-validation") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }} spec: restartPolicy: Never serviceAccountName: {{ $serviceAccountName }} diff --git a/ceph-rgw/values_overrides/apparmor.yaml b/ceph-rgw/values_overrides/apparmor.yaml index c7adf8429c..64f34de040 100644 --- a/ceph-rgw/values_overrides/apparmor.yaml +++ b/ceph-rgw/values_overrides/apparmor.yaml @@ -21,6 +21,7 @@ pod: create-s3-admin: runtime/default ceph-rgw-test: ceph-rgw-ks-validation: runtime/default + ceph-rgw-s3-validation: runtime/default conf: rgw_s3: enabled: true