Skip to content

Apply pss labels from diectly PSS enable scripts #3132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
google-oss-prow merged 2 commits into from
May 14, 2025
+18 −15
Merged

Apply pss labels from diectly PSS enable scripts #3132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbe3e6d
apply pss from PSS enable scripts
akagami-harsh May 14, 2025
2e6cae3
fix net-istio-controller pss warning
akagami-harsh May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/knative/knative-serving/base/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ patches:
target:
kind: Deployment
namespace: knative-serving
name: "(autoscaler|activator|controller|net-istio-webhook|webhook)"
name: "(autoscaler|activator|controller|net-istio-webhook|webhook|net-istio-controller)"
16 changes: 9 additions & 7 deletions tests/gh-actions/enable_baseline_PSS.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
#!/bin/bash
set -euxo pipefail
set -euo pipefail

NAMESPACES=("istio-system" "auth" "cert-manager" "oauth2-proxy" "kubeflow" "knative-serving")

for NAMESPACE in "${NAMESPACES[@]}"; do
if kubectl get namespace "$NAMESPACE" >/dev/null 2>&1; then
if [ -f "./experimental/security/PSS/static/baseline/patches/${NAMESPACE}-labels.yaml" ]; then
PATCH_OUTPUT=$(kubectl patch namespace $NAMESPACE --patch-file ./experimental/security/PSS/static/baseline/patches/${NAMESPACE}-labels.yaml 2>&1)
if echo "$PATCH_OUTPUT" | grep -q "violate the new PodSecurity"; then
exit 1
fi
PATCH_OUTPUT=$(kubectl label namespace $NAMESPACE pod-security.kubernetes.io/enforce=baseline --overwrite 2>&1)
if echo "$PATCH_OUTPUT" | grep -q "violate the new PodSecurity"; then
echo "ERROR: PSS violation detected for namespace $NAMESPACE"
echo "$PATCH_OUTPUT" | grep -A 5 "violate the new PodSecurity"
exit 1
else
echo "✅ Namespace '$NAMESPACE' labeled successfully."
fi
fi
done
done
15 changes: 8 additions & 7 deletions tests/gh-actions/enable_restricted_PSS.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
#!/bin/bash
set -euxo pipefail
set -euo pipefail

NAMESPACES=("istio-system" "auth" "cert-manager" "oauth2-proxy" "kubeflow" "knative-serving")
for NAMESPACE in "${NAMESPACES[@]}"; do
if kubectl get namespace "$NAMESPACE" >/dev/null 2>&1; then
if [ -f "./experimental/security/PSS/static/restricted/patches/${NAMESPACE}-labels.yaml" ]; then
PATCH_OUTPUT=$(kubectl patch namespace $NAMESPACE --patch-file ./experimental/security/PSS/static/restricted/patches/${NAMESPACE}-labels.yaml 2>&1)
if echo "$PATCH_OUTPUT" | grep -q "violate the new PodSecurity"; then
echo "\nWARNING PSS VIOLATED\n"
fi
PATCH_OUTPUT=$(kubectl label namespace $NAMESPACE pod-security.kubernetes.io/enforce=restricted --overwrite 2>&1)
if echo "$PATCH_OUTPUT" | grep -q "violate the new PodSecurity"; then
echo "WARNING: PSS violation detected for namespace $NAMESPACE"
echo "$PATCH_OUTPUT" | grep -A 5 "violate the new PodSecurity"
else
echo "✅ Namespace '$NAMESPACE' labeled successfully."
fi
fi
done
done
Loading