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

New linkerd inject default and advanced modes #2721

Merged
merged 7 commits into from
Apr 24, 2019
Merged

New linkerd inject default and advanced modes #2721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83bab1f
Fixes #2720 and 2711 (made more sense to tackle both at once)
alpeb Apr 19, 2019
6c18ea5
Move injectPodAnnotations() before injectPodSpec() and enhanced injec…
alpeb Apr 22, 2019
845cacb
Add test for non-advanced mode
alpeb Apr 22, 2019
055f615
Fix integration tests
alpeb Apr 22, 2019
3626214
Rebase-related changes
alpeb Apr 23, 2019
5ec0891
Change --advanced help text
alpeb Apr 23, 2019
944812d
Rename --advanced flag to --manual
alpeb Apr 24, 2019
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
20 changes: 15 additions & 5 deletions cli/cmd/inject.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ const (
)

type resourceTransformerInject struct {
injectProxy bool
configs *cfg.All
overrideAnnotations map[string]string
proxyOutboundCapacity map[string]uint
Expand All @@ -43,7 +44,7 @@ func runInjectCmd(inputs []io.Reader, errWriter, outWriter io.Writer, transforme

func newCmdInject() *cobra.Command {
options := &proxyConfigOptions{}
var enableDebugSidecar bool
var manualOption, enableDebugSidecar bool

cmd := &cobra.Command{
Use: "inject [flags] CONFIG-FILE",
Expand Down Expand Up @@ -82,6 +83,7 @@ sub-folders, or coming from stdin.`,
options.overrideConfigs(configs, overrideAnnotations)

transformer := &resourceTransformerInject{
injectProxy: manualOption,
configs: configs,
overrideAnnotations: overrideAnnotations,
enableDebugSidecar: enableDebugSidecar,
Expand All @@ -93,6 +95,10 @@ sub-folders, or coming from stdin.`,
}

flags := options.flagSet(pflag.ExitOnError)
flags.BoolVar(
&manualOption, "manual", manualOption,
"Include the proxy sidecar container spec in the YAML output (the auto-injector won't pick it up, so config annotations aren't supported) (default false)",
)
flags.BoolVar(
&options.disableIdentity, "disable-identity", options.disableIdentity,
"Disables resources from participating in TLS identity",
Expand Down Expand Up @@ -137,14 +143,18 @@ func (rt resourceTransformerInject) transform(bytes []byte) ([]byte, []inject.Re
return bytes, reports, nil
}

conf.AppendPodAnnotations(map[string]string{
k8s.CreatedByAnnotation: k8s.CreatedByAnnotationValue(),
})
if rt.injectProxy {
conf.AppendPodAnnotation(k8s.CreatedByAnnotation, k8s.CreatedByAnnotationValue())
} else {
// flag the auto-injector to inject the proxy, regardless of the namespace annotation
conf.AppendPodAnnotation(k8s.ProxyInjectAnnotation, k8s.ProxyInjectEnabled)
}

if len(rt.overrideAnnotations) > 0 {
conf.AppendPodAnnotations(rt.overrideAnnotations)
}

p, err := conf.GetPatch(bytes)
p, err := conf.GetPatch(bytes, rt.injectProxy)
if err != nil {
return nil, nil, err
}
Expand Down
59 changes: 55 additions & 4 deletions cli/cmd/inject_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@ import (

"github.com/linkerd/linkerd2/controller/gen/config"
pb "github.com/linkerd/linkerd2/controller/gen/config"
"github.com/linkerd/linkerd2/pkg/k8s"
)

type testCase struct {
inputFileName string
goldenFileName string
reportFileName string
injectProxy bool
testInjectConfig *config.All
overrideAnnotations map[string]string
enableDebugSidecarFlag bool
}

Expand All @@ -41,8 +44,9 @@ func testUninjectAndInject(t *testing.T, tc testCase) {
output := new(bytes.Buffer)
report := new(bytes.Buffer)
transformer := &resourceTransformerInject{
injectProxy: tc.injectProxy,
configs: tc.testInjectConfig,
overrideAnnotations: map[string]string{},
overrideAnnotations: tc.overrideAnnotations,
enableDebugSidecar: tc.enableDebugSidecarFlag,
}

Expand Down Expand Up @@ -89,108 +93,146 @@ func TestUninjectAndInject(t *testing.T) {
inputFileName: "inject_emojivoto_deployment.input.yml",
goldenFileName: "inject_emojivoto_deployment.golden.yml",
reportFileName: "inject_emojivoto_deployment.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_deployment.input.yml",
goldenFileName: "inject_emojivoto_deployment_overridden_noinject.golden.yml",
reportFileName: "inject_emojivoto_deployment.report",
injectProxy: false,
testInjectConfig: defaultConfig,
overrideAnnotations: map[string]string{
k8s.ProxyAdminPortAnnotation: "1234",
},
},
{
inputFileName: "inject_emojivoto_deployment.input.yml",
goldenFileName: "inject_emojivoto_deployment_overridden.golden.yml",
reportFileName: "inject_emojivoto_deployment.report",
injectProxy: true,
testInjectConfig: defaultConfig,
overrideAnnotations: map[string]string{
k8s.ProxyAdminPortAnnotation: "1234",
},
},
{
inputFileName: "inject_emojivoto_list.input.yml",
goldenFileName: "inject_emojivoto_list.golden.yml",
reportFileName: "inject_emojivoto_list.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_deployment_hostNetwork_false.input.yml",
goldenFileName: "inject_emojivoto_deployment_hostNetwork_false.golden.yml",
reportFileName: "inject_emojivoto_deployment_hostNetwork_false.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_deployment_hostNetwork_true.input.yml",
goldenFileName: "inject_emojivoto_deployment_hostNetwork_true.input.yml",
reportFileName: "inject_emojivoto_deployment_hostNetwork_true.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_deployment_injectDisabled.input.yml",
goldenFileName: "inject_emojivoto_deployment_injectDisabled.input.yml",
reportFileName: "inject_emojivoto_deployment_injectDisabled.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_deployment_controller_name.input.yml",
goldenFileName: "inject_emojivoto_deployment_controller_name.golden.yml",
reportFileName: "inject_emojivoto_deployment_controller_name.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_statefulset.input.yml",
goldenFileName: "inject_emojivoto_statefulset.golden.yml",
reportFileName: "inject_emojivoto_statefulset.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_pod.input.yml",
goldenFileName: "inject_emojivoto_pod.golden.yml",
reportFileName: "inject_emojivoto_pod.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_pod_with_requests.input.yml",
goldenFileName: "inject_emojivoto_pod_with_requests.golden.yml",
reportFileName: "inject_emojivoto_pod_with_requests.report",
injectProxy: true,
testInjectConfig: proxyResourceConfig,
},
{
inputFileName: "inject_emojivoto_deployment_udp.input.yml",
goldenFileName: "inject_emojivoto_deployment_udp.golden.yml",
reportFileName: "inject_emojivoto_deployment_udp.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_already_injected.input.yml",
goldenFileName: "inject_emojivoto_already_injected.golden.yml",
reportFileName: "inject_emojivoto_already_injected.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_istio.input.yml",
goldenFileName: "inject_emojivoto_istio.input.yml",
reportFileName: "inject_emojivoto_istio.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_contour.input.yml",
goldenFileName: "inject_contour.input.yml",
reportFileName: "inject_contour.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_deployment_empty_resources.input.yml",
goldenFileName: "inject_emojivoto_deployment_empty_resources.golden.yml",
reportFileName: "inject_emojivoto_deployment_empty_resources.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_list_empty_resources.input.yml",
goldenFileName: "inject_emojivoto_list_empty_resources.golden.yml",
reportFileName: "inject_emojivoto_list_empty_resources.report",
injectProxy: true,
testInjectConfig: defaultConfig,
},
{
inputFileName: "inject_emojivoto_deployment.input.yml",
goldenFileName: "inject_emojivoto_deployment_no_init_container.golden.yml",
reportFileName: "inject_emojivoto_deployment.report",
injectProxy: true,
testInjectConfig: noInitContainerConfig,
},
{
inputFileName: "inject_emojivoto_deployment_config_overrides.input.yml",
goldenFileName: "inject_emojivoto_deployment_config_overrides.golden.yml",
reportFileName: "inject_emojivoto_deployment.report",
injectProxy: true,
testInjectConfig: overrideConfig,
},
{
inputFileName: "inject_emojivoto_deployment.input.yml",
goldenFileName: "inject_emojivoto_deployment_debug.golden.yml",
reportFileName: "inject_emojivoto_deployment.report",
injectProxy: true,
testInjectConfig: defaultConfig,
enableDebugSidecarFlag: true,
},
Expand Down Expand Up @@ -228,7 +270,10 @@ func testInjectCmd(t *testing.T, tc injectCmd) {
t.Fatalf("Unexpected error: %v", err)
}

transformer := &resourceTransformerInject{configs: testConfig}
transformer := &resourceTransformerInject{
injectProxy: true,
configs: testConfig,
}
exitCode := runInjectCmd([]io.Reader{in}, errBuffer, outBuffer, transformer)
if exitCode != tc.exitCode {
t.Fatalf("Expected exit code to be %d but got: %d", tc.exitCode, exitCode)
Expand Down Expand Up @@ -286,7 +331,10 @@ func testInjectFilePath(t *testing.T, tc injectFilePath) {

errBuf := &bytes.Buffer{}
actual := &bytes.Buffer{}
transformer := &resourceTransformerInject{configs: testInstallConfig()}
transformer := &resourceTransformerInject{
injectProxy: true,
configs: testInstallConfig(),
}
if exitCode := runInjectCmd(in, errBuf, actual, transformer); exitCode != 0 {
t.Fatal("Unexpected error. Exit code from runInjectCmd: ", exitCode)
}
Expand All @@ -304,7 +352,10 @@ func testReadFromFolder(t *testing.T, resourceFolder string, expectedFolder stri

errBuf := &bytes.Buffer{}
actual := &bytes.Buffer{}
transformer := &resourceTransformerInject{configs: testInstallConfig()}
transformer := &resourceTransformerInject{
injectProxy: true,
configs: testInstallConfig(),
}
if exitCode := runInjectCmd(in, errBuf, actual, transformer); exitCode != 0 {
t.Fatal("Unexpected error. Exit code from runInjectCmd: ", exitCode)
}
Expand Down
3 changes: 2 additions & 1 deletion cli/cmd/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,8 @@ func (values *installValues) render(w io.Writer, configs *pb.All) error {
configs.Proxy.IgnoreOutboundPorts = append(configs.Proxy.IgnoreOutboundPorts, &pb.Port{Port: 443})

return processYAML(&buf, w, ioutil.Discard, resourceTransformerInject{
configs: configs,
injectProxy: true,
configs: configs,
proxyOutboundCapacity: map[string]uint{
values.PrometheusImage: prometheusProxyOutboundCapacity,
},
Expand Down
Loading