Skip to content

Commit c247108

Browse files
authored
Remove runAsGroup to add compatibility with bitnami/rabbitmq (#724)
* Remove runAsGroup to add compatibility with bitnami/rabbitmq * Adapt test
1 parent 1e1fd35 commit c247108

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

internal/resource/statefulset.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ func (builder *StatefulSetBuilder) podTemplateSpec(previousPodAnnotations map[st
312312
memoryRequest := k8sresource.MustParse(initContainerMemory)
313313

314314
automountServiceAccountToken := true
315-
rabbitmqGID := int64(999)
316315
rabbitmqUID := int64(999)
317316

318317
readinessProbePort := "amqp"
@@ -525,9 +524,8 @@ func (builder *StatefulSetBuilder) podTemplateSpec(previousPodAnnotations map[st
525524
},
526525
},
527526
SecurityContext: &corev1.PodSecurityContext{
528-
FSGroup: &rabbitmqGID,
529-
RunAsGroup: &rabbitmqGID,
530-
RunAsUser: &rabbitmqUID,
527+
FSGroup: &rabbitmqUID,
528+
RunAsUser: &rabbitmqUID,
531529
},
532530
ImagePullSecrets: builder.Instance.Spec.ImagePullSecrets,
533531
TerminationGracePeriodSeconds: builder.Instance.Spec.TerminationGracePeriodSeconds,

internal/resource/statefulset_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1189,12 +1189,11 @@ var _ = Describe("StatefulSet", func() {
11891189
stsBuilder := builder.StatefulSet()
11901190
Expect(stsBuilder.Update(statefulSet)).To(Succeed())
11911191

1192-
rmqGID, rmqUID := int64(999), int64(999)
1192+
rmqUID := int64(999)
11931193

11941194
expectedPodSecurityContext := &corev1.PodSecurityContext{
1195-
FSGroup: &rmqGID,
1196-
RunAsGroup: &rmqGID,
1197-
RunAsUser: &rmqUID,
1195+
FSGroup: &rmqUID,
1196+
RunAsUser: &rmqUID,
11981197
}
11991198

12001199
Expect(statefulSet.Spec.Template.Spec.SecurityContext).To(Equal(expectedPodSecurityContext))

0 commit comments

Comments
 (0)