From 916577395468741b2b2831d97bbb793495ca263e Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 22 Mar 2016 10:39:36 +0100 Subject: [PATCH] kubernetes: The merge removed Content-Security-Policy The merge of the kubernetes component broke the Content-Security-Policy settings for the registry. Lets start to enforce that again. Closes #4061 Reviewed-by: Dominik Perpeet --- pkg/kubernetes/index.html | 2 +- pkg/kubernetes/manifest.json | 4 +--- pkg/kubernetes/override.json | 7 ++++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkg/kubernetes/index.html b/pkg/kubernetes/index.html index 7195b9dae64..09a3bda87b8 100644 --- a/pkg/kubernetes/index.html +++ b/pkg/kubernetes/index.html @@ -17,7 +17,7 @@ You should have received a copy of the GNU Lesser General Public License along with Cockpit; If not, see . --> - + Kubernetes Cluster diff --git a/pkg/kubernetes/manifest.json b/pkg/kubernetes/manifest.json index b15104ce97b..2f6c9422562 100644 --- a/pkg/kubernetes/manifest.json +++ b/pkg/kubernetes/manifest.json @@ -4,7 +4,5 @@ "label": "Cluster", "order": 1 } - }, - - "content-security-policy": "default-src 'self' 'unsafe-inline' 'unsafe-eval'" + } } diff --git a/pkg/kubernetes/override.json b/pkg/kubernetes/override.json index 3c280308d1a..5930e6eeeb1 100644 --- a/pkg/kubernetes/override.json +++ b/pkg/kubernetes/override.json @@ -1,10 +1,11 @@ { + "comment": "Local debugging overrides to the manifest", + "content-security-policy": "style-src 'self' 'unsafe-inline' 'unsafe-eval'", + "dashboard": { "registry": { "label": "Image Registry", "order": 3 } - }, - - "content-security-policy": "default-src 'self' 'unsafe-inline' 'unsafe-eval'" + } }