Merge sgi-net to router manifest
Change-Id: I6f9202638a6b32f182dd30f603bb6cb853ff80b0
diff --git a/comac-in-a-box/resources/router.yaml b/comac-in-a-box/resources/router.yaml
index 67aedae..2307a48 100644
--- a/comac-in-a-box/resources/router.yaml
+++ b/comac-in-a-box/resources/router.yaml
@@ -13,6 +13,18 @@
# limitations under the License.
---
+apiVersion: "k8s.cni.cncf.io/v1"
+kind: NetworkAttachmentDefinition
+metadata:
+ name: sgi-net
+spec:
+ config: '{
+ "type": "simpleovs",
+ "ipam": {
+ "type": "static"
+ }
+ }'
+---
apiVersion: v1
kind: Pod
metadata:
diff --git a/comac-in-a-box/resources/sgi-net.yaml b/comac-in-a-box/resources/sgi-net.yaml
deleted file mode 100644
index 75aa95e..0000000
--- a/comac-in-a-box/resources/sgi-net.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-present Open Networking Foundation
-#
-# 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: "k8s.cni.cncf.io/v1"
-kind: NetworkAttachmentDefinition
-metadata:
- name: sgi-net
-spec:
- config: '{
- "type": "simpleovs",
- "ipam": {
- "type": "static"
- }
- }'