Commit 3cd7142d authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

added sidecar injection via webhook

parent 60f46e3e

charts/meep-webhook/templates/configmap.yaml

+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ kind: ConfigMap 
metadata:

  name: {{ .Values.configMap }}

data:

  config: |

  sidecarconfig.yaml: |

    containers:

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

      image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
@@ -12,4 +12,3 @@ data: 
        capabilities:

          add:

            - NET_ADMIN

charts/meep-webhook/templates/deployment.yaml

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ spec: 
            - containerPort: {{ .Values.deployment.port }}

              protocol: {{ .Values.deployment.protocol }}

          args:

            - -sidecarCfgFile=/etc/webhook/config/sidecarconfig.yaml

            - -tlsCertFile=/etc/webhook/certs/cert.pem

            - -tlsKeyFile=/etc/webhook/certs/key.pem

            - -alsologtostderr
@@ -41,10 +42,15 @@ spec: 
            - name: webhook-certs

              mountPath: /etc/webhook/certs

              readOnly: true

            - name: webhook-config

              mountPath: /etc/webhook/config

      volumes:

        - name: webhook-certs

          secret:

            secretName: {{ template "meep-webhook.fullname" . }}

        - name: webhook-config

          configMap:

            name: {{ .Values.configMap }}

      initContainers:

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

          image: busybox

charts/meep-webhook/templates/mutatingwebhook.yaml

+2 −2
Original line number Diff line number Diff line
@@ -13,6 +13,6 @@ webhooks: 
      caBundle: {{ .Values.webhook.cabundle }}

    rules:

      - operations: [ "CREATE" ]

        apiGroups: [""]

        apiGroups: ["apps", ""]

        apiVersions: ["v1"]

        resources: ["pods"]
 
        resources: ["deployments", "statefulsets"]

go-apps/meep-tc-sidecar/main.go

+5 −1
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ func initMeepSidecar() error { 


	// Retrieve Environment variables

	podName = strings.TrimSpace(os.Getenv("MEEP_POD_NAME"))

	if podName == "" {

		log.Error("MEEP_POD_NAME not set. Exiting.")

		return errors.New("MEEP_POD_NAME not set")

	}

	log.Info("MEEP_POD_NAME: ", podName)



	// Create IPtables client
@@ -147,7 +151,7 @@ func initMeepSidecar() error { 
		log.Error("Failed to subscribe to Pub/Sub events. Error: ", err)

		return err

	}

	log.Info("Successfully subsribed to Pub/Sub events")

	log.Info("Successfully subscribed to Pub/Sub events")



	return nil

}

go-apps/meep-virt-engine/helm/install.go

+3 −3
Original line number Diff line number Diff line
@@ -50,12 +50,12 @@ func install(charts []Chart) error { 
	for _, c := range charts {

		var cmd *exec.Cmd

		if c.Type == "MEEP-TYPE" {

			cmd = exec.Command("helm", "install", "--name", c.ReleaseName, c.Location, "--replace")

			cmd = exec.Command("helm", "install", "--name", c.ReleaseName, "--set", "fullnameOverride="+c.ReleaseName, c.Location, "--replace")

		} else { //c.Type == "USERCHART-TYPE"

			if strings.Trim(c.AlternateValues, " ") == "" {

				cmd = exec.Command("helm", "install", "--name", c.ReleaseName, c.Location, "--replace")

				cmd = exec.Command("helm", "install", "--name", c.ReleaseName, "--set", "fullnameOverride="+c.ReleaseName, c.Location, "--replace")

			} else {

				cmd = exec.Command("helm", "install", "--name", c.ReleaseName, c.Location, "-f", c.AlternateValues, "--replace")

				cmd = exec.Command("helm", "install", "--name", c.ReleaseName, "--set", "fullnameOverride="+c.ReleaseName, c.Location, "-f", c.AlternateValues, "--replace")

			}

		}

		_, err := cmd.CombinedOutput()