From 56387b71899c1c48477e7f6160a71d6012a4d598 Mon Sep 17 00:00:00 2001 From: ymqytw Date: Fri, 5 Jan 2018 16:27:56 -0800 Subject: [PATCH] update simple example --- .../instances/exampleinstance/deployment.yaml | 13 ------ .../exampleinstance/Kube-manifest.yaml | 12 +++--- .../exampleinstance/configmap/app-init.ini | 2 + .../exampleinstance/configmap/app.env | 2 + .../deployment/deployment.yaml | 41 +++++++++++++++++++ .../instances/exampleinstance/secret/tls.cert | 12 ++++++ .../instances/exampleinstance/secret/tls.key | 9 ++++ .../simple}/package/Kube-descriptor.yaml | 0 .../simple}/package/Kube-manifest.yaml | 3 +- .../package/deployment}/deployment.yaml | 0 .../simple/package/service/service.yaml | 11 +++++ 11 files changed, 86 insertions(+), 19 deletions(-) delete mode 100644 pkg/kinflate/example/instances/exampleinstance/deployment.yaml rename pkg/kinflate/{example => examples/simple}/instances/exampleinstance/Kube-manifest.yaml (87%) create mode 100644 pkg/kinflate/examples/simple/instances/exampleinstance/configmap/app-init.ini create mode 100644 pkg/kinflate/examples/simple/instances/exampleinstance/configmap/app.env create mode 100644 pkg/kinflate/examples/simple/instances/exampleinstance/deployment/deployment.yaml create mode 100644 pkg/kinflate/examples/simple/instances/exampleinstance/secret/tls.cert create mode 100644 pkg/kinflate/examples/simple/instances/exampleinstance/secret/tls.key rename pkg/kinflate/{example => examples/simple}/package/Kube-descriptor.yaml (100%) rename pkg/kinflate/{example => examples/simple}/package/Kube-manifest.yaml (91%) rename pkg/kinflate/{example/package => examples/simple/package/deployment}/deployment.yaml (100%) create mode 100644 pkg/kinflate/examples/simple/package/service/service.yaml diff --git a/pkg/kinflate/example/instances/exampleinstance/deployment.yaml b/pkg/kinflate/example/instances/exampleinstance/deployment.yaml deleted file mode 100644 index 055f1d01..00000000 --- a/pkg/kinflate/example/instances/exampleinstance/deployment.yaml +++ /dev/null @@ -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 diff --git a/pkg/kinflate/example/instances/exampleinstance/Kube-manifest.yaml b/pkg/kinflate/examples/simple/instances/exampleinstance/Kube-manifest.yaml similarity index 87% rename from pkg/kinflate/example/instances/exampleinstance/Kube-manifest.yaml rename to pkg/kinflate/examples/simple/instances/exampleinstance/Kube-manifest.yaml index 88ed6978..166e2216 100644 --- a/pkg/kinflate/example/instances/exampleinstance/Kube-manifest.yaml +++ b/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 - keyFile: tls.key + tls: + certFile: secret/tls.cert + keyFile: secret/tls.key recursive: false prune: true # I’d make this the default diff --git a/pkg/kinflate/examples/simple/instances/exampleinstance/configmap/app-init.ini b/pkg/kinflate/examples/simple/instances/exampleinstance/configmap/app-init.ini new file mode 100644 index 00000000..8ebb8fcb --- /dev/null +++ b/pkg/kinflate/examples/simple/instances/exampleinstance/configmap/app-init.ini @@ -0,0 +1,2 @@ +FOO=bar +BAR=baz diff --git a/pkg/kinflate/examples/simple/instances/exampleinstance/configmap/app.env b/pkg/kinflate/examples/simple/instances/exampleinstance/configmap/app.env new file mode 100644 index 00000000..c4032090 --- /dev/null +++ b/pkg/kinflate/examples/simple/instances/exampleinstance/configmap/app.env @@ -0,0 +1,2 @@ +DB_USERNAME=admin +DB_PASSWORD=somepw diff --git a/pkg/kinflate/examples/simple/instances/exampleinstance/deployment/deployment.yaml b/pkg/kinflate/examples/simple/instances/exampleinstance/deployment/deployment.yaml new file mode 100644 index 00000000..4d9e12af --- /dev/null +++ b/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 diff --git a/pkg/kinflate/examples/simple/instances/exampleinstance/secret/tls.cert b/pkg/kinflate/examples/simple/instances/exampleinstance/secret/tls.cert new file mode 100644 index 00000000..039a9cad --- /dev/null +++ b/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----- diff --git a/pkg/kinflate/examples/simple/instances/exampleinstance/secret/tls.key b/pkg/kinflate/examples/simple/instances/exampleinstance/secret/tls.key new file mode 100644 index 00000000..a748bb8a --- /dev/null +++ b/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----- diff --git a/pkg/kinflate/example/package/Kube-descriptor.yaml b/pkg/kinflate/examples/simple/package/Kube-descriptor.yaml similarity index 100% rename from pkg/kinflate/example/package/Kube-descriptor.yaml rename to pkg/kinflate/examples/simple/package/Kube-descriptor.yaml diff --git a/pkg/kinflate/example/package/Kube-manifest.yaml b/pkg/kinflate/examples/simple/package/Kube-manifest.yaml similarity index 91% rename from pkg/kinflate/example/package/Kube-manifest.yaml rename to pkg/kinflate/examples/simple/package/Kube-manifest.yaml index e8ebf95f..54693c4f 100644 --- a/pkg/kinflate/example/package/Kube-manifest.yaml +++ b/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 diff --git a/pkg/kinflate/example/package/deployment.yaml b/pkg/kinflate/examples/simple/package/deployment/deployment.yaml similarity index 100% rename from pkg/kinflate/example/package/deployment.yaml rename to pkg/kinflate/examples/simple/package/deployment/deployment.yaml diff --git a/pkg/kinflate/examples/simple/package/service/service.yaml b/pkg/kinflate/examples/simple/package/service/service.yaml new file mode 100644 index 00000000..e8fb0c80 --- /dev/null +++ b/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