Pass ignored IPs to proxy init container (#803)

Author: Neurostep

pkg/inject/proxy.go

@@ -64,10 +64,11 @@ type proxyConfig struct {
 func (m *proxyMutator) buildProxyConfig(pod *corev1.Pod) proxyConfig {
 	appPorts := m.getAppPorts(pod)
 	egressIgnoredPorts := m.getEgressIgnoredPorts(pod)
+	egressIgnoredIPs := m.getEgressIgnoredIPs(pod)
 	enableIPV6 := m.isIPV6Enabled(pod)
 	return proxyConfig{
 		appPorts:           appPorts,
-		egressIgnoredIPs:   m.mutatorConfig.egressIgnoredIPs,
+		egressIgnoredIPs:   egressIgnoredIPs,
 		egressIgnoredPorts: egressIgnoredPorts,
 		proxyEgressPort:    defaultProxyEgressPort,
 		proxyIngressPort:   defaultProxyIngressPort,
@@ -100,6 +101,14 @@ func (m *proxyMutator) getEgressIgnoredPorts(pod *corev1.Pod) string {
 	return egressIgnoredPorts
 }
 
+func (m *proxyMutator) getEgressIgnoredIPs(pod *corev1.Pod) string {
+	if v, ok := pod.ObjectMeta.Annotations[AppMeshEgressIgnoredIPsAnnotation]; ok {
+		return v
+	}
+
+	return m.mutatorConfig.egressIgnoredIPs
+}
+
 func (m *proxyMutator) isAppMeshCNIEnabled(pod *corev1.Pod) bool {
 	annotations := pod.GetAnnotations()
 	if v, ok := annotations[AppMeshCNIAnnotation]; ok {

pkg/inject/proxy_test.go

@@ -497,6 +497,54 @@ func Test_proxyMutator_getEgressIgnoredPorts(t *testing.T) {
 	}
 }
 
+func Test_proxyMutator_getEgressIgnoredIPs(t *testing.T) {
+	type args struct {
+		pod *corev1.Pod
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "get EgressIgnoredIPs from annotation",
+			args: args{
+				pod: &corev1.Pod{
+					ObjectMeta: metav1.ObjectMeta{
+						Annotations: map[string]string{
+							"appmesh.k8s.aws/egressIgnoredIPs": "192.168.0.1,192.168.0.2",
+						},
+					},
+				},
+			},
+			want: "192.168.0.1,192.168.0.2",
+		},
+		{
+			name: "get EgressIgnoredIPs by default",
+			args: args{
+				pod: &corev1.Pod{
+					ObjectMeta: metav1.ObjectMeta{
+						Annotations: map[string]string{},
+					},
+				},
+			},
+			want: "192.168.0.1",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			m := &proxyMutator{
+				mutatorConfig: proxyMutatorConfig{
+					egressIgnoredIPs: "192.168.0.1",
+				},
+			}
+			got := m.getEgressIgnoredIPs(tt.args.pod)
+			assert.Equal(t, tt.want, got)
+		})
+	}
+}
+
 func Test_proxyMutator_isAppMeshCNIEnabled(t *testing.T) {
 	type args struct {
 		pod *corev1.Pod