From 2f4fc58f95015f80605500ef2c0b9ca5cebb77e7 Mon Sep 17 00:00:00 2001
From: John Howard <howardjohn@google.com>
Date: Fri, 8 Mar 2019 09:52:07 -0800
Subject: [PATCH] One file for service entries

---
 .../whitelist-egress-google-metadata.yaml     | 30 -------------------
 .../whitelist-egress-googleapis.yaml          | 17 +++++++++++
 2 files changed, 17 insertions(+), 30 deletions(-)
 delete mode 100644 istio-manifests/whitelist-egress-google-metadata.yaml

diff --git a/istio-manifests/whitelist-egress-google-metadata.yaml b/istio-manifests/whitelist-egress-google-metadata.yaml
deleted file mode 100644
index ae4f14c..0000000
--- a/istio-manifests/whitelist-egress-google-metadata.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2018 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: networking.istio.io/v1alpha3
-kind: ServiceEntry
-metadata:
-  name: whitelist-egress-google-metadata
-spec:
-  hosts:
-  - metadata.google.internal
-  addresses:
-  - 169.254.169.254 # GCE metadata server
-  ports:
-  - number: 80
-    name: http
-    protocol: HTTP
-  - number: 443
-    name: https
-    protocol: HTTPS
diff --git a/istio-manifests/whitelist-egress-googleapis.yaml b/istio-manifests/whitelist-egress-googleapis.yaml
index 2e93698..60e0221 100644
--- a/istio-manifests/whitelist-egress-googleapis.yaml
+++ b/istio-manifests/whitelist-egress-googleapis.yaml
@@ -27,3 +27,20 @@ spec:
   - number: 443
     protocol: HTTPS
     name: https
+---
+apiVersion: networking.istio.io/v1alpha3
+kind: ServiceEntry
+metadata:
+  name: whitelist-egress-google-metadata
+spec:
+  hosts:
+  - metadata.google.internal
+  addresses:
+  - 169.254.169.254 # GCE metadata server
+  ports:
+  - number: 80
+    name: http
+    protocol: HTTP
+  - number: 443
+    name: https
+    protocol: HTTPS