linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change the proxy-init container ordering during auto proxy injection (#1763) 

Appending proxy-init to the end of the list ensures that it won't
interfere with other init containers from accessing the network,
before the proxy container is created.

This resolves bug #1760

Signed-off-by: ihcsim <ihcsim@gmail.com>
This commit is contained in:
Ivan Sim 2018-10-15 15:33:09 -07:00 committed by Kevin Lingerfelt
parent 37bc8a69db
commit 2e1a984eb0
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controller/proxy-injector/patch.go
View File

@ -1,13 +1,15 @@
package injector
import (
"fmt"
corev1 "k8s.io/api/core/v1"
)
const (
patchPathContainer = "/spec/template/spec/containers/0"
patchPathInitContainerRoot = "/spec/template/spec/initContainers"
patchPathInitContainer = "/spec/template/spec/initContainers/0"
patchPathInitContainer = "/spec/template/spec/initContainers/%d"
patchPathVolumeRoot = "/spec/template/spec/volumes"
patchPathVolume = "/spec/template/spec/volumes/0"
patchPathPodLabel = "/spec/template/metadata/labels"
@ -42,10 +44,10 @@ func (p *Patch) addInitContainerRoot() {
})
}
func (p *Patch) addInitContainer(container *corev1.Container) {
func (p *Patch) addInitContainer(container *corev1.Container, index int) {
p.patchOps = append(p.patchOps, &patchOp{
Op: "add",
Path: patchPathInitContainer,
Path: fmt.Sprintf(patchPathInitContainer, index),
Value: container,
})
}

6
controller/proxy-injector/patch_test.go
View File

@ -1,6 +1,7 @@
package injector
import (
"fmt"
"reflect"
"testing"
@ -35,12 +36,13 @@ func TestPatch(t *testing.T) {
var (
controllerNamespace = "linkerd"
createdBy = "linkerd/cli v18.8.4"
initContainerIndex = 5
)
actual := NewPatch()
actual.addContainer(sidecar)
actual.addInitContainerRoot()
actual.addInitContainer(init)
actual.addInitContainer(init, initContainerIndex)
actual.addVolumeRoot()
actual.addVolume(trustAnchors)
actual.addVolume(secrets)
@ -56,7 +58,7 @@ func TestPatch(t *testing.T) {
expected.patchOps = []*patchOp{
&patchOp{Op: "add", Path: patchPathContainer, Value: sidecar},
&patchOp{Op: "add", Path: patchPathInitContainerRoot, Value: []*v1.Container{}},
&patchOp{Op: "add", Path: patchPathInitContainer, Value: init},
&patchOp{Op: "add", Path: fmt.Sprintf(patchPathInitContainer, initContainerIndex), Value: init},
&patchOp{Op: "add", Path: patchPathVolumeRoot, Value: []*v1.Volume{}},
&patchOp{Op: "add", Path: patchPathVolume, Value: trustAnchors},
&patchOp{Op: "add", Path: patchPathVolume, Value: secrets},

2
controller/proxy-injector/webhook.go
View File

@ -144,7 +144,7 @@ func (w *Webhook) inject(request *admissionv1beta1.AdmissionRequest) (*admission
if len(deployment.Spec.Template.Spec.InitContainers) == 0 {
patch.addInitContainerRoot()
}
patch.addInitContainer(proxyInit)
patch.addInitContainer(proxyInit, len(deployment.Spec.Template.Spec.InitContainers))
if len(deployment.Spec.Template.Spec.Volumes) == 0 {
patch.addVolumeRoot()