Skip to content

Add securityContext to skupper-router deployment #2327

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+46 −5
Open

Add securityContext to skupper-router deployment #2327

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
27 changes: 22 additions & 5 deletions internal/kube/site/resources/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
_ "embed"
"fmt"
"strconv"
"strings"

"k8s.io/apimachinery/pkg/runtime/schema"
"sigs.k8s.io/yaml"
Expand All @@ -29,12 +30,12 @@ type Labelling interface {
SetAnnotations(namespace string, name string, kind string, annotations map[string]string) bool
}

func resourceTemplates(site *skupperv2alpha1.Site, group string, size sizing.Sizing, labelling Labelling) []resource.Template {
func resourceTemplates(clients internalclient.Clients, site *skupperv2alpha1.Site, group string, size sizing.Sizing, labelling Labelling) []resource.Template {
templates := []resource.Template{
{
Name: "deployment",
Template: routerDeploymentTemplate,
Parameters: getCoreParams(site, group, size).setLabelsAndAnnotations(labelling, site.Namespace, "skupper-router", "Deployment"),
Parameters: getCoreParams(clients, site, group, size).setLabelsAndAnnotations(labelling, site.Namespace, "skupper-router", "Deployment"),
Resource: schema.GroupVersionResource{
Group: "apps",
Version: "v1",
Expand All @@ -44,7 +45,7 @@ func resourceTemplates(site *skupperv2alpha1.Site, group string, size sizing.Siz
{
Name: "localService",
Template: routerLocalServiceTemplate,
Parameters: getCoreParams(site, group, size).setLabelsAndAnnotations(labelling, site.Namespace, "skupper-router-local", "Service"),
Parameters: getCoreParams(clients, site, group, size).setLabelsAndAnnotations(labelling, site.Namespace, "skupper-router-local", "Service"),
Resource: schema.GroupVersionResource{
Group: "",
Version: "v1",
Expand All @@ -68,6 +69,7 @@ type CoreParams struct {
Labels map[string]string
Annotations map[string]string
EnableAntiAffinity bool
AddPodSecurity bool
}

func (p *CoreParams) setLabelsAndAnnotations(labelling Labelling, namespace string, name string, kind string) *CoreParams {
Expand Down Expand Up @@ -149,7 +151,7 @@ func configDigest(config *skupperv2alpha1.SiteSpec) string {
return ""
}

func getCoreParams(site *skupperv2alpha1.Site, group string, size sizing.Sizing) *CoreParams {
func getCoreParams(clients internalclient.Clients, site *skupperv2alpha1.Site, group string, size sizing.Sizing) *CoreParams {
return &CoreParams{
SiteId: site.GetSiteId(),
SiteName: site.Name,
Expand All @@ -162,11 +164,26 @@ func getCoreParams(site *skupperv2alpha1.Site, group string, size sizing.Sizing)
Sizing: size,
Labels: map[string]string{},
EnableAntiAffinity: enableAntiAffinity(site),
AddPodSecurity: addPodSecurityContext(clients),
}
}

// addPodSecurityContext Only added if server version is >=1.24
Copy link
Contributor

@c-kruse c-kruse Dec 2, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am curious where we came up with this version: Looking back in api docs history I didn't see much evidence that this wouldn't work prior to 1.24 - near as I can tell it would work as far back as 1.19 (when seccomp went GA.)

func addPodSecurityContext(cli internalclient.Clients) bool {
vi, err := cli.GetKubeClient().Discovery().ServerVersion()
if err != nil {
return false
}
// for kubernetes versions 1.24+
if vi.Major == "1" && strings.Compare(vi.Minor, "24") >= 0 {
return true
} else {
return false
}
}

func Apply(clients internalclient.Clients, ctx context.Context, site *skupperv2alpha1.Site, group string, size sizing.Sizing, labelling Labelling) error {
for _, t := range resourceTemplates(site, group, size, labelling) {
for _, t := range resourceTemplates(clients, site, group, size, labelling) {
_, err := t.Apply(clients.GetDynamicClient(), ctx, site.Namespace)
if err != nil {
return err
Expand Down
24 changes: 24 additions & 0 deletions internal/kube/site/resources/skupper-router-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ spec:
successThreshold: 1
timeoutSeconds: 1
name: router
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
runAsNonRoot: true
ports:
- containerPort: 5671
name: amqps
Expand Down Expand Up @@ -125,6 +131,12 @@ spec:
image: {{ .AdaptorImage.Name }}
imagePullPolicy: {{ .AdaptorImage.PullPolicy }}
name: kube-adaptor
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
runAsNonRoot: true
readinessProbe:
failureThreshold: 3
httpGet:
Expand All @@ -148,6 +160,12 @@ spec:
image: {{ .AdaptorImage.Name }}
imagePullPolicy: {{ .AdaptorImage.PullPolicy }}
name: config-init
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
runAsNonRoot: true
command: ["/app/kube-adaptor", "-init"]
volumeMounts:
- mountPath: /etc/skupper-router-certs
Expand All @@ -159,6 +177,12 @@ spec:
volumes:
- emptyDir: {}
name: skupper-router-certs
{{- if .AddPodSecurity }}
securityContext:
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
Copy link
Contributor

@c-kruse c-kruse Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect seccompProfile type "RuntimeDefault" is going to be suitable for most use cases, but hard coding it would likely end up being a deal breaker in some environments. We definitely need a way to either omit a seccompProfile (and defer the setting to an external controller or mutating admissions webhook) or a way to configure this (enviornment variable/flag/site setting.)

{{- end }}
{{- if .EnableAntiAffinity}}
affinity:
podAntiAffinity:
Expand Down