Merge pull request #201 from mengqiy/update_example

update simple example

pkg/kinflate/example/instances/exampleinstance/deployment.yaml

@@ -1,13 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mungebot
-spec:
-  replicas: 2
-  template:
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.7.9
-      - name: busybox
-        image: busybox

pkg/kinflate/examples/simple/instances/exampleinstance/Kube-manifest.yaml

@@ -19,20 +19,22 @@ resources:
 - ../../package
 #These are strategic merge patch overlays in the form of API resources
 patches:
-- deployment.yaml
+- deployment/deployment.yaml
 #There could also be configmaps in Base, which would make these overlays
 configmaps:
 - type: env
   namePrefix: app-env
-  file: app.env
+  env: configmap/app.env
 - type: file
   namePrefix: app-config
-  file: app-init.ini
+  files:
+  - configmap/app-init.ini
 #There could be secrets in Base, if just using a fork/rebase workflow
 secrets:
 - type: tls
   namePrefix: app-tls
-  certFile: tls.cert
+  tls:
-  keyFile: tls.key
+    certFile: secret/tls.cert
+    keyFile: secret/tls.key
 recursive: false
 prune: true # I’d make this the default

pkg/kinflate/examples/simple/instances/exampleinstance/configmap/app-init.ini

@@ -0,0 +1,2 @@
+FOO=bar
+BAR=baz

pkg/kinflate/examples/simple/instances/exampleinstance/configmap/app.env

@@ -0,0 +1,2 @@
+DB_USERNAME=admin
+DB_PASSWORD=somepw

pkg/kinflate/examples/simple/instances/exampleinstance/deployment/deployment.yaml

@@ -0,0 +1,41 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: mungebot
+spec:
+  replicas: 2
+  template:
+    spec:
+      containers:
+      - name: nginx
+        image: nginx:1.7.9
+        env:
+        - name: FOO
+          valueFrom:
+            configMapKeyRef:
+              name: app-env
+              key: somekey
+        - name: BAR
+          valueFrom:
+            secretKeyRef:
+              name: app-tls
+              key: somekey
+      - name: busybox
+        image: busybox
+        envFrom:
+        - configMapRef:
+            name: app-env
+        - secretRef:
+            name: app-tls
+        volumeMounts:
+        - mountPath: /tmp/env
+          name: app-env
+        - mountPath: /tmp/tls
+          name: app-tls
+      volumes:
+      - configMap:
+          name: app-env
+        name: app-env
+      - secret:
+          name: app-tls
+        name: app-tls

pkg/kinflate/examples/simple/instances/exampleinstance/secret/tls.cert

@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE-----
+MIIB0zCCAX2gAwIBAgIJAI/M7BYjwB+uMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV
+BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX
+aWRnaXRzIFB0eSBMdGQwHhcNMTIwOTEyMjE1MjAyWhcNMTUwOTEyMjE1MjAyWjBF
+MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50
+ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANLJ
+hPHhITqQbPklG3ibCVxwGMRfp/v4XqhfdQHdcVfHap6NQ5Wok/4xIA+ui35/MmNa
+rtNuC+BdZ1tMuVCPFZcCAwEAAaNQME4wHQYDVR0OBBYEFJvKs8RfJaXTH08W+SGv
+zQyKn0H8MB8GA1UdIwQYMBaAFJvKs8RfJaXTH08W+SGvzQyKn0H8MAwGA1UdEwQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADQQBJlffJHybjDGxRMqaRmDhX0+6v02TUKZsW
+r5QuVbpQhH6u+0UgcW0jp9QwpxoPTLTWGXEWBBBurxFwiCBhkQ+V
+-----END CERTIFICATE-----

pkg/kinflate/examples/simple/instances/exampleinstance/secret/tls.key

@@ -0,0 +1,9 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIBOwIBAAJBANLJhPHhITqQbPklG3ibCVxwGMRfp/v4XqhfdQHdcVfHap6NQ5Wo
+k/4xIA+ui35/MmNartNuC+BdZ1tMuVCPFZcCAwEAAQJAEJ2N+zsR0Xn8/Q6twa4G
+6OB1M1WO+k+ztnX/1SvNeWu8D6GImtupLTYgjZcHufykj09jiHmjHx8u8ZZB/o1N
+MQIhAPW+eyZo7ay3lMz1V01WVjNKK9QSn1MJlb06h/LuYv9FAiEA25WPedKgVyCW
+SmUwbPw8fnTcpqDWE3yTO3vKcebqMSsCIBF3UmVue8YU3jybC3NxuXq3wNm34R8T
+xVLHwDXh/6NJAiEAl2oHGGLz64BuAfjKrqwz7qMYr9HCLIe/YsoWq/olzScCIQDi
+D2lWusoe2/nEqfDVVWGWlyJ7yOmqaVm/iNUN9B2N2g==
+-----END RSA PRIVATE KEY-----

pkg/kinflate/examples/simple/package/Kube-manifest.yaml

@@ -7,7 +7,8 @@ kind: Manifest
 metadata:
   name: mungebot
 resources:
-- deployment.yaml
+- deployment/deployment.yaml
+- service/service.yaml
 #Recursive would be similar to kubectl --recursive behavior, extended to look for Kube-manifest.yaml
 recursive: false
 #Whether PersistentVolumeClaims should be deleted with the other resources

pkg/kinflate/examples/simple/package/service/service.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: mungebot-service
+  labels:
+    app: mungebot
+spec:
+  ports:
+    - port: 7002
+  selector:
+    app: mungebot