Skip to content

Allow overriding pod security admission label #2886

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
openshift-merge-robot merged 1 commit into from
Aug 11, 2023
Merged

Allow overriding pod security admission label #2886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions api/v1beta1/hostedcluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,11 @@ const (
// AllowGuestWebhooksServiceLabel marks a service deployed in the control plane as a valid target
// for validating/mutating webhooks running in the guest cluster.
AllowGuestWebhooksServiceLabel = "hypershift.openshift.io/allow-guest-webhooks"

// PodSecurityAdmissionLabelOverrideAnnotation allows overriding the pod security admission label on
// hosted control plane namespacces. The default is 'Restricted'. Valid values are 'Restricted', 'Baseline', or 'Privileged'
// See https://github.com/openshift/enhancements/blob/master/enhancements/authentication/pod-security-admission.md
PodSecurityAdmissionLabelOverrideAnnotation = "hypershift.openshift.io/pod-security-admission-label-override"
)

// HostedClusterSpec is the desired behavior of a HostedCluster.
Expand Down
7 changes: 6 additions & 1 deletion hypershift-operator/controllers/hostedcluster/hostedcluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,12 @@ func (r *HostedClusterReconciler) reconcile(ctx context.Context, req ctrl.Reques
controlPlaneNamespace.Labels["hypershift.openshift.io/hosted-control-plane"] = "true"

// Set pod security labels on HCP namespace
if useRestrictedPSA {
psaOverride := hcluster.Annotations[hyperv1.PodSecurityAdmissionLabelOverrideAnnotation]
if psaOverride != "" {
controlPlaneNamespace.Labels["pod-security.kubernetes.io/enforce"] = psaOverride
controlPlaneNamespace.Labels["pod-security.kubernetes.io/audit"] = psaOverride
controlPlaneNamespace.Labels["pod-security.kubernetes.io/warn"] = psaOverride
} else if useRestrictedPSA {
controlPlaneNamespace.Labels["pod-security.kubernetes.io/enforce"] = "restricted"
controlPlaneNamespace.Labels["pod-security.kubernetes.io/audit"] = "restricted"
controlPlaneNamespace.Labels["pod-security.kubernetes.io/warn"] = "restricted"
Expand Down