-
Notifications
You must be signed in to change notification settings - Fork 168
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.
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
Add agent-inject-containers annotation #163
Closed
luke-dd
wants to merge
2
commits into
hashicorp:main
from
luke-dd:lchristopherson/agent-inject-containers-annotation
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
package agent | ||
|
||
import ( | ||
"encoding/json" | ||
"fmt" | ||
"reflect" | ||
"strconv" | ||
|
@@ -793,3 +794,75 @@ func Test_runAsSameID(t *testing.T) { | |
}) | ||
} | ||
} | ||
|
||
func TestInjectContainers(t *testing.T) { | ||
expectedPatch := "{\"op\":\"add\",\"path\":\"/spec/containers/0/volumeMounts/-\",\"value\":{\"mountPath\":\"/vault/secrets\",\"name\":\"vault-secrets\"}}" | ||
|
||
tests := []struct { | ||
name string | ||
annotations map[string]string | ||
expected string | ||
hasPatch bool | ||
Comment on lines
+802
to
+805
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: gofmt needs to be run on this file. |
||
}{ | ||
{ | ||
name: "No InjectContainers annotation", | ||
annotations: map[string]string{}, | ||
expected: "foobar", | ||
hasPatch: true, | ||
}, | ||
{ | ||
name: "InjectContainers annotation with container name", | ||
annotations: map[string]string{AnnotationAgentInjectContainers: "baz"}, | ||
expected: "baz", | ||
hasPatch: false, | ||
}, | ||
Comment on lines
+813
to
+818
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We'll need another test here for multiple containers being selected via this annotation. |
||
{ | ||
name: "Empty InjectContainers annotation", | ||
annotations: map[string]string{AnnotationAgentInjectContainers: ""}, | ||
expected: "", | ||
hasPatch: false, | ||
}, | ||
} | ||
|
||
for _, tt := range tests { | ||
t.Run(tt.name, func(t *testing.T) { | ||
pod := testPod(tt.annotations) | ||
var patches []*jsonpatch.JsonPatchOperation | ||
|
||
agentConfig := AgentConfig{ | ||
"foobar-image", "http://foobar:8200", "test", "test", true, "100", "1000", | ||
DefaultAgentRunAsSameUser, DefaultAgentSetSecurityContext, | ||
} | ||
|
||
err := Init(pod, agentConfig) | ||
if err != nil { | ||
t.Errorf("got error, shouldn't have: %s", err) | ||
} | ||
|
||
agent, err := New(pod, patches) | ||
if err != nil { | ||
t.Errorf("got error, shouldn't have: %s", err) | ||
} | ||
|
||
patch, err := agent.Patch() | ||
if err != nil { | ||
t.Errorf("got error, shouldn't have: %s", err) | ||
} | ||
|
||
require.Equal(t, pod.Annotations[AnnotationAgentInjectContainers], tt.expected) | ||
|
||
var actual []jsonpatch.JsonPatchOperation | ||
json.Unmarshal(patch, &actual) | ||
|
||
// Ensure the container patch is present if it is expected | ||
hasPatch := false | ||
for _, p := range actual { | ||
if p.Json() == expectedPatch { | ||
hasPatch = true | ||
} | ||
} | ||
|
||
require.Equal(t, hasPatch, tt.hasPatch) | ||
}) | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm thinking this code isn't necessary because we could extend the
Agent
struct to have aContainers []string
type, then populate that using the Init function. If the slice is empty, apply to all containers, if it's not, only mount to containers that match.