Skip to content

Commit

Permalink
sidecarSet initContainer support InjectPolicy
Browse files Browse the repository at this point in the history 
Signed-off-by: liheng.zms <liheng.zms@alibaba-inc.com>
  • Loading branch information
@zmberg
zmberg committed May 12, 2024
1 parent 1bc8d85 commit ba49591
Show file tree
Hide file tree
Showing 2 changed files with 146 additions and 6 deletions.
9 changes: 4 additions & 5 deletions pkg/webhook/pod/mutating/sidecarset.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,7 @@ func (h *PodCreateHandler) sidecarsetMutatingPod(ctx context.Context, req admiss
sort.SliceStable(sidecarInitContainers, func(i, j int) bool {
return sidecarInitContainers[i].Name < sidecarInitContainers[j].Name
})
// TODO, implement PodInjectPolicy for initContainers
for _, initContainer := range sidecarInitContainers {
pod.Spec.InitContainers = append(pod.Spec.InitContainers, initContainer.Container)
}
pod.Spec.InitContainers = mergeSidecarContainers(pod.Spec.InitContainers, sidecarInitContainers)
// 2. inject containers
pod.Spec.Containers = mergeSidecarContainers(pod.Spec.Containers, sidecarContainers)
// 3. inject volumes
Expand Down Expand Up @@ -287,7 +284,9 @@ func mergeSidecarContainers(origins []corev1.Container, injected []*appsv1alpha1
case appsv1alpha1.AfterAppContainerType:
afterAppContainers = append(afterAppContainers, sidecar.Container)
default:
beforeAppContainers = append(beforeAppContainers, sidecar.Container)
// sidecarContainers injects the BeforeAppContainerType policy by default,
// so only initContainers executes that logic.
afterAppContainers = append(afterAppContainers, sidecar.Container)
}
}
origins = append(beforeAppContainers, origins...)
Expand Down
143 changes: 142 additions & 1 deletion pkg/webhook/pod/mutating/sidecarset_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"os"
"path/filepath"
"reflect"
"sort"
"testing"

"github.com/openkruise/kruise/apis"
Expand Down Expand Up @@ -946,6 +947,7 @@ func TestSidecarSetTransferEnv(t *testing.T) {

func testSidecarSetTransferEnv(t *testing.T, sidecarSetIn *appsv1alpha1.SidecarSet) {
podIn := pod1.DeepCopy()
sidecarSetIn.Spec.InitContainers[0].PodInjectPolicy = ""
decoder := admission.NewDecoder(scheme.Scheme)
client := fake.NewClientBuilder().WithObjects(sidecarSetIn).WithIndex(
&appsv1alpha1.SidecarSet{}, fieldindex.IndexNameForSidecarSetNamespace, fieldindex.IndexSidecarSet,
Expand All @@ -958,7 +960,7 @@ func testSidecarSetTransferEnv(t *testing.T, sidecarSetIn *appsv1alpha1.SidecarS
t.Fatalf("inject sidecar into pod failed, err: %v", err)
}
if len(podOut.Spec.InitContainers[1].Env) != 2 {
t.Fatalf("expect 2 envs but got %v", len(podOut.Spec.InitContainers[0].Env))
t.Fatalf("expect 2 envs but got %v", len(podOut.Spec.InitContainers[1].Env))
}
if podOut.Spec.InitContainers[1].Env[1].Value != "world2" {
t.Fatalf("expect env with value 'world2' but got %v", podOut.Spec.Containers[0].Env[1].Value)
Expand Down Expand Up @@ -1129,6 +1131,17 @@ func TestMergeSidecarContainers(t *testing.T) {
expectContainerLen: 4,
expectedContainers: []string{"new-sidecar-1", "sidecar-1", "app-container", "sidecar-2"},
},
{
name: "origin no sidecar, sidecar have new containers",
getOrigins: func() []corev1.Container {
return nil
},
getInjected: func() []*appsv1alpha1.SidecarContainer {
return sidecarContainers
},
expectContainerLen: 3,
expectedContainers: []string{"new-sidecar-1", "sidecar-1", "sidecar-2"},
},
}

for _, cs := range cases {
Expand Down Expand Up @@ -1255,6 +1268,134 @@ func TestInjectInitContainer(t *testing.T) {
}
}

func TestInjectInitContainerSort(t *testing.T) {
cases := []struct {
name string
getOrigins func() []corev1.Container
getInjected func() []*appsv1alpha1.SidecarContainer
expectContainerLen int
expectedContainers []string
}{
{
name: "origins nil, inject containers(a, b, c)",
getOrigins: func() []corev1.Container {
return nil
},
getInjected: func() []*appsv1alpha1.SidecarContainer {
return []*appsv1alpha1.SidecarContainer{
{
Container: corev1.Container{
Name: "a-init",
},
},
{
Container: corev1.Container{
Name: "c-init",
},
},
{
Container: corev1.Container{
Name: "b-init",
},
},
}
},
expectContainerLen: 3,
expectedContainers: []string{"a-init", "b-init", "c-init"},
},
{
name: "origin init, inject containers(a, b, c)",
getOrigins: func() []corev1.Container {
return []corev1.Container{
{
Name: "app1-init",
},
{
Name: "app2-init",
},
}
},
getInjected: func() []*appsv1alpha1.SidecarContainer {
return []*appsv1alpha1.SidecarContainer{
{
Container: corev1.Container{
Name: "a-init",
},
},
{
Container: corev1.Container{
Name: "c-init",
},
},
{
Container: corev1.Container{
Name: "b-init",
},
},
}
},
expectContainerLen: 5,
expectedContainers: []string{"app1-init", "app2-init", "a-init", "b-init", "c-init"},
},
{
name: "origins nil, inject containers(a, b, c)-2",
getOrigins: func() []corev1.Container {
return []corev1.Container{
{
Name: "app1-init",
},
{
Name: "app2-init",
},
}
},
getInjected: func() []*appsv1alpha1.SidecarContainer {
return []*appsv1alpha1.SidecarContainer{
{
Container: corev1.Container{
Name: "a-init",
},
PodInjectPolicy: appsv1alpha1.AfterAppContainerType,
},
{
Container: corev1.Container{
Name: "c-init",
},
PodInjectPolicy: appsv1alpha1.BeforeAppContainerType,
},
{
Container: corev1.Container{
Name: "b-init",
},
PodInjectPolicy: appsv1alpha1.BeforeAppContainerType,
},
}
},
expectContainerLen: 5,
expectedContainers: []string{"b-init", "c-init", "app1-init", "app2-init", "a-init"},
},
}

for _, cs := range cases {
t.Run(cs.name, func(t *testing.T) {
origins := cs.getOrigins()
injected := cs.getInjected()
sort.SliceStable(injected, func(i, j int) bool {
return injected[i].Name < injected[j].Name
})
finals := mergeSidecarContainers(origins, injected)
if len(finals) != cs.expectContainerLen {
t.Fatalf("expect %d containers but got %v", cs.expectContainerLen, len(finals))
}
for index, cName := range cs.expectedContainers {
if finals[index].Name != cName {
t.Fatalf("expect index(%d) container(%s) but got %s", index, cName, finals[index].Name)
}
}
})
}
}

func newAdmission(op admissionv1.Operation, object, oldObject runtime.RawExtension, subResource string) admission.Request {
return admission.Request{
AdmissionRequest: newAdmissionRequest(op, object, oldObject, subResource),
Expand Down

0 comments on commit ba49591

Please sign in to comment.