fix: suppuort automountServiceAccountToken

fix #660
and #607

Signed-off-by: lan.tian <[email protected]>

Author: lance5890

lib/resourcemerge/core.go

@@ -45,6 +45,7 @@ func ensurePodSpec(modified *bool, existing *corev1.PodSpec, required corev1.Pod
 		}
 	}
 
+	setBoolPtr(modified, &existing.AutomountServiceAccountToken, required.AutomountServiceAccountToken)
 	setStringIfSet(modified, &existing.ServiceAccountName, required.ServiceAccountName)
 	setBool(modified, &existing.HostNetwork, required.HostNetwork)
 	mergeMap(modified, &existing.NodeSelector, required.NodeSelector)

lib/resourcemerge/core_test.go

@@ -45,6 +45,37 @@ func TestEnsurePodSpec(t *testing.T) {
 				Containers: []corev1.Container{
 					{Name: "test"}}},
 		},
+		{
+			name: "AutomountServiceAccountToken none",
+			existing: corev1.PodSpec{
+				AutomountServiceAccountToken: boolPtr(false)},
+			input: corev1.PodSpec{},
+
+			expectedModified: true,
+			expected:         corev1.PodSpec{},
+		},
+		{
+			name: "AutomountServiceAccountToken changed",
+			existing: corev1.PodSpec{
+				AutomountServiceAccountToken: boolPtr(true)},
+			input: corev1.PodSpec{
+				AutomountServiceAccountToken: boolPtr(false)},
+
+			expectedModified: true,
+			expected:         corev1.PodSpec{
+				AutomountServiceAccountToken: boolPtr(false)},
+		},
+		{
+			name: "AutomountServiceAccountToken no changes",
+			existing: corev1.PodSpec{
+				AutomountServiceAccountToken: boolPtr(false)},
+			input: corev1.PodSpec{
+				AutomountServiceAccountToken: boolPtr(false)},
+
+			expectedModified: false,
+			expected:         corev1.PodSpec{
+				AutomountServiceAccountToken: boolPtr(false)},
+		},
 		{
 			name: "PodSecurityContext empty",
 			existing: corev1.PodSpec{