Check for Namespace level config override annotations

[Pothulapati]

Fixes #2499

This PR makes the proxy-injector check for Namespace Level Override Config annotations after checking the Pod level override config annotations before going with the default values.

I tried with a Cluster and it considers the annotations of the namespace before going with the defaults.

@ihcsim @grampelberg

Signed-off-by: Tarun Pothulapati tarunpothulapati@outlook.com

[alpeb]

Thanks @Pothulapati, this looks and works great 👍

Could you add somewhere a test case that verifies this kind of override? Could be for example in in TestAnnotationPermutations in test/inject/inject_test.go.

[Pothulapati]

@alpeb Added Both Unit and Integration tests :)

[alpeb]

Thanks for adding that @Pothulapati
Is the integration test running fine for you? I'm consistently getting the following error:

goroutine 43 [running]:
testing.tRunner.func1(0xc000235400)
        /usr/local/go/src/testing/testing.go:830 +0x392
panic(0x12e9320, 0x219ca20)
        /usr/local/go/src/runtime/panic.go:522 +0x1b5
command-line-arguments.TestNamespaceOverrideAnnotations(0xc000235400)
        /home/alpeb/linkerd2/test/inject/inject_test.go:140 +0xb8b
testing.tRunner(0xc000235400, 0x14fdc78)
        /usr/local/go/src/testing/testing.go:865 +0xc0
created by testing.(*T).Run
        /usr/local/go/src/testing/testing.go:916 +0x35a
FAIL    command-line-arguments  0.208s
Test script: [get_test.go] Params: [--linkerd-namespace=l5d-integration]
ok      command-line-arguments  11.644s

[Pothulapati]

Ah! I was running the test induvidually and it was working!

The problem is that, the test also uses the same namespace name as the other test TestAnnotationPermutations and the namespace annotations are not being added to this test as the namespace is not being created again.

Changed the namespace name and it should work together with other tests.

[alpeb]

@Pothulapati Now I'm getting

goroutine 62 [running]:
testing.tRunner.func1(0xc00024f900)
        /usr/local/go/src/testing/testing.go:830 +0x392
panic(0x12e9320, 0x219ca20)
        /usr/local/go/src/runtime/panic.go:522 +0x1b5
command-line-arguments.TestNamespaceOverrideAnnotations(0xc00024f900)
        /home/alpeb/linkerd2/test/inject/inject_test.go:141 +0xb8b
testing.tRunner(0xc00024f900, 0x14fdca0)
        /usr/local/go/src/testing/testing.go:865 +0xc0
created by testing.(*T).Run
        /usr/local/go/src/testing/testing.go:916 +0x35a
FAIL    command-line-arguments  0.263s
Test script: [get_test.go] Params: [--linkerd-namespace=l5d-integration]
ok      command-line-arguments  15.641s

[alpeb]

Thanks Tarun! Integration tests are passing now for me 🥇