Skip to content

Commit 42acf0e

Browse files
committed
fix: disable SA token automount for tidbinitializer
1 parent 0344b9b commit 42acf0e

2 files changed

Lines changed: 18 additions & 2 deletions

File tree

pkg/manager/member/tidb_init_manager.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,9 @@ func (m *tidbInitManager) makeTiDBInitJob(ti *v1alpha1.TidbInitializer) (*batchv
352352
Annotations: util.CopyStringMap(ti.Annotations),
353353
},
354354
Spec: corev1.PodSpec{
355-
ImagePullSecrets: ti.Spec.ImagePullSecrets,
356-
SecurityContext: ti.Spec.PodSecurityContext,
355+
ImagePullSecrets: ti.Spec.ImagePullSecrets,
356+
SecurityContext: ti.Spec.PodSecurityContext,
357+
AutomountServiceAccountToken: pointer.BoolPtr(false),
357358
InitContainers: []corev1.Container{
358359
{
359360
Name: initContainerName,

pkg/manager/member/tidb_init_manager_test.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,21 @@ func TestTiDBInitManagerSync(t *testing.T) {
128128
}
129129
}
130130

131+
func TestMakeTiDBInitJobDisablesServiceAccountTokenAutomount(t *testing.T) {
132+
g := NewGomegaWithT(t)
133+
tim, _, indexers := newFakeTiDBInitManager()
134+
ti := newTidbInitializerForTiDB()
135+
tc := newTidbClusterForTiDB()
136+
137+
err := indexers.tc.Add(tc)
138+
g.Expect(err).NotTo(HaveOccurred())
139+
140+
job, err := tim.makeTiDBInitJob(ti)
141+
g.Expect(err).NotTo(HaveOccurred())
142+
g.Expect(job.Spec.Template.Spec.AutomountServiceAccountToken).NotTo(BeNil())
143+
g.Expect(*job.Spec.Template.Spec.AutomountServiceAccountToken).To(BeFalse())
144+
}
145+
131146
func newFakeTiDBInitManager() (*tidbInitManager, *tidbMemberManager, *fakeIndexers) {
132147
tmm, _, _, indexers := newFakeTiDBMemberManager()
133148
indexers.job = tmm.deps.KubeInformerFactory.Batch().V1().Jobs().Informer().GetIndexer()

0 commit comments

Comments
 (0)