Skip to content

OCPBUGS-60579: Suppuort automountServiceAccountToken modify #1225

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

OCPBUGS-60579: Suppuort automountServiceAccountToken modify #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d11ccdd
fix: suppuort automountServiceAccountToken
lance5890 Aug 17, 2025
9f94bdc
add note to remove the automountServiceAccountToken in the next version
lance5890 Aug 18, 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
2 changes: 1 addition & 1 deletion install/0000_00_cluster-version-operator_03_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
labels:
k8s-app: cluster-version-operator
spec:
automountServiceAccountToken: false
automountServiceAccountToken: false # removed in the next version.
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kube-api-access mount point should also be removed in the next version

containers:
- name: cluster-version-operator
image: '{{.ReleaseImage}}'
Expand Down
1 change: 1 addition & 0 deletions lib/resourcemerge/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
31 changes: 31 additions & 0 deletions lib/resourcemerge/core_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion pkg/payload/testdata/TestRenderManifest_expected_cvo_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
labels:
k8s-app: cluster-version-operator
spec:
automountServiceAccountToken: false
automountServiceAccountToken: false # removed in the next version.
containers:
- name: cluster-version-operator
image: 'quay.io/cvo/release:latest'
Expand Down