Merge pull request #19 from utilitywarehouse/sys-rm-ingress

sys: mv ingress into example
utilitywarehouse · Jan 14, 2020 · 0d29662 · 0d29662
2 parents e4edcfc + fcbd2b4
commit 0d29662
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/base/grafana.yaml b/base/grafana.yaml
@@ -1,17 +1,3 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: grafana
-spec:
-  rules:
-    - host: demo-grafana.com
-      http:
-        paths:
-          - backend:
-              serviceName: grafana
-              servicePort: 3000
-            path: /
----
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/example/grafana-ingress.yaml b/example/grafana-ingress.yaml
@@ -0,0 +1,13 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: grafana
+spec:
+  rules:
+    - host: demo-grafana.com
+      http:
+        paths:
+          - backend:
+              serviceName: grafana
+              servicePort: 3000
+            path: /
diff --git a/example/kustomization.yaml b/example/kustomization.yaml
@@ -3,6 +3,8 @@ kind: Kustomization
 bases:
   - ../base/
 #  - github.com/utilitywarehouse/grafana-manifests/base?ref=v1.0.11
+resources:
+  - grafana-ingress.yaml
 patchesStrategicMerge:
   - grafana.yaml
   - grafana-google-auth.yaml