Skip to content

Commit cf1df89

Browse files
committed
fix: Goose pod security context
When .spec.storage is configured, Goose uses the mounted volume as its working directory. A root-owned PVC prevents the Goose process, which runs as UID/GID 1000, from writing its home-directory data under /home/goose, including configuration and transcripts: mkdir: cannot create directory '/home/goose/.config': Permission denied Apply the standard restrictive pod and container security contexts with Goose UID/GID 1000, matching openstackclient. Set fsGroup to 1000 so supported PVC-backed working directories are group-writable and Goose can persist its home-directory data. Depends-On: openstack-k8s-operators/lib-common#780
1 parent 58a918c commit cf1df89

2 files changed

Lines changed: 20 additions & 14 deletions

File tree

‎internal/openstackassistant/funcs.go‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ import (
2020
"unicode"
2121

2222
env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
23+
"github.com/openstack-k8s-operators/lib-common/modules/common/pod"
2324
"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
25+
"github.com/openstack-k8s-operators/lib-common/modules/users"
2426
assistantv1 "github.com/openstack-k8s-operators/openstack-operator/api/assistant/v1beta1"
2527

2628
corev1 "k8s.io/api/core/v1"
@@ -143,23 +145,16 @@ func AssistantPodSpecWithCABundle(
143145
podSpec := corev1.PodSpec{
144146
TerminationGracePeriodSeconds: ptr.To[int64](0),
145147
ServiceAccountName: instance.RbacResourceName(),
148+
SecurityContext: pod.RestrictivePodSecurityContext(users.OpenStackAssistantUID, users.OpenStackAssistantGID),
146149
Volumes: volumes,
147150
Containers: []corev1.Container{
148151
{
149-
Name: "assistant",
150-
Image: instance.Spec.ContainerImage,
151-
SecurityContext: &corev1.SecurityContext{
152-
RunAsNonRoot: ptr.To(true),
153-
AllowPrivilegeEscalation: ptr.To(false),
154-
Capabilities: &corev1.Capabilities{
155-
Drop: []corev1.Capability{
156-
"ALL",
157-
},
158-
},
159-
},
160-
Env: containerEnvs,
161-
VolumeMounts: volumeMounts,
162-
Resources: instance.Spec.Resources,
152+
Name: "assistant",
153+
Image: instance.Spec.ContainerImage,
154+
SecurityContext: pod.RestrictiveSecurityContext(users.OpenStackAssistantUID, users.OpenStackAssistantGID),
155+
Env: containerEnvs,
156+
VolumeMounts: volumeMounts,
157+
Resources: instance.Spec.Resources,
163158
},
164159
},
165160
}

‎internal/openstackassistant/funcs_test.go‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@ import (
1717

1818
"github.com/onsi/gomega"
1919
"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
20+
"github.com/openstack-k8s-operators/lib-common/modules/users"
2021

2122
assistantv1 "github.com/openstack-k8s-operators/openstack-operator/api/assistant/v1beta1"
2223
corev1 "k8s.io/api/core/v1"
2324
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
25+
"k8s.io/utils/ptr"
2426
)
2527

2628
func newTestInstance() *assistantv1.OpenStackAssistant {
@@ -111,8 +113,17 @@ func TestAssistantPodSpec_SecurityContext(t *testing.T) {
111113
instance := newTestInstance()
112114

113115
spec := AssistantPodSpec(instance, "hash", nil)
116+
podSC := spec.SecurityContext
114117
sc := spec.Containers[0].SecurityContext
115118

119+
g.Expect(podSC.RunAsUser).To(gomega.Equal(ptr.To(users.OpenStackAssistantUID)))
120+
g.Expect(podSC.RunAsGroup).To(gomega.Equal(ptr.To(users.OpenStackAssistantGID)))
121+
g.Expect(podSC.FSGroup).To(gomega.Equal(ptr.To(users.OpenStackAssistantGID)))
122+
g.Expect(podSC.SeccompProfile).To(gomega.Equal(&corev1.SeccompProfile{
123+
Type: corev1.SeccompProfileTypeRuntimeDefault,
124+
}))
125+
g.Expect(sc.RunAsUser).To(gomega.Equal(ptr.To(users.OpenStackAssistantUID)))
126+
g.Expect(sc.RunAsGroup).To(gomega.Equal(ptr.To(users.OpenStackAssistantGID)))
116127
g.Expect(*sc.RunAsNonRoot).To(gomega.BeTrue())
117128
g.Expect(*sc.AllowPrivilegeEscalation).To(gomega.BeFalse())
118129
g.Expect(sc.Capabilities.Drop).To(gomega.ContainElement(corev1.Capability("ALL")))

0 commit comments

Comments
 (0)