Unverified Commit 6f445b71 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #125 from nikhildoifode/na-780 

Added initContainer for dependency check of DNS service in scenario pods
parents 210b2afb 0153d06b

charts/meep-webhook/templates/configmap.yaml

+5 −0
Original line number Diff line number Diff line
@@ -12,3 +12,8 @@ data: 
        capabilities:

          add:

            - NET_ADMIN

    initContainers:

    - name: init-{{ .Values.sidecar.dependency }}

      image: busybox:1.28

      imagePullPolicy: IfNotPresent

      command: ['sh', '-c', 'until nslookup {{ .Values.sidecar.dependency }}.kube-system ; do echo waiting for {{ .Values.sidecar.dependency }}; sleep 0.25; done;']

charts/meep-webhook/values.yaml

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ sidecar: 
    repository: meep-docker-registry:30001/meep-tc-sidecar

    tag: latest

    pullPolicy: Always

  dependency: kube-dns



webhook:

  name: meep-webhook.idcc.com

go-apps/meep-webhook/webhook.go

+8 −2
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ type WhSvrParameters struct { 
type Config struct {

	Containers     []corev1.Container `yaml:"containers"`

	Volumes        []corev1.Volume    `yaml:"volumes"`

	InitContainers []corev1.Container `yaml:"initContainers"`

}



type patchOperation struct {
@@ -145,6 +146,11 @@ func getSidecarPatch(template corev1.PodTemplateSpec, sidecarConfig *Config, mee 
	patchOps = append(patchOps, addVolume(template.Spec.Volumes, sidecarConfig.Volumes, "/spec/template/spec/volumes")...)

	patchOps = append(patchOps, updateLabels(template.ObjectMeta.Labels, newLabels, "/spec/template/metadata/labels")...)



	// Init Cointainer for dependency check

	var initContainers []corev1.Container

	initContainers = append(initContainers, sidecarConfig.InitContainers...)

	patchOps = append(patchOps, addContainer(template.Spec.InitContainers, initContainers, "/spec/template/spec/initContainers")...)



	// Serialize patch

	patch, err = json.Marshal(patchOps)

	if err != nil {