Skip to content
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

Jump to bottom

Run cinder services as cinder user #417

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+25 −19
Open

Run cinder services as cinder user #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c7a503
Fix cinder service ServiceCommands
eharney Jul 10, 2024
8993ab3
Run cinder-api and scheduler as cinder user
eharney Jul 10, 2024
1599bf6
Run cinder-backup and volume as cinder user
eharney Jul 10, 2024
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: 3 additions & 2 deletions pkg/cinderapi/statefuleset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (

const (
// ServiceCommand -
ServiceCommand = "/usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start"
ServiceCommand = "/usr/local/bin/kolla_start"
)

// StatefulSet func
Expand All @@ -41,6 +41,7 @@ func StatefulSet(
annotations map[string]string,
) (*appsv1.StatefulSet, error) {
runAsUser := int64(0)
cinderUser := int64(cinderv1beta1.CinderUserID)

livenessProbe := &corev1.Probe{
// TODO might need tuning
Expand Down Expand Up @@ -156,7 +157,7 @@ func StatefulSet(
Args: args,
Image: instance.Spec.ContainerImage,
SecurityContext: &corev1.SecurityContext{
RunAsUser: &runAsUser,
RunAsUser: &cinderUser,
},
Env: env.MergeEnvs([]corev1.EnvVar{}, envVars),
VolumeMounts: volumeMounts,
Expand Down
5 changes: 2 additions & 3 deletions pkg/cinderbackup/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

const (
// ServiceCommand -
ServiceCommand = "/usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start"
ServiceCommand = "/usr/local/bin/kolla_start"
)

// StatefulSet func
Expand All @@ -39,7 +39,6 @@ func StatefulSet(
annotations map[string]string,
) *appsv1.StatefulSet {
trueVar := true
rootUser := int64(0)
cinderUser := int64(cinderv1.CinderUserID)
cinderGroup := int64(cinderv1.CinderGroupID)

Expand Down Expand Up @@ -126,7 +125,7 @@ func StatefulSet(
Args: args,
Image: instance.Spec.ContainerImage,
SecurityContext: &corev1.SecurityContext{
RunAsUser: &rootUser,
RunAsUser: &cinderUser,
Privileged: &trueVar,
},
Env: env.MergeEnvs([]corev1.EnvVar{}, envVars),
Expand Down
5 changes: 2 additions & 3 deletions pkg/cinderscheduler/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

const (
// ServiceCommand -
ServiceCommand = "/usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start"
ServiceCommand = "/usr/local/bin/kolla_start"
)

// StatefulSet func
Expand All @@ -38,7 +38,6 @@ func StatefulSet(
labels map[string]string,
annotations map[string]string,
) *appsv1.StatefulSet {
rootUser := int64(0)
cinderUser := int64(cinderv1.CinderUserID)
cinderGroup := int64(cinderv1.CinderGroupID)

Expand Down Expand Up @@ -112,7 +111,7 @@ func StatefulSet(
Args: args,
Image: instance.Spec.ContainerImage,
SecurityContext: &corev1.SecurityContext{
RunAsUser: &rootUser,
RunAsUser: &cinderUser,
},
Env: env.MergeEnvs([]corev1.EnvVar{}, envVars),
VolumeMounts: volumeMounts,
Expand Down
5 changes: 2 additions & 3 deletions pkg/cindervolume/statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

const (
// ServiceCommand -
ServiceCommand = "/usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start"
ServiceCommand = "/usr/local/bin/kolla_start"
)

// StatefulSet func
Expand All @@ -40,7 +40,6 @@ func StatefulSet(
usesLVM bool,
) *appsv1.StatefulSet {
trueVar := true
rootUser := int64(0)
cinderUser := int64(cinderv1.CinderUserID)
cinderGroup := int64(cinderv1.CinderGroupID)

Expand Down Expand Up @@ -127,7 +126,7 @@ func StatefulSet(
Args: args,
Image: instance.Spec.ContainerImage,
SecurityContext: &corev1.SecurityContext{
RunAsUser: &rootUser,
RunAsUser: &cinderUser,
Privileged: &trueVar,
},
Env: env.MergeEnvs([]corev1.EnvVar{}, envVars),
Expand Down
11 changes: 8 additions & 3 deletions templates/cinder/config/cinder-api-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@
{
"source": "/var/lib/config-data/merged/ssl.conf",
"dest": "/etc/httpd/conf.d/ssl.conf",
"owner": "root",
"owner": "cinder",
"perm": "0644"
},
{
"source": "/var/lib/config-data/tls/certs/*",
"dest": "/etc/pki/tls/certs/",
"owner": "root",
"owner": "cinder",
"perm": "0640",
"optional": true,
"merge": true
},
{
"source": "/var/lib/config-data/tls/private/*",
"dest": "/etc/pki/tls/private/",
"owner": "root",
"owner": "cinder",
"perm": "0600",
"optional": true,
"merge": true
Expand All @@ -41,6 +41,11 @@
"path": "/var/log/cinder",
"owner": "cinder:apache",
"recurse": true
},
{
"path": "/etc/httpd/run",
"owner": "cinder:apache",
"recurse": true
}
]
}
1 change: 1 addition & 0 deletions templates/cinder/config/httpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-A
SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded
ErrorLog /dev/stdout

# XXX: To disable SSL
#Include conf.d/*.conf
Expand Down
4 changes: 2 additions & 2 deletions test/kuttl/common/assert_sample_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ spec:
name: logs
- args:
- -c
- /usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start
- /usr/local/bin/kolla_start
command:
- /bin/bash
imagePullPolicy: IfNotPresent
Expand All @@ -104,7 +104,7 @@ spec:
timeoutSeconds: 5
resources: {}
securityContext:
runAsUser: 0
runAsUser: 42407
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
volumeMounts:
Expand Down
8 changes: 5 additions & 3 deletions test/kuttl/common/assert_tls_sample_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ spec:
name: logs
- args:
- -c
- /usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start
- /usr/local/bin/kolla_start
volumeMounts:
- mountPath: /etc/machine-id
name: etc-machine-id
Expand Down Expand Up @@ -164,7 +164,7 @@ spec:
containers:
- args:
- -c
- /usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start
- /usr/local/bin/kolla_start
volumeMounts:
- mountPath: /etc/machine-id
name: etc-machine-id
Expand Down Expand Up @@ -193,6 +193,8 @@ spec:
name: combined-ca-bundle
readOnly: true
subPath: tls-ca-bundle.pem
securityContext:
runAsUser: 42407
- command:
- /usr/local/bin/container-scripts/healthcheck.py
- scheduler
Expand Down Expand Up @@ -264,7 +266,7 @@ spec:
containers:
- args:
- -c
- /usr/local/bin/kolla_set_configs && /usr/local/bin/kolla_start
- /usr/local/bin/kolla_start
volumeMounts:
- mountPath: /etc/machine-id
name: etc-machine-id
Expand Down
Loading