Switch kube-apiserver manifest to YAML

Makes for much more obvious diffs

upup/models/nodeup/_kubernetes_master/kube-apiserver/files/etc/kubernetes/manifests/kube-apiserver.manifest.template

@@ -1,100 +1,97 @@
-{
+apiVersion: v1
-"apiVersion": "v1",
+kind: Pod
-"kind": "Pod",
+metadata:
-"metadata": {
+  name: kube-apiserver
-  "name":"kube-apiserver",
+  namespace: kube-system
-  "namespace": "kube-system"
+spec:
-},
+  hostNetwork: true
-"spec":{
+  containers:
-"hostNetwork": true,
+  - name: kube-apiserver
-"containers":[
+    image: "{{ KubeAPIServer.Image }}"
-    {
+    resources:
-    "name": "kube-apiserver",
+      requests:
-    "image": "{{ KubeAPIServer.Image }}",
+        cpu: 250m
-    "resources": {
+    command:
-      "requests": {
+    - "/bin/sh"
-        "cpu": "250m"
+    - "-c"
-      }
+    - "/usr/local/bin/kube-apiserver {{ BuildFlags KubeAPIServer }} 1>>/var/log/kube-apiserver.log 2>&1"
-    },
+    livenessProbe:
-    "command": [
+      httpGet:
-                 "/bin/sh",
+        host: 127.0.0.1
-                 "-c",
+        path: /healthz
-                 "/usr/local/bin/kube-apiserver {{ BuildFlags KubeAPIServer }} 1>>/var/log/kube-apiserver.log 2>&1"
+        port: 8080
-               ],
+      initialDelaySeconds: 15
-    "livenessProbe": {
+      timeoutSeconds: 15
-      "httpGet": {
+    ports:
-        "host": "127.0.0.1",
+    - name: https
-        "port": 8080,
+      containerPort: {{ KubeAPIServer.SecurePort }}
-        "path": "/healthz"
+      hostPort: {{ KubeAPIServer.SecurePort }}
-      },
+    - name: local
-      "initialDelaySeconds": 15,
+      containerPort: 8080
-      "timeoutSeconds": 15
+      hostPort: 8080
-    },
+    volumeMounts:
-    "ports":[
+    - mountPath: /usr/share/ssl
-      { "name": "https",
+      name: usrsharessl
-        "containerPort": {{ KubeAPIServer.SecurePort }},
+      readOnly: true
-        "hostPort": {{ KubeAPIServer.SecurePort }} },{
+    - mountPath: /usr/ssl
-       "name": "local",
+      name: usrssl
-        "containerPort": 8080,
+      readOnly: true
-        "hostPort": 8080}
+    - mountPath: /usr/lib/ssl
-        ],
+      name: usrlibssl
-    "volumeMounts": [
+      readOnly: true
-        {"name": "usrsharessl","mountPath": "/usr/share/ssl", "readOnly": true}, {"name": "usrssl","mountPath": "/usr/ssl", "readOnly": true}, {"name": "usrlibssl","mountPath": "/usr/lib/ssl", "readOnly": true}, {"name": "usrlocalopenssl","mountPath": "/usr/local/openssl", "readOnly": true},
+    - mountPath: /usr/local/openssl
-
+      name: usrlocalopenssl
-        { "name": "srvkube",
+      readOnly: true
-        "mountPath": "{{ KubeAPIServer.PathSrvKubernetes }}",
+    - mountPath: "{{ KubeAPIServer.PathSrvKubernetes }}"
-        "readOnly": true},
+      name: srvkube
-        { "name": "logfile",
+      readOnly: true
-        "mountPath": "/var/log/kube-apiserver.log",
+    - mountPath: /var/log/kube-apiserver.log
-        "readOnly": false},
+      name: logfile
-        { "name": "etcssl",
+    - mountPath: /etc/ssl
-        "mountPath": "/etc/ssl",
+      name: etcssl
-        "readOnly": true},
+      readOnly: true
-        { "name": "varssl",
+    - mountPath: /var/ssl
-        "mountPath": "/var/ssl",
+      name: varssl
-        "readOnly": true},
+      readOnly: true
-        { "name": "etcopenssl",
+    - mountPath: /etc/openssl
-        "mountPath": "/etc/openssl",
+      name: etcopenssl
-        "readOnly": true},
+      readOnly: true
-        { "name": "etcpkitls",
+    - mountPath: /etc/pki/tls
-        "mountPath": "/etc/pki/tls",
+      name: etcpkitls
-        "readOnly": true},
+      readOnly: true
-        { "name": "srvsshproxy",
+    - mountPath: "{{ KubeAPIServer.PathSrvSshproxy }}"
-        "mountPath": "{{ KubeAPIServer.PathSrvSshproxy }}",
+      name: srvsshproxy
-        "readOnly": false}
+  volumes:
-      ]
+  - hostPath:
-    }
+      path: /usr/share/ssl
-],
+    name: usrsharessl
-"volumes":[
+  - hostPath:
-  {"name": "usrsharessl","hostPath": {"path": "/usr/share/ssl"}}, {"name": "usrssl","hostPath": {"path": "/usr/ssl"}}, {"name": "usrlibssl","hostPath": {"path": "/usr/lib/ssl"}}, {"name": "usrlocalopenssl","hostPath": {"path": "/usr/local/openssl"}},
+      path: /usr/ssl
-
+    name: usrssl
-  { "name": "srvkube",
+  - hostPath:
-    "hostPath": {
+      path: /usr/lib/ssl
-        "path": "{{ KubeAPIServer.PathSrvKubernetes }}"}
+    name: usrlibssl
-  },
+  - hostPath:
-  { "name": "logfile",
+      path: /usr/local/openssl
-    "hostPath": {
+    name: usrlocalopenssl
-        "path": "/var/log/kube-apiserver.log"}
+  - hostPath:
-  },
+      path: "{{ KubeAPIServer.PathSrvKubernetes }}"
-  { "name": "etcssl",
+    name: srvkube
-    "hostPath": {
+  - hostPath:
-        "path": "/etc/ssl"}
+      path: /var/log/kube-apiserver.log
-  },
+    name: logfile
-  { "name": "varssl",
+  - hostPath:
-    "hostPath": {
+      path: /etc/ssl
-        "path": "/var/ssl"}
+    name: etcssl
-  },
+  - hostPath:
-  { "name": "etcopenssl",
+      path: /var/ssl
-    "hostPath": {
+    name: varssl
-        "path": "/etc/openssl"}
+  - hostPath:
-  },
+      path: /etc/openssl
-  { "name": "etcpkitls",
+    name: etcopenssl
-    "hostPath": {
+  - hostPath:
-        "path": "/etc/pki/tls"}
+      path: /etc/pki/tls
-  },
+    name: etcpkitls
-  { "name": "srvsshproxy",
+  - hostPath:
-    "hostPath": {
+      path: "{{ KubeAPIServer.PathSrvSshproxy }}"
-        "path": "{{ KubeAPIServer.PathSrvSshproxy }}"}
+    name: srvsshproxy
-  }
-]
-}}