Skip to content

K8SPS-550: apply serviceAccountName for haproxy pods #1098

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
merged 9 commits into from
Oct 6, 2025
Merged

K8SPS-550: apply serviceAccountName for haproxy pods #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
39b1989
K8SPS-550: apply `serviceAccountName` for haproxy pods
pooknull Sep 26, 2025
98307b1
Merge branch 'main' into K8SPS-550
pooknull Sep 26, 2025
d8e7195
add unit-tests
pooknull Sep 30, 2025
e54a253
Merge branch 'main' into K8SPS-550
pooknull Sep 30, 2025
7004e63
Merge branch 'main' into K8SPS-550
hors Oct 1, 2025
7de6af8
Merge branch 'main' into K8SPS-550
egegunes Oct 3, 2025
1050a29
address comments
pooknull Oct 3, 2025
8877131
Merge branch 'main' into K8SPS-550
pooknull Oct 3, 2025
a89b3de
Merge branch 'main' into K8SPS-550
hors Oct 6, 2025
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
21 changes: 21 additions & 0 deletions api/v1/perconaservermysql_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,27 @@ type PodSpec struct {
ContainerSpec `json:",inline"`
}

func (s *PodSpec) Core(selector map[string]string, volumes []corev1.Volume, initContainers []corev1.Container, containers []corev1.Container) corev1.PodSpec {
return corev1.PodSpec{
Volumes: volumes,
InitContainers: initContainers,
Containers: containers,
RestartPolicy: corev1.RestartPolicyAlways,
TerminationGracePeriodSeconds: s.GetTerminationGracePeriodSeconds(),
DNSPolicy: corev1.DNSClusterFirst,
NodeSelector: s.NodeSelector,
ServiceAccountName: s.ServiceAccountName,
SecurityContext: s.PodSecurityContext,
ImagePullSecrets: s.ImagePullSecrets,
Affinity: s.GetAffinity(selector),
SchedulerName: s.SchedulerName,
Tolerations: s.Tolerations,
PriorityClassName: s.PriorityClassName,
RuntimeClassName: s.RuntimeClassName,
TopologySpreadConstraints: s.GetTopologySpreadConstraints(selector),
}
}

type Metadata struct {
// Map of string keys and values that can be used to organize and categorize
// (scope and select) objects. May match selectors of replication controllers
Expand Down
24 changes: 6 additions & 18 deletions pkg/binlogserver/binlog_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,10 @@ func StatefulSet(cr *apiv1.PerconaServerMySQL, initImage, configHash string) *ap
Labels: labels,
Annotations: util.SSMapMerge(cr.GlobalAnnotations(), annotations),
},
Spec: corev1.PodSpec{
InitContainers: []corev1.Container{
Spec: spec.Core(
labels,
volumes(cr),
[]corev1.Container{
k8s.InitContainer(
cr,
AppName,
Expand All @@ -89,22 +91,8 @@ func StatefulSet(cr *apiv1.PerconaServerMySQL, initImage, configHash string) *ap
nil,
),
},
Containers: containers(cr),
ServiceAccountName: spec.ServiceAccountName,
NodeSelector: spec.NodeSelector,
Tolerations: spec.Tolerations,
Affinity: spec.GetAffinity(labels),
TopologySpreadConstraints: spec.GetTopologySpreadConstraints(labels),
ImagePullSecrets: spec.ImagePullSecrets,
TerminationGracePeriodSeconds: spec.GetTerminationGracePeriodSeconds(),
PriorityClassName: spec.PriorityClassName,
RuntimeClassName: spec.RuntimeClassName,
RestartPolicy: corev1.RestartPolicyAlways,
SchedulerName: spec.SchedulerName,
DNSPolicy: corev1.DNSClusterFirst,
Volumes: volumes(cr),
SecurityContext: spec.PodSecurityContext,
},
containers(cr),
),
},
},
}
Expand Down
22 changes: 6 additions & 16 deletions pkg/haproxy/haproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,11 +164,10 @@ func StatefulSet(cr *apiv1.PerconaServerMySQL, initImage, configHash, tlsHash st
Labels: Labels(cr),
Annotations: util.SSMapMerge(cr.GlobalAnnotations(), annotations),
},
Spec: corev1.PodSpec{
NodeSelector: cr.Spec.Proxy.HAProxy.NodeSelector,
Tolerations: cr.Spec.Proxy.HAProxy.Tolerations,
RuntimeClassName: cr.Spec.Proxy.HAProxy.RuntimeClassName,
InitContainers: []corev1.Container{
Spec: cr.Spec.Proxy.HAProxy.Core(
selector,
volumes(cr),
[]corev1.Container{
k8s.InitContainer(
cr,
AppName,
Expand All @@ -180,17 +179,8 @@ func StatefulSet(cr *apiv1.PerconaServerMySQL, initImage, configHash, tlsHash st
nil,
),
},
Containers: containers(cr, secret),
Affinity: cr.Spec.Proxy.HAProxy.GetAffinity(selector),
TopologySpreadConstraints: cr.Spec.Proxy.HAProxy.GetTopologySpreadConstraints(selector),
ImagePullSecrets: cr.Spec.Proxy.HAProxy.ImagePullSecrets,
TerminationGracePeriodSeconds: cr.Spec.Proxy.HAProxy.GetTerminationGracePeriodSeconds(),
RestartPolicy: corev1.RestartPolicyAlways,
SchedulerName: "default-scheduler",
DNSPolicy: corev1.DNSClusterFirst,
Volumes: volumes(cr),
SecurityContext: cr.Spec.Proxy.HAProxy.PodSecurityContext,
},
containers(cr, secret),
),
},
},
}
Expand Down
15 changes: 13 additions & 2 deletions pkg/haproxy/haproxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ func TestStatefulset(t *testing.T) {
t.Run("runtime class name", func(t *testing.T) {
cluster := cr.DeepCopy()
sts := StatefulSet(cluster, initImage, configHash, tlsHash, secret)
var e *string
assert.Equal(t, e, sts.Spec.Template.Spec.RuntimeClassName)
assert.Empty(t, sts.Spec.Template.Spec.RuntimeClassName)

const runtimeClassName = "runtimeClassName"
cluster.Spec.Proxy.HAProxy.RuntimeClassName = ptr.To(runtimeClassName)
Expand All @@ -113,6 +112,18 @@ func TestStatefulset(t *testing.T) {
assert.Equal(t, runtimeClassName, *sts.Spec.Template.Spec.RuntimeClassName)
})

t.Run("service account name", func(t *testing.T) {
cluster := cr.DeepCopy()
sts := StatefulSet(cluster, initImage, configHash, tlsHash, secret)
assert.Empty(t, sts.Spec.Template.Spec.ServiceAccountName)

const serviceAccountName = "service"
cluster.Spec.Proxy.HAProxy.ServiceAccountName = serviceAccountName

sts = StatefulSet(cluster, initImage, configHash, tlsHash, secret)
assert.Equal(t, serviceAccountName, sts.Spec.Template.Spec.ServiceAccountName)
})

t.Run("tolerations", func(t *testing.T) {
cluster := cr.DeepCopy()
sts := StatefulSet(cluster, initImage, configHash, tlsHash, secret)
Expand Down
27 changes: 6 additions & 21 deletions pkg/mysql/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,10 @@ func StatefulSet(cr *apiv1.PerconaServerMySQL, initImage, configHash, tlsHash st
Labels: Labels(cr),
Annotations: util.SSMapMerge(cr.GlobalAnnotations(), annotations),
},
Spec: corev1.PodSpec{
InitContainers: []corev1.Container{
Spec: spec.Core(
selector,
append(volumes(cr), spec.SidecarVolumes...),
[]corev1.Container{
k8s.InitContainer(
cr,
AppName,
Expand All @@ -180,25 +182,8 @@ func StatefulSet(cr *apiv1.PerconaServerMySQL, initImage, configHash, tlsHash st
nil,
),
},
Containers: containers(cr, secret),
ServiceAccountName: cr.Spec.MySQL.ServiceAccountName,
NodeSelector: cr.Spec.MySQL.NodeSelector,
Tolerations: cr.Spec.MySQL.Tolerations,
Affinity: spec.GetAffinity(selector),
TopologySpreadConstraints: spec.GetTopologySpreadConstraints(selector),
ImagePullSecrets: spec.ImagePullSecrets,
TerminationGracePeriodSeconds: spec.GetTerminationGracePeriodSeconds(),
PriorityClassName: spec.PriorityClassName,
RuntimeClassName: spec.RuntimeClassName,
RestartPolicy: corev1.RestartPolicyAlways,
SchedulerName: spec.SchedulerName,
DNSPolicy: corev1.DNSClusterFirst,
Volumes: append(
volumes(cr),
spec.SidecarVolumes...,
),
SecurityContext: spec.PodSecurityContext,
},
containers(cr, secret),
),
},
},
}
Expand Down
15 changes: 13 additions & 2 deletions pkg/mysql/mysql_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ func TestStatefulSet(t *testing.T) {
t.Run("runtime class name", func(t *testing.T) {
cluster := cr.DeepCopy()
sts := StatefulSet(cluster, initImage, configHash, tlsHash, secret)
var e *string
assert.Equal(t, e, sts.Spec.Template.Spec.RuntimeClassName)
assert.Empty(t, sts.Spec.Template.Spec.RuntimeClassName)

const runtimeClassName = "runtimeClassName"
cluster.Spec.MySQL.RuntimeClassName = ptr.To(runtimeClassName)
Expand All @@ -119,6 +118,18 @@ func TestStatefulSet(t *testing.T) {
assert.Equal(t, runtimeClassName, *sts.Spec.Template.Spec.RuntimeClassName)
})

t.Run("service account name", func(t *testing.T) {
cluster := cr.DeepCopy()
sts := StatefulSet(cluster, initImage, configHash, tlsHash, secret)
assert.Empty(t, sts.Spec.Template.Spec.ServiceAccountName)

const serviceAccountName = "service"
cluster.Spec.MySQL.ServiceAccountName = serviceAccountName

sts = StatefulSet(cluster, initImage, configHash, tlsHash, secret)
assert.Equal(t, serviceAccountName, sts.Spec.Template.Spec.ServiceAccountName)
})

t.Run("tolerations", func(t *testing.T) {
cluster := cr.DeepCopy()
sts := StatefulSet(cluster, initImage, configHash, tlsHash, secret)
Expand Down
24 changes: 6 additions & 18 deletions pkg/orchestrator/orchestrator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,10 @@ func StatefulSet(cr *apiv1.PerconaServerMySQL, initImage, configHash, tlsHash st
Labels: Labels(cr),
Annotations: util.SSMapMerge(cr.GlobalAnnotations(), annotations),
},
Spec: corev1.PodSpec{
InitContainers: []corev1.Container{
Spec: spec.Core(
selector,
volumes(cr),
[]corev1.Container{
k8s.InitContainer(
cr,
AppName,
Expand All @@ -153,22 +155,8 @@ func StatefulSet(cr *apiv1.PerconaServerMySQL, initImage, configHash, tlsHash st
nil,
),
},
NodeSelector: cr.Spec.Orchestrator.NodeSelector,
Tolerations: cr.Spec.Orchestrator.Tolerations,
Containers: containers(cr),
Affinity: spec.GetAffinity(selector),
TopologySpreadConstraints: spec.GetTopologySpreadConstraints(selector),
ImagePullSecrets: spec.ImagePullSecrets,
TerminationGracePeriodSeconds: spec.GetTerminationGracePeriodSeconds(),
PriorityClassName: spec.PriorityClassName,
RuntimeClassName: spec.RuntimeClassName,
ServiceAccountName: spec.ServiceAccountName,
RestartPolicy: corev1.RestartPolicyAlways,
SchedulerName: spec.SchedulerName,
DNSPolicy: corev1.DNSClusterFirst,
Volumes: volumes(cr),
SecurityContext: spec.PodSecurityContext,
},
containers(cr),
),
},
},
}
Expand Down
16 changes: 14 additions & 2 deletions pkg/orchestrator/orchestrator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ func TestStatefulSet(t *testing.T) {
t.Run("runtime class name", func(t *testing.T) {
cluster := cr.DeepCopy()
sts := StatefulSet(cluster, initImage, configHash, tlsHash)
var e *string
assert.Equal(t, e, sts.Spec.Template.Spec.RuntimeClassName)
assert.Empty(t, sts.Spec.Template.Spec.RuntimeClassName)

const runtimeClassName = "runtimeClassName"
cluster.Spec.Orchestrator.RuntimeClassName = ptr.To(runtimeClassName)
Expand All @@ -124,6 +123,19 @@ func TestStatefulSet(t *testing.T) {
assert.Equal(t, runtimeClassName, *sts.Spec.Template.Spec.RuntimeClassName)
})

t.Run("service account name", func(t *testing.T) {
cluster := cr.DeepCopy()
cluster.Spec.Orchestrator.ServiceAccountName = ""
sts := StatefulSet(cluster, initImage, configHash, tlsHash)
assert.Empty(t, sts.Spec.Template.Spec.ServiceAccountName)

const serviceAccountName = "service"
cluster.Spec.Orchestrator.ServiceAccountName = serviceAccountName

sts = StatefulSet(cluster, initImage, configHash, tlsHash)
assert.Equal(t, serviceAccountName, sts.Spec.Template.Spec.ServiceAccountName)
})

t.Run("tolerations", func(t *testing.T) {
cluster := cr.DeepCopy()
sts := StatefulSet(cluster, initImage, configHash, tlsHash)
Expand Down
23 changes: 6 additions & 17 deletions pkg/router/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,10 @@ func Deployment(cr *apiv1.PerconaServerMySQL, initImage, configHash, tlsHash str
Labels: Labels(cr),
Annotations: util.SSMapMerge(cr.GlobalAnnotations(), annotations),
},
Spec: corev1.PodSpec{
InitContainers: []corev1.Container{
Spec: spec.Core(
selector,
volumes(cr),
[]corev1.Container{
k8s.InitContainer(
cr,
AppName,
Expand All @@ -153,21 +155,8 @@ func Deployment(cr *apiv1.PerconaServerMySQL, initImage, configHash, tlsHash str
nil,
),
},
Containers: containers(cr),
NodeSelector: cr.Spec.Proxy.Router.NodeSelector,
Tolerations: cr.Spec.Proxy.Router.Tolerations,
Affinity: spec.GetAffinity(selector),
TopologySpreadConstraints: spec.GetTopologySpreadConstraints(selector),
ImagePullSecrets: spec.ImagePullSecrets,
TerminationGracePeriodSeconds: spec.GetTerminationGracePeriodSeconds(),
RestartPolicy: corev1.RestartPolicyAlways,
SchedulerName: spec.SchedulerName,
RuntimeClassName: spec.RuntimeClassName,
ServiceAccountName: spec.ServiceAccountName,
DNSPolicy: corev1.DNSClusterFirst,
SecurityContext: spec.PodSecurityContext,
Volumes: volumes(cr),
},
containers(cr),
),
},
},
}
Expand Down
15 changes: 13 additions & 2 deletions pkg/router/router_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,7 @@ func TestDeployment(t *testing.T) {
t.Run("runtime class name", func(t *testing.T) {
cluster := cr.DeepCopy()
deployment := Deployment(cluster, initImage, configHash, tlsHash)
var e *string
assert.Equal(t, e, deployment.Spec.Template.Spec.RuntimeClassName)
assert.Empty(t, deployment.Spec.Template.Spec.RuntimeClassName)

const runtimeClassName = "runtimeClassName"
cluster.Spec.Proxy.Router.RuntimeClassName = ptr.To(runtimeClassName)
Expand All @@ -97,6 +96,18 @@ func TestDeployment(t *testing.T) {
assert.Equal(t, runtimeClassName, *deployment.Spec.Template.Spec.RuntimeClassName)
})

t.Run("service account name", func(t *testing.T) {
cluster := cr.DeepCopy()
deployment := Deployment(cluster, initImage, configHash, tlsHash)
assert.Empty(t, deployment.Spec.Template.Spec.ServiceAccountName)

const serviceAccountName = "service"
cluster.Spec.Proxy.Router.ServiceAccountName = serviceAccountName

deployment = Deployment(cluster, initImage, configHash, tlsHash)
assert.Equal(t, serviceAccountName, deployment.Spec.Template.Spec.ServiceAccountName)
})

t.Run("tolerations", func(t *testing.T) {
cluster := cr.DeepCopy()
deployment := Deployment(cluster, initImage, configHash, tlsHash)
Expand Down
Loading