Skip to content
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

Jump to bottom

Prevented the Operator from overriding Secrets/ImagePullSecrets on ServiceAccounts #526

Merged
merged 1 commit into from
Jul 15, 2019
Merged

Prevented the Operator from overriding Secrets/ImagePullSecrets on ServiceAccounts #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions pkg/inventory/account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@ func ForAccounts(existing []v1.ServiceAccount, desired []v1.ServiceAccount) Acco
util.InitObjectMeta(tp)

// we can't blindly DeepCopyInto, so, we select what we bring from the new to the old object
tp.Secrets = v.Secrets
tp.ImagePullSecrets = v.ImagePullSecrets
tp.AutomountServiceAccountToken = v.AutomountServiceAccountToken
tp.ObjectMeta.OwnerReferences = v.ObjectMeta.OwnerReferences

for k, v := range v.ObjectMeta.Annotations {
Expand Down
10 changes: 9 additions & 1 deletion pkg/inventory/account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ func TestAccountInventory(t *testing.T) {
Labels: map[string]string{"gopher": "jaeger"},
},
AutomountServiceAccountToken: &falseVar,
Secrets: []v1.ObjectReference{{Kind: "Secret"}},
ImagePullSecrets: []v1.LocalObjectReference{{Name: "ImagePullSecret"}},
}
toDelete := v1.ServiceAccount{
ObjectMeta: metav1.ObjectMeta{
Expand All @@ -45,7 +47,13 @@ func TestAccountInventory(t *testing.T) {

assert.Len(t, inv.Update, 1)
assert.Equal(t, "to-update", inv.Update[0].Name)
assert.Equal(t, &falseVar, inv.Update[0].AutomountServiceAccountToken)

// we do *not* set this in any of our current service accounts,
// but this might be set by the cluster -- in this case,
// we keep whatever is there, not touching the fields at all
assert.Equal(t, &trueVar, inv.Update[0].AutomountServiceAccountToken)
assert.Len(t, inv.Update[0].Secrets, 0)
assert.Len(t, inv.Update[0].ImagePullSecrets, 0)

assert.Len(t, inv.Delete, 1)
assert.Equal(t, "to-delete", inv.Delete[0].Name)
Expand Down