Site certs rotate [airsloop]

Change-Id: Ie08a7efdf8e9f2212f65431004f0dcb57ed87ef4
Signed-off-by: Ruslan Aliev <raliev@mirantis.com>

site/airsloop/secrets/certificates/calico_etcd_ca.yaml

@@ -1,69 +1,68 @@
 ---
+schema: deckhand/CertificateAuthority/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEoAIBAAKCAQEAuDeoIvlBP8s5xMI8y5Ked5tylz5xw3QuPjK6CkpwY7L69nGi
-  oN/uasT6l9KY0hpTGpDL8DnhFlW/odTler8Kqj9Cf1IXJ+wfApdCGXPxPOxH8fuv
-  /zT9t9Mt9hpVvgyWTwkg6Liex8KUfaaCyKS5Hdzb37ybAaigVKflCIljPiyygZ51
-  fRkCr+huIJLot4A15Ld28iETqsqL/KhZihAT0LUIGWcORYezTEi67GEAIT6DAQ2B
-  IV6zNDbjaZDNPf9nx3CZqndhKf5rQNtqX7Q0FY3NkuVplJjWgJg8wzJv/acyOuVg
-  Iiq9NriwHWn/1AB/q85dr9N2pUsjSpp1WTuv8QIDAQABAoIBAC6KORsk15wzTpPr
-  8ooHr6tOBWQ6bWlQt8IU9LVW2xAFDqwmR0zXZhdpTln+5YbnCanDfRJivP/0h+Zt
-  r9AT5bDfLICYD6uRVsBD0Ho3tXGLzB1RVcRm8dZ4LrtnKdRKv8qV5s+EnPCgsv0P
-  jSj9nJrzykS7FHoVzPO2OwGuG/l/yZhj8AfI8WSVP7fOnf5HiZY+ZTGO/qNmAUeO
-  +reP1fPYwXDaFz/iA6wTN/YHahE//1eG1WUEFcrZNWJap6iyC69Js4/Q0m+lZKiL
-  TYiWKkchOi++M3BPqp62HbrndTC3TpG0xOipLP5l3OyNZBiFied5suZRuwMjaMiv
-  qcVd9UECgYEA1kZApOKoqXZgRDt6STjPLwDjBd5HwwmxYKoh1P1+4Vyebm6Jiet8
-  DaE1yQZC3u0wPlgos+rs0S3/nSEIw3PVMNUElG3SOX2cK17nSPCca+ShT+MjxJZT
-  mHD1ocjMYatgQ6l4ZqBcXjDHt09K9kYmCXwK5rlRmo+ru/yfDMqMDzkCgYEA3BcJ
-  4c0Pnf2LvwHNrt2OeNS1Y0VavfvtE8vdfFyI0wdN0zzQ3iNyLklrWsWkadUSwieR
-  rjbW5bxyrMk0ELoDD0RZBTKujUPlYDbO6boeL2yw6XiFZxuByqoOPkD2j1TZ++1D
-  X4Bh4aqAtvZwyfoPbU+yurNU7DqCAxCPpgRubnkCf00A8jpPOk2sPOxIc6ncwJgj
-  uXJib2eoFBapDX99mhtjLYyCLOtjtTEwviOAHIgAtVWyWO5PfsutvC67sGqNNhBW
-  fU7aKLKAcZ8ke/m6fnxHrbEH79K2M1SVQ7DgeJKhA/dM7/fxqUAwR5WY6VeX3hOK
-  gGBqOOlSuGTWZFI0eCECgYA7M+NPnxaNXC+kMLsAR87UR/uG+ZgANO0//v3UPxv7
-  ECLqKJjSuFw1gUBkiXfBlDRYj8ZLQ6so3zlFq1XbDf5Ws/7yPADiNRpVeEjObGdE
-  QIuSMf5Ijwip2Ha+XkE0qxF8CAWwgdtSlcfL75zFaAOQVvjv6d91MAPbCTBq6xQ9
-  mQKBgGiQHWc+Xv8n1eLW7JnO/GSAa0hYX5OBVjJ2J4BKv0DPmtgOwjKP8xSAPDQi
-  ER0X2QkOKkvWoPHl6mmyGVWdUVqnUzQMR17QNRdQymmSP0nD0D81S+dv0Agj9e7y
-  il6P8FY+Q8OkNYmmZSx/2f7NojT9whkxx8mWS9+e+zKCzzk8
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateAuthorityKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  MIIDIDCCAgigAwIBAgIUbNF8uEv4gCYGYwhQRQ2kld4TAMEwDQYJKoZIhvcNAQEL
+  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjQwMTEyMjM1NDAwWhcNMjkw
+  MTEwMjM1NDAwWjAWMRQwEgYDVQQDEwtjYWxpY28tZXRjZDCCASIwDQYJKoZIhvcN
+  AQEBBQADggEPADCCAQoCggEBAMPKs/2MTHcCUk7x1kitjVDE7aYF751w+zP+hlsx
+  qbRV/UhCyCE2Phoxe3BJ11EYMJpvQYUxVT3uCNwBuhIDMdjh0jDGdTw/bHZnjwVE
+  3Q51j/yX6Z8jr966nBzS0s0z24UHKA0LwaRBnjdwQU/Bpe5i3SmnTqZOsxJi1sw9
+  osmEfN3dL0zfDhElYHHvb1Myfe0r1vnoV7/vYXf5nxvpEjZFPlUqqTSRkWjvyg1J
+  53Ef9bODwyOv/W9RLRrFNgyrnUf5kvN2o3NnbeMbICz/Bv9kA9EYnwWv2p3Y2nYc
+  4nHLdUrxRna8ZWTWIpnJHCHX3xVF5Ey7nDbPv1IXyXV8mdcCAwEAAaNmMGQwDgYD
+  VR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQIwHQYDVR0OBBYEFFMuHFHJ
+  /RYWaq3myflpij4h1l+rMB8GA1UdIwQYMBaAFFMuHFHJ/RYWaq3myflpij4h1l+r
+  MA0GCSqGSIb3DQEBCwUAA4IBAQApMOBnryit4l19WXzwGcrnFeoqSXI0qbWklZS4
+  1BJTl70yNleDx8W6dl1e7sPUMHvpciFtOSwB6z29GKGXAmdO2aP2HK4E49+zeqkW
+  fB3vQbiWP5HOjBSXRL/2CBHvKtKH4KIUtu4l9rPUjsOseHnj4rh+IMr4mznE3DQd
+  CANqA1SQF6OjA+/y6+51DWD1NYMjQDBlU0/0pDNggwZMmpj005vGM3Zuv5nPp+Ut
+  mtjLjcwKjbypypYC2dyAwy4D6NOE5lqWubpSNfumqVSrYrQxKnb9JgIzhxCbo2Ue
+  Yq07BxPcbotTQaxY1Z8SM9VcJdyITp0irMm0a5uQxCE+zh/y
   -----END CERTIFICATE-----
-schema: deckhand/CertificateAuthority/v1
+...
+---
+schema: deckhand/CertificateAuthorityKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAw8qz/YxMdwJSTvHWSK2NUMTtpgXvnXD7M/6GWzGptFX9SELI
+  ITY+GjF7cEnXURgwmm9BhTFVPe4I3AG6EgMx2OHSMMZ1PD9sdmePBUTdDnWP/Jfp
+  nyOv3rqcHNLSzTPbhQcoDQvBpEGeN3BBT8Gl7mLdKadOpk6zEmLWzD2iyYR83d0v
+  TN8OESVgce9vUzJ97SvW+ehXv+9hd/mfG+kSNkU+VSqpNJGRaO/KDUnncR/1s4PD
+  I6/9b1EtGsU2DKudR/mS83ajc2dt4xsgLP8G/2QD0RifBa/andjadhzicct1SvFG
+  drxlZNYimckcIdffFUXkTLucNs+/UhfJdXyZ1wIDAQABAoIBAGJDCiA22G1l6d8a
+  +jtRdrnRi5+mHQK8ICaRF+cOvqf1+/7XHU+lxHcq3FOXi4t0g3gOXCi3gJtrKmEY
+  MMU3ez3o36+A+nd5MTsfcCTp0bOfBttzdlla9Lnol87Tc95upz5VQCGEA/Qmxnv2
+  R6D6hAdm8K4l/I/0sWSJ3Fl2mYtepMTT2UMvZrjDF5dGg1EzaabQ3fvOM3pqx8Bf
+  nf+34I8cuS3lh25svnPBmmfn2wbyDxZcP9EP+33DJIG2Ou0+g6DgnAAF91OkXV3f
+  3fAocCVEbUA4fDPGokqm1IuuO2M+rEp4p2IcCbks3Z0KBMv9WnEuWd/FnzUjyCgN
+  CbGdS9kCgYEA1fyAsJ57yhDnXjur1tgFewZkV4gnYWzVz5sEHSfe+uN2KSGgroys
+  GgH0tuJKEej4c5sLEbS8iUNJSiTRdX7BTrg7xjbfgJ76FLN0xWY8QC6KkBK8E3Vc
+  GtWYEMG5mq4PhhOYPO34zWCQjykS4sg9NArfowrGRkxl7Bl2T3uhmlUCgYEA6juy
+  c+at2IUynnNkpYk0Emlq7M1Smc7EN4txGnDWamz5X/pxbZeK1L5JEeU0YSxdihvu
+  sbAVRJJIXHd7zomHo6E2iPZzmkZuaiTgPYbReBcWz76oyXRU+ndKWCCB1EXC3XwZ
+  FUfzCMOAoxvYgrsStNPtA6bpVX1Msp5LZTSCp3sCgYBMygXsW5MUmihM+qDZwj+F
+  PG/5sVRgc8vuajR5ufsckU+vxu+Ac962nokQr/fgoXe3FKZOPkuB/nFod/nqbgg0
+  lYxtvvdJksMvdo6q39szNQBoXzC60tywjIG7UamnRlsvxAxXoRYtrT9zAExUsYK1
+  EEncmls4kuXoaeK49yaw2QKBgEYaA7iIS3NHufSOGIsqWvk/r46bjKMXrMXq57jA
+  GIvVfXTqIVRpTFWLdZbzgA+tFXmmDnQDfPn+xcVWxSj1JDEmqImpKMP9XEJMMwh2
+  9u34Cw21xBI2zNABL7DcWb7L+hwLbf5egDAZQsCOLuhBUMHpwz+ajq7VR0UV9v6d
+  DpVNAoGBAIrwHeM/vWGyQVrjhHg3wQJRtmm2W/q1HMFRoYpB8SIin+DRe3N28Alx
+  /MXNckRo951RgdGb2Hko2WWSWMzlK8ZwNa07o9bqTtNrBSOMHVZ8IK1gH4sf1c11
+  +pFOg+R39gSH5rHrhWvO60oNKDeRvqtz+ruj9H6XvHSS9ERL+z+Z
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_1_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-1
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-airsloop-control-1
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEA6YyokvjQOEMxI1MSycrFXtuXhLLTJQkGX/eWugeZEEpJ9r9C
-  3RHddjiENuBp4urk4qdzE/gioJ7nckq4Q3yX1EW36TDE1MD5bRTXVI1x/AVrES8w
-  17NZKge0br8U84FnlrGAx/r0jT4mOIx80/q99/eaHV2lNymfTDlYvQPjE5p/0K2s
-  kstYgzBo0povz1Ld5ebb4xDNMA3aQWOnJ0QVM2MrdBoeTTVCUY4xMke2zaumPexC
-  T7OlqV1XVZJYJK2X6829BDCWa3Yb7iHFOw9U/pW1kvYuksH9+p8zgZxJDdFDMJrx
-  /AXTwb6/isB2u+ydYFaBX92yQxX6kL4ZpiFIFQIDAQABAoIBAQCjUi/Yh5LkpWhJ
-  caCj6N7ZFOsCayNotMT2e2e2M/YABFNw8BNMEWAzehZLYefqPaVOMxcwkcd1V2o2
-  7LWqzAhI83BG7EnZFhHXDEoA4OEjAo7692tKjCsAT18ISyvVlVrhcMPEFWTLGPkV
-  dnkcrC4Ip+foPUJ6LustHLVHiN5VJ9GtnMtnb9TSqMGeUynuOlDeqV3tCIYVQVHk
-  HQDmb2aXIXEqjXopUp2Em05ZveA2NxS3JN/vu7BBgXYEHfVv/wtAGXbNaQ4a4P4S
-  oIG+L9xR72yXUwLM14ybTvJZ0cbiB08eDc+LijsaBJlsHZBm+IG4Bb4lGctNW2tA
-  GXKoi+XBAoGBAPxhYmSuTfm2OgshChcg8CrOvuhdTD9e0utXoJD4WlNkUgH7wTbD
-  8JOpKZi3TwFb12lLU7bxbeRMNtmqlU0xChY4wiwOPBlJDe8RVSYjKoffvxu+GwJ0
-  MlBuK6riiAZoL6UKNZrExgO3tUwhk+lH8ypbGkf427DkLcR6XpaXLsOdAoGBAOzm
-  It32AuHR4Vm13uwy5FddexDKSuj390VaFrZmaZyXxyuGlm8txH5EJ9mBTfuXZG/9
-  b0rZIUeblzda/8KPKFTZhxv6DkxWMWJBGIUjNoIl7wqsP8i/a8C0Druu3TPBlPcJ
-  J38L8BC42os8crggQna82HLalGLcI1b9pWub5djZAoGAKSyqJMrbJdY4+f/V6ZgS
-  FqnMM5SlD+Gkf4i4RW5/LgO77V7pUsn8wdpjUur1FL+rER6c9cfFqe1VNYXC/ej2
-  QFHaO93GqElm4I3vWl16Xth+EUSem3PhkYWn0iVLE+CDhWV5AVsBAzJBfb4sp255
-  mXtrejp7fQx8+wUL0X2wv3ECgYBrnx1l8tZaWqviwoH0kiY0Hm7DMPOZJNV79zJs
-  SNhf4IAGIQ2Ekqk6p6Hm6RxRWPSy/9KokT3SNzgaWMfqTnkHGw+LQS1vtpSWy3Xl
-  PhsMQ0l2csxDWdsM33/1+bnaQm53T/xWdkjof+Ig8SQ4y8cGBELc4roYs2OGqJKW
-  8WsY+QKBgQCEzwFKE+v+4dE5ofbd58ZnTrHaSK+XYBjQ322voJ7kLn0OoLPYmmAf
-  txGih5nMPjEKp0siem4endFnnnjYNKiq5dAoas8mqYEDLFweZp7F8Zg6PWpIICMF
-  vbFIKCWqNekA5NjB74FdOq77DYnmuGC8c4ztsTMwulcIqOMPi7E+LQ==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-airsloop-control-1
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDnzCCAoegAwIBAgIUWlmjO0HkJn+JqzSNVCOfgN0gRrIwDQYJKoZIhvcNAQEL
-  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
-  HhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjApMScwJQYDVQQDEx5jYWxp
-  Y28tZXRjZC1haXJzbG9vcC1jb250cm9sLTEwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-  DwAwggEKAoIBAQDpjKiS+NA4QzEjUxLJysVe25eEstMlCQZf95a6B5kQSkn2v0Ld
-  Ed12OIQ24Gni6uTip3MT+CKgnudySrhDfJfURbfpMMTUwPltFNdUjXH8BWsRLzDX
-  s1kqB7RuvxTzgWeWsYDH+vSNPiY4jHzT+r3395odXaU3KZ9MOVi9A+MTmn/QrayS
-  y1iDMGjSmi/PUt3l5tvjEM0wDdpBY6cnRBUzYyt0Gh5NNUJRjjEyR7bNq6Y97EJP
-  s6WpXVdVklgkrZfrzb0EMJZrdhvuIcU7D1T+lbWS9i6Swf36nzOBnEkN0UMwmvH8
-  BdPBvr+KwHa77J1gVoFf3bJDFfqQvhmmIUgVAgMBAAGjgbwwgbkwDgYDVR0PAQH/
-  BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8E
-  AjAAMB0GA1UdDgQWBBSZKKsCeqy+UKpxsK5Bny2Mli+06TAfBgNVHSMEGDAWgBQ2
-  eHOhXmQR5R9LDPKhdQYbfSGjkTA6BgNVHREEMzAxghJhaXJzbG9vcC1jb250cm9s
-  LTGCCWxvY2FsaG9zdIcEChZIFYcEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOC
-  AQEAqTJNbqoSN6PHnGstKCbZ5N06YLe6tIbdEi1z+2KYNoJd18Dwqla8yx4alC2f
-  U3H5wtMrKXL3stXKO2Vy1JnketlUonjNTetDzOBi1sHXB1P+0BWEjWd3sWUyr19U
-  hja87ZyyhwQTYcPOyqYLHeGvsIhfyDsbYgHuOnrDf7klpRuZzcf0kCNU+hS8h0LV
-  C2DNhC0UJGc9o9XGWdNZrfc9O6hFCKauFjMoClM3MTLcTdYVpSPy4tcJvebi+lki
-  E/jRApU8QMTLcALBUSBEiLfKsJ+4p6ObpO1TyszpFmHa10DnX6Fd0JSoWhUMwUYR
-  /96f38b35Khpj3U0sDGExUt/XA==
+  MIIDijCCAnKgAwIBAgIUXOUH5l2LI7Tcr0lJmLCVdRFQSdgwDQYJKoZIhvcNAQEL
+  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjQwMTEyMjM1NDAwWhcNMjYw
+  MTAxMjM1NDAwWjApMScwJQYDVQQDEx5jYWxpY28tZXRjZC1haXJzbG9vcC1jb250
+  cm9sLTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7FqwHJBQDzBrY
+  tL1OPepyvPFBYR66V5aNQmJRpE5UBXHl8sk0VefcQN9Lw07KMdl8adLvAl8D0pU7
+  4nrgVHMwu75IT3VyDgtEyyMAQyO7gMBg+UbZbMGI8ovgx2/A90JNhOsCW8jkcQIJ
+  QYodbukOUpWGOtBvk4ZIt1M3W5Fl/AWQN90kps3tr64G8Td4aJhg5JbY1vE5bZ1e
+  X6O0zBOmw3JYbstpasQRjzqIlcl36MmRgGHPDmDas0g19yb/ZBVfPODP/iiOVfrS
+  BiZKi44H3G85EDSjxGlIELP1+fe0RSySMvANsq8ssIVk5i6To2B4DVs2joQeVsws
+  ZQcxoetvAgMBAAGjgbwwgbkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsG
+  AQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTVzT5VKNLJ
+  DR16G/chkbIo6OPE7DAfBgNVHSMEGDAWgBRTLhxRyf0WFmqt5sn5aYo+IdZfqzA6
+  BgNVHREEMzAxghJhaXJzbG9vcC1jb250cm9sLTGCCWxvY2FsaG9zdIcEChZIFYcE
+  fwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAmBT1OhxY5/murxOjuSnC0mpv
+  PNHyAhlZ0fb8cfAW4bhg3q8UiSYR3FLo2TLVxmGGDF5cZw2606wHkqnTqTWC2wBj
+  o9DsVG9FPXWfltLwVNIKBv+pipfe7eCSnVOLnzfxF/orzhjsDMpHHQCdlZo4Wgal
+  ZoHZP1tbm5VZarf1fctjGNs8qOsBOvc/Q0jHEfL3qFQp+PEnIccSFii43ZmtKxOH
+  bCZ4MLgOKJaagD2DPiJ4FXKOokl70xpJBcDu5KTuQZkUgvrE4h4cFPQT3Ow6ZBdE
+  7xJH+eJdbVgeHA3FPJ/k48emKFSm6YGX3O2/FhQTqT9lSTtU2jEzh+exORAu4w==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-1
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEogIBAAKCAQEAuxasByQUA8wa2LS9Tj3qcrzxQWEeuleWjUJiUaROVAVx5fLJ
+  NFXn3EDfS8NOyjHZfGnS7wJfA9KVO+J64FRzMLu+SE91cg4LRMsjAEMju4DAYPlG
+  2WzBiPKL4MdvwPdCTYTrAlvI5HECCUGKHW7pDlKVhjrQb5OGSLdTN1uRZfwFkDfd
+  JKbN7a+uBvE3eGiYYOSW2NbxOW2dXl+jtMwTpsNyWG7LaWrEEY86iJXJd+jJkYBh
+  zw5g2rNINfcm/2QVXzzgz/4ojlX60gYmSouOB9xvORA0o8RpSBCz9fn3tEUskjLw
+  DbKvLLCFZOYuk6NgeA1bNo6EHlbMLGUHMaHrbwIDAQABAoIBAB6emU0Z5ISylPo+
+  qnTxwTtCHSIcKRFKYIOCB+FgyMkLkxaVY8TDAo2TuHgH4Q9KlVO9Zh5j/vT7NB12
+  9bFdYPTq5TukdY5TKhj6PiI+2sxHSDUW1zeiixJE0Avb2Dh2v008odHi/8ATlse5
+  CEfE7TPA5GPxoEeCl4mzJ1V6ERPlob13R2YHOikxgRX9QGJSEv6V6pJaoMTrtVh5
+  psw+aOEWXd5Y071mzpF/CSss5XOVCp/X24+DOXASep2NFvToXYHtrShxDMUaHRRs
+  vgeFhx4jjgfL31k93WKsiJYUCgAzqsm5VzcF5//uPKntR/+3rOjJ5nu/GOCGvczi
+  nKNNKzECgYEA4p+ln+VQEMyC5oCmvBtRiLuCc2A+IxFvw1dQUEPSs2d6l2haKzdo
+  JaC7urBPGdNY4odTxUjASH3/rFU793/q8GGUcOC1KsfVAIVhJe8YEVEe6wNxkZPv
+  DWIHhw4cGkboFWvLrYHzHrVofVyslqlfHqo7MtlwEA0z3V3y1ii7b6MCgYEA01cU
+  oROll3UBMO80CauaND4cqEMO02rzoVCMEs+yv/eCixvWI6aQlPtop10q14mUk1cQ
+  IM/YW/iOgLdaOYWx5BCgxhe2FVpEx7xY8xSr5ODfsLal9fM2Jkenn7FKjfGMXyXs
+  RgWWcMYuSc5reku/ik00ddhhH6I17GGBkswLIcUCgYAxYu0rHUQHhSn5pYuwbpuk
+  GojhL9YaulAK19pOw5kFM8XJfRo5VMfDe3Wtx4JVdHNoWmltEt+kbKDtI14AH8ZJ
+  QFqjBrU0b3wBsw9qvuIV1AHS4Vs8iGqOFhDh47dIGq+1C1rFow4iYRI2T53k72Al
+  RJ/GAxCizt3AnhqvhQzj1QKBgHOgYRj/tsl2qoArXz0rNeL/WI52odXp3gGUIA7q
+  s9FziWiygiZfKxtXsZpfzuC91RwHtjs9fBJVmyGxLxvpmbo9nrjCoExuZtMgqUnV
+  NXaz0a7NP1+hAS9QZNVqGnAuh65HAU4OIJDy3MBkv0jZyKHSO7F+ASVdikMZ1dqK
+  6ExBAoGATxCBICsvuSTjefh4aMepY7yuUTpR/hVZI+OCls3ByATm8bj8C6NGvUBW
+  /uTWlgOgERxebAKiZCcmLZNFIcT/YDeMiPpkQ8RJilR3GyWX4dFwrtbFrFipctqY
+  kqZ+59B7A4BTT1PJLiCWdTr2g8UtHDYH5FN5fmclUjasXm6atgo=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_2_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-2
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-airsloop-control-2
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAy8T/P6RIQKIXJRYGDAoF1jWPJtR0PpcWyzzo075X71Jv+IQx
-  kLkHqRY/b2Tg62Vb4pSGjgpGtKVYKuayUomP8FmC6z7geo89dQjn5auAWiRxB8D4
-  O65PxypMMxtfyVLKL+Gbzi14Ywp2NeBuPrcuzMh8XE6ppufMCBS/icmYUY+v9mCE
-  HPPCsPEe2UJj1ZZ5rb68SiFOohXnSlp9FoSjv3opbX8lQ/SN2QMUBfgSqBPUXaIK
-  /UjiFQGI57zn75al8yjr4fA2l9HTZeWK72divMBeo5DKkZO0kEGccEll1rNr7pcR
-  eIaGNYrMMvErf4nuC6bgebOKjJYVXwSgNY4fNQIDAQABAoIBAQC0XpU+JVIbfB8W
-  oc8Kexi9iz1Cts6K1LzFfA3v2E4INqWMip9BJrekMWBHXzlExLy37JbKRkheAPnx
-  R7HTI5c4vlMHnumfMwnIffCfONbtc9JldaeFVH+joUo/9twr3c/A4GhE8bTdnlYS
-  zK1pcEbJ2DFUmADOD+JnyM3ezoa4se1NGUrQTlosnd5wyq0JkPus4uB2DmMcisgr
-  ld2NIwfA/5Z8ovQ+PjUJ8jy2Ebpc2PsYWjeYMQfo6CnM71nRsOz7+3ub46pxq+XR
-  t7hmfrols8MSCaBnstficOdUdU2TFRB27fbgqwQXXGtdPh0DcT1k8nSVu9+FQXjI
-  tVQKVv3FAoGBANTh//0341GR9fc44l2EP8HOy7NfyGog/NSdGVx39HL6o3TUKpPh
-  9IqB64kp7/1U/Dr6tIYEX1gd3flQcbryOThQuGmfyKpvtHjZaKywF+Z8m2pFoZHV
-  cApLjl4ekUBt5VP4lYlsH5tcCFlcLcULMSVijJaEDQS/7VpEzThMRBDTAoGBAPUK
-  eMWoWZxpiavD3jSArkv1ALxLJof8qmSTQMu8dV1YE1HXJSRz2TVsEwitClzmcra2
-  pidAp8SNVEJYnsRc3Mmgnomqh0xf7+KFwXDIcUpJAYdB6dzCNwEogJewVbBC6H5w
-  S8IaPdRUI5I9FHlSY1O9C6YWiKeWwT/DjwfZ/UrXAoGAIkT3ZpX2nAz5IYEgv5ko
-  glR96jRDGQKScM+RY5dT3KaIZag56nB3Y0yi1APSRF/H8t6k7OYLSy4Tq6zNgiC4
-  IV6tMSOts/IjhUjKVvJKBqqMgkEPT2CilqWvF2uoSkzmm+vqdqLXO7VHCsuR+qRg
-  lvoUU66SQe97kAp/Vs7ALk0CgYAmX4BwO5/k3aYgjujCQhCJdpGp6v7attecLm8s
-  OJQMjRlhbJa1carnMch9SFPiHniCYnH8naRoJFW4mhYq2/v7WzrYhirv6+ouCBI1
-  7j3Hi01A+DJ+Tq+8b7JLjuKsWp38BuvmNqPOF2sGoKgPI7bIS0eCt+6oh/Q1XxOM
-  ADgpOwKBgDOqw3UxECpF0CtrS6lDxKKGcazfLc2orNOx8DmuoFwMRajw5Zkc6Ipx
-  hLXybN1sBzVqAYIM4OOso5azghpHd/bq2hdiAfJ5kYLBP+n95G24z8lXZB5Ae8nx
-  o2YcfahzLR0yco0BYJwv3i4rVTHsGI/UXwwdrZYF7fvH892bGIBx
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-airsloop-control-2
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDnzCCAoegAwIBAgIUa/mx96xhfe8dI0ab6iI/7JW+zdcwDQYJKoZIhvcNAQEL
-  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
-  HhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjApMScwJQYDVQQDEx5jYWxp
-  Y28tZXRjZC1haXJzbG9vcC1jb250cm9sLTIwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-  DwAwggEKAoIBAQDLxP8/pEhAohclFgYMCgXWNY8m1HQ+lxbLPOjTvlfvUm/4hDGQ
-  uQepFj9vZODrZVvilIaOCka0pVgq5rJSiY/wWYLrPuB6jz11COflq4BaJHEHwPg7
-  rk/HKkwzG1/JUsov4ZvOLXhjCnY14G4+ty7MyHxcTqmm58wIFL+JyZhRj6/2YIQc
-  88Kw8R7ZQmPVlnmtvrxKIU6iFedKWn0WhKO/eiltfyVD9I3ZAxQF+BKoE9Rdogr9
-  SOIVAYjnvOfvlqXzKOvh8DaX0dNl5YrvZ2K8wF6jkMqRk7SQQZxwSWXWs2vulxF4
-  hoY1iswy8St/ie4LpuB5s4qMlhVfBKA1jh81AgMBAAGjgbwwgbkwDgYDVR0PAQH/
-  BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8E
-  AjAAMB0GA1UdDgQWBBQrKKP/I6wPdfpsSQHvJ2TfeP+ndDAfBgNVHSMEGDAWgBQ2
-  eHOhXmQR5R9LDPKhdQYbfSGjkTA6BgNVHREEMzAxghJhaXJzbG9vcC1jb250cm9s
-  LTKCCWxvY2FsaG9zdIcEChcWDIcEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOC
-  AQEAgA4RUuyx+gxGRAUOjf1gtKa7BbYyjZCOct3LBVVeALxto37VPpwP3mIGq0Iy
-  9FADtVe/xUZ02VQ097xWrCA1/og+pNxZnWQQYwqKkCzjSC0MM+bElhwRWkiIGa2v
-  Dg2GRTO/hfetMny2GAh/r6vmiQZLvDdB6eE1PQlekEGmuwJfP4Bjby1ihhH/iEGr
-  svq+jfvW8J4xYa7e+fc+LTZqlDuv2ieD/aVHRzd9j1+s2zM85M77coOxQIES9pSg
-  eXWJHfTs4gZGhIzV1E6r5tNspUzP/YgYiXoBVufiQzAFA6eADYNJxWVvG6ifFv4n
-  NWL8ouw8rWV+6QMlNQ9dytPo8Q==
+  MIIDijCCAnKgAwIBAgIUERQLtbDMaZ+BvPSUZBu8NEZMTJQwDQYJKoZIhvcNAQEL
+  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjQwMTEyMjM1NDAwWhcNMjYw
+  MTAxMjM1NDAwWjApMScwJQYDVQQDEx5jYWxpY28tZXRjZC1haXJzbG9vcC1jb250
+  cm9sLTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDA8mcBh6Vy+eWV
+  T2uHwYM9OSK4AWypTCy+XTo1HG4Q2t8FqYUSLRmiEPJ2E9b9NJMHeyNbEGejbxtF
+  f5ZaqF/brN2RbDVgirM1rui5elO+huncBoTGmf2r8D8VVtcxx2dxXu0YG5WBccs1
+  k0U2HUgZO41bsSlB/szt/1AHJ4p47KDzePBqqGy0PYfmJkRR3VWDjeGecQyNVlnC
+  CyOmIhmjNsFDCUxwaXYOKt2qocKGQ/6MRQEb/nyEviPM38qB/fbij9Yiui5KGAgI
+  EkFGcwh+c1UwlJD8Yln6qSLzyZF5pE+wiV4S8q9QeQUtgn1rhjsUFBLbGYtlgy36
+  S0HD6N4VAgMBAAGjgbwwgbkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsG
+  AQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTn6aaKhuCj
+  p1GAcfrkJviEPaudEzAfBgNVHSMEGDAWgBRTLhxRyf0WFmqt5sn5aYo+IdZfqzA6
+  BgNVHREEMzAxghJhaXJzbG9vcC1jb250cm9sLTKCCWxvY2FsaG9zdIcEChcWDIcE
+  fwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAGiLZr1d99GjgR8VS0/rwYYZK
+  RvbbrfqmbYEnJg7yGjUfrK4kv3w8fsH+EUFI4cpV125OZSeFWm8DMS20iNHEu71c
+  7FV+uJ82MCvN/ixzWusHitcimAuctrgSXHdSIAj9+ZlADugMaD0e2jTwKpw+KEu9
+  1V7O0z0oC1UmNAsZ+tc8zlO6fat28CFteYwnTpy/b/vV0pgckTlbMWIWAvscVxvZ
+  bufa3GgXZf4UYdVdShw0PCGI1NhcvDR8uila2QoU76zC/AA8wMmxR1GrzNNfll8X
+  /qWLHoLh3R0Cu3ovciwjpPqT/onA17mQ5JQDycPl7QKxSJ9ousH+/wj2j59sew==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-2
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAwPJnAYelcvnllU9rh8GDPTkiuAFsqUwsvl06NRxuENrfBamF
+  Ei0ZohDydhPW/TSTB3sjWxBno28bRX+WWqhf26zdkWw1YIqzNa7ouXpTvobp3AaE
+  xpn9q/A/FVbXMcdncV7tGBuVgXHLNZNFNh1IGTuNW7EpQf7M7f9QByeKeOyg83jw
+  aqhstD2H5iZEUd1Vg43hnnEMjVZZwgsjpiIZozbBQwlMcGl2DirdqqHChkP+jEUB
+  G/58hL4jzN/Kgf324o/WIrouShgICBJBRnMIfnNVMJSQ/GJZ+qki88mReaRPsIle
+  EvKvUHkFLYJ9a4Y7FBQS2xmLZYMt+ktBw+jeFQIDAQABAoIBAEHY+CpffqlUe3OP
+  XSVBd2aHfz/IzKqiYoq9CkZh43ZBG+e0yMNBPQRAQF7nunFDZgIhlhlX6eau3mHD
+  fy6FU+GGhz8/7J979lkVzjqucrINHPaICvw0RYxOO1ku/9XvNXBNcyDNGSLKEQ3B
+  qtci+x4RYtauCWSKbqmyfj9S0UEe+IrlErcV1c1X7JMPgqyQMI6UG8Umav4HqV69
+  yMl2ug1eVJK9iLc4cSwpGIB7hY/xAmmUJRQUUOAjVdVJtX0u89sQoOlnQ8JBvyjd
+  yCAKgCNbKlPr9B3WH1Z0qXmE7tjIwc6YjqTk+1pLrHOAxDtAHh1U/Y4QJLz3zeDY
+  UyHLWEECgYEA0noOncTL6QOQZjeoEvugtD5w7L7Bo25rMTwo274OpgLEbPROUG+1
+  yYro83dvtJeZRzh8OowKzAN3IssBLiIBOCIOlQDydY9eZ1ofSczjVJYAaS2z1Rif
+  0zXcTLzQFwZDuMVGVrhynv/0wbOuIw/vWuKpQFdQl42XrLLZ2TPfaQ0CgYEA6q26
+  SebA62ZZdnBi4r+Hlow7CFFFySuGR9WgRB13JsEzVN4Z4KNndlf3Qb5PLCIBvz27
+  pqvdMt59n9L4Jjg97ei4bJSUumISCvWivf7O0EurmxlPBtE29suHxdJzmjR5lKj8
+  UwpWTlwccLg94zpqPmwfUJGAK4bUpjI+J118dykCgYBNT+pYh3ZDRDzhXyZMusMg
+  EiOWwscMCj4zmp6DgP+OeUu/ncm6gB4tRuokrEWK93ilEZmIQ/KfV9KGJD1tva3m
+  +ZOTpgJprl0F57PAfxMt+d9ywwfgiagDhDBEu8JQAswTbdtVdXEc+HXmROL9HBhW
+  sRVsfeYrlSYWmKeuwgAZbQKBgQDCZNwOQV4G4IY0zM2sxDi9ZTW1IxVqmWom8PdL
+  1RiQ+rLZlwzafqDCcAV56PnONfE6iBl765tUeuaW0HwLtMTf4Ml77+vvJDOL7oM7
+  XOnVswjYdjN3EzCzaE70d+qYjuUzVnOFGef6CuToHkXthsLhKFEcPRptc8eMT8wa
+  cZ8bWQKBgGvHNjljhxFDny2Sl9cAjwXtDI3LpVkPMGK2xEIgOBaGDJosnu0ED7Z7
+  TWBDIf+GsU6QF8msarr98RxLj4Td9KO97J2+znZkqOpqwvbTuOWh5I8332/sGORe
+  Qc5GS13TL9yzh2tduq0HwxpgkccHdEAb4hO9NQrpQPDUsKX9FkT0
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_3_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-3
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-airsloop-control-3
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEA7ukQFCSizRrT1xGSkj2r0iaJg6400XzTj3rO8V923azRK6GC
-  POlQvoc4OOuBJtx43MsImA9o6CmDkh22itYfVamRxmo72JS22rE3aS5ELw71eb31
-  htZgIuVfzuB6cfPrHgUompSOkmRqnD6JVbJRYZERGh105HRD31fowr0GXcVw6awF
-  J8T1ODlCclhe6kgh+NTeKaiIhQdqfWYmdokCO4LO4xdFxYp2T3n89i+FpKFiaumx
-  w9P/0ZyM11eRvS+4O5OFXczCo2Yc+jj9iFZGQ/Ss593UzLFhhXMundy3Mk19ylJU
-  /YCRwiF+EJSRqPhEDUMlNtYrsZRaAIlo5klUQQIDAQABAoIBAQC26qhN09L12GFz
-  G9gtsZwY9Tp6IGn+LmVISE2jTmUSyhsIHcs6WaRhi+QG6IDkwQ6kdarpyXqXrhk3
-  SRqW5+Pr0T10Paf+ZbYucFqtZCf+I6Tchg0zJHVMonOdUA9PqeJNBMQWvkD+YnWh
-  lNvPSgy297uxU/ZIZ6ADoynp15HFPkgpIvQSDXalAivkqoY9zz1Sa72U/fZBEyHU
-  vulLqdA98pKbXyigqjn4AdpSsAx7tD0LD0RIn6aG0+vqWGwJ477ygovQw71qceVW
-  VphTibVNGUqtdMAOpPYLq93JKHDHIetrKVsZOKxoxmIuesNEnZS7SlUMLzrIbrw9
-  akDN1FPBAoGBAPEw2h5NY0rqidqE8YbHy/W+PmDwFjDk/5DFRctMLdrStmMwNKlw
-  mOsuadEiMKi6+amiUy34w6q1gY1ASurNsZdsGJQfvRUiBY7/gTzxpfs5mmxbLbTm
-  M5KqWvJyDhEo5cfaXYyHWo7qWYnAIs1BM4F7YtCWMDlaemYorAXF2F15AoGBAP2U
-  XbGf3qdy9fyX9RokUwudKDC5AU7mjtKfgXioJh/3hBkOztsgm8wLh18IlFAsAJAr
-  q879wxk507sQhQ+dkmtecGzz4Z3Uzr4HOmOgIdUezE/u5ewESBTCZtfoXl7bTjf1
-  t6kWNSpugOzljx61LluzOOS2v5ghJU5V5oyW+qMJAoGBAOZO87jDxPCgjQowsEE3
-  P7dk9kOyfj4qLS+ccEz0bUTquGZ2fZLehebs5vZgY357LDOjYTIgvRahQxgSMHeN
-  +urQuZeXxwIK/qvRpyL+zLPcCW02k6qNtulx6m5gIraYCvKPvYyXIw4dEWrMIW9F
-  t10I6Q6sm1fo4b/zTnAkv7phAoGADCg+zbNCc3i5fmCyqYwwRxBDywIzo9q94i8v
-  f99f5IxzUtg45pyLm5654L6Cjc1uQXs2g3f7EIyLMB68omEFkgw3C6ItoOmA9+9U
-  x034EUWmufZUI5qY8hXX5GYJkDana1tmcL7V0bD2kWT4FZrOHCtdgOmaCesc5MKN
-  iRP79DECgYBpd70hioYaYxcAsSKgFiRa5xvIQRTSAkg948GXVy/ReHeHeH/05GtN
-  Jh4JHemXzHPyY0XLZ4kUgbDTdtfBMg/CwjYDjcHI4786pGHgmz9PnOC5/ZAVBbe2
-  53Iwfgjsut7gsg/A2fmzAarBvdYzxHAzlquHBd6J3YNOwPbos8KFMg==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-airsloop-control-3
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDnzCCAoegAwIBAgIUfO5Nv/+nDvWmL3OmqUvaSM5dnSYwDQYJKoZIhvcNAQEL
-  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
-  HhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjApMScwJQYDVQQDEx5jYWxp
-  Y28tZXRjZC1haXJzbG9vcC1jb250cm9sLTMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-  DwAwggEKAoIBAQDu6RAUJKLNGtPXEZKSPavSJomDrjTRfNOPes7xX3bdrNEroYI8
-  6VC+hzg464Em3HjcywiYD2joKYOSHbaK1h9VqZHGajvYlLbasTdpLkQvDvV5vfWG
-  1mAi5V/O4Hpx8+seBSialI6SZGqcPolVslFhkREaHXTkdEPfV+jCvQZdxXDprAUn
-  xPU4OUJyWF7qSCH41N4pqIiFB2p9ZiZ2iQI7gs7jF0XFinZPefz2L4WkoWJq6bHD
-  0//RnIzXV5G9L7g7k4VdzMKjZhz6OP2IVkZD9Kzn3dTMsWGFcy6d3LcyTX3KUlT9
-  gJHCIX4QlJGo+EQNQyU21iuxlFoAiWjmSVRBAgMBAAGjgbwwgbkwDgYDVR0PAQH/
-  BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8E
-  AjAAMB0GA1UdDgQWBBTKZHdTLlTzQ3BmmsyzzZr0BthJajAfBgNVHSMEGDAWgBQ2
-  eHOhXmQR5R9LDPKhdQYbfSGjkTA6BgNVHREEMzAxghJhaXJzbG9vcC1jb250cm9s
-  LTOCCWxvY2FsaG9zdIcEChcWDYcEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOC
-  AQEAmgDgwZLqjab+RUipWIJwoAsQLj3Zj0lIi1nr7O3QJ95HFBkj1TRz/njLkYHc
-  Nm6p80VaQDbqjAeIgli2Ht6xVhUYSdE6o+AYc4gW0A7UwzGI4y27n2doc1bvenpq
-  bNFBBGXOXceP199x21B3NfPxty7yGBQZfUw+rjqOoBKZCHga5+vZhwt+yIbXkPOz
-  vyeriPEX3Y7UbPhRyZNDoKLCme5FW6Nvdl0zSHrzmYuuMg1CTzBK8kPtG5Ni0i8r
-  ayogTlXgqFhhkAvuzfq8i7+4usnf94+5Eu2kMv9ZUIkmYp3sdyTe8XR2BsLCu0pf
-  ayYFIsvAZ1xwjJQi4v02i6Hw6A==
+  MIIDijCCAnKgAwIBAgIUcRHY2EBGX35LiRu1mPLJ0D3hN30wDQYJKoZIhvcNAQEL
+  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjQwMTEyMjM1NDAwWhcNMjYw
+  MTAxMjM1NDAwWjApMScwJQYDVQQDEx5jYWxpY28tZXRjZC1haXJzbG9vcC1jb250
+  cm9sLTMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBnCnIMTkzvv69
+  p4lYQlp/7KcakGtYTlx+FKJBTunloQJlRqMXc8Zc9RfCXpFpTgGKYwSKLckyDUge
+  B3NSTo7DBSLhTdP0LpLrTQIPcD58/+4b/15J7tZP9zAtFWTx/pvcIdIM4ARFFLio
+  7tOrRkKNt06OyCagc7CKjaUtdRUNCH/Y9NxftAqpYsepB3plRRvZlXSmB+YQJtbI
+  dnbG/w0DZIxhbkKc1m++jdd5vxvWXRzVPzslgQI39uJfavAzPTk2OkTAsi6M/TN4
+  TRfS6n24ZUOopub+1MFMsT6Q+CDBs4kPUDdZgQVeQBpIdlOXP69LPiqN46oytELf
+  1XDAfgibAgMBAAGjgbwwgbkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsG
+  AQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ71EM0US37
+  GQ/+WzH9s4xxV6G6aDAfBgNVHSMEGDAWgBRTLhxRyf0WFmqt5sn5aYo+IdZfqzA6
+  BgNVHREEMzAxghJhaXJzbG9vcC1jb250cm9sLTOCCWxvY2FsaG9zdIcEChcWDYcE
+  fwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEASJTv42U9ec7qYZQYgWDy297q
+  yS4xL+vMT6L+eIVAoX35PLm8cOEbeTZrUxby4PZm1xbpeAs3VEbCeWjzWg7/0O5M
+  mK6OHnnQTCD7mv2/0qjJS1v0gDPMFuf+kSjAIaPwRXlWtk351rd7Hn3XnL2wA/hx
+  yXEqxTNBBdateLMDPSEQKP+2NtcuuyiZd+a1X4SZwt/31byWDM1yKqigPvEyCSwx
+  laS9lGiBVEgIqPgtxIks1mA2YXeO6yLZLVb750D+OJcerwr14y4cmwKO1zptyKEM
+  cwUtnFZcVFh0czFjTkuWpc3dkdtKsbwIjihwo0qsTgulx/hK6Q19isAdWJ43yw==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-3
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpQIBAAKCAQEAwZwpyDE5M77+vaeJWEJaf+ynGpBrWE5cfhSiQU7p5aECZUaj
+  F3PGXPUXwl6RaU4BimMEii3JMg1IHgdzUk6OwwUi4U3T9C6S600CD3A+fP/uG/9e
+  Se7WT/cwLRVk8f6b3CHSDOAERRS4qO7Tq0ZCjbdOjsgmoHOwio2lLXUVDQh/2PTc
+  X7QKqWLHqQd6ZUUb2ZV0pgfmECbWyHZ2xv8NA2SMYW5CnNZvvo3Xeb8b1l0c1T87
+  JYECN/biX2rwMz05NjpEwLIujP0zeE0X0up9uGVDqKbm/tTBTLE+kPggwbOJD1A3
+  WYEFXkAaSHZTlz+vSz4qjeOqMrRC39VwwH4ImwIDAQABAoIBAQC1mSN7mef8iFZq
+  T528wigeuzuV6AY3wvBwdiwms70h3J7hnZrWIYraoC1T693adwds5SlZ7k47+0c8
+  m2JovjSb6dJon9aBv7mgqQ+YqYCDQI73hdTL5hDw2ns+nkWb0mQg2zwpRWnb3e7C
+  zZiOmw1L3bb6p/PLJhheLTPUanB/Umif72m9p2YQh7v6W5HpSuMtUdGVhpotPoF5
+  isameyYvtYDlMhwaaOrIogCcFL8SlMyJD5y4YmXmH2MRwp/8VcD51vivEMLP6oQ3
+  kRoYRUUS6zyw+rsHXB/Fb1Bgb2TPyq9cYUxxJqinGJG02a0hGCjqiHEwLODTQXEF
+  EpQVbQSRAoGBAMh4eKtI0XpvEwnANIkTgH4BZeqKQPL/JCSlpKOLulPTqLE9otWn
+  WWBG1S2W5KAOVOPNh9kJGcg0td4t99V3QHmioVM0KJIWwM9LwcHvc/Lmec1IBc0a
+  J9+OB5Ka4kb+zflsBzcIaIFTZ9bTwFRNnBIHz2XpxqYt2T4QUSIq2F+zAoGBAPc9
+  M+ijXzOhA8HZSKHUtx4FRoUcDi5zGqF6QO5GbzpzdIGT81VaHehaDcpdgKlaVGV3
+  dZekbP9deVMdf5uGD7mYAPbBKL1fISidv5KzvnNMOTMm8sSrUf5pTBLrMAlQ0rL6
+  YmF+uwwO3vkzMC+G2lUeJVXj5LTkREbrwzhsxX95AoGBAIv6Wr+3A9YKsu9vDv/b
+  5y+UyFYhnUJPVyxjoPc1fLBFrZe84vNue+DW9Ml1gEQmXa4G+GFakm8SJx9xV4jt
+  UM7d+OmBFQcU7iKQ0kUZbwvfVJM7RBm3trnJkY4TqgZKqwYLIWqS623KEEqX5sa2
+  vlB0taOCvduRTgyhFhXWdukzAoGBAPOpqNf08uWCIZ7RkwiTCKmYj2iuPre+jxdn
+  0khCuGpF0SPHeUC8IM+WuRKg1iWRta2ObyE1VorSR7kHUHUpSaQiz4hg09LWx2ot
+  FdnyNZeSHqlwEECNi7CNfAEFMwFrW0wzAfSOHrACk/PLZAjjAZhzrl4YzJUOhs/S
+  mUKpyHcZAoGAHRUeKG0nI8evvq2kLb6zPJqrrS0XBW1FhB/wo4HygVjuFZv2w8qk
+  vIfnIE1+PsY5zR8V4bbwSys/6f4Z5EovBb3gbuuvK2M4HKPTikkykIf8XtQX+yzr
+  EG5+HP5x9uY1u+UNOFLQBGwIu/8PJVj81MmBtQRxM7GbmFD6DmMcFOM=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml

@@ -1,69 +1,69 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-anchor
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-anchor
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEoQIBAAKCAQEAvKa+FfOV7LRiLyItyRkTEz546Bd4eJ/SclRcPdJQWpS84ceJ
-  Rt3G5zZicyPtFE4Gh5izK5lvIG6rgjFKpiEz267B810rQz62Lv9UOPhQStMZkL6l
-  GiIt8HOhblKN5IeS1nqEBqc+1JVMbQmqLI/MhRD7jCdu1wBYVpoWnumdqCGmyt9Y
-  srDpP+pM3X7YNROwa+lvHddSNtWhhyE46ov9m7O99yDaY4ZztEjtl8PLdTH92tyx
-  TMCojQV8s/BUmKqlDOiMT7/AjWbNvlEUWv/o1hbsEWj5Asv7gNLatnIurlUdFlga
-  10YlNESVes9kcRIxixyMRu2CK6uz/4k7yYvLFQIDAQABAoIBAFdpr8R+JOcUQjZy
-  0OJQkw0ksmNglLrX22yMeF1Q+ViveMHpckt68fIquf1+FRmGefIUqFi4dMyDW0ct
-  Tdiio+PUGxyH/EbhZQtr1fu724CARmVSYTA1zDGRcqiq6gKNa1WkWU636h4Yu9v+
-  UXLqgqrZzqUHlI1dJJGkPn0N5LaFbJs4/FmFSYV5+MwYiE2SQq0YlpQ8Q2mc/IJ1
-  1tWJC1oGCEtunjGLq1RJg3rIYLSQM6JpTi4h00yZhCLp/UPo6/dt7BuxN5+uIfDf
-  ehTTvTOaVn+dyLKmD4TwtZYV8AJNrFAqqOfCKzPOpgAIftpVGwTyhrvnhtkX+Fp3
-  oZVi7iECgYEA8phw/Aah2Kr19sjmS2ell2bWEx4tQd3ACm6Vu4Dkr9D6UMCo5ZJs
-  6nFQVJ4Rqbs4PwUy7Pazru4h7Oocnq2Sb5V23jYK1JXRXSj/i/rGvYxYygeFqWbt
-  y9Nxkkx6YtitjvSUB/EuJVTv6+JDmNuuCCk6v+txLhB7nT/qIxDhJSkCgYEAxxNA
-  T7gTL9FYIXVjgyHUGeKYBzneJgxiCu55qFPlbU/VgUOpny5wq/xpXtAaNyGZtPdT
-  UZJz+ugqce7z2n1KIjEyNFzzo8ngkqzLB3m56BAPB0GZzASmIeTU+6RM8MPpX39T
-  FUxCPlt1Up2gFEunEbfkCxuxLfid+zHmxQ0qqA0Cfx9Fh0r1j+deIlatjwIpWi8q
-  Em5kdXEIJLkziBmjg9cmGR5Pt3XgainOcYx209ANUjLNeMMTChaCm9zuUMIjnbzE
-  h44daUf+B/76SfbBXN0SOl/QmGo92mlr2DgDo8MaK0VCQdLERC6LxGGjyRLrPoPO
-  zMPwlaZaeZTLqGLcyikCgYEAmg1IuCgPGPLcS1AHCOP1uW5DDVx3j2QHvsPaeysp
-  IJUl+Fj++wK6CC1U8R0DHGSxCHxYCojVnXVp2y75n7tS0fDWE/VWSQog8gArQQau
-  mWlL5+aY+GskkJf/RRhYvfwtLUxfY9zWamDmAl+eD/aXO7vdCceNLbD1t/xew2A0
-  AUUCgYApljJgE32H4eoN1KBYG52ffVrdlgH96L9lSIt4dSa7m5VG7nN4455MBxTF
-  I0pUUil4y4qWsmi/J/rOxbZ0VhiAiGn7d8Gj601BfHrtzvwd8KyqEUNY75X5rtzw
-  e7rC7S/OPHqljkzZLXvFhCQRUP8tTsMNxB/Mnfh+HvJ7hTS+QQ==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-anchor
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDSTCCAjGgAwIBAgIUByiM20rcn+57dV86CsyrvSnBqF4wDQYJKoZIhvcNAQEL
-  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
-  HhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjARMQ8wDQYDVQQDEwZhbmNo
-  b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8pr4V85XstGIvIi3J
-  GRMTPnjoF3h4n9JyVFw90lBalLzhx4lG3cbnNmJzI+0UTgaHmLMrmW8gbquCMUqm
-  ITPbrsHzXStDPrYu/1Q4+FBK0xmQvqUaIi3wc6FuUo3kh5LWeoQGpz7UlUxtCaos
-  j8yFEPuMJ27XAFhWmhae6Z2oIabK31iysOk/6kzdftg1E7Br6W8d11I21aGHITjq
-  i/2bs733INpjhnO0SO2Xw8t1Mf3a3LFMwKiNBXyz8FSYqqUM6IxPv8CNZs2+URRa
-  /+jWFuwRaPkCy/uA0tq2ci6uVR0WWBrXRiU0RJV6z2RxEjGLHIxG7YIrq7P/iTvJ
-  i8sVAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
-  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUwKbg+u5A8OOHYeo7
-  WTLZtfnZ3bYwHwYDVR0jBBgwFoAUNnhzoV5kEeUfSwzyoXUGG30ho5EwDQYJKoZI
-  hvcNAQELBQADggEBAF3Jv0vmsKeZFiM2Fsw6XkDmzcZJeaHhf5VSK6+zY7RzoQUL
-  9Y7fJAfis+5kteuG2y3P680ZlW4UkxYLMzECF5nEQIMTuXxXeD8EWCO8k+ONR7Y2
-  R3Z7PTFJbq0TM0pGLeZsXG3juponCp3OIH7VoGIThnp3LezQgQxuklVODBYhLWeg
-  kn1+DhB8nwsrwhbVkU1l4Ey0eLTstEgbQnSGKg92VFGPV7nD5kS5a1BG4YUtoK/H
-  z6sAO9kwxNYQdpNxGiA21It1cY79Sgy6YlOgUv0JtpspTqGR2scOqIbzNq/kRxZ0
-  gGmyFpZAbgMBN6sfg2Uone3ZAa4/vZIkhdVxTdg=
+  MIIDNDCCAhygAwIBAgIUNmqY7+ab6530KP+lt6aLqPIz2wMwDQYJKoZIhvcNAQEL
+  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjQwMTEyMjM1NDAwWhcNMjYw
+  MTAxMjM1NDAwWjARMQ8wDQYDVQQDEwZhbmNob3IwggEiMA0GCSqGSIb3DQEBAQUA
+  A4IBDwAwggEKAoIBAQDEA3hPSI14O+DUEnUFjT3HCYTmdyA0MP5awgVGTHjw6vmx
+  LCjplD/kdZFYgpLo9I0h842CobnTUzNzIuKl+S6vFCehv5lmwf3a5iuZoQUxk5U3
+  X1EFjhDEFUm8AFOgXIw3stjdKelpVUXxbpZvLzZvAU1sytdQQS8HzE1lqrFIsmx0
+  tZnS0IHZcCzlWf3fxgTm3meNKwFPCh6n6/a4QUveY+iOLz8y25LIArjoS7eEb+sf
+  Sb6crpTcLdmelLYqg8EUSV9+uQ5gNYBUSJqZIn3B0TPLMfAKniiTINZTt2k5PZmO
+  3Ix9ubckED+8Yxy9Gi1b0m1zIWqOWcLFoRKUZW7TAgMBAAGjfzB9MA4GA1UdDwEB
+  /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
+  BAIwADAdBgNVHQ4EFgQUhFSOm87qhm8KzFich6geGyPheHUwHwYDVR0jBBgwFoAU
+  Uy4cUcn9FhZqrebJ+WmKPiHWX6swDQYJKoZIhvcNAQELBQADggEBADpV0xRJAVmm
+  biuGruXfblOYFQnEhBJn5xU/gy8I3uuAANsqGCeTkbSxOb2QRjXm6LBXuN6qk/mK
+  ptzHUHL9nlaf/vESX9Yfkta8X/eiJbqoEAxwgHDzHRyZk6Nk9cTFMOO8TP+b/mOc
+  b6pyPzSqmM8ZiOBF7hVXbtPys5xur6lL+/xjrMpRaK3vXEodxfxx150izKpnhMhB
+  gLfyAQise4PJ8g5dN97SuwqJHkgHOwMGFUvkzmr0M1ZYWmWXz2zhPdbZQdhu9umD
+  hdeooatEtyKAjzzBkSJcl1X/tHPks8Df/btTchWz+1/oFdOzu0hQpxj1nSeDyhgG
+  cMdG6T5BWgI=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-anchor
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAxAN4T0iNeDvg1BJ1BY09xwmE5ncgNDD+WsIFRkx48Or5sSwo
+  6ZQ/5HWRWIKS6PSNIfONgqG501MzcyLipfkurxQnob+ZZsH92uYrmaEFMZOVN19R
+  BY4QxBVJvABToFyMN7LY3SnpaVVF8W6Wby82bwFNbMrXUEEvB8xNZaqxSLJsdLWZ
+  0tCB2XAs5Vn938YE5t5njSsBTwoep+v2uEFL3mPoji8/MtuSyAK46Eu3hG/rH0m+
+  nK6U3C3ZnpS2KoPBFElffrkOYDWAVEiamSJ9wdEzyzHwCp4okyDWU7dpOT2ZjtyM
+  fbm3JBA/vGMcvRotW9JtcyFqjlnCxaESlGVu0wIDAQABAoIBADJYddFfYD7Ommu+
+  JeJ8Ka7yyfjsBhCBuQMUrIgm4jV3FRUls4hzNIn4jJGAUD2XepyK0wEHixQ1XZSo
+  FDDvNMdxVNCdxsf28b4EupQmIJBgSMZFLClSGQpUMXEhYFljC/zOahc8SaBtb56Y
+  efkq1j9ixUE5RF5vr6XAGu0PD6QNBNnmCanGxCCtfdw8bpTA9wwH4IuXpnMVv2lm
+  gjC0GXVoxlbQX4PRattLE+q5RRh5OUhNP30n3ghL90EDSp5HIlqC2c/5BnE/fe4s
+  px0yc5x6fE3rINWLO1af2VmQTThkCLqp7eZaDo4FHHd95doze/pH9E9mtufogHnN
+  1IT/D1kCgYEA1/YcHmFHUxIFOAIVyFQbNSEU6mkRXxGqSfySXAJe0az0FfpCGbFF
+  nsR48Qb35uxYZmno6pqA8SUmisLF2A2DmAzEqiuWTMaWYKGZiSflSpLhHXB9YtCK
+  T3IHwgs++g1TXqEcmeyaqNND6ncOOEQEgoOw2bNik3NwSqR8Nz5IjcUCgYEA6Fqa
+  dlI3Mlid0eXVCjMGgUh1DynI9/zbqeqxh3/QppvMsBOedEREaWFMQqTbTsAN4U2q
+  UUXCGWyRscnWwEgDY9hPGCppHk4k6GftNFzZ+B2dPHmlvhxvilKNYHw20GcCn1Kh
+  kXFh5cEOHc/+oE7oOPQVvHS89whthDM8ssdYK7cCgYEAuiH3qEOFutZMQzKg3ZGI
+  Bammoka+XycVk0EqUD0Gxkb/9TVF5WkBrU5/QpYT8icAJfzgb9uMiMrRRkWLSaSU
+  J+fRVS3OFAwRLeX6M9l76WNgvQPoPdOpccHBaABTXidAFM5dnVjtD9dOsPW9/sa4
+  8Fhag7f1nUqgnOTZ3q9Cz1UCgYEA35uCFuhcUklR6FQEyAH++qAed29BBtcDFuzT
+  2JC63fwF6lWXIlEofTmzyFca7xiIwxCZHgnCF/GR7MVPtFAZYxciVyFJdG7Duh15
+  +/B3m/3z+eUgCmsXNMjpYbdokPrxXR6KeovhKNi3mx018FS/yz+rQ2gdCqfDrXwZ
+  p/uL8NUCgYBIc1M/YTr0Ard3xsj2w3VNwjXT9SgvpfjpuuCPfZFtQ/OlxfJif82k
+  yDyUwfegFICWAOX8kfQ9ncKHx8j5vjCM4YTAu10e2fN+SY7096Dr/oYHOnSkxwum
+  kyVV3NL6OBdpDshLQAsk31VBfs/C7Loj5MUrX3507LZcNqmeNKM3vQ==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/calico_etcd_calico_node_certificate.yaml

@@ -1,69 +1,69 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-node
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-node
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEogIBAAKCAQEArHTTWBky6cdN7F+s8E9bYwCRXmHwvfsFFIjpK2d2rDE1DpcC
-  6hAO318Vv+RW7w0t3CoAzzzv8ma/p8lJ1h/9xIpr44XG6PYGVNUYgQ6ZddvEfGW2
-  OAyql6jtBkOF4sTVzVaExM/rbhKBB+fG2TpQGTCYl/JYE1vpLlzCDkcDFIu3pYGi
-  mwDRwzVzdPnehWFKszXs8AaVWLJtV22qEPkz16z3VSYawcnDuPXo/74nodwyukXi
-  MYdMXDr2Z6ieZvaKw3Urt0/V7JGrieaatnd59ZODe4m4zFreF7qdZUk6qSNFWyMx
-  4W8vOeMQasXI7oB5UvXFveXIjoA3HasVmd7H/wIDAQABAoIBABTndFbRdyJvTjrA
-  vi3C8MjnYLeYF55vtwXuMpVYTUJCFLRYCbplh+f7lp9UBlWju1NcpAx6znsLiV/F
-  PnX+GrygKsPBi4Lhj5Lo4beDFYb7xK1vhs70ehk4GMMRnEEIqwHg4ucYbOlCxPE4
-  Xxolv1/OTDDe514xXeqIw90HLpBmzDId0XwKu6eh9gYG2BrMXn7bRLMDzMtI/iBh
-  3e5G2OmhaShRrpgCEcGEVYJ+V9EXEBPJGzRO0a/ulYYIkV88ainvXyNp4IrOnxPz
-  88jj4LfjuIKzN22kNbXtKgw9idcyJ0NWufctpcbmicM58bLWMi5JmalcB6jDpXsu
-  e7DlUoECgYEAx4Ai0cpEbZk/O8tLFEy9ZxzA/jFpdbyAv2Mbp/DeMo8JxX8if9eh
-  WYDMzyVdBNYSRi/tYpayHsh7rPoh3QRFPaSyq7/TaKK3usAdcIXyAfwQfRrXpdJJ
-  J++fxXGU94achPCVbYr/YldHTzTwD+2PenvsKIcyKLmA4NSwbBut7LcCgYEA3Uv5
-  5eU5b7Ba1jaLh+mbmPptmXdxj4beGvYgDG7W+IDDlpT0sAAMxeHbiH0wFB6UhVOn
-  KVLXDBpP/0oCx1JDsG2ZN28THXnUd0d/Lu6IxK3U/m/JNTy5LTGNDUWzCPnsHlaC
-  gqo8VmgDHO6PsuuMCDv5ocI/lFWJD68zKFpSxvkCgYA/YlCtwsvW3neescpa2r7a
-  geI3YM+W3psxM3XX98lA2v1JyEjXwVS8MRXhQoe5P6Jytkt/pU1WRnA01wvnQrIV
-  EbzKoJm0hu5E4UD5PTVUuBctCFg3kQY5MALdImcn9ZbJDf8L3LujLQO1AKa9CMcr
-  LTAs+DdRhQ6TYD/lOS4bJQKBgD3alJjLf0hWlK03RbzRcOpLZQL2PcmOOtpyXPbc
-  rD19UC3wqIvhF7DftkrqItwcyAqUHS8RtoXtfNqwRyKLPdw8Zgz2gPNGMDq+wy/N
-  AHFo3RXZDPZSaLfXF8PT7Xzezj6Uk5oOFxtXqzcU/xlVeSh8CwRJlRfS6KJ3p+bp
-  iCWRAoGAW60liHAu0kLJRI5smnye1AdNNZjaHhaHZTE2iFcG/n+0sHsJ+A3RHw/o
-  Mjdv2HnmPRccHT4pycm8ypJz+8Im2TkrTYGmPsKBJ+7LZePIw849fjqYazI0y3/U
-  1+GzayalmNLXaR4EPkCTvXKhfESmY43x3Rrf/WHltBR8bUOMyjE=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-node
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  6zFuUnmwlQfjSkv2j/E=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-node
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEogIBAAKCAQEAmXaB5oVeLuXwta+rLfO4lhMEYhCn4cezIPsil2PG9qulvX5P
+  wDjMmGFy8TxS0DOboX+DA/S7F+y3cyKCJwPTbk3LV14h9zirPvVLmB66pir+vUL/
+  vEHZKTAX6Geq0LZgJjkPXuM8yM5kfkzmvrEFUgy2tUO5YISpqrwLT9pYfa6RYGPT
+  lUYfwzJerMKjkeJj9MiEytR5rPkRTv7y29FG+1GSrwNCho9Swh7cC0H8gh+w95h+
+  +NIqP2bsP0M8FegmZRby8rArixtdaNsD81G8YDiEHVQGwN5q3f4OjxNW5jQzlA5T
+  l5AohQOsWfw9NOs1dDc4nfuZiagumPoun885iQIDAQABAoIBAG/FzcUNfFSiK1jZ
+  Us9MRTQhM78NLImYvtIVt9MV3BNLX5MNzZ5OgE24JFSpwBNek0rkKZOXCzHYuqDE
+  EJHECpm7VZATwp9iie94D5ADSaS/ifxlMQh32WhTXAZsgxAy1QLh6l0NGveSw8Tt
+  094t5pclJWoOopU26rCs93w4pt0aSHlpmBv0AzCP5WSVgAWjp2GuFidsGurd+key
+  P4QBp5NBI4zf9C5DX7YnrCgNW0E6GW4eL/OZyWdFa/oPMZ354/48OsLzjcZZKIaX
+  mEEUoeAySs0GapFFlZ9Ac1J/HNllIjm4/ncp2On0l2qVPd/2HBogdiERsTLWqqz4
+  O8wPV9UCgYEAwQGz5aLKB7+zZ3MboQ8Y2seqymOSJrXSTs5RhbFYVXuy8165kSfI
+  SmtQjjK4FDND/MOlZ6TIeoejM1Ib3UF7nFCKUaspOf4teB0BA3JESPBW1Oh/S556
+  6ORd9OL2j1LLolYoMxoucAJ1Tk+ZDcxUlRO784L9Xbp0cOycjvvEDLMCgYEAy4zO
+  AjjvRFvMzpSfe2a5OfHDy0oLZeiFcLiywDwQDYQkbdJ/Wd0X2EsCnV9SsodIPXo0
+  KBxafkImuD9/uZb4WLeOY548soXqJGPRpEEIdULtNxi4sc3ZKljis8373S5oz4vk
+  726awfHhy3V94A3WnTNbshOm4d8hpfAY/g7JNtMCgYAEJ8g6wnV9EziGmqjWn9+W
+  HkRkFR65bKK5haGlsjrHpGEm8jwmjue2CndyiE8ESFJHZ+Lwx1B1quPtn+/vpJBH
+  vkgsF/ZMRFewRVeXPmeP9nS4IsVS2Hem+fu34QcT8OFnfllhOEgVq0fhRr9x15te
+  lk0uofxYf0IwiDeasHr5FwKBgGV0G+YdrJw8yTsZ9teR3raT2wwDLuUvXPtPA8Eu
+  7q1d9K5MYa9PtKfY00fPEC/tn8MMmtx3LV+K5zOkaqv9JHFLpAvg/c3ZU1ep7P7a
+  bzXLEuMITl5JBHnH7c7C10tp61GvH397eGU8g1dei0vWeebGh2idxOsFxQapQju2
+  8PGDAoGAZklE/aKTYYCRraYZtb6UM1pvkz2hdzcBj2RoTWpbD8OTj0pH7MyT2XIn
+  novXwo6l/a98bWlAj2L+0U+DdWUssPhcuM5qnqK+RuslNtYGwXLPLFEX+K6Oj5U6
+  OtYCBnG/5KCNcyaECmNPhrqywJZoh1eOcRzHE/A2QxCJae4Zy8s=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/calico_etcd_peer_ca.yaml

@@ -1,69 +1,68 @@
 ---
+schema: deckhand/CertificateAuthority/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEA5OtajeKpsUOEe9UASbMrswACvp2opPfuPekzsIcfbhze2Ebw
-  kleFyRLz3SGvIHo28+ieLvVIIyE9FsKPgrocfPiTLCoyFtlXiMv7a/jGwWYHG4S8
-  a5RoZA1QcsZQkIN7vM2WMeQSTuVYNEsGPZUN1Mql0VmoGmLVKb+0R419u0gzEGvK
-  fihmxVIZpChhZQpPssQSZRmaA6qpvwR1RMlXJvtY/m6UWfOHgdKxRRY9hBxFZvWh
-  vdj72oy+APA06x0E52/jOUV+3hHZfvNTm81IMmxWj1Gxpd36/mY5W5LVigWztqF7
-  rDHb1j/HBIZkIfceDpn8Lexvvjj75xH+K5+eewIDAQABAoIBAETxxTIaY/UpWotZ
-  GV8ZAT5F8I2sOhCFQ1GOHK075PFq7IrCws2wYnCurpeY/3+Oj2JiWtHVucYqypVC
-  P6qlltLkop6YjsFm8AAZPz3DjUjOC7H0BjN4XQBVKjeHFtiPYQL6ABRClmkAldIa
-  DmUZsTK3Xb1xfTmFLqIGRKuQJ5/xisOXDS0xF4mxegEguYIdvTwjJCxKijNA9cyR
-  +4GifIYEC1HSz7vzJLdcWOj8H3Y01o+ZOQU0/FgqBbQwa1BY8u+GxVJP4kx2pFoS
-  LSBXyJ4SOGBrNpNxbN1n5McjTMtzZm2rnDhf2QmhyphHZJPCeAsAXg+n14xxmWtc
-  jNPV6AECgYEA5tPqhURES5bJhiMCekHKW5VkyVAVVpGIMzh8wyn8tgKgUdPq9j+Y
-  GP0KtbBwOc+DNWc3Y3OlcsyIRJZpGwkgev6Q5vlhSIcO5/IdRX5kVJgFqatPEJEA
-  OTZSz12QGL9lN6X9M8qfVhxeO1x7JFhEEdEbL9V1TrZNU5VNZjTvygECgYEA/eIo
-  s7NdGx6lKnC+oNR0VZ/ESoQiMQ6j8N0et2AcUIO6mVAMHl2OSoH3RHrtwhlysAQa
-  lL3d6fNzSnZazWb5+t8R0P5t/yKtvyPMi67KcmYYdgUJduUVyG/yziiNDKaEIkyj
-  11q8gCfhiuc7xX4fh9mscEJJvqM1EaYFVkDJkHsCgYAVRDT5Lj70j+HlP9h8lw8j
-  vPHaMkyk+yeHQI8OFBI6WqeWomWlZlqHAtk3wBe2282E4AuUWBVILFvppcntObwK
-  WOXUwekam4beC8pymqB3wsHSzfus1Q8mNkEO5dnezdNvexWG7gYcEuUDpxOZV6B9
-  27wbfhketWEOcFT/M6VcAQKBgCOkydQY3Xx+O/AObiUETuTqjlNr46UBijC5yqMy
-  IieHpv35SApHVj/NqVp668BxdDGUEetKEMrUvB37Kdpml7gJ82VlIypLwxrvurrt
-  qkyPWuXO5TpFBV7joLIi7VKWWjy6h9InUgmoD7lBp5mdkG2xOM118QaLwVqd9Wfb
-  prDbAoGBAKA5To1jZU6xy99nuDHiKCttEXekEIF7SlY64ObfBZ/ieyLKKEYc0GLH
-  ZBJ/IvV6TBKycL8DuVAOQssGDwggA8Duv7gFU7gEQ+4lGLDBCUX11EZgvXCVXkEa
-  f0SG04V7jrtDQgqZxRpOdMXDzKstVaWe+9gFdOw9/2Y/wQVbyye/
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateAuthorityKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
   -----END CERTIFICATE-----
-schema: deckhand/CertificateAuthority/v1
+...
+---
+schema: deckhand/CertificateAuthorityKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpQIBAAKCAQEA15MZCPlqwilO8Acd2eOYxJyiN2rxLWWjLg6dZUcU0didcNSv
+  V8vOdBTD3HMfglKNBGgo4MuoEGMjvwQ593N5yc1HQIowMrpCmZyhm6YP0A/OLIGr
+  DLXHB8K0ifA73g3eJO+212wADAGXZa5aXrUNTNZI6sy6vDMPBnB99AgNO+x79mfb
+  PU5YESB6lWVATBqBoLBjghpUsBAp+OregXd/1SFR+ycZXrSLixnYh/u3xfc0/J6A
+  tNCfbBnoIyrKXLTurNo40gmgDlDmnbUTwSLbx/uV5OLx5duKDTfVidZY/jW2G157
+  IPckz2fsGdHvBG6rNSsNoVAfU/Srx464UyiXCQIDAQABAoIBAQDP/8xODmnlwXm6
+  uwMgcyu5uPADzJm8Fa8nB07yo20BNKJkdbJhYfJnqol4sVObqQ8LS3z1uUsF1MJu
+  0iMkETVXc0vmh+8NYw5TrP95cPcc58MkylBCSToq0MDlvvfkvziyJuEiZcB91SNB
+  JsNnUgXtN2zPsI4UfKdorS26QfKS90ow8ZAVum1o3wwXMmqRu0ytWFgNXad4sGe2
+  oyPY75stbju9CUdfB437sjp0UdCGZNqUE1qIW4xc/6tE2XpG05ci2fT/I+gnZxHu
+  Vzv4NtyYTsQHNETiDxelJYH4CX9BTT6vxedurego6XgmhquJAAlRXpox/Ivv0qPg
+  MfT4kfAhAoGBAPq1qs80/yGzlzFD4GGzoJl6dnfAWOdkvSxorttSTC6cizHB8CG6
+  gG0vm64Y9AMQC83zrjKd6NloK9tEF1ON+XXmpRzmOOO3kvd19YEK5rbG0Qz1WYRz
+  B4vtWn1i3ZgrhePRfnOup4mXG6CA5T4pAEJ/AJ1ArN9/IvBPxpbFlrcdAoGBANwf
+  oZYSSnRyfT4N/R4flO7DCwasEr+4KdDpr4VfyQdGnuoVGS9tiaA+MoYYu235pQUs
+  AbX/j8gNtfhRv+IbR/H5oGK5ZGsIT3A47vBSjO6nQrokByPKJTCPJNXmKotCOlGy
+  ip41aJ9Ub7DRHSJo2HYIjVpDL6yi18HzPGwZYB/dAoGADJX2HzTP4gc7/dMkfoMf
+  +tR1Agn77JHYFVSkAoqdHHHrYvITdf4A2HpdXF4QUd8KWKp1AkF/IPrjyLwgV6d2
+  8H5Fp6+/B19910JqsrGzZ1WPxRDED6weot2lf0npSexValxn9rK74mJdlq8h0v8H
+  7k6l3z8R7p5ZSKsYkxUUPdkCgYEAxh0R6Wd862E/p2IftcTm3h1dBxxHo5W0zPoF
+  pxyWaZ392OA0UqNbgoV4I4iO6GQPSaBZydvBJGRyqpOpB29WSUpKN5Bz+ID6Ph5/
+  rnwdq42OWMmkQ2nkHtg2Zu1IzR1GL9FpQQsApqXwAEu01QtYBqOb1OkzN0U4uq6Y
+  axJLmWECgYEA5cPS+t+miH477dljgHHvBCWUYjNtjkhlfgdkpL4Z0AQKO3eqjstg
+  YJu9FHx4e9bOvNpc/4Toi1tG3stOzyHe9m6nc6qnfwk355NXPp8hEzBSL6yeuW+Y
+  wZvR/A4J2/KtK6ghVKj+hdmOVYfXf8tgX60LRwwwZHGPnpqIP9xStdM=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_1_peer_certificate.yaml

@@ -1,71 +1,71 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-1-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-airsloop-control-1-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEogIBAAKCAQEApv7At6wTflVRwC2HHeh3sy/HOeQHYt3135RwNqEOD+tJ4Puk
-  41be+8Lz+N8WIcx6CVhBipOUCQp2kZ0rUysGpFSvMHgFPdTCFUYl549z0BslqWc+
-  Tvnx56vmHkDr6F142P0CJLFqxmNvwhaOpzfz+Us50nqHD7XQCZnmNyKE6UUnAwaj
-  truyygdY1WFGtZ26nqfPnXpxn7r4dB9ss0a5hnWpeRWMYCFXmBq6DQUwW0dHXmmu
-  lD3PkpWAJbrxxMdd4Pch4B3oOsHYEs2X3BSK+zzC1i2CqOYulwTqHnu5Ujy/A78n
-  3WQNQNUw4oANDKEyx0VmWV4BUOqTnEP1HJG2owIDAQABAoIBAHN83LRpKXYF9Spt
-  kfLqENX35dSwUTdbfy2nD0+IZBw4QPh5r1eVfVIpSeZECZ9INOF/ipwWYZs7BDLB
-  ufOjXs2Izzs61Y0kNTDXOWGBwLsb+xjDkMC3dEceh19G0J76/Zc6qh/MHqain+hf
-  Bzq3pF80WgGowPzpZL0vFJnuonJbRScAgzsfMc6/2R+z5vQpRzQyi9GC0R0Bpv8y
-  D1lB82EVLmZd1FxbijZ5eWEnv2zeP8xfMXZlnJkYZHUANIRf5AEYX+2fiY5kDPtv
-  Nqhe9BxU3hNhrqek2bjKMJIQNqVviR7AHChuiPilKDixttgsJielpQNYV99nNr2l
-  Ok7yuUECgYEA2rj7UdZ2A0T0yBZxKlkuR8aQFV7B6SZYxXQ7hsEaNIbm2cUrNWl/
-  aZp+EaduZJA+4Cyb3u7+v6+PZ3pD6T+si2RDowLC/28YriOnC6lcJ4UiqWEWT/4U
-  SVe5LEbLvfiaJF9ASWHeKMweLNUj2N9PL7hAvyAOO9j0DZ8cDtjdSeECgYEAw3Td
-  wNh1SN35Si8AQANZK2JatJz/211YtcEGGIw4NT/D3RBN2SDk3uGagyMEVMdqALUa
-  /yfy2sbt0oJrnAGb5WXZ+NLi12kMbP0VfTclJn3RVcwZX1DLMFgTXnlznp4ZBi96
-  POoF+kkndU1oOeHrrdOGeJjKC6gJGws8w8Te+QMCgYAkcb4unLV9RfgjftnMXJ/B
-  hexsIyXcW29fN0bT5Ukgh3nfv2K7u6BnUD7BYkyapQ5U/Bncw6Xe+rnCXDUEoH93
-  mnVKrCMhvLk4CujCoK2iSCTGZE77dTKcJenM3t8EAHBurxBfKdeCpMBCaCFY+ZyQ
-  Lvta3VSB1FyWCHT8ZFY7AQKBgA03BpM2T1+42lUAroSldU7wnG9fuhDL0+aeAVqB
-  iH9ZK1Xz9z958N9842SAZpeQ0ALyO7wKqGnQT14PQVVP6oltBHrFT17/FD7+MYjA
-  xLtAgHnLjd+a59IB8nVNwtpzl/+KEDq0G+lbLtbIgAaB1txu08WtluOI3ey9KsOV
-  uPmfAoGAEG7AlFUD/XHEnD1rojKIZSs4MFHPnPn+/U2sVjawVuVhYsFX3EEv/V6Y
-  2zYicSYLvX5gEBbBQ6yJjAOTzh/qOVMgon6Fls+rBwxhwhwMXmYPbqSd+UE52/dT
-  Sw/eM/ReAH63/ZJdLGxRYlswiePqCzuSBsUFZEKTzjUt7ILf5XU=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-airsloop-control-1-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDqTCCApGgAwIBAgIUVCK31syVNerrjibBdPHbURxucMUwDQYJKoZIhvcNAQEL
-  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
-  cGVlcjAeFw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMC4xLDAqBgNVBAMT
-  I2NhbGljby1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMS1wZWVyMIIBIjANBgkqhkiG
-  9w0BAQEFAAOCAQ8AMIIBCgKCAQEApv7At6wTflVRwC2HHeh3sy/HOeQHYt3135Rw
-  NqEOD+tJ4Puk41be+8Lz+N8WIcx6CVhBipOUCQp2kZ0rUysGpFSvMHgFPdTCFUYl
-  549z0BslqWc+Tvnx56vmHkDr6F142P0CJLFqxmNvwhaOpzfz+Us50nqHD7XQCZnm
-  NyKE6UUnAwajtruyygdY1WFGtZ26nqfPnXpxn7r4dB9ss0a5hnWpeRWMYCFXmBq6
-  DQUwW0dHXmmulD3PkpWAJbrxxMdd4Pch4B3oOsHYEs2X3BSK+zzC1i2CqOYulwTq
-  Hnu5Ujy/A78n3WQNQNUw4oANDKEyx0VmWV4BUOqTnEP1HJG2owIDAQABo4G8MIG5
-  MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-  DAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUblHl8oyDbfVnxgfCfGA08GaNhVMwHwYD
-  VR0jBBgwFoAUPBdv6LFYloG67Cnum8FUGqzqxVgwOgYDVR0RBDMwMYISYWlyc2xv
-  b3AtY29udHJvbC0xgglsb2NhbGhvc3SHBAoWSBWHBH8AAAGHBApg6IgwDQYJKoZI
-  hvcNAQELBQADggEBAD4erPJCvZ4ZR+dcqNAo8mgv0BdHcCaeYFzDgj8JUkYglnKR
-  Wmk0TP5LTh+niFKbcEqj2KYi/LxbwU8ggkYfE6bXk9KzzauhWiEiFqUmZL3tsf1G
-  QmStI88Qcqavm/KvGKqosoadWafgm1W4HiDXF+3Hs/QjlNed7B+NQZwl2FnQdrCv
-  F5biSxq99MhoiEL1JjWk9thxD/t+R1lWBAtO4ZejwX7RNDXeuIP2QfdLC/TBo5d2
-  7T4NrLGnRnDDFlsx0449FO9SlMho/qMaeKiU98rp42/3qMaRtQHcBclJUFEXmYRY
-  V+6Vnuho3bOQXg6i1yOawXx5GueTrRwVwp3Xyjk=
+  MIIDlDCCAnygAwIBAgIUXJQagtD2HdPXpP2z5RG2tZE9cWYwDQYJKoZIhvcNAQEL
+  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yNDAxMTIyMzU0MDBa
+  Fw0yNjAxMDEyMzU0MDBaMC4xLDAqBgNVBAMTI2NhbGljby1ldGNkLWFpcnNsb29w
+  LWNvbnRyb2wtMS1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+  1UdT8vf1PGJOOtMtFaKVIXJ56WA77gUzzVyPfZXDrf5SozfjsMZWTT/BJrVV7Luc
+  Ep/bXFIwUhon/qX4ca32BnLpfi8Xu2fO7UhXpNV0/SgnbKXU2divyie8mslI7ziY
+  a+9LXtTm9q7ikRt0IsDu8UJpVpBjoxdfAvgL2vpUB6yY4xKUoYh6wfy6E8WLI4fp
+  nYNMo9c5jR0LyWRj9ydF4mtVR8dxlVpaKriCyZ++GuxA4BSlrzPMUbGV2VjaP4Mw
+  zSinrX/DfY7w+mrGh4NkgBihs7LJm8mHcDrkCcJfRS/FVuWkK9/Px5Fodf6GLzjP
+  dIQuLDkg/yiWurOwtYr/+wIDAQABo4G8MIG5MA4GA1UdDwEB/wQEAwIFoDAdBgNV
+  HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
+  FgQUAgGvSR/PFMU0ryEbys+v0lgqIVkwHwYDVR0jBBgwFoAUkjqXMyz52QBo1qig
+  Wj0Fv8qMvzIwOgYDVR0RBDMwMYISYWlyc2xvb3AtY29udHJvbC0xgglsb2NhbGhv
+  c3SHBAoWSBWHBH8AAAGHBApg6IgwDQYJKoZIhvcNAQELBQADggEBABTv2wJi4YiA
+  KYq3grBtRtFcc8L+ghHMW2d+b8oHG6Dt2vVNKpyYyuwgNLrS4DocNjOKD+PwfYrW
+  HZWpcsuvCxmxYy7pcL3+W6xKPYk8CIKChtx95A6nsKX+TFrC7lXJZQjcqHw9h+PV
+  MpWUlv2aOW1FHSv2OfCOshb50XuuyN/wWjDJlZ6gSbnKF1PrGjSKmRKn5SE8k1om
+  iy1tihZGiOKSuUB/qWk/pJIx3wHl29CFBvPV6VHoK3UJOOuxaX/Y+wPsMPYeN8fl
+  aN8covw1PnjJbWpjHenPFQAsvSYz+xs9oYVswFc0JfW00ln/KnuHulxXe7Osc/Dk
+  BfyTDo8oDXM=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-1-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpgIBAAKCAQEA1UdT8vf1PGJOOtMtFaKVIXJ56WA77gUzzVyPfZXDrf5Sozfj
+  sMZWTT/BJrVV7LucEp/bXFIwUhon/qX4ca32BnLpfi8Xu2fO7UhXpNV0/SgnbKXU
+  2divyie8mslI7ziYa+9LXtTm9q7ikRt0IsDu8UJpVpBjoxdfAvgL2vpUB6yY4xKU
+  oYh6wfy6E8WLI4fpnYNMo9c5jR0LyWRj9ydF4mtVR8dxlVpaKriCyZ++GuxA4BSl
+  rzPMUbGV2VjaP4MwzSinrX/DfY7w+mrGh4NkgBihs7LJm8mHcDrkCcJfRS/FVuWk
+  K9/Px5Fodf6GLzjPdIQuLDkg/yiWurOwtYr/+wIDAQABAoIBAQCd0YUWQlNOlnPK
+  5Z7z5nWx5VK+1X4jN+hIKxjm1h6RLqMZse6jTXBpAyc7LG3jmkP4KCAbJZop9r7n
+  mQrJm+90gC21OMW34C3nuWNZTrad6cuagu+JL+WMknDmnNGCav+mxtCf4Kzzlx+C
+  Pq1mVhu5nOnzqy5/bXjZ6pBjPl9VuQ/xoSW02LoK40Q9JXXFKFmu79Gzz6thJ+gp
+  kPadeZr8z59fCyhORPY52azpQh/8a/SKuS6/L+aw8d7VX5YXfwZtwz6rEG2WfebZ
+  IA7lsZAmXT4mVBHhN17ug5krvprhNow8Cra9a09OL5HmeN6TkjGkxMAuZfDOepcn
+  G2SBhAoZAoGBANbCm3EAWjfnb08KQJ5fep5wyPizQe98OBzkzR1aRlWKxYg1DooG
+  rspFq7x4dXANFeH4SJ4U/DJ+wdQy3/BkEk4/AlfGy9aunucSEDZgHoCYXv2oWCSb
+  PX3IudNi2EZtVJlTQ/vbMvW5aTdEzTjnkcgqIYj8hlbd39oNCXCa1Tg3AoGBAP47
+  44YPVqEjBlSdk/cCR2Y3jANFCG/VBlooVu+KV+K/PMrWLl5fVpMVjDFPXsf2Qxxh
+  7PkJNo0Pd3eqUCnLc1hoYCftgb7l8h3mDtT7PojdoT0xUD53+bS6YkvIzQSBK02d
+  1Aj9+yZZOpP94gii118YOSM4GgyH8NGohpqkpQxdAoGBAM5sdd5y+US81peBgkT3
+  /zNlszahjqHzozfakHFDQVGdtmpKnTP8YmuX9g+NNUxDt6Hg9WPFRff/MK2XTPqS
+  JapCFC1srqcmZyQxj5XEY+01CDEGa9qbwMozcrIFU162XdeWWkUuF1hrI//0yNGG
+  e/CK1nsGRtYeI7lCSK2MlZ+XAoGBAO5rE5BhSgiLZCBuNpjq1jKR3Qgj8SmPSQm7
+  0uuJfanzVfuSqKFwHyyIhJSprmUwGPfBDg7uCO54lrzuR4cqeN1r5OEM5yQzWL+Z
+  REeP5rFLxy4v1OUAdnh6YjxX74xN5mI/pN1Z8fGgtEKdUSBwNjHD8bGJp0QhKEI2
+  HSVhSjcxAoGBAImic0RW4Pukj61+EwLWQbUWILGHCgAr0clE4gB135Rg4ve3R6+W
+  7NQGgA1dQRGcJw5klJQTtz8MxEuTpUt3zEU0yPqb26B14wSh7XhJBa4iExXsKUeA
+  1/xoxW/iUzKvr4oHoZ1dr2NKdvDwhAHu0gIsxE0FpT1DV5WNcZDzdCkn
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_2_peer_certificate.yaml

@@ -1,71 +1,71 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-2-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-airsloop-control-2-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAqHau+/vTc/5efBtvveIhxmmTYp0ccQV3kOq8heZyK5tGLybZ
-  cP6mqOP2/5Tbt2Yjd/sK6gsga/bj1JjUYTrfyfABSO/JEqBVVuYjQ6VnNpkxXu2D
-  r8pAlj02NznB5ayMS6Eakbza3WuFBS/BpxnZTEA08GsugOwU9CCovLz36RC7vBgS
-  WcBFpvlxwSlJS4Os/FzBe8kYnqU9zsza09y78NkkbgGVLJJxR6F70JREOHjqmVl1
-  VQA2IAfjkCIrzd4noav/qZQ2LCRNvNdIn8JPZEPceTRnUDu+NmvTQcYmCU4zMcuK
-  5k5ctSybQ9S1WwR01L9Biv1uXDMCNjaiqDugEwIDAQABAoIBAC0zKuARQTruFQvX
-  kLOx6L4DtbfPz8HDZcFMOijzG873am1cTxsyOCU4hR0uI4WhsgKPKO6C7cAKDjcM
-  im9MDJ9x9eZL7/c/baZTOUL9LiRIFicSMzMHYSzuX42RwaSOF1Zzc12G/nJKVvZ9
-  Scg790GuOIYJPAD7VuPpn1yElz/A/fsbzr3NCidDPVIoWGC5S5K1IdyWM2uUAaxD
-  btjivMU++3cRqTCV7UyZsS9QIuZqAEGhDSWtKPhdehytvQXxuN+pRvNV+CVmFVNr
-  nTPAx0xL1Zhh38IYbEccTp4Ztrn12tDHlsjYtuBVqoqBzh9ayg5EXEd77GRac0OD
-  g5VNiAECgYEA3F/oZEOomBOkqYvYmu+VcEDRgZI9M0oEohpoVq59ABIe0TgvsF55
-  SoGg+9xnnP/OmENUJBTFYjpgAU6mmFODyuY3r+TgqvksyJEF6Bkqv2s4+CvmvKDE
-  aJY20/kuaoLU/Ht2Mmodmtk7rzChEd57iXz7aNxcY6znJKai5Q0MVsECgYEAw7J2
-  0OMj6HJKsu6m8rYNvOhCCk+wd5cjyvzDKR7UHvxfd+0vTG4j5b8lGn6FXuo1wUdT
-  mku6CDpaC83UpoZ77DPaPh1DVTmD04iDkPx9FFMk9BSXKC6IITioN/gbgXhQYT5V
-  s47VN1yS46/KOXt5LOZYxhuGbiVL/M3n9hT+39MCgYAGlze0B/H62luKVoxb1d56
-  RPX/EgiSiBwrXO7R6NYEMoaJa0zB0ZF/EPFnlufiYiQjmZ/ilFxy25wTbe69j4HZ
-  h5kSwZ2Wf20/clbi4h3NK7/AbE+yRHybRCLPpBwnQ1JrWqXmTBYmk2idjK7Eggrf
-  ycUbFbwNnxYqmnE0uHcuAQKBgAsn6U4PJMTjfw6kPDAp4K6cLueXk1+95fR0ZEu7
-  zivWBzs28jNRNAqs0tinzcKTZ20VO9bX6kr9yJRTr4OutvHIIvDXijcZiEJOzfE9
-  84NtGfYwFk3cGTaLnEtUgXzn9u0UOJ57zfvR8y23n7eXKlk86GKivw8YYTSQKGEG
-  4WCxAoGBAJgV7ZQMFS6041pGT66NKh/uE1wBr2Tn/ST3LLAltx/9LyW7cDqvXEfD
-  X/ahoqiOOpR6vDu7HKa87g3Qnf+4z/vedyS9U0WxJbaS/BtCBej8wBhk4O7y/hMh
-  Evk0IVqfuE/Tdy67kKmPo9zlw1YatcE9OzVdBSKDqrvejzqzHPfE
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-airsloop-control-2-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDqTCCApGgAwIBAgIUMftE0dunDzwApYz0PQWsuxcxFLowDQYJKoZIhvcNAQEL
-  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
-  cGVlcjAeFw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMC4xLDAqBgNVBAMT
-  I2NhbGljby1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMi1wZWVyMIIBIjANBgkqhkiG
-  9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqHau+/vTc/5efBtvveIhxmmTYp0ccQV3kOq8
-  heZyK5tGLybZcP6mqOP2/5Tbt2Yjd/sK6gsga/bj1JjUYTrfyfABSO/JEqBVVuYj
-  Q6VnNpkxXu2Dr8pAlj02NznB5ayMS6Eakbza3WuFBS/BpxnZTEA08GsugOwU9CCo
-  vLz36RC7vBgSWcBFpvlxwSlJS4Os/FzBe8kYnqU9zsza09y78NkkbgGVLJJxR6F7
-  0JREOHjqmVl1VQA2IAfjkCIrzd4noav/qZQ2LCRNvNdIn8JPZEPceTRnUDu+NmvT
-  QcYmCU4zMcuK5k5ctSybQ9S1WwR01L9Biv1uXDMCNjaiqDugEwIDAQABo4G8MIG5
-  MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-  DAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULJIaOYnkMQhJjJCoVK6kqpNh2uAwHwYD
-  VR0jBBgwFoAUPBdv6LFYloG67Cnum8FUGqzqxVgwOgYDVR0RBDMwMYISYWlyc2xv
-  b3AtY29udHJvbC0ygglsb2NhbGhvc3SHBAoXFgyHBH8AAAGHBApg6IgwDQYJKoZI
-  hvcNAQELBQADggEBANWuE2Zliq2whxZRj9cGyL8JTbcrevuxPLDV9zrT0JjExWON
-  N4YWlf/EiHxJusfC0gYNAMlWpSZLiw56FpWmrXb5/bbvOyfLIdQpZVBhWDAcpc/+
-  MSV+FpRjklTQuTrAQqEBU9UEToaplKSpWNAdgGF00e+cKjP6fr8u7hQY/qOS738x
-  iCNXue8oeJ430Xl4hSxqI1SMkMYEDYOYlt43pvhwOzyITrfl2zSAl77I4f9b1oNC
-  PbmCpKEI8ogry6b+QcvWFlXnyozLZ9EIj/P3VTGxkz4z8UbskAwvHGVxlbQrter8
-  bA2eiBSkyQF5fUnslUx4LHe8M2lHxTHChPYEofE=
+  MIIDlDCCAnygAwIBAgIUdUWHGlTJR5G2EP7aizOd2GrhoA4wDQYJKoZIhvcNAQEL
+  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yNDAxMTIyMzU0MDBa
+  Fw0yNjAxMDEyMzU0MDBaMC4xLDAqBgNVBAMTI2NhbGljby1ldGNkLWFpcnNsb29w
+  LWNvbnRyb2wtMi1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+  syTq/HScT4FD7hicb/bvENRt0mpZZvLeIq7guOHOG5e8D9LjqopqNTgYaG/AzRpk
+  PEvA2Lo4rxPpAqE25pJmbuScsvplTbwkO7W0rncelo6ywbXLk5d1+wo6uW1dC7p9
+  R1WRUyIPBYY/naKAXKagjT4JPOX0N+nqQmMgVI8qT5vU9+FD1tBRglF/wcnpENfq
+  zAAISnPexbdC17pl9GY1YgFnFBpSmxSh65vl7EoYCe7hLPmSs2HpEsl6JY3sqk8z
+  Zgb9wYJzXfWH+92NOZ9ARz/8GULFHRbS+yjlgTp30A6NIu3h5SVG+Jsy7YN4KcTc
+  k+6rlySCFELNZUTP65NYtQIDAQABo4G8MIG5MA4GA1UdDwEB/wQEAwIFoDAdBgNV
+  HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
+  FgQUAq3oNa6hZdMRSe0lphGO7u7x15gwHwYDVR0jBBgwFoAUkjqXMyz52QBo1qig
+  Wj0Fv8qMvzIwOgYDVR0RBDMwMYISYWlyc2xvb3AtY29udHJvbC0ygglsb2NhbGhv
+  c3SHBAoXFgyHBH8AAAGHBApg6IgwDQYJKoZIhvcNAQELBQADggEBACBZ4OaWTuSC
+  Jtt6+5MIFpX51w5ufjD7hsEmf5cVpjSTqvYA23KcWX8HYa9kiVnVVr4YtkxnlWMk
+  XmrxR/4E0O+gItRJ1ldlssxLrcc8bCaoo2vPSsuwOCA8bkBcjC23TwYoao/Ohw0Z
+  952+e4AOIAQdytoTMCGY5K/0JanAnQu6upR80YaURiR3tbc2klUvsUBkL6yrCguo
+  t2LRSBR1g0hAzbwlDJqcROGN6bil+VSjV2e7qm/2KHancxHwFAPy1vlUL3PrbH+J
+  YF2T9Oi6wRc493An8+TiaRbfn9dI8jTiVNORbuC4M2p6w7ZLcaqRF1KtOpyLCAiz
+  Mxjn6lVeyFk=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-2-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAsyTq/HScT4FD7hicb/bvENRt0mpZZvLeIq7guOHOG5e8D9Lj
+  qopqNTgYaG/AzRpkPEvA2Lo4rxPpAqE25pJmbuScsvplTbwkO7W0rncelo6ywbXL
+  k5d1+wo6uW1dC7p9R1WRUyIPBYY/naKAXKagjT4JPOX0N+nqQmMgVI8qT5vU9+FD
+  1tBRglF/wcnpENfqzAAISnPexbdC17pl9GY1YgFnFBpSmxSh65vl7EoYCe7hLPmS
+  s2HpEsl6JY3sqk8zZgb9wYJzXfWH+92NOZ9ARz/8GULFHRbS+yjlgTp30A6NIu3h
+  5SVG+Jsy7YN4KcTck+6rlySCFELNZUTP65NYtQIDAQABAoIBAQCBFJrVKVjv2J6P
+  0t/1tSHxKH+xW7vreBgjOYrm7J1MOHrjk/tDiNSaYD8GEXAE2X1cDOF5yETLsjb1
+  FCCw5tA0GznlpJKV/njFJVp5U4+QwGWBOnLjeAEkz+wca/bdWpSmb7t1AVd9jYwN
+  E2gWWmHZI9gYL0FXgI6xIyfKhhXgoZ122G9o/s2p9NJ6+OuwVn8GFRGNEXcjFJ0q
+  zvxf0hXyusEUQfJNbk7Y1exKMGlsmEi24j5HT/7iMLzJOHJaHO31w2WQN5KG22tL
+  NbJZRcFD9/DtzHyK//CkVDH/kDW4EZ8lpZ/e048dAON18ESfSsypAByaTjqcD+ig
+  raEf3/BJAoGBAN3MzBOKN2NpMfYEBP0PbmM/mqp+k8IP/k4wBchLKaFByh8uJ/UR
+  +7CC9jn+UJzdzJmaRUOfk3kiRNfvgzBEK118irj2kpCZX8a0GfEJXuqPojEXh5JN
+  FG9+HKHrMCAqKm7n7U53wCJ3RpIjuE/DbBeTWhlxDgDfeskmI3Fc8aSvAoGBAM7E
+  Wf5A9lsBhwmKtGqKVwZj/F7bsyiOwZiCNi/gmzZd/f2ZwGlQUsOX6nXmul6eb6TV
+  RYEKpKC9fCZLInNZxc9Ts3tdWMKmf2Lkz5qtFxZgnwj2L+/R8o+HYxPOD91z3ii1
+  TOXvgcylagG8jnWApIlZM7T+dxsGmcflBIpc97nbAoGAQwmDJOTBmOpSj2jnmRTw
+  6E5xENbxEdaDpl4dYUxWaMbZsFLjAM9OoyryANU8yCzBiit2g9nXWOViqWFa5Vu1
+  P6xEwWLFKa8xo30L2i5a4cpH206hSzbA1nHndYkAIrib2ql+sBjBmakzSzhAnNsT
+  8Iw4zze8Y8cn9WPxknHlF0ECgYA0VNfeFP0FHYba8GMnT+oksOuv6nUWv8LZ4aLr
+  TTKbeQCOzfo37V91J57sxj/HMNxa4KudtF7kW/DvFDcc8Myy46FaiM6tPUyib/zn
+  TgW44S1/LCgHz6BPmVmHKrEzQF8q+HAFBjBY5kjFNb7smGmMZapDld/5VBtZz2nt
+  xwff3wKBgQC5zQNodyiUAcKIUZoDCUPrQL1GfMNRFKOl6omAN+xasRsrw4YhM3XG
+  9aqxGzJzeUrhVWTmY7wYsJOGhUxWjSbkFuQ3CKlrDnF4sUe4RCz0TgqRgrvvLNyx
+  4gABKxErDktUOEhGN1eIakWa3FTpRWf/SYdfFPqk16ijxIbPlFtYNA==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_3_peer_certificate.yaml

@@ -1,71 +1,71 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-3-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-airsloop-control-3-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAvdk/I74o46oXS73+n0/mhwbBbfr1erBshIPaKCNjTsYMLW9/
-  ktMVDRFuYxCUEYGXf22a6caTgjZerK2OcmOFifgIaAu8ucA4Lksn9FQ/JyrcxXIu
-  1U10YuF4jYdZrvgewYVdVIl1dtJ6m0jwxJE4fMbZCLP2zUXFyLJplripsHJXBIyA
-  3SB45ipJ5mTDkjxcx7rW2Lo6jxBbUyZhfeXYVTPw48CNx9PQDXBeNEeW/SpsssN4
-  DQSYJrW0w9frAJ5BNXDWOoKtS+BWxlp+6RymI5aNjXFAfxAvJ5ZBcSj7xUXRpzNW
-  X9DeU5i4OHq0x7O4+5dzbnAjuOLl6AA9qausvQIDAQABAoIBAQCVKDRFPsgdZqt6
-  5MFCJaJ2/8XFRODNDgOUcYta8cK6RzuWDv3qO1FUvRc/We0be/etNE370fpe2Zy0
-  in9aO/rVFTx1kpMqVW1OYdn4SqB7g1+E+Vr2Vy5T6dWvTGIX5/UyEjfrjTvuqRuP
-  GVWg+n+o+QnXnp0PVfw43IO82UTozPGk+IxX8SyktpSDEdYMiDKGhEGStPA51/o4
-  bcbgJ2kUaqKiEF/D+kDV8/iU3ZKUuS2h1fAmZW5MH6fsiHFsbW18zhdLRXA5BAnJ
-  q3E7XX5cgqfiRB5QBEUOdX2vXHiznNVQKcD616Ejkjde/MdMtpuuSeiUguzoZdfA
-  x4TQw5q5AoGBAM9gDaW6S118AxgUGqWVUARdBloILNjSRdAe++KBjFqByCjIFtTT
-  iE2/Y2WfqvQOTtWJ0BHiG8JqVh4Agomc15lV/6/Ebb2Ve+PVtAhNuZc4uNg/WY04
-  VaZfU8g6ZHfyhKTh9BMaRudMrwBSG0gM14iP+YYXcyjbT8YnGAYAGU/HAoGBAOpd
-  I4RLpMmwKRPsK9K48m+DLrb9hmWNTJY9Pp2VMUNgtlBzye5PcElgVUTTET0g0OY1
-  CNPqEaFf6EjQR0K4GBrXKTeY7kSW5kJ8ZwxI//2io9qb8Q5o0AwOGfE9Zjf+Cq8T
-  06L8jJ64nqEDdQ+M3HIaloE648uld/82+NXYUydbAoGAIU9dgdRlzLNhz9lS2mwc
-  eUb0ATw07/L+scp4TU7f253jJ+HUAQWlbE+kyKsYC7HMqfJEEMtQCC+Ke7E7Rp2B
-  6ChvNK2Jrx021Eb8byUE/axnzJyIZu24nEvNqmjuwHGdKtr8mKDs6LRhm9yUc0NU
-  z6PIweg8YECyFLMs4bHcXvsCgYAl9qBiNb6jzR1aVM9kewEKfz159udmW9UkIReb
-  fydTur7NmXQEXmnZ+PjXBTmtpTsxjzW23hutAFQoN1TTwe5lqqTKlMND6Q2zh2NJ
-  4ilVdJsGNmx94QySZ1ZcdY2xVD12zsdhh3df3pgTjPPRaQfsk9H9bQSpYExn0wfL
-  3BbcMQKBgFyfktLNwU83vBxFxXEd5Lq3o8mPAb3ipBM/1MBY7KT8ziUXLRZ+ftJs
-  GwA7WxR1m9p+/UIdaXjixh/MBncIl4ou/E9JMkeVaovUWC4Nq+cldaFvKJw2l/Rq
-  ccBug9/+GXUzDC/nCwjc2gmoD8txqXRROnyZSiQSFAQE/LlvmA1n
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-airsloop-control-3-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDqTCCApGgAwIBAgIUXnIPzuIbvvDP2AlmlPAlMkDhYrgwDQYJKoZIhvcNAQEL
-  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
-  cGVlcjAeFw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMC4xLDAqBgNVBAMT
-  I2NhbGljby1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMy1wZWVyMIIBIjANBgkqhkiG
-  9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvdk/I74o46oXS73+n0/mhwbBbfr1erBshIPa
-  KCNjTsYMLW9/ktMVDRFuYxCUEYGXf22a6caTgjZerK2OcmOFifgIaAu8ucA4Lksn
-  9FQ/JyrcxXIu1U10YuF4jYdZrvgewYVdVIl1dtJ6m0jwxJE4fMbZCLP2zUXFyLJp
-  lripsHJXBIyA3SB45ipJ5mTDkjxcx7rW2Lo6jxBbUyZhfeXYVTPw48CNx9PQDXBe
-  NEeW/SpsssN4DQSYJrW0w9frAJ5BNXDWOoKtS+BWxlp+6RymI5aNjXFAfxAvJ5ZB
-  cSj7xUXRpzNWX9DeU5i4OHq0x7O4+5dzbnAjuOLl6AA9qausvQIDAQABo4G8MIG5
-  MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-  DAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUxUmKipe5eB2o0TU4xBG4e6WU0+4wHwYD
-  VR0jBBgwFoAUPBdv6LFYloG67Cnum8FUGqzqxVgwOgYDVR0RBDMwMYISYWlyc2xv
-  b3AtY29udHJvbC0zgglsb2NhbGhvc3SHBAoXFg2HBH8AAAGHBApg6IgwDQYJKoZI
-  hvcNAQELBQADggEBAJi1XyWXmKCmwyOluv7Xcn2vZcCFQBAZSEXeJDcOMH+aIJTm
-  NTLwYzOzTHRJlXY9dQTXHVd6E0ebOwrSdc6NjYZ2OpL2ZGv5EaHGxIKpJOygUIIB
-  bZXlfB46NNCMKuJ0EHn2yF8OQvzXbPR1QYA0KSfOpVkH+3xWjgEya+NxH2v21FP4
-  gNXOFj8nrDg6rL0TxivXwDqQ0Ji0W8jO9c9Q+nFiFpQKyFFJoBgPzS6MSnwzrgtl
-  5YKQ+85vKgAGO8LXsYzntOaXEdojJe2Mfgeny0qvJiSq8DTr4n1d7q6DedNtJDaA
-  aF3nIVILYaNT2ApC5m29p/XVo3LieMwV2I1pBqk=
+  MIIDlDCCAnygAwIBAgIUVFRmXn7GYapv+C7OnmVLGd7qKfswDQYJKoZIhvcNAQEL
+  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yNDAxMTIyMzU0MDBa
+  Fw0yNjAxMDEyMzU0MDBaMC4xLDAqBgNVBAMTI2NhbGljby1ldGNkLWFpcnNsb29w
+  LWNvbnRyb2wtMy1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+  oxvuBt7vgOEJGrOSZKinMTsqWNz7sZEMv3zW7CiU5EBaH+0J0xjqqpDg+E8edjkh
+  RnR/+B5nNOuGKwwwpGLdfCIf3Qpf12eU57qeucwT7AYx1S7ntJgVULQCd9npvL2e
+  TitPXoDBg2GMlFU7vMYEfbz8+RZ0oAqLfiF+o9j1OWMAgeHpVFwbUMgHKFAPzb41
+  fJZUkRUt9yYqA9/xvcmLg3Qrmwr9ytIwtp9cGxJ08aXtPLGXxb7+DDdAeGbTtUZ/
+  cvWB44KXEvYO+kV5vBDbe4pwOtB9DlUc2BwZL73YAHFHK/fyHFAGJy3WdNkXUi96
+  uefQyjgAMS0pwtvZTEsyuQIDAQABo4G8MIG5MA4GA1UdDwEB/wQEAwIFoDAdBgNV
+  HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
+  FgQUFXVgSMVIY6HCIaWkxvROv0UPcU4wHwYDVR0jBBgwFoAUkjqXMyz52QBo1qig
+  Wj0Fv8qMvzIwOgYDVR0RBDMwMYISYWlyc2xvb3AtY29udHJvbC0zgglsb2NhbGhv
+  c3SHBAoXFg2HBH8AAAGHBApg6IgwDQYJKoZIhvcNAQELBQADggEBAJcTukY9oa3O
+  4OC+mbWvKeDeBxdGs+DlFuOvIzgRNj8s45oCVhFfSeXtZbC5a97c9A9MiYZd4Q6j
+  0LO9sprotajS/Bsy/usWNi24SHiCkbuWl0jZfcpxy8ZpagWRtzz6pjFEB7jXKlDr
+  pC8rNAAW8g+vUwGdFIRiEui/gRseBfG//hU72Pt6zXKd6D+UP1pGR3JZJXJhgx8B
+  /Vv61oW5yC8ubtz4Mj/6PXy8F2syykeGwzMDJtPJ9kepGzNhl4xN9Nnc251M1TiR
+  iC3015iyBL+4M0rS476c6AqyNgmIok+0K0YPPPhhAVjlt1kHspJqBg7afGa/una/
+  B5cxDChKqt8=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-airsloop-control-3-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAoxvuBt7vgOEJGrOSZKinMTsqWNz7sZEMv3zW7CiU5EBaH+0J
+  0xjqqpDg+E8edjkhRnR/+B5nNOuGKwwwpGLdfCIf3Qpf12eU57qeucwT7AYx1S7n
+  tJgVULQCd9npvL2eTitPXoDBg2GMlFU7vMYEfbz8+RZ0oAqLfiF+o9j1OWMAgeHp
+  VFwbUMgHKFAPzb41fJZUkRUt9yYqA9/xvcmLg3Qrmwr9ytIwtp9cGxJ08aXtPLGX
+  xb7+DDdAeGbTtUZ/cvWB44KXEvYO+kV5vBDbe4pwOtB9DlUc2BwZL73YAHFHK/fy
+  HFAGJy3WdNkXUi96uefQyjgAMS0pwtvZTEsyuQIDAQABAoIBAGdQwazIeZyA7mtj
+  Y08vJPgiKeiv0R3gatrAEML10ZniyTN/ycFU/w+bRWUDeKAZ/+HI2WYom+cBaLLL
+  vePiW7jNRLGWaK7ghYlixDeb9OKD6fzHAS17R8UewJF6Dnvm/+czt8p8dBbsK0ep
+  1XT1WNLsarC8cJMPGtyCCt1uB6aY9FGW1sJiZCwSkzquffsmgr6j2qH2FEdn/A+e
+  jOyD9TXgJ6Nrx3mvoI3q7AVCzpQQ/SiD6IxMjmSlUYmXVzXmMS+xMgYupy8qgcBR
+  8m4+1R8CR+w3nLzlisJhYSUOdgefRNY6wmPPT7KUSx1gMEyU9IM9sSC4BrKR3VPo
+  qKUs0AECgYEAzWAmkONzQOKTFbb1IydeD0pnCkXFvxx1VE7XxCnsQ470QFNBT+Ku
+  mFY/P0xPRha4xHwTY/KaXI9gh96nCwF7udi+niwedeZVsjNWmf70Fcp2abPDj/a4
+  5vJRHlJHdFumNMKw5/f+grNHY1k3IUVD6Iu72UQATMCKZK1mJuNQpvkCgYEAy1Ch
+  S1wVQ4YXvbUISLL6SP6v/2q7fOGFpSnwqp+NJnH5pOgOe+WHog+w6VmZRhlWiA8B
+  QsWko41keN3G4iB+Tt2kDr2NyOC9Ed5xcnXQud1V5P0pYvmy9MaWapHI6GqYLg3p
+  TI5Hn/TvsIUXPr20dPkGMtW9G1LiHeaakk5nGcECgYEAslZ1BsnLkiNtj6Sg95a+
+  0c5M7Zmq3opKxBv2twukcwHWzWi+RS1VaUkzgLa1++nNJimL+PV43zlNnI5WRXNT
+  Sg2RcO5kwQJzlduIrw66S5XU/3KvNfsLktgGYqsWC09uY1BQqA4sPriJHBcjjUuF
+  bZCxXTf0frGPO19rXgd0SJkCgYBLC2HdrQl0OQR+U1nRa66STt+riTvW5m8r/YUF
+  lYrGC/+3bKgb9ybPHLeSCi5W/3c/FTrD6KvSapgRPNryEEhO1+R8RF8XLEzdUZvS
+  QcZfNGFF+mPSUpRJYRuYDmN31hCBv0TDqyio1AG8yANCd0cqfdhZ3ybD9R3dJ4ca
+  RbIsgQKBgQC6HliGCbCY4QTRceCZ5cqPe6de3FW82U4wdYcb+D636lMjGE0KLTRO
+  lHzsFXEDEAM1r4nvcLebay1ynwi1ljWQg4+ydGZ0Cl4AjOT2+sGkRJrz47cmflSy
+  PJx7knfDBYmYp7aQpFOq1/5KhRkCvGcp7PGN0dzxbWIJi9644oE9Gw==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml

@@ -1,69 +1,69 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-node-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-node-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAqSpEQu0YTcI+Sk7TzLAgyXIGF5yYsNnAm9O99BF+kAKnlXON
-  9ODgbL40Ma8k/gs4x/Fmi7uDFqQQYr9MerDmNE+NdR7FsYgNcvqaLVzqyZqn3P+b
-  iB5wY+xwtXVYSAdK01xfjEerSw7zD2BZt3x7jk6ETyS87Tx2puCwoPLSz/C8rNPk
-  vt6fWRh+gAfIj8nDaHzmqS4JLxccUJI7lL/T5PPAy0tVnv1JvFaBLJ6GItp8HRrC
-  FM0tLtuwIs6GPNrsMwmfzIXENNnp6luGp0unuxawspiwNfEut6HNJ9C3HqMudFq9
-  nsCquqC7Ff7EF1W/EG2vjkq+Pj0hfIrGQbS3ZQIDAQABAoIBAQCKvDNHgBNSkl9r
-  qcJiOIBrNaxxaOiBAdTI95rts/tMOCEgnKhrkJH+HO/JX47DGojy0bP8HUihJOSb
-  V7BtXu8tL6Ef0KDpvF7rUUNouK+Fr+TDho4T0IL0MFEvQJGqYPCo7zUdYxnEcPo+
-  PhLWPK1IRHSWQ9b96XyV1+iD1yG1jrAb7WrS16EGtGIuuGCzjcOrGZj6umTTO5up
-  UjjsSXXYp9oLyc3V3QM+Q8cWVJoRHSfFJrfu+lHN7ohvmWWaPJo0+QXsrHUQvEzP
-  IK0tniC/LP4p7Js339a9UqoaQrBsuF2c7WZ9EN5fsJ4Kljx/aWw3uSx8Xt9pvLiB
-  04Rm1BOBAoGBAMVXn5cZLtoiIMy2CG1PoR2xUp5Pk5CYTYwy2Sbb8q3/bYMiCdvQ
-  08nknlFo7VwaNWTKmMp7rp6VxFBTGwcVCXwR6VMVuE3Ge0uqXE26qMSzZ1W8wMpy
-  qTiwGaTTdbWCR7KuJYokcsmKKUt0V578Z73HeysR6dZdUuY7j1maMwHdAoGBANty
-  jlRQavSkjBXVruJUJsiwy7pRFxdqriIusHCT+1ayiJJFsP9q7SgmfA1sQ7WUn2jQ
-  sgemmOxogearXEpiM5w1OsSZc4xuLC41aoVjPMuvba1YhNNuwJ+HRJoyuaSo1SM7
-  6jwYtFzB0W3JhvOeoEtQqB50qmPO30j1hH32F+cpAoGAD7cZo2vC+mYLXKIGa8YS
-  m426eZb2tmYajtahymFrowWbT/0O8e1gYEyPewYzGMmRhPRJVJ6i2kgs+QSVO2wm
-  dDXs8cviAHeU7AKmFR6PQBLVYNOGOtkEttn3QNQCJLE6SnVp0eVzKq+Q+ExMigGp
-  tUhEe7qSd5q49lK56LXJ6BUCgYBYeeRmnBGzVxBf0Up0WAdXDOjm0sDjoRBaGcbr
-  bM5+Evc7Ojv1ju/VK0cCxm66LBTlVpcgvIuVbUFKdjZ8iwFR7qgmEdRjfxvy+Xhc
-  FTmyyaUHqdPLxzCEYS5ImUD94VAlp4d1+WPmrgI5KHJvkLoCA5/0v4bfPM4LhWmI
-  u4rBmQKBgQC+0CSoP5AkTQPMkcdj8lqyxCtH0PYMG4kjIbfPaVx0CTDT7l3Un2it
-  bTTp9KOMzURCWmW2WZRc1Rm+4098iey3/nkcCQQxCROCHnpxGkRh+1mOkimXKit9
-  EPZKutdbPjYZm/jGIyZDz1WvHPkiTaW1xWlMQxNASxv+lm804Y+Jcg==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-node-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  bkQTzTkRz2TPsAxmcM8aObIhTcFVbJ9R
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-node-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAymBraWa1y9PMKZ8IG6VhWldQSai5lHsNRipqmloO9TDCLSQ5
+  ILp7mBNcZnWFin7NMffq8yVWWpK8B1rlbRux8MXTeltE3uJxgjaQZqX3k+QhEE5z
+  ob4BLBLfNgJiWV/kNwuNnW6Nn3wMtN5gwr2O1NjAKU1+nlWuVViUNulnJGCEzxDT
+  iymySKLhIY58A6hBHGiPws5Uk7le+pv2VP3SzJkudTRN8CfwaclYtc/mdtHHG+uL
+  NJHfkYRbT366T+mn62oPnvPeg635wi2uAHreO+wYSbsryWZfkTAJp7R+aIU3FbH4
+  BodJdFEEZac0T3VUzKmnOKMtgTAhdHx+LU7SQwIDAQABAoIBAQDGqwDG591vyuuR
+  sFz1RtTbKvvWU5xa9rGBQAKGpAIrEUKNrhGm32qVT+xVaOk/nFszwn0TVIQBRirv
+  zXuMMLPt+UYxx4dEhmeHvKjlG+h/dmQ+7cT18uCTs7MMAisqMciHgP/0nKLK/aw7
+  olK62fttV5rM8RZruRD7F4nonhhyy8za4fvZSZP3qy9m9HOCWuCywu2tcLQe9FHH
+  JH0Ro8jOYMlkopmkxTvJTEfQtLReVPAx6stXJev236PO7KUCXIS9P5t9faVmpAtK
+  o5JE7gMMgRfKpLB/QvaP0DYKHefeNupu6qgBsVv3lvcvE5jwffOFkFpFFlCFMEYL
+  6dRs1VkBAoGBAM/qcOQSbBk0Ynwj/W3gXBjqvBPjcODrH6YOWaV6nTS0YByj3zOz
+  Dd5B36uwh1SdSh7in5mW41fjQSzgPvPF6k1riV9QaojYMTwUYVxPPI7k0V3WDhke
+  P3EgAOFOK6MKclL93Y30HTzTp8sJKG3X5aNV6HdYND1vW8TzU7wJa2frAoGBAPku
+  CTY5He9nqDSIR2p9ZBVLcaesT8HnuSuaXCW6GHFUOLhozygWpvYFgE36yt+S0up4
+  +3swngc3SeMv9qvuQ9RhbZwi45nnCnQF2jXmd4OBG3moNt1tox7A3eWWQYsZs5zT
+  8Rmc6eZD42tg6K7k+a5EQJU1/2/NET6pFACBkMEJAoGACSCUlh6M6kpXbHW0AWfR
+  AzMC0KiyYt1PhV2p587LKe4lLfyvprhcin4/0GyudDN3doWiVf6+ujP6v3qUqOTu
+  VTm8TRfdpWZAOw/1+jRsRyWaX1EvS0D9rfymrT1eQwkJXcVRPZMS2YG9Ivei87d/
+  mD0EOIEBwhSqZan86gtL0MMCgYEAgwtE6PFM3vTirw3kkQp0sgZFNWsXXuCgr1+0
+  ilq+NAuY8NKd73VKRSRLf7cfLkknBwytJPJCiYT4JLS6w1zA61Z5sJ1gmTW6d54E
+  TkhwHgauDmL6x6S7HpdLm0xUF/ViUl3b9B5jnCej2HrUo/XjoVRfqpkFRyTPpuaA
+  kGuTVxECgYBSobxhceOQTz+c0Rw/6l4g8A5Ie6Hvp1LheSlBl0uyT5Fr2WUrm/wc
+  PinLfdbEITrCW8qZix1Ca3Y5unG8bm7Ek/whKCLFe39BQlC+ix+wJdTYlxAO7Ngy
+  gxEzSVRt0q8/yZ5QHTLgG/prlkrS7+ISM38UEJAoeCmU9aGvmJeyzQ==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_admin_certificate.yaml

@@ -1,70 +1,69 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: admin
   layeringDefinition:
     abstract: false
     layer: site
-  name: admin
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAuI+MZnsbWfUi914wYXxYO294Pala21yHhgHrQoiNrf7W/0Eb
-  JTrTKCrgzAzUusOhK9NnyYHOyP5EW1FZug4JBxYj6CUJvrBW3VbfPiOc0ndvx0RV
-  VAPT43JeHrYgbgX1Ee0ielzyvstmUQ/8TKgNb2kmzmGj6rhRH7jKxWz+YSOv0riq
-  VFxuTE5HrF0VENbBdcpoZ7ccST6W62wQuCtNWwFSjOt2p1X5L2poxpX3X4WDg6KQ
-  JSViyaNSOKAm2HDrX6Ntyr8iGkehlBFLEWrMslJS02RiYNu1GOvGJQmUIDMOCC3f
-  hd+u13mJWu/aMdIo04bQkhhEeINc3P4NSgAj8wIDAQABAoIBAFs78u7SGnI8wP1B
-  nW8DdeZjsy/gIR7hPclb931bXZZOrN9fwtiDnNB1aczU5vAwNuMgTWUKeztWnln5
-  +/4CZCoRosxmSsvuBfLCt/bSyfosup/pwriWb882wRozdBKPdVdYPzv36LOyfrDB
-  0zndtU6Gz30kPVCRruCci/hOae2ATLVkkFEZEHHqj88/BRAVafUCrw/gbxnMbMCl
-  hlw1oesP0QmM86b8FF1U6ULZtRb/xWVJj5myxY/HvEnhV5/uGOF3Evuau5sbVXgF
-  gPKqavNTq4XUnRLzPfeRRmBbbUqciBlt7K4hNs3fR0xF07AEEp7gfbWWOZzf22p9
-  eWVL3EECgYEA04Uz8tMsbiWq3Ln07xnccJRofALO3XvlIpb140nrIdw8dD03pgAR
-  GsEi+V4v+NsaPz4Ik/vnfEOrgknO2yFGhP4gV/m3qmgwhOb8zDpiTOzx5a2qHoal
-  MQziNNDIO6Aj60CGtBmupfXSnuVbpJ4wl/obsan6LcfX9V2Tyi3qkaECgYEA318G
-  63h8A2ILl2+9w39er7do/LkdUrCG3Nc8qrnxk3Cof+NJmmYkpFMJ7fOnrwigvnu0
-  5F/HOgjqw/rxLRvo9RP8eMBt7DwxhA4Be8vfa3kN+HSAUBKBCjdMeV2IodKAccay
-  WZvzrSupQurd6UbLVqbWSlvn0wJNEX1uvE3RNRMCgYEAg66JiMKvBmOs231pXvFa
-  qzu5UHrvDjPzknUo3zdFiu7xM+xomI+yFlXm0BgzBVpiHL0h2f8ZPeNjAtmwTfuJ
-  S4Jp4Fs2XIBAtHyZJQuz5vAcKEDVh+uLK945dWgFQBmSQwMI2Vajw+4mEYX4Z6OT
-  3Ql39EM93QJtD/QR7exn/AECgYAi7pB9eJ0kRkv7xczOavfa0PsJMsXkLZkZpktl
-  g6jE3wRq45eaHskyLY5K+STLGbVRtLToVhYo/EYCmhbncArxcMu18pn+LLetqCcR
-  PiPVgdvudAGxBAPMHjPGcxsv+2R85o7ztpDYDxDsVyCXH6wjA/pVLKRHen+k8ZHE
-  vwKtowKBgGOZExS4jl349IJ2wI8e243ed+omohl1mp+wDasllW6Y363FSR/JCGlM
-  J5HRY2Y+JEyqdKr9Ye8APvJDNGKCPMglEdFZwvHb/cBxtThdWJLn83iFWr88tc2f
-  pighsj/ubHItNNtIpTU24WMmNCOyE/XWOh0Gg91rNmG6ufr964SC
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: admin
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDYDCCAkigAwIBAgIUG6f8g1wpGSuStcbXVhNo2zqO2XkwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMCkxFzAVBgNVBAoTDnN5c3Rl
-  bTptYXN0ZXJzMQ4wDAYDVQQDEwVhZG1pbjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-  ADCCAQoCggEBALiPjGZ7G1n1IvdeMGF8WDtveD2pWttch4YB60KIja3+1v9BGyU6
-  0ygq4MwM1LrDoSvTZ8mBzsj+RFtRWboOCQcWI+glCb6wVt1W3z4jnNJ3b8dEVVQD
-  0+NyXh62IG4F9RHtInpc8r7LZlEP/EyoDW9pJs5ho+q4UR+4ysVs/mEjr9K4qlRc
-  bkxOR6xdFRDWwXXKaGe3HEk+lutsELgrTVsBUozrdqdV+S9qaMaV91+Fg4OikCUl
-  YsmjUjigJthw61+jbcq/IhpHoZQRSxFqzLJSUtNkYmDbtRjrxiUJlCAzDggt34Xf
-  rtd5iVrv2jHSKNOG0JIYRHiDXNz+DUoAI/MCAwEAAaN/MH0wDgYDVR0PAQH/BAQD
-  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
-  MB0GA1UdDgQWBBRAKgqlD3xnDV5SOggShPN4b/2HazAfBgNVHSMEGDAWgBRzeXbl
-  Y16yoPqFZyyaMBlcLdGBKjANBgkqhkiG9w0BAQsFAAOCAQEAbizsMYOSM1hQGQ4x
-  23xuJRV3ksJJDFAsh9g6bYwHEh+kwN3iNBn3vopP7HA0o9xDx4b9NCh69F5AqGzC
-  jYF22q9ArBXKdCfU6MU31zFCFLO72OFj8abKCDhOLK8Qh2uq5klprUrnTGPx3hg3
-  w2OYi/ATI0QFuw37fsYq0svKQ9nk3axPbv1lTscYSaXnCOYqlDCI1gz1jYeKWG14
-  VuCqDlsAypdysamACkC8k3ZahVWizYjPQx6rx3moOPr8GwL6/uNFfs8h5s6Aaziv
-  spDyfcATu+ATWPN76ZTgmMhz3qr3meu5YxcoOCnyhtr+aQgbWGaSmgEqK1jwxnez
-  JEgmgA==
+  MIIDSzCCAjOgAwIBAgIUdIr8jsaf/vxURa+iCi53TSutA5cwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDAxMTIyMzU0MDBaFw0yNjAx
+  MDEyMzU0MDBaMCkxFzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMQ4wDAYDVQQDEwVh
+  ZG1pbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALcYPRZoxMxVQU5e
+  DnMZ/+PWVlos/rxh+9kW+pQhHG5rs7Ff2lB8UbEQTofXldVlWCPSpq59IgFOaikH
+  ZYo3nPCDHNp7VjWRaVqKXmGnXgVALACD0Xvb8KU8v2nG/1dQsQxXB7zTGMz4chI5
+  SAa4kiLUsaZNeVZ1OSlhMNrUcvnB1FHOQe0fxdc867T0z55+StG92xoXs7pOhOCk
+  PoDsaMv53sH0p0h4Cv0+p5wXDvPHEavGK3XMbLEaUgwYQGHNTpFR7It4BZLvGuQ0
+  Z8W3OU5pBqHhOcHFSRsCq5tM547vLyHbu/XmtXobTmmN7aObowBMhCYvtGcQDrcJ
+  ZXF+fn8CAwEAAaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
+  BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQuxaJZDDlSkdBC
+  zcUKiLh+EA7TYTAfBgNVHSMEGDAWgBTeNOr4DxThfKHQOoaANiQGA/DdiDANBgkq
+  hkiG9w0BAQsFAAOCAQEASV3HT+gNxnCQHsJ6WkKmG9GpswF4DhOkZNarwtoMvfG7
+  Ix2dyFUGNfQ8s2CCzPrrz+oEoxt78glkb68K7nGtTu2LODH0oNU/uJCrmmIzzA+d
+  gz/iDkxT+t1AQtMxK15tmsHzWSPkAuhjbvI6IUkJ6TkfT7Sc+1Tiunp1g0O1K+x+
+  OV1LyiriPBLGwFQIhsMr4QCjejgVX4cQqbNivxssCuXwMxbrwx5BIikCiQRbMfBZ
+  iipacUmZoHVd3xOrOUoFX5ziL3nxZ0tsleANPmlhsgU33DlkjtafVQXOBwPWwUU9
+  QAkhBgjF5S1vA2wp19nVZURZ/D6FyTDpCGXyUK8yVg==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: admin
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAtxg9FmjEzFVBTl4Ocxn/49ZWWiz+vGH72Rb6lCEcbmuzsV/a
+  UHxRsRBOh9eV1WVYI9Kmrn0iAU5qKQdlijec8IMc2ntWNZFpWopeYadeBUAsAIPR
+  e9vwpTy/acb/V1CxDFcHvNMYzPhyEjlIBriSItSxpk15VnU5KWEw2tRy+cHUUc5B
+  7R/F1zzrtPTPnn5K0b3bGhezuk6E4KQ+gOxoy/newfSnSHgK/T6nnBcO88cRq8Yr
+  dcxssRpSDBhAYc1OkVHsi3gFku8a5DRnxbc5TmkGoeE5wcVJGwKrm0znju8vIdu7
+  9ea1ehtOaY3to5ujAEyEJi+0ZxAOtwllcX5+fwIDAQABAoIBAQCFUjABJk7O3vGL
+  x+9Lns32sDb2uLbQo6SIYjQaMrYKLYCOEtbcLnoprU8RmUiwN3hjtVrLybA+NUQW
+  Fh249F/hvgb/jDmtDfIiDIlHIGDU//JKebHLN87V8xMKSe3aPZZ9/s1SkIAJmIsv
+  e+hXhIRcunWVO+qzqu3xlKTHY1VJSMATM8LP22t8sJKnsNUKJPRisMTgxldMSeA5
+  CLoHf/sHyZLvJ/Tb/Gp4axq7K1DCO+Z8f174eemVdBOITbx3jiuN/7Lo+d5UChVp
+  o2Ez2oBEU40KtBveloQbherkmib5om++8LFsMWioqsgPocIUYcEHLpexOjuBTwGO
+  Xt51E6RhAoGBANLftt5L3PvZ7sFah3+WvIWomMDPvdNxtL1Kd09ZJbU+K7ciQPrc
+  KRt7KN9+ZjJuH/yBgU+uYbhGVLFu/9cLau+QbJOd9KORl6BAggfEtLTtE/nNMAxF
+  5ZfTZuARwho2iUqQ/uX5wZ7Cec2IsuQeWKs+cvI5BNwhy0RN3zJAI0NPAoGBAN5G
+  st0MClH+1BrTsHIS2cuDo1p+0fn56x54hVBx60jWwQufXU4Exu/0TEHukZeQTDWU
+  q2YQ9aaV3JDuXyYxkG4kKS1By9m1oq6IKW43+erKKqLkGoHAVWsclcS7dtDzjxya
+  AFz07NZU/b4K1XspY8qDZJN0zzyGbGGqqG2MXAXRAoGBAMKk5zoHkoISJpTpCDtY
+  GsnQ1rbayqA6y5cR/lEKu4ixS06uWoZz46nPI+ov1QtlpTbBH2g6UU7z9EcXayXH
+  Dzzz9ZTIb0DwKaItCRk8k4SRdSfWIyyg9A0RgFsBaUYi4tUmQ3Jp+DOf1ShHrsBr
+  1nKyoQ0+XmMG+oYgzw2mMCZ3AoGAIraR2nm15uZQQ7xJsxcEkocFbO2fZ1XDhWe3
+  EkAoSaDYVzNVRAj09KaHfkh+zlfHvxpvxinh41lGMBA6JeHZt4nIMHw1FNQMCwvS
+  xJbTXfqiu/u5tAfQj0DQlv/b53gSIppeciYCEtsFIbfZbTmijw8EFw9ICiDILlyT
+  n0ArYvECgYBxvGKsz1WE1x3NcuXHuujH67Z4bXOVQr31SLFmEQYR5iTN3FyCI0c6
+  TzfcOnGcEX6JuH/7kgDZhv7Il2dyLCWb9FdLPqbWtOuNdXHx2F+2d0Tj3xLQ7CyQ
+  t44gtyDtcgvC3BFUiWgP+9BQ1Fkrx0NgcU79iCS1V9I05LOUFSixNA==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_apiserver_certificate.yaml

@@ -1,73 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: apiserver
   layeringDefinition:
     abstract: false
     layer: site
-  name: apiserver
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAm1xh40eG/9SghratfvdmFGl0wSZnLCfLFFS1Mu3ULW2GTkWH
-  S5mLjoKegX8hQCvOLYfTw9oY3P9w8gtthnNp/j91Ctzkb9JAgphk4XBuyIQUJhKW
-  hkUima0HMRSO09FFQwQWqykFn7WvAnCaIj3yjzG1GTLK9p9sAp/oqRuVVqOrw7qN
-  z4cNGXMX95/rgxVClpFUhAdTXFX/k5wSF2h+K5ckNVaoPg+81VNRrwXLdGyGpeAM
-  lSsYdwXn0Uitj1C6SQ9YxUUc2srVvMAaqPT9LvoOfCXGMhtpP3VsWUpydb5W3Id1
-  /OthO6Yeta5M4kfDWYPeOqTYtxuj+1j3ZxCZfQIDAQABAoIBAQCH+zoqhmag8Wh3
-  wNjmcoBEiXEJxiUzvri/WM0ogIXgJScSx0R+ZSyDVcyKp81gr3bM3z/5AqIUfPhM
-  wrfgoJA7WyuEkIbZYPvZ0q0prREqLIC+OjLJ3yVDwPC0grvophiraZ61vTgQ7CL8
-  TbZ7FiGCOA28unpvlmYhfflUWrJBm68Ut5lg0/8f7+ozZ4rvj4Y++DL7hRXDlTWe
-  /didUKl6fHNC5GNMSOpnvzvBHKmzKKX1/755aOoqPGrJ6fXMqhcxqeLrt8VaM5CJ
-  WeLFRs83b6jo3hyRODWF2Iv5UpZdohkOODBBeQRjeNF2jnyZiM+wFS7wkSu5NQHw
-  86CH5Zd5AoGBAMfXT1FMwBRmYmwDiT2peA0zriBcwILpnnqcoYsVfRUYSg8SHMn0
-  1SWY9kW8P5kGNdoPSBRRn2/0vxuPhe0ebnLYeKkpf3nyGmJUKH/2mnl73lkKJ1US
-  F2iVPjv6t42CsoFod+29Q302pJHAu/D/HuzS7cypm1Zks9RN62Eoq/lXAoGBAMcF
-  I+a0nNL/UDawk0EqOsao71oW1cXHYeOc24VguTDGg1WjXa/DDkVv5L9T9w2Tqh++
-  4siRfPNRzplQ54k9v6gZGjIWT5IHyp4tQHYhrXovBVJHEwJnZDynnizfARNPEZ+h
-  KnxlkRqUolgcMYxYYmCBVX661gYghmme0Yo7VLtLAoGANOh9OHIQfJYqwpwhDrE6
-  doxTMoA7+6zsZ1vmrRMQXbBjkx/hfVqTv/OCaC4RzGrHgScAl1iQ1KxAmIRkGcYv
-  ybokH+07scZ2U8giPNbGSRmRYZN9nFlA11CD/I9BX3bV2csVzVyJbLI12dzkJUb2
-  Ig8qJEBXPwVEUxYaFkwVU9sCgYEAreD1zti5szbRNBbtcJ+ennZ2N/V/a76Y7a3b
-  tRoecljd4fJLJgZ673ulFOwdCsWaewXhSW6jBkrQ/+5JfARw8EKOOnh3qJQaGDxc
-  91jRIdD3Cz2BhDYkw0GG1pk3bVFFinvajLiIH/sAI47uUzndKYeV1JUT7GJ6TMkv
-  NWBE1SUCgYAPsRKCM+6dNhG4MnAherPBE2V+BL8tfb/2YsbMhmwa+EJpnFnoqO5w
-  iJUz/ZjVa42zJp6O1JjXAkq/GwjrlcSBwlxrF5pmTOyN+x83d6Pxz2HuM0uauPUw
-  pYOprrL0lH6PP6hmfvisId3ICkcdQcFUo+vHAixMGXramgmGBDXFRA==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: apiserver
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID8jCCAtqgAwIBAgIUTbrFp2B4aLvgW3V1pU+KGzbFXikwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMBQxEjAQBgNVBAMTCWFwaXNl
-  cnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJtcYeNHhv/UoIa2
-  rX73ZhRpdMEmZywnyxRUtTLt1C1thk5Fh0uZi46CnoF/IUArzi2H08PaGNz/cPIL
-  bYZzaf4/dQrc5G/SQIKYZOFwbsiEFCYSloZFIpmtBzEUjtPRRUMEFqspBZ+1rwJw
-  miI98o8xtRkyyvafbAKf6KkblVajq8O6jc+HDRlzF/ef64MVQpaRVIQHU1xV/5Oc
-  EhdofiuXJDVWqD4PvNVTUa8Fy3RshqXgDJUrGHcF59FIrY9QukkPWMVFHNrK1bzA
-  Gqj0/S76DnwlxjIbaT91bFlKcnW+VtyHdfzrYTumHrWuTOJHw1mD3jqk2Lcbo/tY
-  92cQmX0CAwEAAaOCASQwggEgMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
-  BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUrNjP/+L/
-  WQ6T1jhkwMa3w0qi754wHwYDVR0jBBgwFoAUc3l25WNesqD6hWcsmjAZXC3RgSow
-  gaAGA1UdEQSBmDCBlYIJbG9jYWxob3N0ggprdWJlcm5ldGVzghJrdWJlcm5ldGVz
-  LmRlZmF1bHSCFmt1YmVybmV0ZXMuZGVmYXVsdC5zdmOCHmt1YmVybmV0ZXMuZGVm
-  YXVsdC5zdmMuY2x1c3RlcoIka3ViZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVy
-  LmxvY2FshwR/AAABhwQKYAABMA0GCSqGSIb3DQEBCwUAA4IBAQAflsjCszqFHZFg
-  Yx8U2gOjI8pHZjTdcG8l2NrZXJDw2hCb+yGBZcxdhS4tXi2ZRsL9tsI6LVPt1eRX
-  L7l38niIGZCuFySJuIgPUf2VUkUpCWTgD9lRlrk2G66m+SWAPBVLs8XgfrFB8VGq
-  XD+hfv+jDdrN08k8yqbzk+eAjojEJHID7jz9yLwrMlsh2EnmorhWplYR8mAA5fH6
-  yU2mcpJYs8mPBcKinkvvvqyfmUBKfkkjd9mwWrTOKKMmproC7o2V1mYdyaygAHTD
-  5MswOnjS1uJbIdkOZ9ceadkrP/44TaHMpbtJRnA30eaHFrG9vIBPJirEoNq9GCd7
-  9YPpdTz6
+  MIID3TCCAsWgAwIBAgIUGuqCUogPhihLEjeJ2bYRHBiaagAwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDAxMTIyMzU0MDBaFw0yNjAx
+  MDEyMzU0MDBaMBQxEjAQBgNVBAMTCWFwaXNlcnZlcjCCASIwDQYJKoZIhvcNAQEB
+  BQADggEPADCCAQoCggEBAMe13A8pWID8BUTpXIaTlNeQrjNoHzhD55h51ibmR53O
+  dHHBXgf+eCSfceNmg79RvPP4TLmGCM+mQ4sr6HYqXkbUCcr/TQjyJ6AgRh/TCRT0
+  ZOgylJcM/3IQj115iRc43a3JDQsFwXVmS3KEsrHYL8uKfNHWXWDzJnRB5QREyNEU
+  xJ6+OlALp419qNvpfDxi75BL+f0u1Xy90ufGTNksoKDyPtEUoK1tFVqhMeqVvYtf
+  Kn7xT9SKHJHQCkWZOco+xuik4y6qRzoulmN0gwx+5+r8IRHpcXUAFZ4/R5ESYcOr
+  MdmQp8oS2JgqebrZgCNVnInNswaUk2m7KVyov6SFOLUCAwEAAaOCASQwggEgMA4G
+  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
+  VR0TAQH/BAIwADAdBgNVHQ4EFgQU+Qy3/HK1s/x4N6rPHzTv4xosZt4wHwYDVR0j
+  BBgwFoAU3jTq+A8U4Xyh0DqGgDYkBgPw3YgwgaAGA1UdEQSBmDCBlYIJbG9jYWxo
+  b3N0ggprdWJlcm5ldGVzghJrdWJlcm5ldGVzLmRlZmF1bHSCFmt1YmVybmV0ZXMu
+  ZGVmYXVsdC5zdmOCHmt1YmVybmV0ZXMuZGVmYXVsdC5zdmMuY2x1c3RlcoIka3Vi
+  ZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FshwR/AAABhwQKYAABMA0G
+  CSqGSIb3DQEBCwUAA4IBAQBpHsLqUaFE/qO503uvYgC6OZP8GA9KPulBfEv5NbVF
+  Vn3jtiM3z5aih8FAl8lkf/mJ/RHqDIwRehdBMd4aX0u8eX6D8d4iGRlXPBv2EJib
+  k/tuWlOP9zOEOPk9M9xIVvvPamPS2/bbm92JsDtKqppksix7zjjK93xFsDPoyKkQ
+  diFRAdyqlOfYYSNRUvBrBv19zTlBd26jflRQccaxNWdbKv8RUxfQJRsi/Oajn95N
+  jJdlriNS/w6GtaNuNkvhuTmM14iAXvi2W5zkNUy9C+ZxbBq7nzP1CBpBIHmHQAY/
+  Ub5gr1/IhunYrYta6KgfwPeji5lPaLfuN83LqJjwcYp7
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: apiserver
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAx7XcDylYgPwFROlchpOU15CuM2gfOEPnmHnWJuZHnc50ccFe
+  B/54JJ9x42aDv1G88/hMuYYIz6ZDiyvodipeRtQJyv9NCPInoCBGH9MJFPRk6DKU
+  lwz/chCPXXmJFzjdrckNCwXBdWZLcoSysdgvy4p80dZdYPMmdEHlBETI0RTEnr46
+  UAunjX2o2+l8PGLvkEv5/S7VfL3S58ZM2SygoPI+0RSgrW0VWqEx6pW9i18qfvFP
+  1IockdAKRZk5yj7G6KTjLqpHOi6WY3SDDH7n6vwhEelxdQAVnj9HkRJhw6sx2ZCn
+  yhLYmCp5utmAI1Wcic2zBpSTabspXKi/pIU4tQIDAQABAoIBADe2sVR9eVZKeIHY
+  BFr60vwsPZzTwFnm/7YWzzp85Z/Nl8igZEYgpI26+X+x+rEl8Wuyal0bWlvri05J
+  ConkmfZycuTxwiDrxUgzmLyKGC+DWp84dSGKm7zLh+NQ44DZ+WXg/8WCboz847Fn
+  +Z4JrJPA5792aQiB7MlkFKrTMZ66CLuRvWlqtx+Oqz4aoAgWk+noBcnTO01Jym2k
+  rF+6w8wHSHcmZKUcZTDVCFE/vRataHv8pwfj+ZCBxJjz1Tj4OzcIP1xtNZ5aXZzo
+  e37u6sbQZnmd2Hx+XFs8WeWzK+BijYx8kmIETT2XLRilaTyA0q1mriGV0V7U+28l
+  QzuYXKECgYEA+SG4bFwZjUDfpXLQn/fXjIAXOpX4L84Z5W41CETSbm/B3fdQpOc/
+  8ACsFXajFr4KEGACKKWxwqaj8xeKfhV1ZhwHzCe66WdwwA3zxl0844K+KUbCD2C2
+  2mVgIr0kZ8esjzGjb+0MYs4630cS73FFCbSmbwcp036znZnc7ODsYe0CgYEAzTdX
+  epiqFR1c9mRL1xAgTI4grEdJ157NfWHVHykJ2EJ6/Q1A0JzXdoSst+LUXD/K3wpg
+  kdRHk898R2vFztX3F6J9KOJhsV2g3g8u4A/hZJdbSMRxPh393DlEjx3t+4C24Cqi
+  ZJd+zetd+NtT8iMhdSGOxokO4fZIPu4CxrI9eOkCgYEA1oI3Vm3yvlImf0Gd6q8v
+  FFXSKmqouRi/6XF8DjOb8OUfSyzAbkyDG/aoNQ7inBljdvgDw9Xvegeb0Rrq72cw
+  n4vxFtL6uC+NwIAC70Cmxcp0S/wV6cG/j8qL/T1YlFcz+FOoQx4bdRPXUxrSbgLc
+  i9/VEnJbjDRjGYc612dPgX0CgYAylt393vyuz9pG81qu3c7YkIEFd12AxikqK5/6
+  WoeOxHTFRSshQkjrcrGRc12ekCtW6Jv91zL+ATxF7w+Ieb68GNZ56bTjoI0zsNKB
+  cejCf32FZsfz5DjcvVFlZp9wTL7IbDo0ShR8dvVnj8oV+wsYcPldgBQnKCuPN+V/
+  ThlRYQKBgQCxKwQZ+GKw6F5OQgcpXs6h8jjIYtpHiVuIWtgTt7uye6g0P2qzJsCu
+  4Xpdr/TaPGDvOMEhyaHZmfsofcE92efWBXLghVWV401H5Mgpa/8yHCPi/9MF07/3
+  ayQRMgUYPbvz4AZL8vh+q2+DQLk5NrVQlX/9E+OJZnyIkXk7sA26UA==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_armada_certificate.yaml

@@ -1,70 +1,69 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: armada
   layeringDefinition:
     abstract: false
     layer: site
-  name: armada
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAuLzOsr4U5+UaC18JcZJcoaMkDcU9FWtTPADPyT7aVUKujd5k
-  cb09oBBq6fEFP244QbDRCude0qo/pbh2wwfTBu4CMLsFaNc/b+HcrPIxttViJVob
-  EAgHK5mAl5JUAOaIBIQTpqZqH9OyQuZqmXDbf9D5wwB30UP+Fwdfs8at1b34leiJ
-  rP1RgyfBmVP01AV12JgaubzDMmeqkG6USqw2QUmKMnmsaZvTcHmGvZyCx/+9i7XQ
-  kvPDtOPvluJ36ZS2ZRPd2w8q7FGs34hfTm1wy5bvtwqgRVFtqY53Bc0HCL8q0NFd
-  WKPCU90V1WwPBsTwVMC6Vke84Ez0E/UoEmfnEwIDAQABAoIBAGi6WK+KBM4F2kLy
-  CKeC4tKbatgHpf5bjp8okqMy55GIMO6qUeUM9D+mrwWapm/0Kx5Kf+efjOj+rQBk
-  16bu65o1GbbIf2OVCxiBQZol3zsYMwCb2VW4R2BXMEg9IzQzfI6a1Y0XMHiEib1V
-  ZL9B9J28Oatru4E9+3DQtFd1XZ0akggoiRrcJsd182RSf0leAPC5fN+juLgE+d9j
-  XkitOB7H3pBkLxfC6F/vmliSTT/ee3Q/hZFDYoaqLBmCQToqyxrQ4I9T1/Q2HmBg
-  rhPGTHh3jUQ+AA4EKVrb9ZZD9oNAjadvxfkELH8U5wqiaqaqqr82NjRr4hzzjxss
-  6vGOlKkCgYEAwi/UlmGa5zUNpxLWlREDiEEIsUOeh78KM5NAUipaUCKFeu2U65t5
-  0yAOzuWgzpNr7bxyTrSrA10G/X5SK12ZTAz3RyXlZJUjCojZEaClW6OvlJkMrhPd
-  pCZiuVi97Tq4B2Z+DGe0LnGy1mt+gI/sEJbRct/JZeNbg4R4USunyK0CgYEA84r1
-  XmyRJEfFgshSVtNnnWj21UgrK4POyRX90GD4JUcfhxW+foGC4vZFAwRcKEfDHoOQ
-  ziyis05iSLCsnRRGSrL7lLqMeKaPMwxEjcb/eRwpjBT6OuadJ5ufcR8wLupjb627
-  Rq7JaHcSP1yiFzC95SbZPZ51FtNXSyd5/Gqdpr8CgYBLnbR6mqdnQRF/7aYBhg6K
-  EEkCPgKNeabPTpfNZxCkA81WgQ1sca6Ot/0MM/7aci2k9azNWSz+skr2iyoUGO6I
-  3sOrwOYCtNBgWcmtQ5EgjizhAHgfkTzNnuTyp8vNhQAEYbTTv846B6xMMq+gAGs8
-  Sn5k7R/PvSj1na/8a7N6QQKBgQDBnemwZdOF6mFFtghv6qXnaLlDmppnf+R3zTn5
-  3f2pdT/FXy4Q2Nm7oln/KgoyI8sliScoIig/MMPGUl8IikPPwzdraFug15nk1Y3y
-  wQ/9srv9F/hPt2OdR4Wco1TlF4ZyFMZcTTzmBjPFl9ltYly1vwraiA1CVkaCAyJh
-  4EjxdQKBgQCtA/LFCkHze19WaeE+vOaDjofe0Hq6RU02KVLzCRYqgEikgpQZQ3ME
-  TBzIpohAc3I8892vJ7/JUHgFAh38CxXgyaWGvDkFRj61toWpNM1DKhz6PpMynKsE
-  5MX4yvw6oBVLyXDeI4GIaqekBM06hquDMrG+bXjHxGK3jKkB6/HXBA==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: armada
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDYTCCAkmgAwIBAgIUZkNLKctFD9KjDBq0B+FVawHNL1swDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMCoxFzAVBgNVBAoTDnN5c3Rl
-  bTptYXN0ZXJzMQ8wDQYDVQQDEwZhcm1hZGEwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-  DwAwggEKAoIBAQC4vM6yvhTn5RoLXwlxklyhoyQNxT0Va1M8AM/JPtpVQq6N3mRx
-  vT2gEGrp8QU/bjhBsNEK517Sqj+luHbDB9MG7gIwuwVo1z9v4dys8jG21WIlWhsQ
-  CAcrmYCXklQA5ogEhBOmpmof07JC5mqZcNt/0PnDAHfRQ/4XB1+zxq3VvfiV6Ims
-  /VGDJ8GZU/TUBXXYmBq5vMMyZ6qQbpRKrDZBSYoyeaxpm9NweYa9nILH/72LtdCS
-  88O04++W4nfplLZlE93bDyrsUazfiF9ObXDLlu+3CqBFUW2pjncFzQcIvyrQ0V1Y
-  o8JT3RXVbA8GxPBUwLpWR7zgTPQT9SgSZ+cTAgMBAAGjfzB9MA4GA1UdDwEB/wQE
-  AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIw
-  ADAdBgNVHQ4EFgQUAfT3wEA1nzBK0j5B4OCDLRGjsYUwHwYDVR0jBBgwFoAUc3l2
-  5WNesqD6hWcsmjAZXC3RgSowDQYJKoZIhvcNAQELBQADggEBABgD5EnDNJ3DLnyq
-  RwKqNiKOH1AGoK04u7oaqIkmuMIV3MUKYJzCuDpig1biQum07Sd5usfY3a+9zE1M
-  dx7Yt6rDDqGx4iCzPh35fuLri12TMHCFWelq1GzYQxq7Vnz6dvQaFgnyOnUc3CQe
-  X2/QMT0VtNsDRCpZjOZLSt/vtEQEUByIB/ZP99DoSF2oot4Zg9DYtWQvlQpyYQ85
-  XhZE+LFHElbn/zxw7bgQ6GXtlIWvsCJIk1f0FVq7BYxL8h038grBcgG8EpxqViYh
-  /YuMnmjEBRuFN4DxgEf9SzrtsXK5YJs0tjPaLN78vZVAzfOO5SEbF46y7Xc0Dqg1
-  g+Vchgw=
+  MIIDTDCCAjSgAwIBAgIUPKK0NUL5kEcFEYwaSoeATozuRv4wDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDAxMTIyMzU0MDBaFw0yNjAx
+  MDEyMzU0MDBaMCoxFzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMQ8wDQYDVQQDEwZh
+  cm1hZGEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrP/CaNdnjIdmZ
+  aosSvKvd6q51OayVrZn1PMq8/MrqSEZUKS59Wl5/k0RAFi6NM/RzGaUPzyXmmylN
+  eaHHrB9qfSb8M53lSL+8BT5QAOo/vGhVRu64w68yhVFxQswd/V7YmUlgF2ExQZmS
+  I2s9xrMIpTk8ljrWOjbxoWbY9xA0rtpnBlX+G87Sh0IBKe1CPSp+oV9l+iWp0Z7B
+  qrCi5hnVhBcwihxSgFeAJxaQj8gO+4goTL5OfDBUSmn7phjS48Y7JZ8EQzp38ZV1
+  fICUblak14WxyaNARirKuvCBFVhtkJnk3WF1bHyvPi1mJltsfxIY05XQHpD3wePg
+  H9A1j8o7AgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEF
+  BQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUmLkuejZjxY83
+  vDuad/erqjra61gwHwYDVR0jBBgwFoAU3jTq+A8U4Xyh0DqGgDYkBgPw3YgwDQYJ
+  KoZIhvcNAQELBQADggEBAN1vhpz5Fj6d57cATZg7AA1O7sYpmi0FXYJ18CSXbE4C
+  2Ri++us3T1ANzmDVqRLC+Jn92W3mns1GGJyFSYDJo6hPUPJXPaJGGNi6mZvPkJ1u
+  3IRfVWFKKbRwBRGN6712lpGfkaCne9Kv5kezW4c8+IpQUykhdvcg88bod3YWo38H
+  pxdXDyokd45VAR3SylCJKW1Ps3Q6slTKp8naMGT4YRqLbMZwrsJoASINyQduAdnJ
+  OWPyz1GRUC7J+QcZd/egO9ejtWtnZIR4IX/n7935IVAPuQgqEw78od66FsAZzJbT
+  PiFUqvQHVFMTK6tAqUTwrbArEZI/sHzQN+hxIYRCDpg=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: armada
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAqz/wmjXZ4yHZmWqLEryr3equdTmsla2Z9TzKvPzK6khGVCku
+  fVpef5NEQBYujTP0cxmlD88l5pspTXmhx6wfan0m/DOd5Ui/vAU+UADqP7xoVUbu
+  uMOvMoVRcULMHf1e2JlJYBdhMUGZkiNrPcazCKU5PJY61jo28aFm2PcQNK7aZwZV
+  /hvO0odCASntQj0qfqFfZfolqdGewaqwouYZ1YQXMIocUoBXgCcWkI/IDvuIKEy+
+  TnwwVEpp+6YY0uPGOyWfBEM6d/GVdXyAlG5WpNeFscmjQEYqyrrwgRVYbZCZ5N1h
+  dWx8rz4tZiZbbH8SGNOV0B6Q98Hj4B/QNY/KOwIDAQABAoIBAA2XIHAMkAMff5ZW
+  Rz0wbe9JnZi9//1M7qfwsCI5aZ0YKUSqk/7sug0j0cnION+J3P95bIkJpndbnvaA
+  DZ+8AC5CSmK/cettT5ILVHui5vQx7pG99FoDZZb7z4/OfkZvAiTsXU9b66GuFBLt
+  7qfTagfonNc7EOZJbmzUo0XarZWQnZEUnlHPI0nt1GAIk1FFtj+EIEBQ2VknPwXt
+  5C83ro8DCOveKV7zOrrbeUKDlnEpBZKU9xcduHuJXHyc5aU+JIQSQgL7gs0x2SGO
+  0O5WU13MP6Rpv7Ux5n1dvFj+WwifEmBo34VwetFVKIm+c40CcEUpiYrxFAsAemdt
+  knnDZwECgYEA2TrCU3xbvffleRvRQO9WQ2tB29U04xlF700RXye6rvR84WmPHbaG
+  CkaZJOnJw3j2+vBu7Q1+iIAYPr4pK7N3tCHrO+emdwRaFKB2ul2OdGc6uRbWJza6
+  prfLGmTcKV5UJNHGTMYhRzkCUxaqGSa+IlysapV/64f5GDgVZEsiAbsCgYEAydBc
+  QZZmk6G57/v9mLEoyMsZClxk5reyUL66+uU/gsQ0WWsUh1cvn8PCA6rEl7iMXcnU
+  lHYovnVBeb/bOLhDxTRPmPKzBasuDiBiCkeleP/b1H9RlvbPmsB65pBAqgP1lCij
+  BTbAMfnzgPqHqejsPMk0xLoF6c0VEY4mxxs2kYECgYB868WErSc0/7H/C3gyl3BM
+  JQoimWFol8gX7YHn7rj0k7SdDE85DxXWIvM+vxNATff6JvojaHczmDZZHpIeh353
+  IGpecMDSALas1fpxAgxB9HtYpUFSG68K4PbznrzdLVnGMryOugG5K5eioI4BGL6O
+  lCyyvnZpxDADNX1Xx70usQKBgQCjZHKNF3vNIy8rQVW8fhKLHwQTA2Md+LQB86nm
+  4BxffwLzMmLYgJoqO4+k8GlifSQH+xSFbnTmXoC4VcDjVyxnSUb4ieavPDx5a3Z0
+  5DTwlhYhIUOpegHzRMs8SKZSAAqf/Zae7gkFbVzcm/mictZxEGYMsJ+A/22DXRfA
+  NCQmAQKBgQC54EOgS+2PvQRZUAzZpV/SGydjAFDv+ecbA/B/9JpvY7yTx7Jc+jlw
+  Czq6ZeBnTEMjR6nHZin4rC7ahxeuDgYuotUJnUzYRdkir7MnF/vvB4M1Y0DH+3XE
+  rVDugrfIhQlaXsZ0sbvu3D90oOcfr6MMu4BbR2g775mgMlLkvVAglg==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_ca.yaml

@@ -1,69 +1,68 @@
 ---
+schema: deckhand/CertificateAuthority/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAnL8Slp6nfPaUJI5EHqw2SO5a16rN9bRWYODsluoaMi7zD77t
-  Q5VcQqQWeHOhNxp+94tSLubNG6I2BaOHGgQYRNtmGz5MLlWeavT4eRTsyZjz25js
-  y/jxWStTBfkpiTaeHzC8+wr/L7hFsu7UM39X+BRDOhclqHywM+7mggUyZv9iTg43
-  g3x6/IsYazUW5Ra19WnstLAep/sya7amOtIeiSbMvuBUKg/DETXMCZlrKRyYel3P
-  RbZhJp13XkUZJQtKqaYWQ9mWiQQQZQxzNFnyrsAQuIPZMLdovzTnVv8IW+jA5tll
-  WjPYyBmuUJeiiF9kSV+fLtK+Y5eZTpjFLVRD1wIDAQABAoIBAQCEQompw/dpbxpz
-  egOqqf8oLM9EOWCOWXulRUT81k4CWDFJ8P180FPH+3LmchLvTxEhSVKwNpmNHqNc
-  wK4n2pqrx0Dx7fAUDLSeZVQfvvNJ7CCgA/qS5dyoM/FbEfHlUMu9X7+mSJIoruFI
-  6VLunR4aOua65nslHwkC2StxPHdaBgOygnqNe+23lfOEhmpoeti3BY164ijpsUJt
-  CYqrse/JNrClF7XdHtex7vgf02qPgzV/fpNTSUMKNoRVdUJNZS5+ErzBTSjZXxdV
-  pEf8ApTN7Npbo8k5RSUifZxDzWJlKREG+ZaER0eBGfwT/9wLj/h9bWgvgcNXmjYH
-  pUXYtnfxAoGBAM6hYGHePgextZ/D3MD6H2SqfepA/ytiWdt+8oceIhmjSujQRyqj
-  dxS3WVMfTakPj5z1enU2UqVSDEu2aKFeLvy5ODIEKc7Ju3XnFTbqle5IfaMelWVE
-  7ioZzH1sR20lgHUcLQD4ylX65CwCavis8SrJOhPvQdGBWLL08yMZL7SZAoGBAMIy
-  hddP7njnxqXGJ2TmJB6paTHlenaj+xWJxFmHco6psX7DOVfyAQTS/+2wBy+hmGcz
-  JsUwb52mM4Zh49kku5y/oBMpp+QfcgFgaLGsh+ajs8I1zU1un+EceNcD+NtB6MY6
-  s5apKyBet6Y1/ap0/wk0fmuoZzvdKPs9FRQYgJHvAoGAX3QXNT7Ygu9qSsLNQOyL
-  AhLslgGunxkRD5/mY9rcv+E6YrCMn7rh8NT+U7LbSmUg385a4rjUlwB/I57BWQJM
-  TH0344se0SNKER5OI49c8bXVLDydoSmlqBdA6xPRLy+q1u7ML22+8tcy/s2jIvup
-  cS2CQeE+E41gL1OO2kDxU8kCgYEAizNt7u2z0eTJ5tBIMrIpF/V1mzeT9fELLOAo
-  58gIXKzUtzm3JAwroMqiez0fmYvq06a91sEmcMnOyzfl/COxe+V8F+BXIVVNAiGa
-  SimS7MdRNhgcxrFSVylykSWev4PaGCXBz3AJotViLPkskH/2xCFlsUPwY9/e3WBm
-  eJYrqu8CgYAYzdgVLO+rsyVrgsz8b4WFNJZdWSf0V+bL8+VgetYW+urU7krfg3Xz
-  4zH75GH6WndUhk84MlWMDtZ5kzokF8qJhwRZY+Z3cG56UHKiAM7T+BJlGn2+HHwe
-  fXI/wBPgIyp08VYHJDXTER5bE+yrk4tZntQ9YCwXI7/wjJJXGozrvA==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateAuthorityKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDSDCCAjCgAwIBAgIUf73Te0+ds54Gg/YmAjPZiJFKTv4wDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAwNTM2MDBaFw0yODAzMDgwNTM2MDBaMCoxEzARBgNVBAoTCkt1YmVy
-  bmV0ZXMxEzARBgNVBAMTCmt1YmVybmV0ZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-  DwAwggEKAoIBAQCcvxKWnqd89pQkjkQerDZI7lrXqs31tFZg4OyW6hoyLvMPvu1D
-  lVxCpBZ4c6E3Gn73i1Iu5s0bojYFo4caBBhE22YbPkwuVZ5q9Ph5FOzJmPPbmOzL
-  +PFZK1MF+SmJNp4fMLz7Cv8vuEWy7tQzf1f4FEM6FyWofLAz7uaCBTJm/2JODjeD
-  fHr8ixhrNRblFrX1aey0sB6n+zJrtqY60h6JJsy+4FQqD8MRNcwJmWspHJh6Xc9F
-  tmEmnXdeRRklC0qpphZD2ZaJBBBlDHM0WfKuwBC4g9kwt2i/NOdW/whb6MDm2WVa
-  M9jIGa5Ql6KIX2RJX58u0r5jl5lOmMUtVEPXAgMBAAGjZjBkMA4GA1UdDwEB/wQE
-  AwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBRzeXblY16yoPqFZyya
-  MBlcLdGBKjAfBgNVHSMEGDAWgBRzeXblY16yoPqFZyyaMBlcLdGBKjANBgkqhkiG
-  9w0BAQsFAAOCAQEAlNSBj/hF11K9JZjs+U3SzRUc1/o3kNY1Za7ISSIyLpAAoIHn
-  /SHzQitF9Uqx3Pep1PCRu2X+L1G3edvL3gL42ShQ660VZZgNPXC0ZrjLPHT07I30
-  JUR2URjfTaAbRk+EqsdiRTJpou5PHM/EW3TESA5eqRZEigdVibqifS1+YrfT9kXe
-  wwYjNNkkQaYUb5GpXQiUKnI1KPd5iV/wclRz8JDuDcGQLZ/+aLHohAiN4o46kYjI
-  VOHEBZ/34/UjUw6yVoFNF/xaVgWUXYLuZdz0lDf7R56ZWWIZZZRsd1gkvKjNsjy2
-  TtMu6+Yjd5ht9f0kXkZo6wUb0joQbJFP+ybNtQ==
+  MIIDHjCCAgagAwIBAgIUTfxrK2/MYWhYXlPAx+yPjwwlZpwwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDAxMTIyMzU0MDBaFw0yOTAx
+  MTAyMzU0MDBaMBUxEzARBgNVBAMTCmt1YmVybmV0ZXMwggEiMA0GCSqGSIb3DQEB
+  AQUAA4IBDwAwggEKAoIBAQDuuQGzrOWdCZNbnBwANTXPhwuIeiZ84Rr4jNj8PbIH
+  f5qsTI4AYfb0FoZGij7ZzIZxPzGY8g7kKSAp9IRxDdXKTCNq+lhyuFH7COIHyBPZ
+  hstc5K9j4D4FoDzuCp97HvXOm7pH1NvKWg8BIWczgf0yZ7vzNSHzyHLMA1RYRwBl
+  nNZ+mT/OmDEFmKJk4/7YGYfUS7E/GFt/n0AJP8DoNmvc3ULQmCdp4lLzY9TiO/YH
+  Go20AUDeORi2AM51i3NnbhwHmPL6zgB9ubQ2VSgCHAGU88DGcrQhGnbRYQKoh+91
+  nFKPFddEvLp3FIfBu5QC+FSEmhNjHgTWp9c8xzzNAkJ7AgMBAAGjZjBkMA4GA1Ud
+  DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBTeNOr4DxTh
+  fKHQOoaANiQGA/DdiDAfBgNVHSMEGDAWgBTeNOr4DxThfKHQOoaANiQGA/DdiDAN
+  BgkqhkiG9w0BAQsFAAOCAQEAhZ0irHes/N6hfp4KygM56nJSyhbHLq26lCHQVjhi
+  M/KXNdZnxz/dwIIZl68mJIIiIUnx3SfpX/749A9VvJW+zw+AjZvRsBpKbtk8PRHO
+  YfIAs6/m9zNfHj29mGif/0WYcpGj4dAV5d5L7l4LCMKbeA54frTEQmEd1lvA9CMG
+  03BUK49D5Bb5oBW9uYC9oAGFetxIxkzYvScUPjD9yiYlmg7zXu1BpgPBYItgD0ko
+  mlQW52N53F91c2/4Ds5xoLeKUCOpMlLdKXExB9dJRMhEvSRrDkVCmm73b4SPDb9d
+  6W20PGE2y8CdJ6ThfU4wAn81jtQE/mtAYtlkjFHZ+idSZw==
   -----END CERTIFICATE-----
-schema: deckhand/CertificateAuthority/v1
+...
+---
+schema: deckhand/CertificateAuthorityKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpQIBAAKCAQEA7rkBs6zlnQmTW5wcADU1z4cLiHomfOEa+IzY/D2yB3+arEyO
+  AGH29BaGRoo+2cyGcT8xmPIO5CkgKfSEcQ3VykwjavpYcrhR+wjiB8gT2YbLXOSv
+  Y+A+BaA87gqfex71zpu6R9TbyloPASFnM4H9Mme78zUh88hyzANUWEcAZZzWfpk/
+  zpgxBZiiZOP+2BmH1EuxPxhbf59ACT/A6DZr3N1C0JgnaeJS82PU4jv2BxqNtAFA
+  3jkYtgDOdYtzZ24cB5jy+s4Afbm0NlUoAhwBlPPAxnK0IRp20WECqIfvdZxSjxXX
+  RLy6dxSHwbuUAvhUhJoTYx4E1qfXPMc8zQJCewIDAQABAoIBAQC3xzu1LBS0mYuV
+  ChBQZKZhdpB9Z7Q7jTyrPhtJzOFCfoz/ugvT5ZctgC2tHn6WQ6r4gfLX0Pl/0t1N
+  D03qjwEYNRdLIyF2Z8nNHaCM5w3I98mVYQRZOmflAuAFTa5LJaGMhjyZUhhGpqBI
+  eYOulpLq/Asoh630tEsUHjgPodF/Zwrbj/XPlauzmo3mZcyzo6TVu37A5DinB3DE
+  nyFPS8533+yQgA1AxF6IR8s01EkGuVbkRZzRGnlFvasxtis1z/09QrhI21cQFQQ4
+  7uAcH6LIGnuxWIaBpmulQO2n8rcIwddF2YlLbjGK+LE3M1BnGbeICrPimaKBzn78
+  Ndu3FIvpAoGBAPPiirigscnUwSomh1B08uDqHiXvTO49SfI5b1lHimEHUeHbTaJN
+  rNNghnuT/SGhyu2DUq1t0vP1XtJXpdQ8QdDevpm/yB9WAcuZZjsG2IgFGisr5QRz
+  ROrxv3DIg0V6PBpsPvGvaSuDFbMGCRPSDz18HCFHZ4oPPpCI1VwN0XDnAoGBAPqU
+  0Sks0RnSEp7EEHGDD08fOvPPMtUvIfNjHmXmeZErsxDJTmhteLJ/mM5vu0VedERr
+  DQ8Zg9HU43nEo0tgT/QfnQLL7x92S15YkgZsNSqkTAPSmZ8BQGdofXF1LXWTMQKm
+  /lYlT0Vfr3jjg/vrTer6Am8gL3q8cjzr8pvkf6tNAoGBAML30D5Y+MiJNQMlWfeQ
+  BrqXbxKUg8PRa1QhZkrRTmbTGzqbvyyJPCifeeNBI5PHbBsEaQwMSCCPgAZX21IX
+  +eWorGbtUmb6suS49Wkqx9+1dH4e0S8Fl4rbSFg5c/gPCA13i7paqJEIckh0Ar29
+  qEFW/oX8N2G/XhzdxvOYeF7xAoGBANO6EK042Al4LhGGWtp+wd255qcBaNMmuwoa
+  syGoxwk5oljJr32fGf/Avo2XbOXlNFpnFaaviWkv93D5DHzxCT2dxJ4LUKYF3xL9
+  xYy1u4qnPi9wsCrg9NkrOes29k1FLIEwNvD1H3Dfs7VykB+5J6Im0w2wZU3QkroV
+  J24/ePx1AoGAM3fp16cs92b505azBosnNQpVvz6IZvdCFgjWEEbMs+KnfJhhGlx3
+  q13w3FoY5CD9mRuzT4Ekd4VaKJGjp4+tSWF1Yz8VexJVSHAdYm3EIKZbT7mM+2nJ
+  zN0EOGUkLy3cyNFmWbkY2FjFCAO8dJ5X31KkEfQ1w/CfxJAwXYNBvDI=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_controller_manager_certificate.yaml

@@ -1,70 +1,69 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: controller-manager
   layeringDefinition:
     abstract: false
     layer: site
-  name: controller-manager
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEA1PuA+JaAdnWZKtQx5OHaPH60bMt7JdPAeuR0QUH4taAZuCfi
-  RfVReMVmiuB0FpWyQWOQcr1u7acsQpA19MjBH2WghI3hGWad+Y6ZhQR9mp1JsAW9
-  8qaFtykWMymGAI33nCB0/lAA7dn+yDAHBSHrZFkivCMz/yOj7kDXk0BOeMxNBh/4
-  qkTtiLZVcu3VvXVtfsUtzr9/gs3HTM6UNOKO+8bvP9vDsKSr8dtadR7zaibWUNP5
-  fUmXbGSE0nc49dWlHmN0Z07LtC82wVrxgD7zG6AqxzVWdk/iNbL4Ja8/Dz3pHBT3
-  qLOqNO3AkFa7NRnATi3efdVsONBoYfcDGb3u1wIDAQABAoIBAQCpvL7uXtOGlPY6
-  wd35sV2B9ODKC+jbHsU5q7RTBca2yR92OqMEahxCCeBNMdCS5z6nCjhmmT48vIxz
-  iAbYTN5MrWud+Iy696NS7ii/b/LCNDQzyn+1UK0kaeQ9ZgxbiMkbbmqO+yeiZ6e7
-  1zrhBkVZNgiOs+eOoNLW4Gpt+kQP1B2pSYwejcDGTaOsvAHRkmSOEpmz7CB0Liqr
-  Ca7cXW2YSFqiD0JecW4fK8N19Q707aigg62g2c95Q3o48Ehg60vKk48qt7gLpmn+
-  W0FwpDLiOcyq0jRce5Lz4YjWs45gzRe94VopVlTfnEw2/peTqDl0qnvFRwJmjlMW
-  pY0kiXHRAoGBAPXJM4BO1bb6QYqX4fcocGGPdjDTSoMALCjgEWMqtkSXTcFw3Bu9
-  Cax+W3eC4EXhPfshJ/vxBBZoeIbKGTyoDL01c702tqglGWHAVTPrd9emZb190ULu
-  JidwPkIqnaEbYTc1W0t8lIxUzdQaA+081sYBBUlQ/qhzjYJgfhOCtrIjAoGBAN3V
-  UmSJESsbRXbxH7KjY7sv2DBxwgjUtQOxCIvQOi5tMDPTUnzSHDwyNqgScckAlsKN
-  Cr5YwrQkNSSu3XlpOXLEYov6TVR83pNPyqP3iu4jNHPfAbgUB5RT0ctwGjp2VwL0
-  sFwUg5Wi8xOlvtQdakqSdu8vguI/5AdcIqSWnRm9AoGAIyuxZPDjABX7fvuQ6C8v
-  NaazwPTbOrexmf/GPSyFfHcyNzYRKR753WcPa6CcuyMqHV93O0QX06ULai5NQjLB
-  7+lQMIk9xf3ZDfXZu148fe1fraftY+h0KTyUjB9RAxbJ6H6IG9st3o7cDTfTzATi
-  rt7ChOVEK5KtczSfleckgYUCgYA1xZXZRNhiiJPIBx7V4IE2SJyw8YJFPbo7ENiv
-  e2P/CPycM2dVVmD9vnY9O2tVe80Pj7zA8ycPH4+6OqD44ybHyQ7SO3QvPK1/K+JE
-  6KZGn0YBqFb0VfaYX9EE7UGOVk01LDbruxVCWmNtqcmeBRtUxDgMNooVacNOfWjw
-  WInwSQKBgQDaOGxwf8xBcvLkqQmkJb2aeF2oqY8VQWqx7lL+RNgK4o+UGzRzgv+s
-  7NtEC+6B4FFieJO6nkd6iBQaHHyeGER7VgqK+VcmNfXT81ty6Wgmy440FxW3gKWO
-  RdptqSgkdzkbad7PcMPWCLwkBjp9xnEGgUyPm9HyehSV0eDCyhq5pQ==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: controller-manager
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDYDCCAkigAwIBAgIUUjxUnxwCpJ2pnr8BZG9URHuw5/0wDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMCkxJzAlBgNVBAMTHnN5c3Rl
-  bTprdWJlLWNvbnRyb2xsZXItbWFuYWdlcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-  ADCCAQoCggEBANT7gPiWgHZ1mSrUMeTh2jx+tGzLeyXTwHrkdEFB+LWgGbgn4kX1
-  UXjFZorgdBaVskFjkHK9bu2nLEKQNfTIwR9loISN4RlmnfmOmYUEfZqdSbAFvfKm
-  hbcpFjMphgCN95wgdP5QAO3Z/sgwBwUh62RZIrwjM/8jo+5A15NATnjMTQYf+KpE
-  7Yi2VXLt1b11bX7FLc6/f4LNx0zOlDTijvvG7z/bw7Ckq/HbWnUe82om1lDT+X1J
-  l2xkhNJ3OPXVpR5jdGdOy7QvNsFa8YA+8xugKsc1VnZP4jWy+CWvPw896RwU96iz
-  qjTtwJBWuzUZwE4t3n3VbDjQaGH3Axm97tcCAwEAAaN/MH0wDgYDVR0PAQH/BAQD
-  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
-  MB0GA1UdDgQWBBRguWSCzClqJeY8n7lqOiMNsR+ZDTAfBgNVHSMEGDAWgBRzeXbl
-  Y16yoPqFZyyaMBlcLdGBKjANBgkqhkiG9w0BAQsFAAOCAQEAi/KBhdJ/z01sHyNi
-  EimUqQ/ldA9iCgyzOBFiMN2wr0ecgAIEvFGaPWfpiA8n24TSXuvNBhHq/GFoxYP0
-  yCAruVaS/M6+QC9P3VNw+v7ENzh/9nobuCUt7//upU2LHp2F4NMSliHIJaE/0JmP
-  8GrT+79jM6Q/S4XDMU0bdWUC4L/Xh6RF1uUxKK5du4Onl1Y/kJp6MyRdwj5njxvj
-  vD0M5T0Ahxfqy+Y7KsLJkMGqofTKbtH41NRQin1j0qEZVx5n7CAtXBcPfEHi/Zak
-  1L2HKTgzHLFY7zYiY70GxCEuQ0xpeej/pDQnyztKlhOVACNXabVYQnsotHvRipPd
-  mzXHHg==
+  MIIDSzCCAjOgAwIBAgIULHD4KEKGX6rWB+9vFko1v555u0swDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDAxMTIyMzU0MDBaFw0yNjAx
+  MDEyMzU0MDBaMCkxJzAlBgNVBAMTHnN5c3RlbTprdWJlLWNvbnRyb2xsZXItbWFu
+  YWdlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLTzLh5PtnLPVje
+  Fm8kHhgR7BeqY4M9bgy4TlZVIfbHf1JiCKeG5NJRO3rRCe8dVOjk0zZQ5oENXNI1
+  1C2ZB/SfpcmGDrqJLN8t50jrahLiiMKXT3Qz/PGGTIPAEjL/+6V2bcrGfNMf4ywq
+  SG+bTTYRoc6QIsHQTkScUPMpJdomhqsv6ustjeZMYgPEFjCUfPx99C3nnQpWvBNO
+  MEAoSXQOw+5kE6x2NaRj5bHjqBmSVPyBcsdJWOKVfsnv9WSMF/bKARwnDn60pMw4
+  x1iQpQ8oDaJijqXl4BhodGNk6njGB1KH7ULqSz9U/2Pleq7wxUEpHs4vDWmkAl/0
+  CLUBkokCAwEAAaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
+  BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRVb+MCUI0PutMC
+  B9afK6RzEk5RBDAfBgNVHSMEGDAWgBTeNOr4DxThfKHQOoaANiQGA/DdiDANBgkq
+  hkiG9w0BAQsFAAOCAQEAr4FGzJYv9+/moMSoOUAChBMzjYIT/IuoCyW+s4u2badO
+  cyE168WzVHfzblAnRj/TBqxQPHrU9MdSG3J7pvBcpYuGcfRL0+MFFPisc0KWj3SY
+  lJ0cF/6OPFvn5MqIjr7myS1UKuKE/+fgLYPx2j88qyvm/V57LgneUSHvoGKUhJJU
+  jwTr3dZfiZlEPTe/dzjRE/FPhHpC+Si8EZ+D1yURW0b81sO2+dOQ5XEyFGh3gfSc
+  QPNLC4z56kJJuHpg/VIy8Dt+G0NO/+ZCXGQQTVGDtQki/mALRujvsNTbayKyI5Wt
+  APXsiHgiCVQ5MqPOgWO7+L6Zsq6ie4WN3tLy+Lz93w==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: controller-manager
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAstPMuHk+2cs9WN4WbyQeGBHsF6pjgz1uDLhOVlUh9sd/UmII
+  p4bk0lE7etEJ7x1U6OTTNlDmgQ1c0jXULZkH9J+lyYYOuoks3y3nSOtqEuKIwpdP
+  dDP88YZMg8ASMv/7pXZtysZ80x/jLCpIb5tNNhGhzpAiwdBORJxQ8ykl2iaGqy/q
+  6y2N5kxiA8QWMJR8/H30LeedCla8E04wQChJdA7D7mQTrHY1pGPlseOoGZJU/IFy
+  x0lY4pV+ye/1ZIwX9soBHCcOfrSkzDjHWJClDygNomKOpeXgGGh0Y2TqeMYHUoft
+  QupLP1T/Y+V6rvDFQSkezi8NaaQCX/QItQGSiQIDAQABAoIBACzvc73XGaf4ng26
+  oMCEvtslhcHcmuzbfs/LcEPZWJN+RcwZvjr6dn0y1FNkO67OHAv5k+lOIt3C0dQw
+  moRqs8kQZMRi30iYN6JNEpUMMrdUHTFofBqjBahbKtbgaLJQCJfnTmdpwOv8U0VB
+  yrnguGIhxBr3tQQmp8Qt01mGuXA7WklbsW9eDhCeyog1vbqerdSHwPaMmXgFY5lK
+  Ec3fCyY0GIjCt8JrKeGiDDr9ghV+7u1Ew6vBngEtOZVchAqfmLR/8FHAtlvQ+gmi
+  BoijsyUf9p6lflZnkL+mjA9oVi1v0EX+LO/+nJC0zW0oGSMeghc7Om8W1uU0rbr8
+  HqLn3AECgYEA5WKVPD9xnO4g83t2V3L3kZUO0jfl14Fjpg81DBKVB7L4enVxC+2S
+  u4OPCvATW3T76bJj4ReSASCbm5EEJB4UA4yiMHbSIx/vt/C9V7Rmp0LVcaU4z2+7
+  NGI7u5o+dfmaoRXhCUVLRFS4TcB5wn4c+46+sSQmlUCSZ94hJFI08eECgYEAx5OA
+  den8RszQ6Lvo61Go+ce6aS9QTmLZqOiWkywhwqLw36ByLscc/XFLh4rhcde/NBHI
+  vURu/6pr4o9x27wvBvtmmvUIL6MN9ZWW6ue4Y8MyJ5t5gpYlFm0/QZ2913YvOl8A
+  A0vaJxMiChd9R/dAxdCNmNgW7T82Pqu0hcLkhakCgYBJrUJ12YLqfuoCirNWH005
+  a4EZMG8YqyyQl+3X9Nf9YxTAcJxg0mwA4p69SqNNCuQnCe9eyy1QQ2L3srp7x1Vy
+  Vmd53ZBdS9K5aA/I7d7S9nqMSB9ZMXAVwT+iYEaTqhpqhxaC3cjxJ60S/DGfsNYq
+  To0dZJkn81eTGRvYCLeMwQKBgQCBEptFJ1P6MiJ2MnlcH48KJCsiNfBZEcM1Y19m
+  xWb8K0dfSbQvHqVYIDq56Y8OgnrtYQcTqTukbAKkHyOC+jzr5hGg7BIkRO8VQm69
+  c6mkE6zPQtUeKJ7J11POywbpX00CEki+2QK4vL4KCtEChx1EEjJRhIenXndlpsT0
+  sWv8KQKBgEKq9GltcqvKDJAVmkvqfjw4QlIeZ+eQcm514fEtpM5s66dOXVXAVHK3
+  7OSXA3NKGo7QjcocsRDHYkCauePkTSOIH8VUb1Gnu60tYqoqNQdIX23krhePYQls
+  q3jz5cwdAEMVHKcKZm3uQn7qugZjwBGscwM06zbixwy6razf85T9
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml

@@ -1,69 +1,69 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: apiserver-etcd
   layeringDefinition:
     abstract: false
     layer: site
-  name: apiserver-etcd
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEA3cxqa/BqiygXppIfT4uoFTzWHDyLjFG04NliYYG5HPaR61tW
-  P38MfE0zskt/c+PjoDqs0VUeoMjrNFYt1OVRDdJFpwG0IRW7sYk+T983H7UGoXVN
-  uAqZtwn+I/v6oM1UubT1kruVlvYuZEt5QU9jAkIHMQT/+ieNCQJp3w5i4OOlqdCq
-  4v+1phPn3L/wgO5p3KL0c7EnP2jumRKUHljOQvJlgsMDMv++MwqlGooxS6Cq0BjV
-  y1nA3KrQBOO0nRBV9EdT1vUYAYs/PpFGUMyTG2kqDG/Nd+c1qiaKzNXvvjkBUoWE
-  zFLa1IOliE/lx9cZw8aEN+ZGG4DmAZJ81PE4pQIDAQABAoIBAQCmzMID5svZVw9i
-  P2W4pqiDQDstBQNVRWUn65OnDK2v8GaQfyH/ooY7PLvyDAEPoIRgzX+F9eOQu0jX
-  FTBmeQZZxJaJICjc8ME0pKft3UpRWAxihBssmxw6oRM08JztLT3YYxSDgvreiskc
-  t/26df9ZhVpvLPlsoS3ZZq1ECEeoI2QsclU7I0GxjGOvABpycqEUGY/IE+grtpp+
-  xwN3cMOJHijozSgsD3L4324ytI/lqHLA/5qYO4J+bEDJ7rWCPsbHNGjAD3BBIKUG
-  x+MUsyyvHkoR2zijHnSiP+5O/HecRbJGS7/+Y9zgKBtdq5QDqDsAYF5fqI+abwh6
-  BGdXVJ4BAoGBAN/yHiNb0c3PdO2n/eLhYSvGiSjk2KhROFub/q9OXlakcmjspccQ
-  KpAhrbzVKQ2z03tvqj1nN3wjG37wAQrHTEzp7JP2Wb796b1YDg8c7FYubb9pBLto
-  B9g1QKBJk5XE7dJ2MPAD1JMKgFNLA5KUWypzH3c+isshix4+QZzIeFNBAoGBAP2L
-  nfOnFvwPbzc6+1O4j6+t2bMdt91fcymSJION6u5+XCg5C29C3KoiWISSx3C5rRU7
-  ap5gLORXlV3pBJ2NEQ9AteWoR72cqtXaBWHf+nNz3qUiZg+RKQJjg/Yh7T89ob8N
-  Co1ldkEJXcu7eFeRdLDTdJnZqwRzWt/+VoJOQGBlAoGAQkViCdCoO6GC1rl59mP/
-  33Z3LHTccKLobKOzMKmeXUF44ff17vynu9NbmJ/z8CwhD0wyMs2Sq9ev0Vaw2EG2
-  IKSw7/BdCpoVS4T9VBeZEL/YlmY7kkHs4FyR7V0YoZ+PSVLUlJJtm73lz8BJJF1m
-  xR8gVqdZZ1db1e1SeVUR1oECgYAo9lGCd9BC0MuLBMBt+jdcjp3JTlfSMAWPBclY
-  Z6k49rk01mJ+izLTWdErOft2vsiz0XGcPLWD/pJnJapVOeEzsaSxgcp1W8ZN3ndY
-  JLN1y5aA31nV0gHqHOHI9ho6SV7EWvsFdQrx3u2EaLk8jIdpuf/wizYR9gEMhy66
-  xqGn8QKBgQDLQn2K/t/7ywGFjMbrCqjCtaRanSOqM1Lo72p9cHqm/akZ6OmdKn4g
-  YRWNlk/zQetcuahJ+D+6+vU/BKZb0VBdA699I4NMxMV7/3kbfVve5/OhqvhL+sAT
-  CvktxW9ww5NF4JlC26UUV9O/vTwEfaVkC+ZIjQcqMZv2LxpPeEhwjw==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: apiserver-etcd
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  miSEtUBC2tX3DgAtrnYj
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: apiserver-etcd
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAqr0uhWuy0zMJRtfZhHkzfxoFDEIXw7L5nkVLP+GaWFxZrsgh
+  q+9lneSxd8JTr7OiXSLLTsZzidMk/MV1LGrZje5y3EEjdL+Y4Q0gjzqcQJlinGqa
+  vEOXDUL2YdbFFT2XEevT6eITEUUesYUi/cI/qCfJKwLfZrfzWsGU7LKFKTpjEUAD
+  W7hHn9Csg/qP5FJnRn59kPCqEbAkvmmYnaW0Hu6TQnd09lRMdQqVbQAfdzWMhaxQ
+  CwgH1c0I+05p9MTlzTfupMQnQvoJrzh2CsbmZZQoozpy1Bbtcu/GkF1QvjPzLdeV
+  DVb/qnLgRJQKRxXv699MWIBJwLKPVo0LdjydbQIDAQABAoIBAAtt3IZb3j2bBfzz
+  CAGBJ3xTnpDif7q+6Uy58L6W+ID/tZUomnBq9w9ptqOAo594U98OLDPavvMz6h7t
+  jNlrUaLZmmC6D4iKJs6x1UMhNkJwwhQcYr1FfQALQnjsKocwd0Ng2O+oDYSzbsmN
+  UvlPnnlAKIwzhgbXO3gQy0pI7PcEcIP2AT2qUQ7cNvWpxns5XS+5DXSjCeVvuoqk
+  E35GVsD/fLuE38PFZ1HDGzuA2dhj7YHrYCgpvcQx8KsCkd6qEmGSKG4s3qdoEOlM
+  JpqjmCvPB5RORDdGOPh2UkesZb7rwVCYszSKe1+UXsTZCBdRGORyXSjYh/v61hmq
+  fG8rQiECgYEA3E80kP6y+6d8LsjOMTM7Hy72lsBgF5L5b1PDKziZ08YUnpClkHvW
+  Kce2qoEH+TKsh8DXTHqEt0yFQCwuneFIzuPq/s21WkYgj7KyEClVga7DE3LfmknP
+  T1cP1DQCo2os0NETH96HcMtsZ7bQIogEtHzrmZfrqtrQpuUOsn0JufkCgYEAxmYq
+  MAiqknOd2liv1WJhTyXQTw2w7X/2Bjc0OGN7ChvqXn2OtdDY3vn6/HNnlfGRmkgE
+  6xUodg/N1QINtuE+wa04+sqNcHrpNq7LJR6lGzj+SN8EoFBABGwYRgqAhkVLGmfa
+  lefP2thFai+X2fRVb6DyUhr9Qn5QbRyNzjoqPBUCgYB4pd+RsAnwis4VCN7yTq4H
+  674a3ItDHbf/4Y02NC75rLZKB8jDkS29f6NnSHZHYBrf1RmSxl27y+oFNKzqxR8M
+  PgDJPXodT94xE5k0BI7REBXApt4RLm6bcoA2o6z2NQUJ7hVdFI5zlNNvEMx2vKpm
+  9SpI2Mu0q1QssbAUyyjycQKBgAghm80ILeV+s5OFWv+F3rMdu6Hhz8SMIAs1LAC7
+  owlRB5QD1VuCScEpwa2jFTXCBtOp6/mujk/4adk3ElTSen35mYI91vorL2+8Tjsh
+  PGcXOOTHryra3yTPQVdtisL2CBP2+bB3Jb+0aXPmq3SVXQMMN6JB1OtqveUa7Hzt
+  SVnZAoGBAJSRZd7BGwMZsAYl3GRumt9Ju0ElpKgEXUGjhyGCcd/nIsxmoa2asHoP
+  QJXi7cwIVgmA7ldpF0AOqqMw+v4JaH5QtNHduhbykf3gqwptwKGRz0zRltcJxc2/
+  2NEht9qMB8mR/385ekHvlKBgsL591nWhcI9ccPFTLVk6er0DnVyU
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_ca.yaml

@@ -1,69 +1,68 @@
 ---
+schema: deckhand/CertificateAuthority/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAqHMY6/uBGlyWM47EEB9TdsrvZloH8v0YiDPpUsPw0s/GQYoF
-  eiXL2utDxM+VKG81r9/FeDKrsignIpG2NdsMbMPnp4x0Cv/fIAsMGKIzblT1z2aV
-  FFm3WMfYJikMZQIMs5FzirvusNm6GjJIIl8pUCPMpQkrNyLoH5PhCQWtGJVyAulO
-  mdHR1bUw6OQAGw7XMD6ERK2g1yIxb3eTVtKnbiH7Pr4VJke+WARVT5jnrDhQ+s/u
-  mHIMrFccigydJNhr+HJud/wI8BzbXw/Yo1VhPnvfff7tQxiX34W5R8lBrXu2DUl1
-  71FkNiR9IUPH3mQtOSR7v/RVINf4m6WhBnGYqwIDAQABAoIBACjQ+tDzeCzzElIb
-  3dYqQQcf1TJvzk1Klo8qRPcRE2GBhwCKeRlH30WEjD88LWBG0jNzfV3KqV/Z6uGt
-  fQE/upsAPTmUBupDZcVV5/BwHRY27/j5WlY8Bvk0M2PLvn0bKgi4zc5oC0Y++6Et
-  Xd02QcRxaDz1I8uQYb6FDpopDfBOoSH7/QKVa4EuqDhXDxNjhz+hEqTNqQBhMStw
-  pRvLkWk5ZPcX4Fk6mfYsFQy63RbzimWdDHgr0EY8vb6A3coanIIqGpdcVwkZ0Pxc
-  OEqo8yaAElX/OQUUaMi1B48OrScx9cnL8LY2/Ie+uFAtVYoiATUgzQuZ/KGJD7cZ
-  f6xeVgECgYEAwsujdQiOKHvSQto+fQkryc9nCAQbdbObHN+PCZstMG47tPW9gxTH
-  0T64ngXoPJe3Z2eExlWRTMJoh/jKuFL3TCr3oIFFHS/wxv44Di8+KIEgN7GZA6Dz
-  lBZ/+YecS+Rn85tfzlydHsxfIKfI3LktejPFlBSnzkWvKAP5Eexq9eECgYEA3WBU
-  soNs9jz2gqTGqn6QeH/J6DtoSh9dhyOs8kD80hop4fDW7FPey20G7KrNyRmm755D
-  xcZrguEU0cZJC/peX7GEJHomPtjKi/XYXFVgYaGUACwREWo22MG04dxyqdupqwqV
-  AvniAqDqob9rF6XNJnXtP/DT8Etl7NVuB5dqCAsCgYAPtika+XOt5D7TUZMUtran
-  cmkXBm3IkpICRC3fUnrUmy+JqwB8ICL1x59Qb52JtZr/ZiQZczFjBZM01GZVc6uq
-  oxSSB5sxfXpoMn0G99yFm9SjaVm0Jzk+SopL8Bo1LNkNlwylMmch4s4RbjcPRoha
-  gO6AwSG/y3MTQS7HuU/vQQKBgBdxSAbPXA6HTiNvh4oudOYNwjfRcq3GvIS/BmVw
-  9FTbaGwAsQG9r+4i0YTmYXxWNxNQ0yRyapgldarxMHMQREYl6jRiqwIkuu4vToYY
-  lGhCUAXkpLoPYVd6y8jPK2VJWaI/MKBsDb7xg2c1egW7DQpxmnoW6pqboWN/BnPP
-  WO8ZAoGBAJ1uFQdtLtOVOAhxfEGwPGjsavhQ/f1NC9dcLP8KfbnCrI4VRjooL9aj
-  PN2Ya30yXqFqa1LMkkNT9uUpGDxkT4FpwGj8Atot1npNV2d79A+ac/PmUgS65Yg8
-  gsnIOG3out4xI6y1DDwckf7sVT+vQFywmZWz8FAC0tmj2boN52GP
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateAuthorityKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
   -----END CERTIFICATE-----
-schema: deckhand/CertificateAuthority/v1
+...
+---
+schema: deckhand/CertificateAuthorityKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEArwVxwIvr9LzH0NbR3DPfry9g0qgqlOHJnQ1C50w+oi3kmN6N
+  l3UCy0kMMUta46Ma8QSkxkO6D97P04HdmYmwNrG8GUKGER5DkkTiM4B9NYttZJGs
+  K1ZV/TM2ipadBmeQi704p7jEeAjyLlzNDagDlCYB9JbDwcY7dxgQtQKAHBVzoF2K
+  rcY6IaYpydTyV3MqN38SZPbwh2QfGyUgZ0zpnfvKTT5tUKbLJ1DIxD6SNx4x/DoT
+  BbnIxk2wZuQyv1m37tAWaB0BEtOuzF94rHBGOSTpaIOzUmapN/V/aHrh3h8nCbzZ
+  O2rSUO6AZeDKFpNIS/JUGtSZUo52mCdsky81TwIDAQABAoIBAQCOgR9SiFrxpXgI
+  abDr22zIpgnu26/4EzNmZbLQwzrIMBfOBH9DD6nbvTlpNZLmgBpincZQDDsFywRq
+  kXXOGtbYYbTm2ExyybJ4+Q84oejQ3RqP5TBLBPv0sms5QlLOMSr3LHVh0sZdeeM+
+  rp7i/KcVTDERZmQzdWVbncOUrlmDAvYxePJPezWC9qxv28jbw6jZbobjqNSF0m7N
+  9I2UBrC4IpD8jOUyQ+lddZ1dbM8eM2fWRhCv+r0C+NggCxYlX9x1PlDgVoCru87L
+  cPy03yyTW4V/aH8z6vc0pwuaeu7zOFnaxIBIKmXMG/BjLxtKV+W/9IeASz6s/8QX
+  IzadZ/XRAoGBAOhzEJVxXojaBSOOb3iqXTpySpu9mNr/u5Jstg4Q6FBiDnKt8gqF
+  Uqu8KFyc0eDE+6xuLmdQEBJLNgjee8hLVrUUlXnJ6MaUAL/3EwNN7ZITrp7AVBkP
+  eX+nNP7p0PS3WngPXVtaqH5CxJEiEsgp2gt6h7Gtk2IpelPPyiOCR1x5AoGBAMDA
+  4/1Ma+PuXF66qeiKBx04tUBK0yqfFvOf4GLjw8XXmaYr3bQoxiWet4OOWrbaQyd4
+  79/IFpBHlkZRDZzIGj3SrcLWLL1SiSxodp+C3d5gU7smPFxsoCW3AZCGiekXjc8o
+  vno22hrgS8sHVt0lEwIWbWozZxx00w6kp7ItMZ4HAoGAPkPMNmu2yeu0orCdtXHV
+  JTnGOG+SCV+lS/So0529zQJnIlrr0duiqHPvT9eF9LJvQ+IDthLhKzVQVRHbkGx1
+  3m2UGJp4KvEsPj+drS3rrExvYwDbxha6EfKlJH9XRKX0quJavITNS3zxEHtTEqD7
+  UkXRIUwAhbPcm6S2Xcqg+OkCgYEArL0wlJOkLMQ0a4CFPCxWa82iQVfNHmksPHCO
+  upC7pdWtkMnHCelwic5PT8qHaU7416r97WJ3Nh2xgpqoxFRfj//6UJ13wsLww6dq
+  h1DUXLGe2B1QAtQmQSZcdJTditLc90XgTc5Sb7uKsQyGv/C1tC09KOugAFSBwKG2
+  12rBCIkCgYBlNWprQitYTmThfwBYu8RNWpPett81LQa48DxjC0W1Jn5Ef7bhF2Xw
+  uKoB2ONGtdFQCrUWjwxxMW8N1V1p3i5w+PWoYkpOgAVKRmcc3U9EfLsbjpaVjW76
+  lfEzMMwqkInf22dS8f50g7nnMVawt8eqz3gkX03I1ZGnVJFrr0/zCQ==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_1_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-1
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-airsloop-control-1
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpgIBAAKCAQEA47VOSnOhjF6NaQuGEVocNuJ4jCDC0J/a8cbq75mxFXcPxJuY
-  Z6U3/dFAuk4clNYyp+1S1exA7hKVKHbAPkyF72BAhvl/S/KiLVIAkva+NZWWNonP
-  lzyA0bVvQWkiTfZ1xcSosFEW3H4fuy5CgvvxiKApRKmcT6FVuhXtX/bXUbWAGCVB
-  hMw/x3dyj99aZwZ5WZ0C4YYGFp8oWgjuEhLsGJKsTP9xsJoWSnrG4oepf5W4P+bC
-  9iT8WrYdpDdJLxxQn1UctTtXFX9FpwYtS2iMwtAEduP3aBfW/vWQkzzEvGr18H4y
-  OhTxP+W5mWgSMev7b6tQ8qYFkJ7t0DQugZkrwwIDAQABAoIBAQDWAh50xrw8Ctlo
-  spXsVP5TbwHQ4TF3leXWehdv3Mib3eyJ4ZqZPqSi/jmRX7xo/e9Z+Ch0ObjEh957
-  yy/e3Vi7o4DB2leTb5SQd5NmjFQ0VER7OYZLI2gGsDjCBydgkpQZrTzFiVCtJjR4
-  XX/RTyywNabTi30HMiA55kXUfU/cz6xnMT+0ZYF+D+QpTCVKJtwFijdh0vDxvQ+v
-  M1aPdNRlbarFyubzurF+1n+SDKj6olmA1oY4xz5EH4/rVnUH9o4FuV3cG5TQL3X+
-  JkrjEGzCqKXU+rR7sSS6kNoc/6IJjLZDt55CsK6i4HRHoASPvcb9VK95NYjd3opH
-  CvPlR6QxAoGBAOn8xEP/Bd7McuX49z2D23xT6mHAc1akNCeo5RnQIEOPkkqWdgI4
-  BGIj+8q+bR8wkTe8wwQcvC1aSUmu2N5i7uAecWh1M1KpqAXvvYL20pl1kh4TidKN
-  sW0Zzg5WA4ZELDRoKx6i5X9IV89+nbGCfafN1vh8b2MNbs1zcBqdc8YXAoGBAPkh
-  UMCVyb7wQXITc5o4091GcV05Zv7toDSArqHY6efomE7yFsUNy6vyqMlqd89/G7F8
-  DIhY292owyDNxDokjKR/OsEaek9vKAds4sQ1u4xuGGI0TRh3Qik94jikE0Bo8E/M
-  lDR9eqrzdcdKpPQ7rZLNck366xLqoZVFZPZSmr81AoGBALZ7afl5n3Nl0UnnQ7LW
-  7crliwpXU9xDTWWMw7fA6BiolLfU5g3O8CQ12f4BSwsjDm4AqbrASkW4fyWW1g2B
-  7LgfJeUIWlFifOa8VPkZU59Y4O7R4A+0b6YdlOT7Ud5ZtnvcrZxEAGWm3sy0+3jf
-  wu2mi7vZF+mRJVPXbptjJlJbAoGBAOLwETJNgCh5jPRQecbrqzru90d3ibYBWiVZ
-  bzqpcHE7dLq9VjaMmZJ5in1nidovLFfh6zyszSO+nnkcV3qrXp5d83SCHRaM6AbT
-  jkIzvDNw+q9Ce1QlFtSgtZjpBUxwCzB16C9kekCNZCV1fouobTXEBjK4tjhWGXjz
-  bMPhfWtdAoGBAK+lBVORlQ+ABHmycZv4Kl/W67p2fKLRszXxSEgpblY5uP+1OKki
-  3r2fQ8zyHjY4X1khbKHSIFPLt82a0oIDwQwI9TAqawBwQoJIdRaRkqoxHHAi5TGA
-  dFuowK7YeuHao6maqSSXbaHFgwktdZQ9C0C+5lHiIyIH5ksJOz6VpRWZ
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-airsloop-control-1
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID1jCCAr6gAwIBAgIUFWmXrnADbVKuruUij7gy6g4RNYwwDQYJKoZIhvcNAQEL
-  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
-  dGNkMB4XDTIzMDMxMDA1MzYwMFoXDTI0MDMwOTA1MzYwMFowLTErMCkGA1UEAxMi
-  a3ViZXJuZXRlcy1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMTCCASIwDQYJKoZIhvcN
-  AQEBBQADggEPADCCAQoCggEBAOO1TkpzoYxejWkLhhFaHDbieIwgwtCf2vHG6u+Z
-  sRV3D8SbmGelN/3RQLpOHJTWMqftUtXsQO4SlSh2wD5Mhe9gQIb5f0vyoi1SAJL2
-  vjWVljaJz5c8gNG1b0FpIk32dcXEqLBRFtx+H7suQoL78YigKUSpnE+hVboV7V/2
-  11G1gBglQYTMP8d3co/fWmcGeVmdAuGGBhafKFoI7hIS7BiSrEz/cbCaFkp6xuKH
-  qX+VuD/mwvYk/Fq2HaQ3SS8cUJ9VHLU7VxV/RacGLUtojMLQBHbj92gX1v71kJM8
-  xLxq9fB+MjoU8T/luZloEjHr+2+rUPKmBZCe7dA0LoGZK8MCAwEAAaOB6zCB6DAO
-  BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwG
-  A1UdEwEB/wQCMAAwHQYDVR0OBBYEFL+zlx2c7uji/Ux8xAL9tZ/TAGIMMB8GA1Ud
-  IwQYMBaAFNTsRGAcI4NEPxVLcfO6o6BWDwyCMGkGA1UdEQRiMGCCEmFpcnNsb29w
-  LWNvbnRyb2wtMYIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
-  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoWSBWHBH8AAAGHBApgAAIwDQYJKoZIhvcN
-  AQELBQADggEBAHfhCqUju/DQTX7A3TuYRUByCLSUu5D+JNK0WJF7zXOWSsVPFzyN
-  ZiCe1lOkZPKtg696/ZZM1YBY21DCuDoxi1P7EyqDdnVmPVmetOjF/Flh3XpZQorw
-  JdtFYOQLRZ/GP9HJn1da9U7H6n2OzKu7biFuYhDiNM56ooxv7mcQLqnEKUu0SmTW
-  jsqb8qQghee3sFRcUaoAhFtfDHtdwAxI9T1bPBRxZth4FPY6/+1XN7OxYocwRBP3
-  hXVqZrQ3ecYR+NA/XuEGLpm5/oZbvYD/Fbc2uranvz6G7VRqlF93JZtcTRfdJQLG
-  ZUQZNAibCUipkg6nD0fa+C7Edx20tLflFV4=
+  MIIDwTCCAqmgAwIBAgIUDAQZ8Cnscuncma4PpmG2dcgnlxkwDQYJKoZIhvcNAQEL
+  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTI0MDExMjIzNTQwMFoX
+  DTI2MDEwMTIzNTQwMFowLTErMCkGA1UEAxMia3ViZXJuZXRlcy1ldGNkLWFpcnNs
+  b29wLWNvbnRyb2wtMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKTu
+  kT11zakzjNjUq1+4MPtXFl7HMJWYwwEgqGI4wkcmGWMtM9PkvA/XMt+0oNjDoSvX
+  6pD9J4jPVa3k6ejhsksiFGhfirms09TLHq2dgOg5HQ3sECHeIU7I57YqNo6hMBm3
+  2CBLIXtsX0nvAhrBn2Pia/oIgwGHLgJiapr7tFJ6IFVsWlKcQ6IVQqrD0ug6+rMI
+  SWo/yBZgJF9VPsKti1bf/Gp/GatiL0O4PNfuN2C2x6pCeB/IwAK70GsadN2y5wnC
+  zFCu+fNg0t9els2EoDZh4ve3zPUltnfsNaSj3A1+1sZh6oGnEVjOc9OiTQLgXXte
+  03SYTmjOEM5HLQUH8rsCAwEAAaOB6zCB6DAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0l
+  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYE
+  FM9adAIlRBO5uf6WEoRThfmulw/lMB8GA1UdIwQYMBaAFMka8XObiRK/nd8IiYab
+  CpduIlpoMGkGA1UdEQRiMGCCEmFpcnNsb29wLWNvbnRyb2wtMYIJbG9jYWxob3N0
+  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
+  BAoWSBWHBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAHh95xM2TnuIhhfs
+  UFvjAapiIKBB/5MZrmoX2t2+S/NyH3DE6N7PPasXhRiIVg4wzVPQ0rGXNJAmdy1o
+  YaUFjLdTx6k1+enEq5e1odXmjEKiyMa/4+Um4mvhCCeTTBcXQxH7fcp3tE/RrwWM
+  aG/RPDlC/BaGyfRNalpZZJxkrr5lflR9+nSlH5czHmUKrHR8BokDGZQlDUmjwuSE
+  SXV5ynCmRW8U/iopLsEd6RetD8Syd3bJjR87JWlnkBSxHjVOhlUOYHs6ks4+bdfE
+  D5EdyZRNLRRBNKr1Vwbc0PpV4qmmGK/eWDm2zjeKITOIGTC34xq1myNjny3C+8rL
+  N1Xv88Y=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-1
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEApO6RPXXNqTOM2NSrX7gw+1cWXscwlZjDASCoYjjCRyYZYy0z
+  0+S8D9cy37Sg2MOhK9fqkP0niM9VreTp6OGySyIUaF+KuazT1MserZ2A6DkdDewQ
+  Id4hTsjntio2jqEwGbfYIEshe2xfSe8CGsGfY+Jr+giDAYcuAmJqmvu0UnogVWxa
+  UpxDohVCqsPS6Dr6swhJaj/IFmAkX1U+wq2LVt/8an8Zq2IvQ7g81+43YLbHqkJ4
+  H8jAArvQaxp03bLnCcLMUK7582DS316WzYSgNmHi97fM9SW2d+w1pKPcDX7WxmHq
+  gacRWM5z06JNAuBde17TdJhOaM4QzkctBQfyuwIDAQABAoIBAQCK2YESkctbJ9fq
+  b1f7FHDAF/fwQJcJSfrZRyoazpfYGB4FXXelaopcd5oPtNw4wLE93N9Pwp/20D3c
+  ULwPX3qfQAiYOd7rI7GOEpY4KUHtvq9UGikWqg+2aPKRbIZTmyWIcTqVLUr5wimS
+  b5GA/wJ1r5ehfmrz7V7xiPMgmMidKXNWkhUP2tmJDzn+WY1ASyY8kopz3eb7bHYD
+  Do8gMAphEckNna4hkoBcPTRm7MLtvrg5pSYWFDQ1kozpNkqNMcTQp3axvN2Llowg
+  g3yIy7K+MDt2FCKWboSHAEtg/FSMzqQT7H6jaxknZlbm3gK5ZlJFYPOWR6anT1jY
+  LMe89S3RAoGBANMVgCu4EkNdnX9MIahLPHBzQu6AC/e7Js42sd/KalUtivTEHOzm
+  d1JEllsxa4xz8j0U1VDjgkdrGYrqs/sysiS7Y5N0Zcojgv4EFFhqY6a/89Az5su1
+  du8RhCzTmVVgr8K16+FFK6MwW4jUhNdjliuk+L8tcoG0YE41saAHj4bjAoGBAMgG
+  /2qVqIL06+7w1fWd0E9LkROiUGH9LLywoenGa19Sawu+wiYXVX1ZkSdddoHNo9M/
+  jsaNPubnTr2oqQNktMsvXwQupHU6ac0yHVQpRH2kNAUVu2OOsiqQCW7wyfyMNl09
+  BA/272YJKM/Y5D3R/YfBwSu+51dwg4ey3wnnSFRJAoGANUdyCJb3lSVmAaGXxUDo
+  SoHtXQHZA3irvNU1ZIVU/Zb3QfzWSD2L1KoXQYFh4hvKAvzlMvuaAKjZ06SWNUuA
+  h6D861Uv9CuufqtM71w7NvWwdtcC5FwzXviO4jmutEwpUP5WQZASCajFEe6CcVNj
+  rjR/zNGN24tJ27PV18zQv30CgYEAkqeeyNSlUi6kdPGazZRBUIIFAjI1YUKwdD/E
+  1pOl0aOp3FimHCtrgJYUuJnr80uEW7PzyFtyzPS2ZJOuJ1DExVwb/AL+jPyg6dNe
+  cYA4OS4U/c1rMJlEw7QLVo2wajua+E1uFw5jg5oflBRfc3vsuIY0TRCQqSlTJkDd
+  CnPKMhECgYBzrfsCfs5D8dw6oqhUJPe2KaG8vYIXHKaVyURKaSJqMBPs1nGlR+h9
+  uprOUoAbwh1C/6PnYhNUr2SUpN+TBD1JgrZa2R38vdvx/19Z9Y6ul/vK6nTnKL4J
+  TXacKY688ezDmT04yTbZVVTTdKKpiJFzfS2Q6JknF1UW3EjbHvR9XA==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_2_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-2
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-airsloop-control-2
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEA1JRS/QE3fOIWJYWDRwXMWtXLTlF9KpkwazPzwjepnvO3ZLb0
-  mc4fEi4RfVpm7sVgnTAs88pvMJz8u0y360CWqJ59SPwJO9aAFsXTirKPpd91hSoE
-  hR61ccnlu2odYSxwFyORYZ+DXlKpfBLpNLfNL6azF2VidgboVjGOzxYuX6jSKp/l
-  y2A2dL81NlwRKKhAopeowZFHprX8L9XrYpoADbtZsKhqyZ4DDPBji+OUfYBAmV/w
-  1Zu7RT8JNq9k0RgaG6mESZOdKx/NKUnkHYf+CEoBc7Jeo0TDye4HGmP9NFS8dUH7
-  wEzOU4IG4jMsnmExjiYmICAV215go29WT+FvbwIDAQABAoIBADGQI4k5r2Y+kEtP
-  RbxZbbv//NbVyQkVjmRwSHUP5UxaJngk8AKsPDJQ62L+oOEqw8viX5i3qhT7hTFm
-  Qbtn47iMu0k4+i4pZNPqa9f6qeNSpmPV2BfxgPx2xklcBF2Trs62TD8mocpsG3gC
-  ML1J3V0u0LKzwLEkCyeNhm5iDY3fsZ57lCyQJ86yxkteeCvLFYrMvtbd+XQlpOmi
-  fsuqu65NiU3VBUoTch3qq+zCeznco6vtXlqolUfo0yu0Kzf68MkbKotYAP9GbPGV
-  7WwZ0YmuQGF/KIMl2OXvbKsoSgNu8zm+5SD78r+1bHaKMqZkn4cslXnYuduWNJBE
-  s3Hp5IECgYEA2q+8ssydFjvSY4ahrirz4ReC3MOy0Iacpq+VnnAuKRop9tJHAEek
-  tUjCS7hkW5NBu1poXgN0KvwvL1MHrShOWPyIL1rYAHrC9ApQADG+NUKwAo+bE0g1
-  Hcv25MbfHFiYD21STG0VsqVojzrZp3AspW4fhGPZYibyavmjXPvSBJ0CgYEA+NnU
-  JKbD21lzki/IREKKzRUYY2L7aSaMLmA6Qw82Xz54mNOvo1oneXAP57fpxwyxSu7M
-  gt7nxANltrJ6B9/n5gvlwrqvnEyE2lO8hULJjkaLFWmYEJx+9fIH+nnE29Y5v+rz
-  MEPq6m3lQmB4MYj06tJaUtE3F561I2S/2VFsmHsCgYEA2kGKkuij3wzVbX9w3eMA
-  hCZy9OJcFMJElhenu/k6GMuEFlLHif/24vc681eU0dCmSdZxU2MfDcejUBgOEUOo
-  7icbxCdmbRQYfnfMYGVE8OMdx3CL1TK70IFAaBQTmLbTDJKPELfOb/2l3U1e7T2H
-  UZQW4IrG6q70Qs/ju2mYsgECgYBNnOKla726M/PvrCdx4q8Xt3SbystOyE8AR9Lk
-  B2KV4g4K3DrzX7LgFStgweOPyU2iaUgvqQXwBH88s/2LZzIUdbF7Qm5y+QqWbXdm
-  uKXUUfwe+YgL5kNSweHrJP9Y8T+hs82VSBmEdDIEucHC8Uwx0NmK6uWb4EvudgW/
-  6b1M8QKBgQCsfAY/wZmJ2kE3Nnt31tcAcclffZW4hA6NXuq84a3/lLqzKMYNpIgR
-  tk8XAXi/bmLKHvr6o8LpVmpwIqwcUjYum6n3qg/af9B1N9w4UL67CxiROak6TJq6
-  A+6r7yrDSLN09KxrhPo9zkbRDi5q5WEXYEQTqVtaQd2NdA+KMcGp7g==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-airsloop-control-2
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID1jCCAr6gAwIBAgIUBz2qyb4tMnThpB6JFI/ZhhI5mnswDQYJKoZIhvcNAQEL
-  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
-  dGNkMB4XDTIzMDMxMDA1MzYwMFoXDTI0MDMwOTA1MzYwMFowLTErMCkGA1UEAxMi
-  a3ViZXJuZXRlcy1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMjCCASIwDQYJKoZIhvcN
-  AQEBBQADggEPADCCAQoCggEBANSUUv0BN3ziFiWFg0cFzFrVy05RfSqZMGsz88I3
-  qZ7zt2S29JnOHxIuEX1aZu7FYJ0wLPPKbzCc/LtMt+tAlqiefUj8CTvWgBbF04qy
-  j6XfdYUqBIUetXHJ5btqHWEscBcjkWGfg15SqXwS6TS3zS+msxdlYnYG6FYxjs8W
-  Ll+o0iqf5ctgNnS/NTZcESioQKKXqMGRR6a1/C/V62KaAA27WbCoasmeAwzwY4vj
-  lH2AQJlf8NWbu0U/CTavZNEYGhuphEmTnSsfzSlJ5B2H/ghKAXOyXqNEw8nuBxpj
-  /TRUvHVB+8BMzlOCBuIzLJ5hMY4mJiAgFdteYKNvVk/hb28CAwEAAaOB6zCB6DAO
-  BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwG
-  A1UdEwEB/wQCMAAwHQYDVR0OBBYEFBw9h1fp+U9RuS4ho0k5vQH8EoSMMB8GA1Ud
-  IwQYMBaAFNTsRGAcI4NEPxVLcfO6o6BWDwyCMGkGA1UdEQRiMGCCEmFpcnNsb29w
-  LWNvbnRyb2wtMoIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
-  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFgyHBH8AAAGHBApgAAIwDQYJKoZIhvcN
-  AQELBQADggEBAIGOq0Bzap+jADNpocY58Kt7Mz6lWCgWzkhPLGQZZLLtGf4kDbyK
-  cXknqBcOL4mGHnfoWf/3FIgFJv4OBa/aWPL1P98d+q6rPqGdEYDcDAnPdLShcE52
-  V2rGcJ23lAdF9kNimuXnrXkBMVm1njgRtDHMAbQZ+TcIPZk1DeMvDcUQqPNjp6vR
-  AtMcf1GLcs+gs/fUFekDQMrj0PZK9+aUtWB5GTqKSQS1KAgsBg/L2YAqDskcQp9y
-  jlDvnoi/8zfdq9ayJGQ2NiwKvyWuEXHY9R+6A6+iM6OpUBQSkpIwtVxvdWV1OHCM
-  RqHAelHfQCdgKVx23Lln39h22O2FTdR0UjQ=
+  MIIDwTCCAqmgAwIBAgIUFG7cSmO6E6sVEfMW6BYYknMdzwIwDQYJKoZIhvcNAQEL
+  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTI0MDExMjIzNTQwMFoX
+  DTI2MDEwMTIzNTQwMFowLTErMCkGA1UEAxMia3ViZXJuZXRlcy1ldGNkLWFpcnNs
+  b29wLWNvbnRyb2wtMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ0Z
+  scqBiDQLkuSO08riMo0FAQqiNU0ohkvFnX9wR71KfFJP/0dV0m2/IrrD8OiZJCyp
+  qd9GHTQ5uKtzgjR8QtMtRZmqtdJEmDp3/JSoorUWRy25lZbgXpKLA8h0PbHHYoeo
+  OcXwYW6Q2j/7d++P8C/vEPX0UMt4kDlWqLlSd5AmAqT8WkvJqP4l4KWkWSw7+ER0
+  KqSoOdOVkdVpdpT3AaryQbEOB4ydB7GufU0zOgINT/8/7JxTRlkr8/V0haZfOm/p
+  DKMCgFdH4o99BKe6DwMZkBcgnXA8YBqy5gOa3af+/cVF1LL0aJtXdBQyeeWoInL2
+  +xrsLip9ND+orfp4/EkCAwEAAaOB6zCB6DAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0l
+  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYE
+  FBJUzeoUhiu2EomQoYA0o/JFELybMB8GA1UdIwQYMBaAFMka8XObiRK/nd8IiYab
+  CpduIlpoMGkGA1UdEQRiMGCCEmFpcnNsb29wLWNvbnRyb2wtMoIJbG9jYWxob3N0
+  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
+  BAoXFgyHBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAFmoM/A64cF7obQ6
+  ljL2B0HMfGvIGQFGa0lfESND/mT9kixGj6MspB3lBCwKJ+RUWnk10MCYreEjrt28
+  BvPQT6AOBuJ3HbuZUAQCJuBFlJluJtXMEBcpr9kLRa5ixLeRdO6EytI3ivr1xQ8r
+  8aoF2lC7MT0NjFdkslzgf4cOK5Tju9X1OV1jJGE5s+qImfSjqBywebqxjr2Sg4MK
+  HGwM7Z2WM2lOPt11p1R9TKcyiMrkUqFl96zxoebm2hML2R/xV8ycSCkaSqkVHRgv
+  lsbi9v6kyIYv3rM4Q4cs13vLOFQs/4vq2s7VuInHeZj4sRR6STcJM23j0DA8z5Mx
+  tp7uo4Y=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-2
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAnRmxyoGINAuS5I7TyuIyjQUBCqI1TSiGS8Wdf3BHvUp8Uk//
+  R1XSbb8iusPw6JkkLKmp30YdNDm4q3OCNHxC0y1Fmaq10kSYOnf8lKiitRZHLbmV
+  luBekosDyHQ9scdih6g5xfBhbpDaP/t374/wL+8Q9fRQy3iQOVaouVJ3kCYCpPxa
+  S8mo/iXgpaRZLDv4RHQqpKg505WR1Wl2lPcBqvJBsQ4HjJ0Hsa59TTM6Ag1P/z/s
+  nFNGWSvz9XSFpl86b+kMowKAV0fij30Ep7oPAxmQFyCdcDxgGrLmA5rdp/79xUXU
+  svRom1d0FDJ55agicvb7GuwuKn00P6it+nj8SQIDAQABAoIBAB+MbmjVdG3HOTuO
+  9zdSD4bET348LuoMzlNfHw7dlHqN/8Nj70b7FCQX8ziAatu7DUmu1L9SzECVquE7
+  dBVoMt9Hwydl4deVEOEFAYM1Dl/BVo/3KfQ/oJ5bLmpN9anC+aV2ggufB2H10u5w
+  aJiCVmC56LUL2EHUN1pcbcuxpPMcbnWNUL4B4QHfwK0B9uWzp9OS8ux2xcJCdtiU
+  H6PG0jBlehYaczxbacKvRVDKh2yx4ALV2sAHhSzXiR1IP6K4zPSwiR4goW7geUxx
+  31QzGLkyZOf6XPY4ZqrOew/srgNdY/X97tsIVZzRRLPx1g9kL0XjP6TucHngYhkh
+  5Ozg7IECgYEAyDxhRVLd9aUv7jX+ulRfJcVbiq8/uvMgiJTcnjAhwDK64Ax8BI/E
+  UEoU7YX0YfEDogi6K+mcWsUsOWLx17DWXxkAM2Va3uWIm+8GlSPTJAfFJamIL23q
+  4ZoWcyj6IZgloSgen0ZjrX8ouL9TUoIErhD/EUnRxwhv4jKqXiWxDBkCgYEAyNoD
+  C0KDRAMvR3GFcx94z/GhZcCBmmFlbx5L/XNkpvZ7X8ifciz55fMztsvvsSjNNfkN
+  w9n7TrIJnGgeaLtsvH/dW0eyVmQTG6kEl0XEFPi9jHD+gwtMPpS9jrhSEwc+YtS1
+  XNBY7oRnz8BZhchQcUnbo920vetHk/YoWF/wd7ECgYAM4yX3ij/S4ZDWKg98+pUt
+  HyinImRdqew8Hiic3cguUJWKegM5X+9oo3v5VZfG/fYX5avly6FOjkYsY1vhX/ZM
+  JJXIuQtCMU+7iYTI8IdUWFOt+t1TACYP4xTy0H5YzywM1UIzShp8PiTmzxmTw959
+  PYbNHA0uXDKnQk+Iw7BDcQKBgBPY1ywpqmbyGZ3prdIubfW+XsB7QVNMBIXybHfj
+  CzMkcBSK8paJszfxzE5n4IuVCJIoxh9wTtD77s8xyq92tcv6ppj6gLjgsrKtBPMd
+  xb58xd423C9+0k3szL5poFKZCKUjd7hwLhmDo+53h2Ec5jYLolSS9+U8dpo8XMg+
+  0rhBAoGBAImbvnQFlPU9nzx0nOQ2Y7IxdLojoSrmXHKkWyMnmxX39l5shn748jSh
+  vxURh/ANatTm+ozPEnysVMSLCugoQhyXuqbAt58Q31Qjd2wFrES/kZN8GpUqu1hX
+  +o0lwSRsH/m7igppez45xRNn8Oq6Nv1mapKQTKoLQX2BtBojRE+k
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_3_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-3
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-airsloop-control-3
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpQIBAAKCAQEAtqshpa3zUd0RfmF60U1yMswVOrAgVfZ7S7L1E+F93LXg9YFp
-  uwgXZ40YgXH67vSY/LnSRA5qcw69wueL7jXDWkylg9eNS3+Yfcz94X4w9C+LVaiG
-  8qXAO7Gju4v/7BnOd2emM2MoxefXRrfn3kSXN0iL006ljFJrEtCAYDubp2+fHI6q
-  Bscd/SwsOTZTO3rsUKYHArx/XjimEiIYZARM75oeSvIbEheUtlfhlC/HdpgGO0Ol
-  794PzrBhTa/5uuv8nPWXxL6sctBKBmsjhqyhVssezq2XI61bSzDHbXNJaofqV6Hw
-  F6idaoIrG2GVdU9QprJ76GkPXlsdsXXahnffGwIDAQABAoIBAQCjjPmlU+gFpf+h
-  vjmu6L6UyLFBSKzLCtM95c8Uq9J7KMVwSxyVfxsldek5DQp1pL7NmLqwgI/C0LIK
-  rjJVaAGu+e0/7GDv9iBckovFt6yxFViVqzyYSNujFtvYcfMEO97mfgELBX9eIsRW
-  5xZNpfAWaXf4C/ShfLGtuM0YXIZzFDOfTrwrFRdBI5iVkkbdNx7W0U1epyirLuqe
-  ourSlNyPf9Ufw3xHAakeG6erdtvbCZ2X2yjiuKeEiowu+2rDuaWV7hGrWOSOdXQq
-  yAi9XN/z/2hD3ep7G2JgjHShjmCYM6NUxDAfX/XRfKSZo9k0Rod4hv9qCK7FdPwA
-  OwhYJShBAoGBAOfStvx/Z8wTYBJy3fG1JLS/V2bz/AR6++kcf4tjPTFCA32vXKm2
-  tQH2tHF9uILdXsN0Hlu39Oq3/+re+sQjCYt1KcdUODg8uV/xilZ4Js6BFqGvFqle
-  +gbHlG6Zb9lkj27O64Q5MUv1euYI+5d+LitTmyEXLATtZOy80uBpqSNxAoGBAMm4
-  Ej8L1HoaMcOCL5h9TBGnuzSjGhy6dKcNL/XDvmCm+z1JQVP1VLLyb3gef/YsZEiy
-  N+pyZnylCcrCMi2l5WKy8dDeoYVpiRg9J5FOeWj43zeBTn8EzJxD0HfvUfMj48Cq
-  Q7p2V+In7VZEzd3R2ty/z1w1fH1fw74EUhsSmc1LAoGBAIgX8gjlmr/5l+r8uEMP
-  vs7FjcAI+CiBMqY1bsMbrW7ffEEq09FmS3ktpd0Cm3FoGBvSbYgWxJePEZSG9txy
-  XUYbsD0uuhp5u7IRkM8WlmGg8vJUYY9pDIsyW3daaIlNOc8pdqYXFVOsd0vYdisH
-  jn8tA+M3QUZbP2ajq4DHRt5hAoGAMChPwtlyKoxiYQiNkFwpcvWWTeS6cS1aeB8/
-  2e6XXr++r0zz2bVyOR6D2it95SmH74sMql4RdaR5B/0AucEnWD7cWD8uVIlzf2Pq
-  NFiFx7fSoo+uS8i7iHrwJBHwgJmK4A5GCRgDtyxNDxFyDIjzNUxdluf2BoB8XLrv
-  VyNDsK0CgYEAyzg9pTxfBkNM5/IZxJoqhZ2dDZsny2BYq33/aQMnQqww8jxYx9YM
-  4nSQSMMPmWMY8pffS2jarRL1A401Nc+L6mcocB11kUE1pUsda4SF2EUh/xXXrkQP
-  MSZOm7W74Kd6Zt8b/kbL4iLa6Br/svIvvuQlGU3TluWP5id+TEO0jHM=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-airsloop-control-3
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID1jCCAr6gAwIBAgIUIZWybMCL1BkiE1HxURoZwAFO9NkwDQYJKoZIhvcNAQEL
-  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
-  dGNkMB4XDTIzMDMxMDA1MzYwMFoXDTI0MDMwOTA1MzYwMFowLTErMCkGA1UEAxMi
-  a3ViZXJuZXRlcy1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMzCCASIwDQYJKoZIhvcN
-  AQEBBQADggEPADCCAQoCggEBALarIaWt81HdEX5hetFNcjLMFTqwIFX2e0uy9RPh
-  fdy14PWBabsIF2eNGIFx+u70mPy50kQOanMOvcLni+41w1pMpYPXjUt/mH3M/eF+
-  MPQvi1WohvKlwDuxo7uL/+wZzndnpjNjKMXn10a3595ElzdIi9NOpYxSaxLQgGA7
-  m6dvnxyOqgbHHf0sLDk2Uzt67FCmBwK8f144phIiGGQETO+aHkryGxIXlLZX4ZQv
-  x3aYBjtDpe/eD86wYU2v+brr/Jz1l8S+rHLQSgZrI4asoVbLHs6tlyOtW0swx21z
-  SWqH6leh8BeonWqCKxthlXVPUKaye+hpD15bHbF12oZ33xsCAwEAAaOB6zCB6DAO
-  BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwG
-  A1UdEwEB/wQCMAAwHQYDVR0OBBYEFCXRx4wxsoYhOSVWzWoGdmCCtRDEMB8GA1Ud
-  IwQYMBaAFNTsRGAcI4NEPxVLcfO6o6BWDwyCMGkGA1UdEQRiMGCCEmFpcnNsb29w
-  LWNvbnRyb2wtM4IJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
-  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFg2HBH8AAAGHBApgAAIwDQYJKoZIhvcN
-  AQELBQADggEBAIS8Dh+JphhxlcpR6RXgkWMk9gKc/FpKY2Cdg7hmUPuZ5KhXQyT1
-  VOlTtamxpTfNKjdU3NzZL9SHJ7ngSbc/DQhWWgGQMcRlEQ+w9GC+FgwdizuGQQe9
-  B/5Z3V6qUcCwTZu2Tc5t0vsZUGfEVNawsVMV7Zps6+4ItjXLfrNTJeB5WBifEaEC
-  QCGbiiWYYs1cfg1Vky7JBZTcCWFp8pUE8pOroWw1Ox9ZiGxsHrHjtxEWlJiZHaQ2
-  PFEykuq4XcSJHdeNGnxS8kAlaz1k8PVglAgAiVthVnftG5GZ++ktbJuhW0H/DDna
-  f40Ag69sbp8ceFZBoNzOuZMKc2WEWOFjOjI=
+  MIIDwTCCAqmgAwIBAgIUT2ZPL3vGZKbA6axMZAzJmVYS4T4wDQYJKoZIhvcNAQEL
+  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTI0MDExMjIzNTQwMFoX
+  DTI2MDEwMTIzNTQwMFowLTErMCkGA1UEAxMia3ViZXJuZXRlcy1ldGNkLWFpcnNs
+  b29wLWNvbnRyb2wtMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL1q
+  rhMxHeY3UxPebhOpTGwGj44fMcbB9a2gokkRToD6XWwmZI2AYOGc4wQpIaa32xb0
+  QdZaKBhyCW7LpO1zX3M/rK7ng+G6nU+YOmgjEkEbRJ+jzCGA2OaZ/ixhnPYGLH5C
+  4IIOH8JihRo4YCjXjmczJkTAyNbwzne5WN4cg0OKriHJXD+5nOCVLTBFGXkKxPIp
+  XYDTWzqpybse8Dul/HHH7GsviDBFV1dEpUE17HOAO0FFRQYwTGpPBmd0QsUvxBF1
+  og9uTAG4dP/W/6D7ZUWBVP7PQPb1HiAa1rwT1ZcbEhqtb43F322nGvQ8vHoSssEb
+  iRYRAiG6izuWL4NL+d0CAwEAAaOB6zCB6DAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0l
+  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYE
+  FEVz6mVXnSIu1mHWEJnaOwLZl5itMB8GA1UdIwQYMBaAFMka8XObiRK/nd8IiYab
+  CpduIlpoMGkGA1UdEQRiMGCCEmFpcnNsb29wLWNvbnRyb2wtM4IJbG9jYWxob3N0
+  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
+  BAoXFg2HBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAAriJDgHTwTVjmqe
+  JDsb2nRIb90O1hKVFuSlCpw1dJ5Rl1EW6TcPqO8woCus2Nl+0gZ7Ml0Hi21AYcPd
+  M/PjLX2qH9ZwrB33gsrtT/O7X29KcXDmCQrch7ALxR5pH/79NbGFDJnSbj8GW2os
+  4I5q+5329eDj0hiNDTRpQdIpRNcypuNDBv9Izt5QBuRN/x0J25Bt4CI+k2dCbKmB
+  e5/tbRDIeAWWOGB+76DohAVuwvcAcpvJOpQFXrYDrE0xPle+0NjLqwAwfF7N2OBV
+  iRJ5GdKlFyUOYoB+knCajouzxuqkDvmhvUpAstfP2qmVT+1eLdXDt4MhwBxC8HK4
+  HWJDJAw=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-3
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAvWquEzEd5jdTE95uE6lMbAaPjh8xxsH1raCiSRFOgPpdbCZk
+  jYBg4ZzjBCkhprfbFvRB1looGHIJbsuk7XNfcz+srueD4bqdT5g6aCMSQRtEn6PM
+  IYDY5pn+LGGc9gYsfkLggg4fwmKFGjhgKNeOZzMmRMDI1vDOd7lY3hyDQ4quIclc
+  P7mc4JUtMEUZeQrE8ildgNNbOqnJux7wO6X8ccfsay+IMEVXV0SlQTXsc4A7QUVF
+  BjBMak8GZ3RCxS/EEXWiD25MAbh0/9b/oPtlRYFU/s9A9vUeIBrWvBPVlxsSGq1v
+  jcXfbaca9Dy8ehKywRuJFhECIbqLO5Yvg0v53QIDAQABAoIBAQCiil7iXS2ZFjSW
+  QjMXcBoCQQcDIEWol1xpKATayp0hFLcCTVfQDTAVqnksYtdbpz28TtIITMlHYOQz
+  TVEz6eMolKVsWYLUOz0uxiSopB/P+sRCcV6ECXsXN2HjV8hHXjjkCCN7tv8N4Vjy
+  jRoHMiIi8MOQEBbIS1ABcO2Pe8wwMd/e0Z/dTj6GCIQ/Njx1Xp1hVV5yRfURunqA
+  9+v2wvfUkTJ9nGDDn8hsqet8/Uxzqg5pYNpTZbtNMvW8AFyRU6xn2GnJPZpwszni
+  G4fh9MAiJjOjECCosUkpN6dLqL2c6UyxYSU/wWpbQxOymCOSQpV7svDgupZI3lx4
+  buuZ1h0JAoGBAO608Wb7oGOsBw1+xV5vw3GO9ydPt6sRM6NY712q2K2VRC1QHTto
+  u2y/R8QIYCk2csSsIaVFUKiWT3CMMJ0ohY6EqZ/k9U4igIPKn5htXg/KorEa6fT1
+  qvNurzHdNxg8CHic/ugi7RFh2+nYf6JKqyqxMtRQzG137XYSbbWV7ao3AoGBAMsj
+  mlaFhUNrPTkRYb40z1IA/sYvVxGITTnE0YNeH7wFviLD7nuAg8CtFKHAs7TeI61R
+  wzisx8r/xR+PzKTP7eix39tyjZY15ppbcDjmcd7GmLr0VGxwf1FK273DtFIL6rmi
+  ePBiYILTCnrH3zJWMlGeMjE8MF1nStBuCKze5OKLAoGAH+GY0ElRLZ6/PmUtFSTW
+  NKeEiQKTpExi2jE5nwf/coeaGHc3wESHq8mMWzlHJpn4EB5xS/KLCEkzCPQgVg0g
+  cV10jj91J99hzLhWQnRw+Kj2u7K9hpL9JxAkZAOIpTr3YqyNOxHXGdg5F+1rdpCE
+  deo+wK6d7wzycS+a6YLBwFcCgYBftnu+7pR2yq2DGRSDyWAx1DQ27xFIOn+gi4Lo
+  Mc4kClSnDshsOoZZn3OMLz69JrmKrW6dYpOUq2SW1Wtn8Gy5ai3+uP/LWcQ40IKU
+  3MekXtCRrhOlMHBcvjfBNtfcnK7RHqN7J+8vVP6oEUqx7fkxiac+mYx0RfnzMRU3
+  VqJjtwKBgQC3ecnXCTUwByto4jOrp+5Sxja/X7Toj8zhv5eIP/gZct6ojxClskXd
+  tuwXnSQZ53qe3eZjMJRm+WHWhkAIx/9FAYig9tfKqmKqiib61iKASHK5XSjc8wgO
+  Vd30yVTjWK31sf94Bt0bm9DpIDZxO2eXHQBp0DcG01y9nhwsuA+URQ==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml

@@ -1,69 +1,69 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-anchor
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-anchor
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAvy82FnB+kbzEDiKGNUecHkfBdcJeiNG3aYLVyT5qRVc575w4
-  irhEAIRdiFuYRgAbGJlmrZczIuj0yRBt3MM2yghre0u7CECLCfNvfF7E9jruRpTf
-  DPrMuo2YFS+f99+xhRIdIRhqc3QYZbxMFH8vM5GWYtU96Ls0xExQtH/jSIhoJs3c
-  u9Z8S8F1p8vgOaFJacWPBybgKFLlE8ebrDoZdp0id/Vg7snd2OGuq6h3cNTwL0mP
-  Jgz0q3O8uNaB0PFup7HsHIkWgkTVBTAi9/+/OqIrVoEVaYdYFWw7ilrx3BtVFGoP
-  mPFCnnje2sUYoX3aeqVO46hskjp2s20pxfD0iwIDAQABAoIBAElIboIhctKoObp1
-  T15i6ZvNw4FBFP167cQa65mtPA0CR2nqRt4djatpEXUwLuk+JyTBwFLv7yEFjLb5
-  fjMt/PVqTtC/EZ0zKFiTIHva08LSif0yGWGfTRSBK/eK/tWDwEcSz2mdM0i4CpYM
-  nFkK+2vX9X5C4O0xvSM1YYYes19ciHxCLSkIGtYoH4D4+5cCE5lcmiNUs2Hbqn5Q
-  AOsSMkbVaammGmFCvR2vk9URT5SQi9m9BrERo4FV8Xjc3ZksuIQrZXcvVTE5yAP0
-  PdGWqLssludV5gGcQVEIg+zYftS8z/zHUQHyS6ZQQ/HsTCgwumA75n9D9ZnMD/A/
-  Q/xOq5ECgYEA3tk5vL17JjIHlLb0MX5PKhBGiiGFNf6Tcjor4qF35lNDszNQ9Pgu
-  A6g9vDc6ej/J1PUFjz8V+90RoDAdRBfZ5X7+9k8uMtGF0iF7uACDBu/FDJfdAa/3
-  M6brVm0cwuiWkiJ0KLpbdPsWdwGIIwg/wWJt2P3+BkeZsuy6AYqN/fMCgYEA26Ad
-  yVxKr6Svw0ZWW2xLpStKInX5UVCnxajhsI1sGvnGSVFCvmmRkOoqMZwr/NNzbyzt
-  YnnErNCHZq70oK8sU/HDE0m+l1YPQA5+J6DkYuqpFfDSY+PFKkc1v9VDCZcARnr7
-  Np5498AFZIjh1WGCzDylP1hBUI6qFOvfk3E3nQkCgYAgAQpttLiu75hvHydKxF0S
-  KWw4AkBjVMBQM1KCJbZWebbLUZ9azxmspMjY8wWO8QJHdzjpLaI2nbUeUEqjsNk2
-  QFrVfOGhor2ZQ/3Emy42HNEr0dOHnoHeBSbfLqRmyYh2TERqZPklf7nmNW4bud+O
-  IlisRS3qMPY94AmGlyN1SQKBgQCFHXUwWLoD34OQjg9FdkwbHjPe0zZ77LDjgsrY
-  Ib+GUiG2yoPzuTS7atKMIyYeJWNv3QE8kKV+QR3wRNaMld/+OSiNhkL4ova3UpFw
-  H3qN4cD+RWqflKwqReL0FKR/KYDHNz8QCdk0ALTEDJsko+eNNqzJygo8c1vvNk/a
-  o+KbUQKBgQDDoo2gCxXNHVjeY20GA9XWDnOE6s6u48RoRWfg3TZOGiGqSTruERs5
-  ueDwh6/rd239LMLZbAP7SyibzKFNxkErLABeR2MjT8yPVCYzwp/OcyIhg8Z2YBSt
-  a7BOgVJbks2lYMOJ4hYLaq+eRV/bCEwUbom04sQYKj+dpayNdv03Qw==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-anchor
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  rO9tAEd0OXXrIyzX
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-anchor
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEogIBAAKCAQEA4UEwn1aOm7yj2cFa8r44Qz5jkPoYRj1leP86osiJUa0UZHck
+  Ba81ugkkU83lYB3mIIq79e2PHOvDMHyIxH34LvxJIr5a+phTWcLKt4Q4Qim2LJAE
+  s5blGbSzUcO2sOym1AQnd7L115WXTQp3joUTFUoo5MwWR/nXJ8LzHMSZzeqM9UGf
+  g9rCXQaVSXSVrnAhKcW/RcmjlhMcOOWdSzLag00NgbZJ2ISOjLtWDCoKl0rjja90
+  OFZouezwWnWbDf7IeIv/Jm4eQ4mttfZzWyQJJBc/TISDGq8NTXsvI/E19N6tymdK
+  bsuz+IOOfuhUpJooOPJzUfYKeI5ssqgvPXGV6wIDAQABAoIBAAfhlQbuK10tk3oJ
+  9tmpaCSKKUeoSHMksMkz/OQ3Kf7OlHkTZhJA2BtjOH8qJA1h3mxjDkKDhk9XvGOU
+  5+AgHC/gqdpqWJqN+9SXKSqUmLdP6EzU2SVDcU6d8Ow6ccjs7sVaQ9s/SrS5Sirq
+  49X7t/g1uQqQTXNFPY7plkH6avs2WdXdTnuFwj51eq4aGYeG+wY6QVWAm9YW+BVv
+  KvdA4KeC8jz58iGZbok65pay4va+bDy0lHB+8cJdzIwdINLjEZoNC1lTLPQ5lLPX
+  b5lQ8Tl4nSyaqPFWWRiaPkwDS6lkAdsFgLQuE1p0Hokd8wHOhRjTGrFe7g/LsnpL
+  NeMQaBECgYEA40BsjeJ8FZk9/EcnHXSGXx96VDptMCpWn4Y45Lqf/rkHfecUscYQ
+  NOybtQAPuPBmbEiE8X4ABnp/pP+2dAWPUFRPXGhGNnJsy5EIWVRNJOzzKRYaKZ1H
+  F6Dm+D9Pm9nu8z9ypTzl6xXe9GJU2y3Tf4OAAGqUbEBfARTqqxm4d/MCgYEA/cAX
+  roJq3sHODYAmb3Ku3CRGxy2H17YAWO1CgLIVmqh89uIssMvVIWUD2ZV70ms7NywR
+  CiTNl1sNZtQj3Mm0E2zYVarIay1h/8tgQ7KZbUSq/hK1M6SPi4GO3eJVDOkRh4Sp
+  39fv4oEf+FAZ/eayPSgx3FrAd58JUbc631J4ICkCgYBiZQqbhGzljSxhhw1Qm5ty
+  pFZ7EbElIa/P8nW/025jBApSYTN8pZ1uzOO+QwCLusseJ2goh73LEE8kSfPd2Gpt
+  BZQ3Fo8QFAs3ONy8kNu2GUJPj9pUGl0lxe07n24AtSPY/qfNE8kZOKcIeWr0W6sv
+  kuhhRcRt+pEoDr5sxv4wMQKBgCyKu512ZywS+QiFpjmJ+AfMlmAALgg/enAhtbrB
+  h+lOCiGMMiwWm6LxCGv5QXL+P7a/lX4iV7Rp10BlnKX1Ahcm1BK1l9i4bqtoF83K
+  XARCOYG/5u7ZxBjI9Tsdr7BEeT9AmlEgposr/2CnLujSxhbWJ2p2w7I7yHb/ouXw
+  pAWBAoGAaqlFjv2SFv6co6G8z7Vy8Y8jZuZBGgumyyh+SAr08OAettsNtorCWE+U
+  1ScklsEjlgiH7kUTucqDNZAkmpeiLMBrW5AG+u61CcNN6u9zn0kGXBets/x2Tc59
+  6WkUKkz85ZLYUvRf3s0AdfK6J0OOvO2UFDzB9eWSj8jXK4v+/CI=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml

@@ -1,72 +1,71 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-genesis
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-genesis
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAosu2+97GtZvTXc643g8j16qEZ64GctzaFwnL5OY9fUz9iEmU
-  OBHKeLNjTisSqgtgq9LetctnguvKul+arYWVwSr2gDbVyIrP2wMaV5G4MXBL/TEA
-  hi5bJQFixZdEdHwkTJNvKFHX1OrpxaxQm+lVP3HyRnsiwfSgsXMDZpaMqBq8+y3V
-  Ky/X7cSt900LrdHDwYH8k8i9yQWd55bYzhfDx5IeAIDlrY1fq4bIjRE6kDRQ10oD
-  G+3v64JfOqSZA6/eWvmd0ZDsd58JqqYIkcRTETKpbKlwGjKc9AKTqyEeA2WgCDd/
-  HKQ+CDo8tjc7kIHyLLIhhvLA4jgaGAB0kLuFiwIDAQABAoIBAQCfMupRqszVonnz
-  nYnJljKt39G1dkhWIUWhC/J5ePKeyyCQG6w3nKZMnNi7A4IwCgpSXVdvnmcub5mD
-  4qRnlmAZVANU5MrxX1Xezkz/X8ApkLCu/DGQBlsZeB54LfJCm3f/7pngaxDO5Z8Q
-  sO7vWSIFdk+/vwEBfVF71oZ31zfb1yKjJE5ZQq2gX3Tmsn+3nOvQoTu/td2thGXa
-  L9/dXt3dk2Y/oYZIIfpRooUKgQwjGEg6zK6iY3V//MGFJiVPWqo4mDh+xGVACzwI
-  uEaVhm1WAUp4krufoBhBHXEOfYIn38czsgqbG+Q4RHX7/q14Xuhl5l96xOH0JxTs
-  PIzwfmFRAoGBAMfOCc9LN4FPmBt2Z9TggVsJNIgIHvVLATAOZWxSqbilS180bZsk
-  5/6Od7H7oN+f4uquxC0MW1ueBfZmq9gY3Nrk05KmAneSYwA9SUSLO7qpeIGXr72o
-  myfCyyE1JAmRxWMoNLt0/ftoG6CTjZrCs+JSkFOVeNw2z3FHDTGfCfATAoGBANCV
-  BT5o9Z9hZvxnU0iJcigLLdqLP9Q25FQIsjNSFqLXVeOR5azIUw1R0HDJXFtB+o31
-  Z/71rRxhMYws3IXjraWtzCX1/9fGs/pL4jkRS2iyovEk/9DU/58UxwC3ILQn/hpb
-  biE4XLqsg/7zwNFqh4t/NRibW8OluHjenw/XzvOpAoGAQgtyJKpJQ54qulEuSyiW
-  uZ/WVGzSxuQvFVJ85gyA+37v5h1vaYwOf49aM2PormKsYES6peViwWr/r44KmZjG
-  UDi5Us07HYku3mJjuJuJd88S/UtFlRyJhOAXwvdM3TjpFTiyDZDDb3nfP/nmIdTg
-  HxyJhodu9uPLODdzPgbDAy8CgYEAs6EiuvS5U2EWyBhT6Qw1e7bk7mkttxzu1lAG
-  55uyUtsP5MQo//wlSjtDP16qYw0XMlo+DZyWUPKDMS0RXV0OlrhuL+MDSliddtkT
-  IgJ65tew6+vpQ3esDNxf5YXQbFZkx14mIgXgFgOsSUyyqacMxF3w5Bgnlv6JN87B
-  PWullsECgYBiwhwWASc5A4kCZTSbTG8r2KIP7Uq/M12hLahTFwO+ifLS8g+Qqe97
-  HoeA5tqIt0uHJ/7XnvS/CvWRT4OYOdhMLOB/tg0DV/muCC9JNJAV7Zk/IRyOnZDu
-  r8Pzq9YS+ozAFCsoTqKFtfcD0r7e7W0KFdgQ1JJWYdvOE0BoKiUpWQ==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-genesis
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDyzCCArOgAwIBAgIUC1NU8SEKA0mtoh/LOPGL2YIEj7EwDQYJKoZIhvcNAQEL
-  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
-  dGNkMB4XDTIzMDMxMDA1MzYwMFoXDTI0MDMwOTA1MzYwMFowIjEgMB4GA1UEAxMX
-  a3ViZXJuZXRlcy1ldGNkLWdlbmVzaXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-  ggEKAoIBAQCiy7b73sa1m9NdzrjeDyPXqoRnrgZy3NoXCcvk5j19TP2ISZQ4Ecp4
-  s2NOKxKqC2Cr0t61y2eC68q6X5qthZXBKvaANtXIis/bAxpXkbgxcEv9MQCGLlsl
-  AWLFl0R0fCRMk28oUdfU6unFrFCb6VU/cfJGeyLB9KCxcwNmloyoGrz7LdUrL9ft
-  xK33TQut0cPBgfyTyL3JBZ3nltjOF8PHkh4AgOWtjV+rhsiNETqQNFDXSgMb7e/r
-  gl86pJkDr95a+Z3RkOx3nwmqpgiRxFMRMqlsqXAaMpz0ApOrIR4DZaAIN38cpD4I
-  Ojy2NzuQgfIssiGG8sDiOBoYAHSQu4WLAgMBAAGjgeswgegwDgYDVR0PAQH/BAQD
-  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
-  MB0GA1UdDgQWBBQ86JEqOsfZHObA+eO8764WgHG//DAfBgNVHSMEGDAWgBTU7ERg
-  HCODRD8VS3HzuqOgVg8MgjBpBgNVHREEYjBgghJhaXJzbG9vcC1jb250cm9sLTGC
-  CWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVz
-  dGVyLmxvY2FshwQKFkgVhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQBA
-  LsaCZhzu1ZcUSPHBhjuWM9zWWu4OT0jNE5MFJgodS34BbB2v1AblDOU3/vJDWuGx
-  jq90FsWz/G8XL1oeOYcwqNuJOVcDPq9x9odKwH7YFXXzUrBg7aFJxxqnNwrdqDsk
-  2NOxF3XZaPVg1okjpvGTs1yiA7oG6LgGr+9FFtoWcFwxajpbzg+ceyUx05q3gJ1i
-  aP6eQFV2gx3de8OWdHDjFmWMhwNFJYYPk7PDaGo2dO5cvVS3v0hH4tmsX74udbyx
-  TDGbaGWOuZrsQuV5RCOrSvNlUkcNwDpmZPTaTuZM2QqA6AUfudeiwRtyJ9hLKVfE
-  lMTWJBJVhbV8Uo9zGBJQ
+  MIIDtjCCAp6gAwIBAgIUKTJ11GhYaKOwFkY7zBdxSqcNdRgwDQYJKoZIhvcNAQEL
+  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTI0MDExMjIzNTQwMFoX
+  DTI2MDEwMTIzNTQwMFowIjEgMB4GA1UEAxMXa3ViZXJuZXRlcy1ldGNkLWdlbmVz
+  aXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrHPr1JeC4sEXjzMyh
+  4AgaqdiHgn2TO35O8Ijp3tybXaUXvzNAI/IrBmI+V4YgjCpSdKE2JxWIiAjMercK
+  i3U50k6zm0LMkz2IN9tZ49XVrukmdCkbL0lg+4RbVwp5BMrrxf1FmrG8SDa+XKSI
+  EIDfzrNH5rmvdoQaEHASCYDy4QgdtXvg7uw0Z4mhYeQxToAvpiRXaeQYkaPMU/iV
+  ELTiKQuCylTxSCtNdvUO2CQqO0NDeUzgMHCDisNqN/D/kQNtdKDbcToBX4PBh92e
+  TUiNevg6nqQCAHwF+kiyFJYV2OvuWvoVSOfZi3YspVCqFm42K1t/24WLd9YcPwnr
+  syVnAgMBAAGjgeswgegwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
+  BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQXNwv0Tu4lfDlg
+  FNBia410SUuh9TAfBgNVHSMEGDAWgBTJGvFzm4kSv53fCImGmwqXbiJaaDBpBgNV
+  HREEYjBgghJhaXJzbG9vcC1jb250cm9sLTGCCWxvY2FsaG9zdIIta3ViZXJuZXRl
+  cy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwQKFkgVhwR/AAAB
+  hwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQAGgjJbIVVeQqUdIpNLCAoO+G9Kx5nN
+  ROa8I/IaHc+LztbUKqsn4bJAbg9sfNz78lOV8qFB/Q7Yv9fEoWJv0QC/Tq0bzDzr
+  BfwdiqWh/cYs8V9/VL4GvLhoQtWXBFr6ryQa1s2QuGBuwXje9JxMiNJ4Pf5zNw/6
+  x468WQKMh2I1zg8Gr/k3D2uqNqGiojHPCU+JSPizq26bb1GLl3lhmOuXIbtrhyaC
+  3HxLioVepmp+DgpTCPycgHdV1V5Uoji0wMNtyQ5JL/xqILWka8E8fEBjQ875Fr5f
+  Ax7/1RhSiAjuv+ZLwUGti9CbJb/d65i/yoF04QNi7UYMQHNsd7VJry1+
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-genesis
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAqxz69SXguLBF48zMoeAIGqnYh4J9kzt+TvCI6d7cm12lF78z
+  QCPyKwZiPleGIIwqUnShNicViIgIzHq3Cot1OdJOs5tCzJM9iDfbWePV1a7pJnQp
+  Gy9JYPuEW1cKeQTK68X9RZqxvEg2vlykiBCA386zR+a5r3aEGhBwEgmA8uEIHbV7
+  4O7sNGeJoWHkMU6AL6YkV2nkGJGjzFP4lRC04ikLgspU8UgrTXb1DtgkKjtDQ3lM
+  4DBwg4rDajfw/5EDbXSg23E6AV+DwYfdnk1IjXr4Op6kAgB8BfpIshSWFdjr7lr6
+  FUjn2Yt2LKVQqhZuNitbf9uFi3fWHD8J67MlZwIDAQABAoIBAHozKRn34gOjh1YH
+  BUC5cLAyCbvEug9ylmKjrvNuQBgIiYVq+5vbz+9gELs64EPQNc1LE3JL+TnXBImb
+  PasfKymPAruLrunQYUotsc4BQs3mqwTWQiDy5TGIjd55S7ZfcNduPtD9h97Rp57N
+  JIczWgX7ZNd9c7BWMEM46ABJnzhTx6pnYV6kMf4Tlq6ZSRqnqRGtoa4b5Z05cucQ
+  dIyPJJpRFKJxZnl/XPu6/dwm3bckqXkD88HesO9axB5qDYNB9wvpeRk30M+rR0vu
+  8FE8xx67GwP9nUKueA0mtDb0gA8MaznHWlWZ3sZE1BVvC1kW0tqB1p0o8r7eNI5P
+  my7IdKECgYEAx/VUnXNW3xxwogtPosN22a0gauB4mtgf3kzlPnDF6PfZ8gG3EClS
+  92iNjWIVgg1jDdae2CrYtdYr/lOjwrlF/x/4fmY0Mi4xMEJXxOTD+8y26Mj8qDPC
+  7a/6TMgLjsZRssCLn4zmr9cVcjYSKtlpJ1D48NEHT383mWUqHO8WmjcCgYEA2xIP
+  xpt3LLDXI0KPQGgUHUiF3sUGejdU3PzMAS6/HAzCVK8R8KKfTw/VN+r1SKIbbELV
+  H8fgjkHb1TCrJKKdNBComn40KfmtLMq1DE1RLaprtu03zFwKEiMBxq9CUYguXbME
+  SJ045JQ4fW8BuDejYethIhEVjZeLIF+nEaHBdlECgYBJd4L6Qpllah6b+wnsZGKz
+  gZ+KhSTqx4OV+qyzr12XxhDGkQjAoF5CVqDDlIkQenitafB8velXjfQmAncFoWrt
+  XMLBNi3xTfV2pLl4txCm4EVH7CigaDwzdlfBhDJy57y2r3XdTjin3J+dke5E3hJ7
+  ho2gdTx5YeV8r6W0ccfdKwKBgQCBT/cJ+Cjvs286vAZNMWJ2KqIC7nA1YkXwsDRH
+  mm1qxElNrY28anH5PFJS0Jl7B12CmSyuttBhiJSYEkNju61p109+6nImOOA1KW6X
+  VWhOuWMdtocSVV4IeKuKuVc/Q1CDNLGZn1y+6JMzz3vHXuhNW6CZeFYtnz+bm3rF
+  2KKXEQKBgF6p66kst/AWDjY3N/eU6G6ICY5hNgjRi3Rhvrpfhyrxwr36xZa9Sigc
+  jIcA8nwg7awd+EXF8tLlOpWJ6lNCc3DUKuwVsL37BiS/aDmLyuzUJZd+RYohh38f
+  XAoNLtDhJiuu/jdtbYQqdA+c3KndRP50rnm90p6FM8ZvYt4HY8Xl
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_peer_ca.yaml

@@ -1,69 +1,69 @@
 ---
+schema: deckhand/CertificateAuthority/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAw64UiUH8JRh1FNr+2zKzx9tDaiSzS6o91DYY2veiVqN9vTDX
-  XoZh6QJuwb6Law+gsiM5JgU5CLzLn1qpSiwTLWhd2TPNfdjU/ghmrbMt7SxTt/2d
-  7s0jdvW/+6v+5DALXmc3OxY2iVNnSVnqI8tVjAIte7VROAeeGFjiukf5Wgz3lmwl
-  XTafzD2xRUpaB2kHhBB7HdxtCSiqYlx+g+qGw9LHwGJ7A0whza0V9XnN2cHj4YkR
-  ZhBRqe8taJNACMe5nnH00RqYJnVRnvzoC+hDK83iKehnsiI7ZC/PdfIQvxJ4vP0R
-  cAXQkBJz8hngH6AfkWmoFvSd0MhlxGBn7Ygv2QIDAQABAoIBAQCmKlk+BU58obwq
-  rZzlvrRz7nnc1LV8d2BxqE6LAuZT9Bl+Ys9AcZULLQmodIonq+ml28tXwe+gv9GZ
-  zH8dgTf3wzyOiTLivxJ/ddrbfeBuGsos360RcBnBlwYkTPXyB+pfi/6WqlI9Yxm+
-  bCArrStD7UV6W4pQrgdOXYyK6zuPfx5FcCHFpoZbxaKJNf5GIQUrpRgwemFzx3w2
-  vPWXCq8ryFWkyD9JjDQqf+saESAtnIDm+C6QgNLqhxb9G7/IhHFhOSGk0u3D/z/P
-  dgrWpe2ap+8unbOXY628tHDJPJZy5CcVG4LRbzXr9Eghfjms6opLI0SccF5D+HRA
-  SPs0O/BRAoGBAM/Vi8SueemsjvU6dYF5zXysR+PRCYNL4SfTONcFjqOZzDtILGIK
-  +TbXtgrwIUPu/ou4nyIr552wpwG0PE57Zj4oy5Mef37Sd8g/0vZkZQfZ7Agn9Ozg
-  jaCSwydqzmiquZ+gMIjec6GJDsEwBPIqPNt2wxPNJwvzwQNzIJAItL0XAoGBAPEH
-  crLUo9DsDVGRBUb4qZEA/UCzwqgrhzYF5//xUjxNFHiS8Bp4dthh+RP9sL0AXJGI
-  m4ZX/QFsLlk09jqP/hhGjXkhXx8Je99OUbuSymboKrUV2xuhUgvr5GD01QQjKmD9
-  ukyiow88ZrocKFhs27wetb33PMkitzt9Z2MtO/CPAoGABzou1RUYKjcU9ZQl1+3L
-  ZoV7LoHracRuvPrMZDXOQwQrJPiaioJFLlIMA49cKMeb1HIEHqUWNdaZyCZjXntO
-  D+VNRv1tg5SAE9ecV3MgTEiYu6PgEYixhB72aF1/dgZR1Co25duOe9SPTcqEsYMk
-  gKE9oWel7vV4Bc2wGTIkTtsCgYEA6A4sruItCgOKWyKNeyQDVXknWrj3S6QE3M1Y
-  7UDw1N+9Osz1X/blLTU+crHIDF+hv/hPDEwAafM2uGpWOlHR6Jtcr+eiRiaCXZ9w
-  72/HcMZL/+aX+oUZkiK90V9HC2Gz9oeyawAWj5+uo7ZiXagI8ph6j/fOTTQgR6VX
-  +dNeJx8CgYAeBgwIOhWF6MnJQ942nnv/Z2to2tAncTlU/6p8vlnDn42bgWBLUNdn
-  Reuvhqu30L6RBjlat3hESoBKrQSwhQ8y4kmtguVF+iH7tke5WHuJ/E+ius0cMYBK
-  kVFupLs6hAlmEYSxxt8q3K5/xZ8Vc5WsAMXZ3X+zSJ7y8Aw8eKwM6w==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateAuthorityKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  +IHvg/4u
   -----END CERTIFICATE-----
-schema: deckhand/CertificateAuthority/v1
+...
+---
+schema: deckhand/CertificateAuthorityKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAt0YsiawJY6PG9owazj0pu0MSuSE/PMnazQQgWLgvo2bJx24l
+  nA3fFioTkfgTTFLqWuoR55XS1hrOHE4eA3Bnq2ajfeZCpOopeVecY6PYoTFLS5+d
+  K9plrjXH1QyirM5LSspovvmaPBAeyGZTG4pTJXoP6k1GK7pnACZTFCm6jGQ6euFB
+  uf0fyObIbjGQcDNXyAjVz/zP5RchaN3ddlWnGjRgPor/n7t0NNWlR6md4sWMNp2d
+  /6mUqI3jDRYHnG9F0Ij1IlbOinPbwVqtuJ8fJtIA96g5hPqNz+kIc+zg4vOAY2CJ
+  oEYpEhfNpw49tO8MjETNIPNUZR1CPfBy6dbATwIDAQABAoIBAB7mvBeyZBriwGdN
+  lC917JVgZ8XDL1BmkHfE3FdZJt8cM6VmkvzO8fBgw8/2zfoueMk/cilj/5qOBnaL
+  TVAzIaeqtKJDsrTvrnKBLSM3uwzirNlhXjTIrCBFfR4U9VDBr7w6iJK6ryC1bxtG
+  9XhNSFunSwusX8p7sWY7EAL0TjnhWzECKheyZ06Zbq9UGMf+mpC/ZH2RpzfJHzE2
+  iKotm0q0HxW2x3zIwQM8IWBGvQMcPdhUg2QuB1EJ6ABPWN/ah97ObhAmp5vemDkL
+  mqGh/G0SBLF1B7jq1QimTfoDfcuyney9qRdMtHvxmL0lYwMj1eVHnbvRyKQ3TrXe
+  2bno0HECgYEAyx2DaI8wb7J1PW++Kxrcelm3sazPvGtO7vnwFrH2wOGzD+EWqR5u
+  ZD4lsX6WDZ+Jm8gDRQOXvRZorEm3NtSF3Zp4dmqa57Brw33L3T44RKVJ48VSmIpF
+  CGPfw4Tz0UxIrVO+Nk97k2iSLRK7CWHyqgpbMWiCdk786vLD5PFQa5sCgYEA5v4p
+  1cm3cXdQA1qvcXiRa1K/qttajwR0TuvmdVcbWvoyyAFj6FS4qBTHSnfxA6PQMESp
+  XdVwm8YyiMVU31k7SYGtCk+mOP3ARg0SdYpffCTOLYTFRLpWTeDocx84RBrOAFhX
+  0qr2s00svcDNtcWBhvJ4ntaF/Ev39j2/QpEAC10CgYEAhNiYyhpdI7Ek3Tnot2iq
+  K5vieWL9u86zobn3PeDH8v+rjgc6OwKcURQUszKIEgD2j90RxmHDLPkrHQRZwJLf
+  u0D86PZwuni5AvOUEvBO/RbebQryKrLE0+f+wnKCxbGPF05eakcyHAeZE8HccxaN
+  EIoVewtPyPGAmmqNlX//iWECgYBI01zxMBWLymgJhq/FgJOoWIBhJ6MXb/oTX8Ba
+  wkm3lyYndHjBKOTG6TYjvkjYMu9SKHOVR9Om6QfJox0tBX7xn9akZ5QqZ6YU784g
+  DK4p/5iZNUDUeEL5bq0ajn84yZKk/TVDD++TfANdF8pDQq+hkhSBT3USpAjbM4B3
+  RivTaQKBgCcNlpS9vAJvbuzfOEHV3XUKetWZWT3eRiGiJaFly/F1Ifh92rWt2sFv
+  V0KFFwGE/u4/PAvtZ3tsHh0eWQydMryhuI1G3DWaEK4b2xpulbmzKxx8elHs706+
+  6WelwrKcpzwnkkRx+SyJreOr5xLS9R/Cxn+hfJ8BKL0kYw9N8+Yr
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_1_peer_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-1-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-airsloop-control-1-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEogIBAAKCAQEA5zPg6bEJsNB7p/KtAjwRsetAl6vnZQ4NoyCZ8D7BC2M2NyqQ
-  HTWxbwxFfpKtZZuEU4DbAJqh5todEJWnKQ9OqAT3x3pHrbh0uDusMlCA4sj1rNv5
-  HAx9TiopGxFZzruK4MVDyKB5JmagR8O8UmBLmyxm1wevqhKw9ih7mZ7K3KZoLbxj
-  +nqM2pXEzlbWZNAHPf4wq7BqpAqksBWHH8SZaXjI3QNlE/74bU1oUr6IHvTnGSuK
-  I4S+7F1T1K3WlchjW1mG0hibGNC9hGql2YkBkbBdJM4CAukeUO9Qea6HM3nQRHOp
-  Pae8OOv8FgoKPJjqnNQ8EcJ12NEMtYHw2JYuGQIDAQABAoIBAGEaa9sajOxjE5xd
-  Ewa+PdxQ5ucMvvm1ZkreFWlOoftrZsjSqoZqF6SBLerUJdln8LK1isV9LIRtlQlz
-  ISrgj/OHap2wIMy4jOUXwuG65/bX2j8IgF6kbDhZAryok+R85f4zO53WsCtNrQGX
-  FtAuO3LnuiWTx9aRVRt9szO4+pCi0v/sDIps62r/zFEcvo4C+H3EU3CbVC1K/e3o
-  5oF51glwQk/GGlW2tkVyMv2RB0SgU5nYggaZK+8EGroRyz0ALILmIDlEwiGJMcXs
-  A1+AAswuJnBDkwqjpj+ZvqxeCdestiIVVLJcnIpAfGYx7x7zlqvB/u046teyfZIy
-  dwSm1QECgYEA9HFDI1tuJBJw5zdbJpJ+eiJkfzWNqXKTEJQ0wvHUcdHfp6BUPrsN
-  lY/wg/J3dlXe0cDU84+UREQCX77KxZTs0GpP3W0IV545KWTLEz0DF1Xk2Qj7kw+7
-  hdn/jhwt3i2i+gnN2SlPx+VBbpvBQNvlWbsn1UMjDTmIboYZtQQ/ROECgYEA8iJc
-  lWRk9k0REiYEXg15mreS37k0bYmbj4ZMJck/CbKHsYbcuM5mdBQmBgmKKnHXPKN+
-  45hwZScfYqGYpi/9T9r64cDCN95zM3E9B5vQDC3ak8uFK5CYIEeKY5mbIL5GY/Q/
-  M3Dmj9zU7fmIU1zv98Ctigkws94wqC+vk66i2DkCgYBO5L9mifviaJFIDvW8XUu0
-  36TP6dju96u/jhX5VVPb6IDm+Tg3hue7fdmCvJ8R8mUYDcStV4ni/pBFlq6bVpWY
-  LrfYH3ixzr9kPMPOUcLNpUtXQS7xKAK+EL4Kf83OB6yyRrfJfyvguH2F1X9qD47W
-  hzE0A5csjYUbJuzlH5nMAQKBgGdab3Z9IfNYNf8vJxIWYl++F/1TCqPu5u2+f2Zp
-  nnS/Ndh7Hl/sCiNmLkzJaaZwbVU+3Hy9pswmhOkO3R+iwFeDuy79nmlGlJnSriA/
-  S/DG6dPIPZG46JZusw2MlYDGdzlXGlsUx/WEZ4ckyiH7O5rfLbQL9DPylYZUxHcf
-  RfdRAoGAefjh5Bnz3ECv8UFXRFXl1X38dtBU1HtMhT0Ydp1Lc+16pT7VN4r3jhyH
-  xPeAZBWw75QFg7dz3StGZl9D+Rp1ZwjI8fqbeUeqJtTFEOeYzseX+3arhabmIkGc
-  bGYJtfNgOxftbX2ZVvnJgQjpSbfI39ZnIHfTsp5hbmbvx/DTF2A=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-airsloop-control-1-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID4DCCAsigAwIBAgIUZEhPJI3jZLE/f8JnCYIkUEB89w0wDQYJKoZIhvcNAQEL
-  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
-  dGNkLXBlZXIwHhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjAyMTAwLgYD
-  VQQDEydrdWJlcm5ldGVzLWV0Y2QtYWlyc2xvb3AtY29udHJvbC0xLXBlZXIwggEi
-  MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnM+DpsQmw0Hun8q0CPBGx60CX
-  q+dlDg2jIJnwPsELYzY3KpAdNbFvDEV+kq1lm4RTgNsAmqHm2h0QlacpD06oBPfH
-  eketuHS4O6wyUIDiyPWs2/kcDH1OKikbEVnOu4rgxUPIoHkmZqBHw7xSYEubLGbX
-  B6+qErD2KHuZnsrcpmgtvGP6eozalcTOVtZk0Ac9/jCrsGqkCqSwFYcfxJlpeMjd
-  A2UT/vhtTWhSvoge9OcZK4ojhL7sXVPUrdaVyGNbWYbSGJsY0L2EaqXZiQGRsF0k
-  zgIC6R5Q71B5roczedBEc6k9p7w46/wWCgo8mOqc1DwRwnXY0Qy1gfDYli4ZAgMB
-  AAGjgeswgegwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-  BgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ5JSje8gJ/dg705s1bWlel
-  gPLo1DAfBgNVHSMEGDAWgBQulEPun8Ht56xTsVn6ByYXttQg3zBpBgNVHREEYjBg
-  ghJhaXJzbG9vcC1jb250cm9sLTGCCWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNk
-  Lmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwQKFkgVhwR/AAABhwQKYAAC
-  MA0GCSqGSIb3DQEBCwUAA4IBAQC/mfAKIXQMBN+AdqekzbpRhjg2xW9V8bF9qzHM
-  SY2LLl4T3GntMLGQgoOvyEv40JPRgVzt9aw9+g1RB9uW6aqMgDkfWKLfUUGvJ+0Z
-  wXkToimPyTyFpQNvxrr+Z1NF4jpczI9sMVUL6SMvy8/bSBMzM3/vGPIWw0BotT3k
-  GlDZHXjKfS+W/cFfec06+ejCnZ928hWeWBuaQ5Fe405trhAlV0bSRgE8ana7Fptz
-  zjx/9BjkF4VnWKkyNrrog+/ZwI8Sw2Ie0PZgps1dPTdLnAC7ewjiHw39b01fIORB
-  PGwAuY+3uh8qFHau4Mz+iSSYK8Nmw3M35w6aI3W79YJz8+/U
+  MIIDyzCCArOgAwIBAgIUXxvVsCXWA1ODr+ItrfiN1jzNpGowDQYJKoZIhvcNAQEL
+  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjQwMTEyMjM1
+  NDAwWhcNMjYwMTAxMjM1NDAwWjAyMTAwLgYDVQQDEydrdWJlcm5ldGVzLWV0Y2Qt
+  YWlyc2xvb3AtY29udHJvbC0xLXBlZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+  ggEKAoIBAQCsQ7B/knn3nM2uHZye41ID28Ce7sHGR8N5mvWXhnoHVgATAzdtdFcV
+  Y5rBDMuuG562e5lBQwEMfL5iw3baOPUUTBDFj30u3Ws++Iz/TDkTn6V26zEMdl86
+  HIV6dQU3vd0BsnHR5hZq3qB5DpbuMuTU/SJkbtmhcOCymHJUz0KEbba089cs1UL/
+  bdWKAzWRtrLO1uYxCKF2UVaR2mBz9LUyIzqnEYjZ35JZuY+NBH4NPz9rC+Wi3SV/
+  VjWF/9uQLSoyf4kGaV7BAPWx6c9H12dC66X+fDvfb7R87YRw8Q5dw7wsoQ4drs61
+  QJgVsvUdm3XNbqtuMQEoTFQyJPEowkzhAgMBAAGjgeswgegwDgYDVR0PAQH/BAQD
+  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
+  MB0GA1UdDgQWBBQZ2/PUKDFFMv9ftspehZzrcyTIdjAfBgNVHSMEGDAWgBSdAqxU
+  jHuupEKvqDMiwoCuippm5TBpBgNVHREEYjBgghJhaXJzbG9vcC1jb250cm9sLTGC
+  CWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVz
+  dGVyLmxvY2FshwQKFkgVhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQAg
+  A7nfHdHZ0Pn81Orif0mYI0DWarPr8dTHMldOMh+eJi2KmYOly5NSgacsPQLA6ovo
+  wHaZAU4oKCwJYvsO4tK5NmqNjQ5OI3ezAdArv6ch9/apdhIgMDf6Kr1Tyq9q6BMS
+  fQIoFwMQnXvuydqtTsF+GDcmwA1sTQq0kXBt7JBtDGNzBqEandgG2mBQDqYkOMhF
+  U+Eeqku1F8YRvkxhkcxyTbZsNfp1VRZS2etA6A5Udwapvc8hNPDEL/Fst41lXE5c
+  R6aHowqKhNYJpcTmGabPI+eJTGisLzAylp6EuZaZmLkDuIXe45edu+iJPiHkz2bZ
+  i4CBP3tDtTuRmKuwsksX
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-1-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEArEOwf5J595zNrh2cnuNSA9vAnu7BxkfDeZr1l4Z6B1YAEwM3
+  bXRXFWOawQzLrhuetnuZQUMBDHy+YsN22jj1FEwQxY99Lt1rPviM/0w5E5+ldusx
+  DHZfOhyFenUFN73dAbJx0eYWat6geQ6W7jLk1P0iZG7ZoXDgsphyVM9ChG22tPPX
+  LNVC/23VigM1kbayztbmMQihdlFWkdpgc/S1MiM6pxGI2d+SWbmPjQR+DT8/awvl
+  ot0lf1Y1hf/bkC0qMn+JBmlewQD1senPR9dnQuul/nw732+0fO2EcPEOXcO8LKEO
+  Ha7OtUCYFbL1HZt1zW6rbjEBKExUMiTxKMJM4QIDAQABAoIBAQCL2ty1hd8dx6E4
+  5fOdD6MrXMLyhZauet7ZoJQZM+VohUrEJM1gQJ7ez6H5b4EBVo0xTAFteY+larVL
+  C7Q3kRxwIR1Qt6EDZmJGmpYmQuTn6Kn2dRW6L3Q6gqNfexgEXFHMqeo8Zhf3Jc2U
+  2uJwesNLpEPC1Dg+GJ1kgd34utgfGHqabKT1vHmx9OzgSTUg6bmzqHxY/2D5cMmK
+  KrR1f/OyXg+5zlbBeCn+Csvi5sNH64dFmIDFAMCpOYqtCMswzo+fRuylUNY70+Ab
+  M7BLZmlWyq20eRrS06jCyqDA1/hPr3Ld8FbVZP6GTWfpEFCB9r3CimIK7N2Tq+fU
+  B5arP2SdAoGBAMsMymmeQHYg6kyV/Nfuazk1juEGYGHkLgg51dB2JwCJyKS/ESEm
+  N14uoVV74YpPSaAY9LkS20wk1APg4K48aPrjgj38is4rwus+XtiOkUOyA1Aj5d3p
+  yoAXFi7/1OZV5twtzdCciTdrUByUYq7RjPhfkNUJHb7MmcseVEXQ9IDvAoGBANkv
+  t4kYdtP3/y3WulWGeG8+Jw6pePeEKDpqTMnEBEVTPwe+mqB8n+qU84GvoCm8r3O2
+  4XjpgtlZTgPKJKpwnKNK+V4NUlf1kiAHs39VUsyJWUkLkXyh7fR56s/+1zQYNBVt
+  zckEW/l+KaGVx7lyaW+yMoPoIOWow5gh8HqZeW8vAoGASd2IUO3J429L7LpvdZn9
+  FZ2/MWshatsYR9PKTYB95bs563y6XYXKhI+QD0n2nVsEnKIXfLA4aLXJDvQiqB+/
+  zO0wtx4E3MWcrflNhZgvjiHXBLNabuUazogXgNd+eqBrUFO1WJtpa2i1hwAP+iqv
+  DretN2KOmJdTp0mMPK2sFK8CgYB2On+S5fpp0WrcLTQqMpWFGTRxytfLBepQQmWi
+  wE4C3xpEwQGzs6PqM0OLqWtqzQhF2ZxMEfHlF7RcY8Ip9juOuNWe2Wml8Eynmwmf
+  m3cDWRF9rgp46j17BJNKvtOvzC0uLSQE9ZaL7p4DFGIxFZNH9p2BKPAflQtE2dTr
+  KHjuiQKBgQCmpUi6bwOH9tRh3qpa60t3PWaXUWAI85PSFQN4q9PcsjcAIZ3pYh0z
+  aQAS0LAHzno1pVM/4LdX8FxnusakZ4rGR5avqtbZmJfVzMoYrCVwoWiFFcpVOjvY
+  RsPSfDnvXkq/f6Az6MJsxv8/YneepmVAelDSAdF2wBucO7g0F+3bmg==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_2_peer_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-2-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-airsloop-control-2-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAuSWYIKFFgxl3X6MbTrtoJS7AIhXe9fIJfqDR3ueunDQQw1oe
-  5bB0v/FFjCptEfic+ZPXWDA6xeT+gV3tlDAF/9TRrj54LmtrETJe3GHYAHF3Cr2D
-  8PWnOiapuI5wU4keeJ5henOC8dxXo/sPysjMJFV++l0DXeyX2+jlPt5ESTY03eUb
-  D3MCMa6+YrOY/rXc0qmhe8AfTtFd8J5RO3ErJ5arGieNnH5tXvjlC7TKh7XJFNef
-  IAz431jB+U9ejRPGXUk/7L4IJnwGIe0m75Wt9oJFUdCmX2NB9vzYhr/nW1RH/MKB
-  Nv88QIBZDOOiht1cu1DTDfUIBm5lBFTJylcuzwIDAQABAoIBAEpfdaq13cx58F/0
-  j0WjNoSpMPkAPB4j6fh59ZRLEPMiXxF6JCs0JNHtw3g4mrO7YKNI5hpA1XslL68b
-  4hHC8MYB4XDTG0faUpoH199DVpdm/ODNnDCxHUnYuhiu7yQ/UoQ1awbbW+B4GKSA
-  d6mH26lExssfjfiuz5nBBkWo11low/ifmoNFXZLEyJTebt5nMgeg0tNGYIojCbJW
-  t7h3AfF83sEefWt7AdGRFMd3QsGq2wcz2YYB03C28sy+K3jGIJ6VG3u9LYn6HGk5
-  uTdcsqmBd/+r+b27eap7gFpEqksLeFpcx9mnO4CuQekOUBW4pMHPolwWdMgBWxyO
-  cPKB1QECgYEA0u3l2TEoVlOEJfBDX/lDPxq0GbMiYB1uLcb/FGxJ3ZloQ62tizMI
-  bOaPTODE6MAO08DcQwjpSAaF+61PCiMjaZj0ityJIOOkSv1x6AXIuDc+LlNF2PpD
-  bi9VXAtrrhdfFQeT4Z1SVA45Oy5zWUYVQHaNdFD5CkfjiY+R8fNaAkECgYEA4LVd
-  OJ8uwS6aCpzibTZ6BZC5KHJF13Wn18GHpV89c2WzfMc6/b6fH2hC8mw0pkct8XoI
-  sb4mTWHfcLUNap1iTBy1Et/Z8zD0GkB8Y5Ak4txXE4p0YkuToRQEWDF0MQWqra3a
-  hri0YiiTSl+m59/S9UAma1zrpWKvn5g4UQ2DzQ8CgYBthYM8RC8Kq/DI9jk1oyrM
-  oGP1mDL4Ly/fax1VkGjGPHqL8alTxtrQGOM9atQzek34m4KC+CSQ9nopVTLeM6KW
-  mQoY9CvrvOe43GKBtEclh+GskiaJZGEQ3Fj5IyD1U0NWmwmpM1PlO0FyPks8hoxQ
-  XX5TcBvvv6Yg7kA8njwVQQKBgQDKiA0epLLiYZtrp12Z6/jtHTUV1HFIsn32RDN7
-  hS0A3pB5DaUI4Y/QIgv9LjQCDrPFKyW89lLVejqG/li6WGIpkdJO0b5CqEPLiYXT
-  wy7L3qcJMMiXc+D61OzZhLFiIeZlJgaJWN8UfdfLuAzaf21HqWs3Z4fpB9qdMPjJ
-  bTH3VwKBgQCsPKFyLl3R/Yjm9uDqS9nnB3XAblyaj/tMnztSR+I5MXPhbZ02vuYB
-  1BPChQLD31ZeS62UDDrETFvfsnJxYsR1wmczJPG7Vjv9UJX6s4FKIp0VYzLJoG3K
-  2qP5w8DKXl8cun7jqbv7ky5eWtzr6Ayzb/tOyg12uDEGdWcpHTN9+A==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-airsloop-control-2-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID4DCCAsigAwIBAgIUba8aZKAT3xA+tUOoZM0W1g1v1dQwDQYJKoZIhvcNAQEL
-  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
-  dGNkLXBlZXIwHhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjAyMTAwLgYD
-  VQQDEydrdWJlcm5ldGVzLWV0Y2QtYWlyc2xvb3AtY29udHJvbC0yLXBlZXIwggEi
-  MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5JZggoUWDGXdfoxtOu2glLsAi
-  Fd718gl+oNHe566cNBDDWh7lsHS/8UWMKm0R+Jz5k9dYMDrF5P6BXe2UMAX/1NGu
-  Pngua2sRMl7cYdgAcXcKvYPw9ac6Jqm4jnBTiR54nmF6c4Lx3Fej+w/KyMwkVX76
-  XQNd7Jfb6OU+3kRJNjTd5RsPcwIxrr5is5j+tdzSqaF7wB9O0V3wnlE7cSsnlqsa
-  J42cfm1e+OULtMqHtckU158gDPjfWMH5T16NE8ZdST/svggmfAYh7Sbvla32gkVR
-  0KZfY0H2/NiGv+dbVEf8woE2/zxAgFkM46KG3Vy7UNMN9QgGbmUEVMnKVy7PAgMB
-  AAGjgeswgegwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-  BgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQC7+1IwubB7hI0a/PzAyao
-  2E4jtTAfBgNVHSMEGDAWgBQulEPun8Ht56xTsVn6ByYXttQg3zBpBgNVHREEYjBg
-  ghJhaXJzbG9vcC1jb250cm9sLTKCCWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNk
-  Lmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwQKFxYMhwR/AAABhwQKYAAC
-  MA0GCSqGSIb3DQEBCwUAA4IBAQB2lyVW9VC1RGj63sNYs3FdL+ybZ7Wx3AbcoP8V
-  jWipaI/lJaJFR/3PdQmzQR3C7vYiVwxiB6XP077sEj1RFAuZyH3AZe1WQwAJSbv3
-  PCDyHpVBBWoREQTXHxb/fHK+p0IORwvNj6xBf9urxwB1Uq6kFsRRBMLPkoMc4YK2
-  lQ6bXm46/qeLw+oU+TwEXHFExw8U1VBYgngGp4DXyTURi/JHoStTQLV39eQHikJR
-  pF4qqXdUOSuu4abUstd9hG/1N9zvCUdJoKv8Sa/uKo2RIG6ahj1kwPUoY77gsQ/q
-  Ahsw/IXyx+GmnI3vFCD2pjKIp4Q1yPC1I6QT53unJG9c/GAi
+  MIIDyzCCArOgAwIBAgIUV6um2XlKFGZWdnvBiMMD4JdxFTwwDQYJKoZIhvcNAQEL
+  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjQwMTEyMjM1
+  NDAwWhcNMjYwMTAxMjM1NDAwWjAyMTAwLgYDVQQDEydrdWJlcm5ldGVzLWV0Y2Qt
+  YWlyc2xvb3AtY29udHJvbC0yLXBlZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+  ggEKAoIBAQDfRPpSzx5qHVzeUTymi6vMN+XFPDa47HNAvDy9EiFcU6JYE9ZYmQyz
+  hsEz1CWufaJr7LgjPaTB/ypzO0Ahz7BoFtO72nDPnzQmIUNAV7OdKToPqjJWRKAa
+  I3otschcuhiOfKcTrAPSEVQQV9GktHk6c1MpT6AAuE3nLFKRbPAPO/os0cccXcDb
+  2KYfzWdhbvETawpV4J+luJczH6s9Ap/abvPJ1fcS/3tzHzuZrbpnmsDPFeP7qYsF
+  MZn7jBQ+2cFxASU93fY9Si6LbOyjveKjg3ndqyYJPeNV5V1V6YVwuZNkHXChUnv/
+  1GWTMKg3oz9qSIfP6jPlwEoCFwtQrJx9AgMBAAGjgeswgegwDgYDVR0PAQH/BAQD
+  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
+  MB0GA1UdDgQWBBTQvIrYq3U4RESbTdFdV2jEMbV7CTAfBgNVHSMEGDAWgBSdAqxU
+  jHuupEKvqDMiwoCuippm5TBpBgNVHREEYjBgghJhaXJzbG9vcC1jb250cm9sLTKC
+  CWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVz
+  dGVyLmxvY2FshwQKFxYMhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQBm
+  bQBaG0IuYDtUbco8xbg/VJBCzIGBmw6ap/IK3LLhtQ3lTFlUq+ZD8pp6XsccSBaQ
+  28xeoFMOlmLAjj0KrGypnIexRlj+gvHL414cXrhX8MeLRC5mgnHhoPb0DGaHmSFk
+  KAJ9OqPzgFActECH2DzhQIUg8ZM9Zxz4LxR7oV9NE5qgsyJfOUmcsMsLMX5WNJ/h
+  FDI5fD+1vYrt5Db+uSWrpkaakpVkXeHZeyIgLgDTXpQC7TooQ1xH+dHo4K329uYU
+  yPGodiNZFr45dL4K3drtzsgP5cymgyAxuLMxK9jpr77WFVNHvRYI9gjCUuVJ5uoz
+  wfqK7Hp3+yLcWr+mIUa5
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-2-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEA30T6Us8eah1c3lE8pourzDflxTw2uOxzQLw8vRIhXFOiWBPW
+  WJkMs4bBM9Qlrn2ia+y4Iz2kwf8qcztAIc+waBbTu9pwz580JiFDQFeznSk6D6oy
+  VkSgGiN6LbHIXLoYjnynE6wD0hFUEFfRpLR5OnNTKU+gALhN5yxSkWzwDzv6LNHH
+  HF3A29imH81nYW7xE2sKVeCfpbiXMx+rPQKf2m7zydX3Ev97cx87ma26Z5rAzxXj
+  +6mLBTGZ+4wUPtnBcQElPd32PUoui2zso73io4N53asmCT3jVeVdVemFcLmTZB1w
+  oVJ7/9RlkzCoN6M/akiHz+oz5cBKAhcLUKycfQIDAQABAoIBAFkVZ5/E3kjOwHBA
+  D6gQEJMiNn6VAOyWA4Jv2PhDlKYHBL6J47tkDcpP2SS53/MYU8cmI26EOQniquhh
+  Wrxi5usROJg6l0pwJlmUagXxOExb17vKV91N8mebgjNbPSuqYQPxPqS9vKSDn3wJ
+  3i8Oh1RIEYVpLNk8sHCtoaA+zCX3NF8Fehc9zwmjcEtq7qhEoLMkyE8DY66212iA
+  VQTesZQz2A3vrhN+4jbcpMPM+4ZhKx5upqRdbcwXnpoYnbMMTIx0lWpejb65mFBN
+  UHlrbqTFVYaPRAlTu5OqSoQQg54zyf/8tgQSD+A26KsToLKgsQJ++zMlCcVC4sTw
+  enqkPcECgYEA46xDkA4Ua/scewcpBpRdVt107zSEOv4uYZKD7MCuyDrLjOap1a3Y
+  5el1A3KjwbDmg/VerVFipsmLyUNMzxbjfc2pK07U2NvEeuQyTOSU9MHAY922yO31
+  wAylIF80E472RzKXWyypAVC8b25hKEjlawM273icm4IszLifxAo+Oa0CgYEA+wx0
+  8iL5S5ArBZAHj3Vd4IFtmVD2jN73TH5bBFhwo+TcDe1n1H4Yndea2kV4CbIlF655
+  rCzJkUleiXXyYY9xW8NdmNilZGevye+32cjkYPE9hvVdHwWl5eiOT9/lzQ80TVxU
+  JQ2rgZzT1WzzVWHtbDSNWqSVW27llCN/aOwe6BECgYEAlCIUP5l5nhxfloi9H8PO
+  y2MB31WrJ3sUkHW1Eoj3792ZbQ7zt80KT+VLNjgT5kWEZp1ywZAvgNen9Qat5hw9
+  XjA+/qenA4ZSW6c4NyGO7YVW+WNbt3ZkrFVN5zcqegNNqFt5cWAogmuWf2YxHvX3
+  F16bEsrGEsRrA7SodvQ3Mm0CgYEA2ddBUysN74e2DSmhpdZOE5W7qKIcjribFoE+
+  MVMcytq4KE2tHzIb4jtIX8aQFrnCff4kDkb+0Vc89UKnhAiYcOvht9OmEK34V93v
+  RsePhJ9QqF8Y4uZfwlQ9yQmbuohK9iX7zftCq0GOf0//BkPnZVFkpxbRk3lzNUxo
+  Ln9VgkECgYBOfjHeWKOP7p9dZ7Y71NS/bkJ0HzrZqrj36fQ+X5zB0LypnT/ZIfJq
+  3a3D0ZSD02eluw+6cd5rUomg0DxL1rZE40sCOg4wlxeC/yEBJtEkk8Pt9unvt10Y
+  9+OtkqZkNIYCnHhd2DMP2lpq28CiEdgEZcE/XQWFBMU5sMNjixPo/g==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_3_peer_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-3-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-airsloop-control-3-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEA0o/h0rkNbtKQsaJqDxTJfbAYtCsm1MYvYuMFudQbco67/goE
-  VLmcGPjFaJ5NixhQ9M112PXXvrcXO9B9DZIrXix+tbzaskVu2D51q5TIE3basWKg
-  Mr1XF02nPyNyaFzjC86QrI9o4ueTCWEEovn9CbN98lS34XFmGh37h89hVOQS0wfl
-  eTtD/yupYdu5B15nxYoG+hScwLKqSpiIOpj/8Fe7kW2ApIFcco+wMkqbkTlwyzyp
-  BtWcxYkZ5J8MvYYeqhHm17WDa8DSC2ZMZSB5jqeZtAao/frxKkoExknvgEMiNV38
-  HbX3IxTwFy6XOsBUCxYd8s+k7Ud6QQdHOPCkiQIDAQABAoIBACWOJh/4g43Vnpsg
-  Nbx03688Plu8KpPeuUrw5O+NBkw7awpXbQhThqTpkgQj3/7EGoRfNPq6dn18mHdB
-  q1xFStjkJMFzaqpLOgb1tPUid0EJfN4QkjQakzMD1aWsQ9abYp+Tezhb58A4v3/3
-  vuT2o4wcaIVVWOqr2CMmX9uMQHbsV9AbAucaa1qLMuiDOLSg1DAtPtgOQXuik+wt
-  h6O3xJjt2StmPf/Wd7EYjr/LW1Nj56A2q+XEtNII6KoicLrGxC8vLsdEcytwJNtc
-  So3TzuGa8Xr7H9ZZMbFgrtfU+odlHDt5MRDE9F8SBYk+Lbdw0fdrgeLeHxJsIHIZ
-  SoGJYwECgYEA/WERytZdejiaihGDwTpLUS+9+6wf0fNw2TUmzTROid/9NP7qk30S
-  BAID6Cur/xLlpgFWXQTH42M6AbNGO79NWG/c7OM/YpG35g/DvYL/TryBQdr9ki5z
-  qQa30s2wKK4yHEtrPwh3ptrmmI7MziMZu+UpZR5il9gSymIAqmWuTakCgYEA1L1v
-  kQIbQQyHPC+C45b9TQJDS1YUS7wmsPBEumfqkm6mNpASR/m3rDLHqXHHTPRvGi1N
-  KcRpQdUenMexzYcoTkFRE3tHUQOpYivV8Il3dpxooqm89ydI6DNJp4vByCBex5Iu
-  j2YDfA+2OVNYGy93m6AIrsp7mDq9WglYHVf7K+ECgYB/G+weEm3we2bjbqfnDoRs
-  JQQstgt8eqCZBnYBqYTg29IdfOhWtv6LrishlI8DNgqovbEClvxj0Qpvgezw2iZG
-  AFAXMmVA4JMdwbjTYF0NtbkuPVrJs63oFGuxP+hocALJePhDNc84kEXwMGsD2k31
-  mZ+rj5OsUwQSLRniYYIQiQKBgDOcHWPFag0219v+/rbt21eCVAcDw/q3k39bWqEK
-  MrsBgus7umOhrjBlRVDTHHGL3yQvl0epsYtaA4ovW/AreNi7OcsLHjsGM2Jwlf87
-  qjKpMS09Fm2zJxnFz3mJCyLcz4GE8iyxp+jB+wgfMwGtW0vy4AhfcOp2XZdpKuo7
-  fOChAoGBANh8kUC47oiVByQqGSFa9Wl48I7IATND2gAmVCC82du3kpRf/3cGcDfn
-  C24ZsRr8C0vZwxMwLzM/yJqMl3zVv9RtTruD3nldx8de8aNt84p+pzljTXLg8ViM
-  6uxK8+/xd/EPQ8fjYmW9MxryJLtvB/a5e8IwmT5qpMSbJQ7H63ar
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-airsloop-control-3-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID4DCCAsigAwIBAgIUZ05nUjPSCkae1zvCIMFNI93bpQIwDQYJKoZIhvcNAQEL
-  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
-  dGNkLXBlZXIwHhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjAyMTAwLgYD
-  VQQDEydrdWJlcm5ldGVzLWV0Y2QtYWlyc2xvb3AtY29udHJvbC0zLXBlZXIwggEi
-  MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSj+HSuQ1u0pCxomoPFMl9sBi0
-  KybUxi9i4wW51Btyjrv+CgRUuZwY+MVonk2LGFD0zXXY9de+txc70H0NkiteLH61
-  vNqyRW7YPnWrlMgTdtqxYqAyvVcXTac/I3JoXOMLzpCsj2ji55MJYQSi+f0Js33y
-  VLfhcWYaHfuHz2FU5BLTB+V5O0P/K6lh27kHXmfFigb6FJzAsqpKmIg6mP/wV7uR
-  bYCkgVxyj7AySpuROXDLPKkG1ZzFiRnknwy9hh6qEebXtYNrwNILZkxlIHmOp5m0
-  Bqj9+vEqSgTGSe+AQyI1XfwdtfcjFPAXLpc6wFQLFh3yz6TtR3pBB0c48KSJAgMB
-  AAGjgeswgegwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-  BgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRn3KM2W7BmAmwq62W5BlTM
-  lkbLJDAfBgNVHSMEGDAWgBQulEPun8Ht56xTsVn6ByYXttQg3zBpBgNVHREEYjBg
-  ghJhaXJzbG9vcC1jb250cm9sLTOCCWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNk
-  Lmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwQKFxYNhwR/AAABhwQKYAAC
-  MA0GCSqGSIb3DQEBCwUAA4IBAQA/8ZebXM7Yk9syHZkeII33lSb7JzsCKOecm6RM
-  s35Z/YcVNniqkAUUQIxafud8cRqDm3ex/Lb3QYnlJoVFV5peURlJ2Yc2t/3Hmi7o
-  HMBdMC2Me89EWcGvQUdvySro2sXXazqB6wQtjc3e/GsppWOmS86jOeZmUdtT/Dvh
-  fPI8wg1AzvUhix23apWCYD4pxStIwNZnvVzPKMAN2aFKpQAew/6ZZT8NzJqA5U8V
-  k0PFY+0UvZPGtDEMXaJ7YF28qzSP7Y8U8w9OUFD6jMexX114iOMDX0O0p6BW2Ge9
-  IXEnvZ1umITw2SF3IJABS/7jYzNtEyXoc+NrJ4hsvJXNM1SC
+  MIIDyzCCArOgAwIBAgIUU4aslReBB6Y8nSrJjDK8ljOyvvYwDQYJKoZIhvcNAQEL
+  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjQwMTEyMjM1
+  NDAwWhcNMjYwMTAxMjM1NDAwWjAyMTAwLgYDVQQDEydrdWJlcm5ldGVzLWV0Y2Qt
+  YWlyc2xvb3AtY29udHJvbC0zLXBlZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+  ggEKAoIBAQCqP92Ggw7i1vWTEElKB9YH5U6011vGkgoRT99pQtxNbtA6m8oSKcNc
+  6Pa+c1N0tqXPFFVZhE/nEvOjJvYaHFPqgaDXxaH+kwRQkT190YwXbr9+nxnr7UGW
+  uswlAsBAw5Xf46VDxtrybWCJwQFRjrQ65uMAWdcxUKSRo6yrM20ajgMaPG0pe+Se
+  8kAicYIJeJi1jlpf+qe0YUGdCnIuqshbAp0rLgub44QxM8znIeohIlfUKQtVEjxc
+  z4R6sc7r0D7KAz5iwQJAX5voIFpqfH4I4/MRy4ufYyMg7SBl/JuOeAGQntwk/Z6h
+  cH4A1MmetSy6vwv/K4BFYLzsoqEta+gbAgMBAAGjgeswgegwDgYDVR0PAQH/BAQD
+  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
+  MB0GA1UdDgQWBBREt6BXmKIFAOPaU4hiia2UVzMSkDAfBgNVHSMEGDAWgBSdAqxU
+  jHuupEKvqDMiwoCuippm5TBpBgNVHREEYjBgghJhaXJzbG9vcC1jb250cm9sLTOC
+  CWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVz
+  dGVyLmxvY2FshwQKFxYNhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQCI
+  xTsM6bsZhtjP3LYOvGlcu5cDDWAgRNfKu4rPwOmT8c8F/S8VnQoFhNPQ6MJAl1uS
+  7cRlaNvA8F2tmPUJuJh6c7dWbn2TW6khlKpp/8iH4FrRsA5/QoXZPTQzAWvsTNPn
+  RfFAHoab4rq6LNsFURGJVg/SulxmmbIs88Vk8sRkOqXLqginPs6XaZTckMzZqoN2
+  5rL4YMyOms8ylLtGH22OZsZippykdGBNVJyL7DB+IeRu9eDxm6X+okeFK5GpMyQG
+  +YxVnrHrGHaX8T/+8Susjpl00G1ZeldY11v3F2Xq6wlTx5ThkNQx/TVQqTVZ2zX8
+  9imIKIg4Z7JrkB2U1k7U
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-airsloop-control-3-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEogIBAAKCAQEAqj/dhoMO4tb1kxBJSgfWB+VOtNdbxpIKEU/faULcTW7QOpvK
+  EinDXOj2vnNTdLalzxRVWYRP5xLzoyb2GhxT6oGg18Wh/pMEUJE9fdGMF26/fp8Z
+  6+1BlrrMJQLAQMOV3+OlQ8ba8m1gicEBUY60OubjAFnXMVCkkaOsqzNtGo4DGjxt
+  KXvknvJAInGCCXiYtY5aX/qntGFBnQpyLqrIWwKdKy4Lm+OEMTPM5yHqISJX1CkL
+  VRI8XM+EerHO69A+ygM+YsECQF+b6CBaanx+COPzEcuLn2MjIO0gZfybjngBkJ7c
+  JP2eoXB+ANTJnrUsur8L/yuARWC87KKhLWvoGwIDAQABAoIBAEQbAlpyCT1zco/f
+  PwJPei50a/TqBfu8pixgwGXSamDLiJ85fS+g51c+lp5/cg5JlrDtWGtUA8bTjQVi
+  a6bsWCGCs749gF1foKU+RNQVRK6HDjHwIaWApvFOTqYroI8H7ue+oHkpjqLWYH0a
+  6ZUfujep73tPdUd0FDFywXtHOkkZiScfCZ7yCp2+TFvr0yJL2WpC7WXNkFoq4RjG
+  UoFLj9KvYq4DlQxnNPVnqKhJFP7RE8NnkXiIRh+FNvlU1l6RqDpe5I7k9EPc4JdF
+  RWhXqSNiuizNgyYinsdWjorESOI022slAldJhhiv3VM6N9E9d9G8OLTcYIogn4de
+  +yV8iUECgYEAxssvly22qiq89YEpNQL2qmshOzfMThPXxp00vxA9TIvpu8c6zP2V
+  SLV77b55JMvI03uamfKUPHxS7+eQCriWKBQt7kxz1d5nkiWWJATiBNxkCmzT8l+U
+  nOBkdfnaNHUuqg39eag4r3feEl+NoO9hRU60Kk6APz+RMJwmXZX+QCECgYEA2z3f
+  S8jSXbdZzPJsx/YVY8SqqXJYEC4SztoSHGK2FSuWAs0aa3e0Ev43g8MegCRcFFSy
+  Nkm9xB6EqSI+mrdDq3l8iwTWVgBeqQUgXeORGrXIQmfc7owFqpE3R0nXtN6VewO5
+  iakIpfvnLXKgfE4PKQTeZjcZIbtYCDVaraaRELsCgYAdOprQu6Pz+Ty3TDpm1Py3
+  qfDE6Dtd74T2av7qaNTagGfpeC2pHk/o1OZX2n2tb1kj3zSoFga9rfnz1DRVnzZU
+  xkLKmusdMwo/bs9YlG83D8CV19KB/JO5TTT4M7hlpiUqU8xFKvrKsfEw+mO0mf3P
+  VvcekVRB+HK8lvj9IaS0gQKBgCmyKrWPC/Mm271OncGp24eN76cqR/VLzefpMWiU
+  nWyJTY5a05t8uJKkJoq4oSRdxeVX9ky82YpjA3fnO2DRWd1SzYzi7qCMkXQztWQl
+  04Lw75Uxi6MSnkFCPPEh6hRMAMHUg4Ta0PpAXkcWdc8uSVPTyThHYlA4ARYOj6BW
+  /V/hAoGAF8HAwwFI4Wa0IfXDRI2Oq0BPGN0ZYmm4Cwd/t5gEbhmW8naJ+0jrv0cO
+  ol+uMRlZkZtWEjiUlQbRahdR7Ad93lJsZcyegpENZrjW6GoWqGztqQ1/pKMW8BOg
+  OKTSzc2FFx5oqtlKBD52EygYj6hG4Je/F0uRUa3uwJiuNs7OQJI=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-genesis-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-genesis-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAuKoyzX17CGMaRNCXtaYln9SjkcdKW+u6SDiXgQmu4G4yUeBG
-  ++vrveln5j3hhpmmekw5trjqn81S/xY3N6YIPqcW56NzQXeUDewwicKSt7MbYjqY
-  1wxitHHGcMgVUYyd700M6elEbfPZ7Y1+vqfDEP9P6xgijVw6vjO5i7wU4ElNEKfZ
-  r2Mx5baRYgTrvmXmKpsop6i7TT6d8cuK5rdi+r+k4cLZFHnfmpMpAkuahYWRSSvH
-  2hKeY6jUfd17XWmjDimxQp01ujz/R7fGqDsMQpi3KT/2vR0Djr96f7qwiZcG249Q
-  Y1YSsqdT9EPTFlj4wyN+CYk9Gmv22jHxmBCgiwIDAQABAoIBAHE11qNoFC9WIlqh
-  zwBL9bEA+a57kTi9UZzJJQi02QM6S5sqdhonzoTFPS9ILKUKOaesZ41/3EdP51v/
-  UKbLIS7X3RDxgc1W8+t9K1ypbq00HsufxOfB7hlVzySBZaBzJrf4crxMh+kooCgk
-  oNldnBcljudACp7DNjg5Gb1y9xFwk8yJIxVwm2f37PGOq7X7PPfIpItxJ2BB14ER
-  00lmLmYqiW5/IzEg6rlzhYBPDdh4XR1zVAZFMx+3qOFJdyOhQH+3FNqBYNvMxPnS
-  HQLu3ufBS9Zzw1vZuwXWS/dQchFns2+wrlUgLH/Z39aoL85URICiVnalJ0xPVHOc
-  xQcsLLECgYEAzYs+IUgVBVWoT/BiJ86RkvOgg90OVeh6V8lkPSuk8EVPPfhBqjC4
-  f4KefJO2WgpaSvvw4S82gGTxCLsJdnitFJAPQnITXIEZzRGSg3olj5OPCaJLRb+T
-  sNbHJuAWrZwXpMQyBDTJqWeGLm3rt5ovUI5sdA3O0/KyyAhJlFCr9P8CgYEA5f7g
-  RgqjW4snXeprT6z1lDl6r6x0U57Xxdb9rBZHeWWSJhfZLXXyG02NbyAEX1XuivAw
-  QEFc8WZ+jJysLk1eheW/Q4P5rMrly0R2Sq3cltq++rB9H0x8ppXCNQeIu2NJClhH
-  LNJiwYCcVoT0ejPem0QG7rTW9MLoPTA5yji+WHUCgYA4uSKOQLw8WqU2WlpcLe+S
-  pFU5zrl0D9Ijg9p73x2HiTkTGv3UH9nqpntiWclLE+xTITAalNLvn+u8wxEbdrYd
-  JJxxc9XQA3jBVQYf7oeLFee1eupW90Wk2cDgA5t+kcMcn2BGNOMqMv2etosEgjJo
-  gsV/SYg4iZO5DEByA8lQtQKBgDpWNq6tXhgHKLoSjpuMBFJPbgYHGQ5ouNQunvM6
-  R3DMSZCt9eEpDHrOZfRsy48e7b2CBMsXiSqV0714s9eeuj3+M1A9tmOUp0qyl8qD
-  ZPNCkrRldactsGRUkgj/Wzgki8866vq8dl4ccAsl+BjS9UCutY9wgSFeGqgChnX7
-  hJRNAoGBAL1cNc3aXOKUvzaafIB9hzVn9i4bkHj8puU9soVYS0Ya/vYrQCxeIN7I
-  HbQIBSHIZ1+GUqZuF1QOrD/rKrDrurdA5IXvqe7CdHmhC3qqU5++pWcf/TGMMM/6
-  jh9EKDvhQy3FADm18pkSskLoT/zU6s02gdS2TXfJR6BRNbtOYz5F
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-genesis-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID1TCCAr2gAwIBAgIUXgv8+s+CissBpqgkDkVZdRfMvOMwDQYJKoZIhvcNAQEL
-  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
-  dGNkLXBlZXIwHhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjAnMSUwIwYD
-  VQQDExxrdWJlcm5ldGVzLWV0Y2QtZ2VuZXNpcy1wZWVyMIIBIjANBgkqhkiG9w0B
-  AQEFAAOCAQ8AMIIBCgKCAQEAuKoyzX17CGMaRNCXtaYln9SjkcdKW+u6SDiXgQmu
-  4G4yUeBG++vrveln5j3hhpmmekw5trjqn81S/xY3N6YIPqcW56NzQXeUDewwicKS
-  t7MbYjqY1wxitHHGcMgVUYyd700M6elEbfPZ7Y1+vqfDEP9P6xgijVw6vjO5i7wU
-  4ElNEKfZr2Mx5baRYgTrvmXmKpsop6i7TT6d8cuK5rdi+r+k4cLZFHnfmpMpAkua
-  hYWRSSvH2hKeY6jUfd17XWmjDimxQp01ujz/R7fGqDsMQpi3KT/2vR0Djr96f7qw
-  iZcG249QY1YSsqdT9EPTFlj4wyN+CYk9Gmv22jHxmBCgiwIDAQABo4HrMIHoMA4G
-  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
-  VR0TAQH/BAIwADAdBgNVHQ4EFgQU+FW0mvuR7Oid76A/DDSp0hqGnLIwHwYDVR0j
-  BBgwFoAULpRD7p/B7eesU7FZ+gcmF7bUIN8waQYDVR0RBGIwYIISYWlyc2xvb3At
-  Y29udHJvbC0xgglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3Rl
-  bS5zdmMuY2x1c3Rlci5sb2NhbIcEChZIFYcEfwAAAYcECmAAAjANBgkqhkiG9w0B
-  AQsFAAOCAQEAKyxHF+ctXmJuIEJJl1RlmCYLkH9We9A/WXsd7Xpandz2+hfojg5t
-  an6uPV8ITyEQlo64WEmshHhKTpxMxmf9pDIatQVt5rKjBM/JPiSdNI2DyZuBwKQi
-  S6ts+G0yjzLrRv+adowwa4MUO3xO1lVJcgwlvN3q+Kh2Qca9ExjO/PoKoQdmGkuj
-  UAbzJeRZAQtJ+u/0ES7d3hOAQ6SQi41Y6NTqTJBwq4ZrTULvLXW6p0QBtfwRwM7D
-  gpFvMIacKGadJaMp/8PxPgqq8G/9vQVMWVZxu8vy2kT3VXrpgXn+1tEsFwzoNJar
-  PsaCsTYb7SWYz0LbDvE+iZfekIQOZz0wgA==
+  MIIDwDCCAqigAwIBAgIUOgRbpMB1wb7ZS61K6Lmo+d8FcvEwDQYJKoZIhvcNAQEL
+  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjQwMTEyMjM1
+  NDAwWhcNMjYwMTAxMjM1NDAwWjAnMSUwIwYDVQQDExxrdWJlcm5ldGVzLWV0Y2Qt
+  Z2VuZXNpcy1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqTgA
+  deVhtjVkEf7fkzo1zwY3LNdRWbediapid0g6WfAmaTR7GiubVv4CMXwjP7HkLwXK
+  Pr46kiCZ3FKCwcLxWnQBMDHKMExQLfPMHRPPd6RJjzxKHtWIkCvnYLXj5H9Wq3pN
+  vZoit4ffHenRS8kC54F5cAKVSH74DZQ0b68CdudKtilCgbiivi1cLbUz8kEBTp9e
+  1nmd9aCJWNvN6l6h90anlGk7AKI9vEYvv90smikC/aq1gt3IO5PZqXe4UdldFfCh
+  6VhV+wQefCyJl1QfRerjamoyzuPijuGfdYxurHsNq2YHzFkfTYGAHuqjXTWSfTYg
+  iRsIh1cH3bFn9zMjsQIDAQABo4HrMIHoMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
+  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU
+  O7/zgac6jL6HcUCIyqfJTcO/YkgwHwYDVR0jBBgwFoAUnQKsVIx7rqRCr6gzIsKA
+  roqaZuUwaQYDVR0RBGIwYIISYWlyc2xvb3AtY29udHJvbC0xgglsb2NhbGhvc3SC
+  LWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcE
+  ChZIFYcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAkhxV6CLHlokz4sd8
+  xH0hk+WjIUrcOFviSCvYlj4P9XNr94Gy4oIYyLFNWBnNAF/HsDoxmtHsJXUwv0kT
+  fySQFMaHJWGXwAnRqF0uDN9UxHE7+5yf+Q0HGWM4hyPfh3ki6LuAcAC0fZIF2Fal
+  FC1jW49C+n9MMyMF0fNHgUZHAALhiJSLZVlX9RqYmEk+OXU4dIbIiykLztFEuyEs
+  j67r4A8wbtYN17MbpAYy7aoXb2PN6mDMFRaG7fGzZX5/z5cPS/IEmuSPzNBK0blX
+  S66lokm7WNPk/nziIpBUJmy/Jc/FYJVsUPBoa/FycWPKgtorus3Ot5WWWtTbanLy
+  OryEZw==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-genesis-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpQIBAAKCAQEAqTgAdeVhtjVkEf7fkzo1zwY3LNdRWbediapid0g6WfAmaTR7
+  GiubVv4CMXwjP7HkLwXKPr46kiCZ3FKCwcLxWnQBMDHKMExQLfPMHRPPd6RJjzxK
+  HtWIkCvnYLXj5H9Wq3pNvZoit4ffHenRS8kC54F5cAKVSH74DZQ0b68CdudKtilC
+  gbiivi1cLbUz8kEBTp9e1nmd9aCJWNvN6l6h90anlGk7AKI9vEYvv90smikC/aq1
+  gt3IO5PZqXe4UdldFfCh6VhV+wQefCyJl1QfRerjamoyzuPijuGfdYxurHsNq2YH
+  zFkfTYGAHuqjXTWSfTYgiRsIh1cH3bFn9zMjsQIDAQABAoIBAQCO9vJkqMQx1c/S
+  6Ftpnq9hVeX9q3hebSPa8Cm6jzpFTACXt7AdfyQBjh66Qh/hq2CWXbTt53fCh2qW
+  Wtt/6jxQ6FsspZQl1AOVnzkeg+MvOIyxSAVzIYL8EyuraGC+ZtsJiw3tFzEnj9Jw
+  CmA6P/yFLL01ZelL04Gsrz7R8LELVKP0Xq4gwyr7jmQsv3KYjt0B1eziUNdEUV3T
+  HA4ucsS5Nh6CSgAJT/ZByIjw1GAoAT5lklvVt5IXLzyYqWCNTJ3oMFDCUn4KrraU
+  fzkxjB3v3y+qIeGJY0q6tbfBki+xwPTQAB2GAyTbyjDzeVD75/1oG+QrqB3PhN9K
+  XhbnSKoBAoGBAM4lEOtfpthQjPoGZOzUYNm4uJVfzhYCvEgpUhg18Fe8Iw9oxhwp
+  m5Ug3QtG8VOYwho43PN/uIrRYgQ5TWjAQ5L5PlQdc0wyWGyVNlVoRfoo/vZYUU3B
+  ia8jhqLftJHDlM+VqcVfxx4i7O6lioDAd5KuZerX3C+73vklA89ITZwRAoGBANIk
+  wPG1mad68yQiCQcV4SCpMPC8EzcuAB614l+w5z7HVGbSWZTv7abm9Jk5U+2M+HOM
+  o2ZdSdmQ+H058y77y8Spb4M/ADWAzJJU8BVvDXtIG/++XzX5+wZoyYwASnlqmHQl
+  4r0YS1NHy9ISKc+wNRTSQtbqs2KiDrmoGwsTpS2hAoGBAMO/vslDExPlqXjiCYQ6
+  R513Iw/04aVVA6UiV6pVzdwB8uj2/OhROkPp6PyEaTSQogB0bptqdLqdCQ4pu6/0
+  ojY2J1GIhaudQwoYxndjhM9/jlwukUXcufltKrQO6VBhADX+UC/0OwgK8iHLYDHS
+  kbjfkjfmsldBdwHufCeg6NGBAoGBAJod2mNqjAYIZclaLMTFhxYs/3eOd4lAc1YS
+  jrMfSnkANyYxnwFb9S8ysrCtGqBdgtk7i5rHUCH/8D3nAjKy9/6DRQU8byrOCzpG
+  kM0nZPvFJsOpGqq7ax6IO0gx7mydgLGuF1wXNScewJyQNZnb4RIkImD8QBNWRvZi
+  E3NMNRgBAoGATCrNcZrCeppNAANOtOotrxqgYoyl5R/IpLJFc3E93MMzugazHHmZ
+  TU48qbWlh2544R3zthVDh9371Y57tVKmIqGMRFHGYWhAQPQA2DCxN/Lko+iE0/E3
+  klvkWBls5VeuHZRPot+/Ntf6ax+rPARvI+mNxGCHGx6QjtxZjWAUso4=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_compute_1_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubelet-airsloop-compute-1
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubelet-airsloop-compute-1
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAlr3bfAmSsdauiKWrwZ7HSHHKuZrQv3nJh5teI1dQ76raizlt
-  MUHjUZdamnr+05mBDy59NxYdnBPnilpuv/jCGVtwpxP2hCVnzXb5U19yAx3mEHBm
-  KDRNy3C9VYz3JB4IMIVisJvhasIlJ444if7Db2EbFrUuLXXv6cN9Q4FtIDjaHMya
-  yhFeTLgv8lqNaHnAcI3BSm4v8biD7Kkeml3vuJuaw4FMyqNqwLb/CBqQoEQrRlVX
-  2zmqLHPTRcOX0jiWNE0itHlhGcoLEvqNfAP39JPA7xvuFE43FQxT6AmVuB1RDJW+
-  mXQYUC3hzknpCEYRYrTf6hZ6Nvtbe2O+70LtkQIDAQABAoIBAHzbNw/vMfVhd2Ex
-  sCkIpdHohtzjUaI3cuiClR+6tAw/vRLydvIEvA+ZyO8Jj0ae79ouTIKzK8Vaaz8a
-  ln8lwUeViKKrE1XzUZ5KvEsFVH8mZagaIVONtx4Z/Ij+4LmmsmvWH59fDgAKXRH9
-  Z/FM9n2rte9CFMSM2jIKvReL/WJgz0OihWdTC8t1U8cJfi7cj/wmi+EN94HFtJUy
-  2Hso/kAQIFEPLqIrXmgXt+zXouSIAZlX2m4shU25eWMpk9NCEwMVEhXBXbWYCtwV
-  OS+4b7o094S2IDL9oybVh6MvxvdoYtd6wcSxJuP8BlytvBLA4Gq1C4wSi79zXbhn
-  svnSoMECgYEAxDZSOg3Q6NTGHj2DyYZXrRfR7rL5ZIdUoiu9E9eXTyP8nxLP3PDc
-  p7EV1l9yyDaRIFLoNKr5Q2/xgNkSfHJxhq5Old4WtAuEijTrNbGHEdnwFsl6vig9
-  vh+3o4c6wGyycEiMTi0BGWnhMhqr6W03LP3ID7uFk6jObeS8BbfD+0kCgYEAxKyS
-  K4em3xrpd01Q8TPhw4xQp9B/TdCeUjeUdlVWmdJ9ITb5kLSg1nJK+5lpGnnEcb1e
-  fZSV0geNL+oXUnZ57cPvKTUfoXuZfStiLIbDSI2CTNBLeoPTqdQJhJ1iIf7C9UC4
-  liF/bw9o2BYbL7/R4Bv9UqQIRzhCJ3NTUHUOWAkCgYA730+MA3dB9NtXkvHJ5sKO
-  QPyAWACd2mXK7onNqjWzoomNiNIA20aZrQG63nlJ+syiDmpo19sj5t7MsHBhpRJb
-  RIkaViCbZABXo/o58igDHHuUmHpp2CGvCEKjFbqpyQFSHfEiUb1KIfLjtRvMKNVz
-  VyVbF5+VBSeohOmS3RZicQKBgQCu8O4IKF7Hv5GCHFTuaH7eSVaJH03Nss7RRT0a
-  0Sf6JaBGRjdRf0o91mZaTIiQE1Yo8hA11lA6BZuRzkE2icpFM27uEaH0KxRJoahv
-  AOR+CdmoZ/NrpA1H2CMrQi9DG/Dg5NQMPvmymVtiMq+2FoMiPONleiEe8KzvmIa4
-  X5cFuQKBgH3RKN6CPQGH+Jww8pWvDRSJMXLGIM+HgRMZFvHffgmdjDxsMn3J9tSs
-  GfadTAlAXsX3VX+utoSynzXChABx2KRgucaoMa2w1Saq33nLGgeRbQ70jQ44YM8E
-  1S9V2CFy2/2YJ943UqGaHQxXeNv0Spa3mS5s0nOzeF4/z6ZXfctj
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubelet-airsloop-compute-1
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDnjCCAoagAwIBAgIUJyqStWHOt98CurlUeQtFprhxI70wDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMEAxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEnMCUGA1UEAxMec3lzdGVtOm5vZGU6YWlyc2xvb3AtY29tcHV0ZS0x
-  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlr3bfAmSsdauiKWrwZ7H
-  SHHKuZrQv3nJh5teI1dQ76raizltMUHjUZdamnr+05mBDy59NxYdnBPnilpuv/jC
-  GVtwpxP2hCVnzXb5U19yAx3mEHBmKDRNy3C9VYz3JB4IMIVisJvhasIlJ444if7D
-  b2EbFrUuLXXv6cN9Q4FtIDjaHMyayhFeTLgv8lqNaHnAcI3BSm4v8biD7Kkeml3v
-  uJuaw4FMyqNqwLb/CBqQoEQrRlVX2zmqLHPTRcOX0jiWNE0itHlhGcoLEvqNfAP3
-  9JPA7xvuFE43FQxT6AmVuB1RDJW+mXQYUC3hzknpCEYRYrTf6hZ6Nvtbe2O+70Lt
-  kQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
-  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUcMkjyyEfHLeTRUBv
-  vVTtkebvNSYwHwYDVR0jBBgwFoAUc3l25WNesqD6hWcsmjAZXC3RgSowIwYDVR0R
-  BBwwGoISYWlyc2xvb3AtY29tcHV0ZS0xhwQKFkgWMA0GCSqGSIb3DQEBCwUAA4IB
-  AQAFAVVl65WP66p8OChIli/xbMqH71QDDe6P+URo3gtangeaoof9sJhu437PX7ym
-  UqnZiMYhgVqKQ0dHe2rKJ86N3cLHqJcZyd86y6s5gKmjjNHaZi0M3Gphi9TKncQJ
-  LrA6JWSJSbfB42y9iZEGOz7Hvn8F0aYOz992PQNWI17UYuWM1MLbZpcJcKj4TURe
-  nvEprqB7HTtoI9n3nxO//Z7N1qBFQi0oKVqJ+oKy5s3hV86J5gAd18CLKw7wAQwn
-  h/iNi+PmuoE2DzfUOZ81sswyBGoIeZlczU/gKENGOZtmhA/OQ2p4tGPyg3Hkh6HS
-  1DbzYntEeDpfR8j4U2LwoPaP
+  MIIDiTCCAnGgAwIBAgIUPWwV8u+BI/Bp6+lX5xgBPRKQpbgwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDAxMTIyMzU0MDBaFw0yNjAx
+  MDEyMzU0MDBaMEAxFTATBgNVBAoTDHN5c3RlbTpub2RlczEnMCUGA1UEAxMec3lz
+  dGVtOm5vZGU6YWlyc2xvb3AtY29tcHV0ZS0xMIIBIjANBgkqhkiG9w0BAQEFAAOC
+  AQ8AMIIBCgKCAQEAr6Znfiq+cVGiSsIoFnNFk8h6c/vp3HRyeruUoL+a1s5NZ4lV
+  Il9FY6oq095XRj+pjzEq3q6SATt1kcDrKawn49gvAvqlDZ9LQVUc9NST8fxteYeX
+  Fv55etmRysWmEFkRQhNkF+3uxsnX8D3RRL2RyOQ4wVfHVWjQoIlRyctE0dvqtYB7
+  imAVFd6qlFr2B7zsM1CGHFfv/QmvEpNmzAjYuYZ3A/5gJnv2ZKjGwLf67AELvYa2
+  YnYUib1X+TCM1Mj6YycJHm6HvuuaVcPUnfEqzTyBVvbEjaPj2EAPRGeCQnkF465u
+  JKzcYGmgdDm5sUf0mrBS1MUBzl3l41ZvClAfMwIDAQABo4GlMIGiMA4GA1UdDwEB
+  /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
+  BAIwADAdBgNVHQ4EFgQU8tbWGRd97ei4tuHHnithW+yFwOcwHwYDVR0jBBgwFoAU
+  3jTq+A8U4Xyh0DqGgDYkBgPw3YgwIwYDVR0RBBwwGoISYWlyc2xvb3AtY29tcHV0
+  ZS0xhwQKFkgWMA0GCSqGSIb3DQEBCwUAA4IBAQDUbRJTQ3lw8XKGjkiA9rGPXy07
+  h++hytUXcj9lfZugurCunsvkzqFiMa0IUnKKgQNXWbDLNrUx2T7oFPnBp7D/vv7P
+  eqiPKaQpGU8xRFaeoRrjPXk5OQy9NJSsLBulLemL43XH8Ng5LI17v3pt8Q08cNPf
+  CqMWK0t9zrkGCJBLsgubsX+pefTFYRlz/71ukX5YKjAahmUoB3v4VRjF98wTLqEM
+  l/sFcKteNRELT8LNYh5qc7lCNuRlTmF9oecCer+RlMH928BGVI4cCJpSHO+To1sO
+  6lrelK69C+BLr6orOOI/vgWZtbOpTSo4+FUb0yw0DwiBFWIKRHZ+EPP22MLw
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubelet-airsloop-compute-1
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAr6Znfiq+cVGiSsIoFnNFk8h6c/vp3HRyeruUoL+a1s5NZ4lV
+  Il9FY6oq095XRj+pjzEq3q6SATt1kcDrKawn49gvAvqlDZ9LQVUc9NST8fxteYeX
+  Fv55etmRysWmEFkRQhNkF+3uxsnX8D3RRL2RyOQ4wVfHVWjQoIlRyctE0dvqtYB7
+  imAVFd6qlFr2B7zsM1CGHFfv/QmvEpNmzAjYuYZ3A/5gJnv2ZKjGwLf67AELvYa2
+  YnYUib1X+TCM1Mj6YycJHm6HvuuaVcPUnfEqzTyBVvbEjaPj2EAPRGeCQnkF465u
+  JKzcYGmgdDm5sUf0mrBS1MUBzl3l41ZvClAfMwIDAQABAoIBAGj2nKPFcTaQXNYl
+  vgTkb3CHfb1vjWmi4II9M+z3ctToRVMYuxomKnYLSzp+hFLDWlTqQb7+PNulp3Uo
+  /p5RdSjvl/BEzXsddMAe14Xqvln9yYG1J/Gisf9aooe0oq7kOq7snYS7N1PtbC/x
+  EOvuCH8u+kd3Z/O/BeTZCln3MTHiJgkH9Tpitn1OFqkN5u8Y5Wg95TlJiWFHtj8v
+  TuVDtKExTNfh3M8gDxiYN/qANQMHhAr2d9sfXOaQD3VV7IGTD+JlG5YlA9U5E7xM
+  G/4qbxAGjC9nhOUQHjoWH+TkR9xgw/DxwvTRf9hAIVVsiz1d/DnZExH0dgpzO6Oi
+  cqOeP3kCgYEA43gAUu7lksCwIA2mXnEIuTDWkoDYcxUAtKEJVz6AekFVcSaMOD/P
+  0t/t6LbK3mgeZLDtiKV/98jpixKNxaz4ZGfekpVsQVyAyfCJZioLVLORRcCQzf9w
+  4qTur19O3jKiNrPqWlo1TvRvEpksfo0XuC+4CviTKKxxdoHfZhbO1Q0CgYEAxa6C
+  MJsqSLRQeUmq9qqLTUYIM7ZiplnM9e1hrQ2J34hKw7fXfAroGxGVHRnXkcA1umAW
+  3n0l21i/u3pRoaGSW/bzAFKHBHxPXcpEr46pwwXfG3dPsLnK/v1caKdyXB0eJKTS
+  cHPYWe7lxsLi0Of6BcjWCPg1OJ9WJAuQhtEGNT8CgYAcrt0bmBRK1RFgeVgpQIeh
+  Eo98GdMxb8yO+l97KN56jBKCGiJEVYeXR7VwStx5/xcWC1loibYBQMxyRPyrmIwZ
+  3R8rzLvB4jA7RqGMyHB1Vc9TxFx+HV/WtIWEh7giPLBHxZgfnJBsTFZVOgtqSdBb
+  4WiLuZyU3GnST74j2WxrYQKBgQCngNM4NIKD0KZP36hKEwCunaTdjLHSm00dJeQa
+  Ktqk2mvfo6uno+ZA6Ykce4U6L1BXeIxoQksNrgno5iC9gJbv7jTCFSvrFRp7MqU4
+  zP30DsmaEGMqMIRdxHnFA/3XJ6UfD7pxJvgwXEm/PevLcIVe2Wrjds5CCGGJcXMp
+  iXxlKQKBgANNYfEMENVLSeTIBM6gUXTAlISdF9HwKZZvG+Kev6GsU3WolYVmz4ON
+  KB6GZbg/6humiYtg1nbTixqSryoBd032MCLIsB6FSYD6PQqf46zYA0/6+GHEpjKe
+  ZlyOjJ/9yJykquoIysOnGfe2F1wmOBlld88MSWVe0NRezi+kZXMq
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_1_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubelet-airsloop-control-1
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubelet-airsloop-control-1
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAtZQRoE7wE5xxgLtf4XoMCHH0aWg9OhWmlGlFRtfGDePlcfWW
-  J05dhatwCxBxHqFcavdt82Bl2tNMI/3yvAs/DhUdj4vN7buUYNIoDDMychEn99JS
-  XxLU/bTsEf5GGXVTkLctbvDicC63K3ijGSd16o/lgu7Z9zmI+hNhkOdeeHZZNs1f
-  SpXLQniz7OAhpXfjOsmAR2gcsT7ORWPlJb9+yGUtk3+N8EIf9yUKznXAQkYkxJVR
-  pwZvvZlUK+/FWvsh5vPpMJXLb7xTJ7K1mZruyerA/a8cd9Pxcrypu8z7/iXOMcJW
-  a0bb3B+zUoymWnniVRLIPO8KLlm3N91EBiZV2QIDAQABAoIBAFZkDYLVK9pYy5Px
-  EmxH0iPOe/gOtVrGZEwmTeSn0r5XGJqAuyEWYt6vM47AEuH86eimsnRh//P+JjLV
-  p0CapTSBDWB3ptGeNrleI9myHiUxTm/VbIV5g0b2Zn8lGJsSPGEVFhO7njC7uUCA
-  lDDqmmqwbgU+uQusHyTERd5YhpUPA424oSjTp9xalw7mHxcEG/PSFDCdixuIleZH
-  owahudsCl7HXOySYQQ9yi+891NgLQu0KobdbyWlq6kkWXPt9U8ZRPq9NT3zeTTrW
-  x7uRB9KWHPL8pt7VNsn3HuJBszbuq2vw5rhYhXk/RpKNQyl6d3NWvUfhUalXCzQT
-  9609T9ECgYEA79rtt7fmxsSogudToVFZufINyWmdsDtEl1CTaB6sK3IEctET7Rp/
-  6lw8nWKrZnlx8vxy5kPnGel21Ih8i+Fd+XRm4q44Ixiwiy7B0EgZsBQRudL6xU5G
-  JXPbZ8HfLMcqgJumoNh6Fy2wNft+Id00/yn2OcElETLnFVOb/wGH3eUCgYEAwczx
-  KNiNqZBwNjLAmDolxbZWlPYHefld2WcrO4AaX8DX1hZgt5YxS5YIyeKgMOYprbYP
-  M5l2C1g9wjbh2vxj9s3BzNQfUd6WuGelcr5CFucPTxhM9bANMDT8Qxb606rtEFVz
-  aaLMp6LHeIfEzRf3pabJkEKTa4hghkvfowOb+OUCgYAQZla0phVYZ9/hu3FjaU2K
-  QjuhFuCaSSMieXbqupYpDk2xkAwdvR8b5hya4kE363vYElzE08W8ZtMiKwbhBZLI
-  WKYkP6dE9w4zJgpIdHWVLXocy4kr7nMrYmWRDZd111RXoMze2I5YgV44Aq8YH6jc
-  /YCBaGxhZaqZMbNL103z5QKBgQCp/iizWXC5gbbL86y4WpjzWkOMGlrohPHrVvG3
-  GWEJCNDKO4rOvnGzCYHgBGfbPKjmdMHU0xGWVeqmRxnJyoWs4ULTdmWanJK8Yj3f
-  7j9uc3McQAaRo8GNvYxhFPEjZdTX9Pxtdp3plYE+mmjoNdPGfAxl+9/v/QoeAsPB
-  69KOeQKBgBGuquBq8thzIzvtfOGJkuPQxMK6Y+2ipDcja1qDfeLl9WN9df/rk2dM
-  V1TrnGZr++oPmZVZ3PnWmlr4YpQYmcSxXM/eE2sUeycCNYd3jQfhn1Sm1vtSXY8z
-  UPGMxfkLsg/uaQg4SEDM6xrNX3+gsEY/yjU+H5oWGw7w07+WFjry
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubelet-airsloop-control-1
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDnjCCAoagAwIBAgIUaJzHd73zdC1WIHy0w3NXmjLJstowDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMEAxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEnMCUGA1UEAxMec3lzdGVtOm5vZGU6YWlyc2xvb3AtY29udHJvbC0x
-  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtZQRoE7wE5xxgLtf4XoM
-  CHH0aWg9OhWmlGlFRtfGDePlcfWWJ05dhatwCxBxHqFcavdt82Bl2tNMI/3yvAs/
-  DhUdj4vN7buUYNIoDDMychEn99JSXxLU/bTsEf5GGXVTkLctbvDicC63K3ijGSd1
-  6o/lgu7Z9zmI+hNhkOdeeHZZNs1fSpXLQniz7OAhpXfjOsmAR2gcsT7ORWPlJb9+
-  yGUtk3+N8EIf9yUKznXAQkYkxJVRpwZvvZlUK+/FWvsh5vPpMJXLb7xTJ7K1mZru
-  yerA/a8cd9Pxcrypu8z7/iXOMcJWa0bb3B+zUoymWnniVRLIPO8KLlm3N91EBiZV
-  2QIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
-  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUUSnb147ZNUESlC/X
-  c6Yya/atCKYwHwYDVR0jBBgwFoAUc3l25WNesqD6hWcsmjAZXC3RgSowIwYDVR0R
-  BBwwGoISYWlyc2xvb3AtY29udHJvbC0xhwQKFkgVMA0GCSqGSIb3DQEBCwUAA4IB
-  AQADrJMk1XmEnUC3VeMUc83YP4MezCoTTM3omqyoMRysi3Ws3Uvk97vxD4lUTvD4
-  1UHhA7+ZsfwqE6AKjsDVpOlAMtSkCu5n70u+y/LnyGHEOhsu2fw58M99pP2rk5T4
-  g07xcl0AwZXyA+xjrkM0v3QEv82OnCIBnk6PzQ5bY9IFHTHlWxtxeew+FbVWEP6k
-  e2n3NW+Sv7DjR8ukLfMjBmNQe+L7Gq8fMb5+kiIjm+MPzUZgTT0ZP9VrbZYwdR4K
-  VGOyupCOX7okcTQf2RKYFx6KRnnB2BbTQcN54bldmCAp0xTmrjlQ3i9OSDfEYCY7
-  uUkpoIfrCbXxj+3t5il2BsyG
+  MIIDiTCCAnGgAwIBAgIUK/04EFv/M4sJ/yLL2i6QZDfoOlgwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDAxMTIyMzU0MDBaFw0yNjAx
+  MDEyMzU0MDBaMEAxFTATBgNVBAoTDHN5c3RlbTpub2RlczEnMCUGA1UEAxMec3lz
+  dGVtOm5vZGU6YWlyc2xvb3AtY29udHJvbC0xMIIBIjANBgkqhkiG9w0BAQEFAAOC
+  AQ8AMIIBCgKCAQEApiCHHpPbrEpNZ9TE6iWA/SpiFCZvgoXpXVHNjf0LjZTAzKuE
+  Wkatj07yvj2+v3aCJQ6AdfN5c1oacWVYUHAy7s6TVtZTxJJMCWnkFCO21j/aHnzG
+  SgForHVJKp4wtDG2niA8buTMQwGkgb75PF2qaiKhJA6eutBg/AbKyG9MRIsRQPAe
+  tVKZO+5hLBdhs8miHsYbtWDcc698RZi/V5AQCzKOuqoFjAc3eV59v6m++W2y2gMi
+  6o5BBsUoRBMWb/3l8NP0+a6j2KfBttLOwcOfDTTFLbsLvUQzEY2UtAJUwIJu2Ryn
+  3sClkdP2kPzZAePJTtkRH0Oe+Zc96t3qHzM6CwIDAQABo4GlMIGiMA4GA1UdDwEB
+  /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
+  BAIwADAdBgNVHQ4EFgQUm23sJkGlGhPHB2Tw4mhHrfzKhr4wHwYDVR0jBBgwFoAU
+  3jTq+A8U4Xyh0DqGgDYkBgPw3YgwIwYDVR0RBBwwGoISYWlyc2xvb3AtY29udHJv
+  bC0xhwQKFkgVMA0GCSqGSIb3DQEBCwUAA4IBAQDTcTSEgK8BYq8ZML6Z3SsJdzlC
+  SsavTkC2EeDcFy4O72mNboWfsqLMQHuCZs17x/uXUScaLjoOJ+BnkvOjScRg9mDk
+  Ny60Wx+IJXxNBqcb4xki1I5KDcjGiPDVfAewBNzRKCQgnoYTtsBvmfVizksCLivn
+  pD8eiuw4LmQ3hpwPWVU30LKiakHXaOfTn2c3+b4YVeY9GXQYZQ0Cq39XRQGMVKnf
+  Wn8qfCAv50gn3v/Ix6F01PKSXG2d5u4rsk5HVZx4ZjDK1+aApja9sZqLR9HVxw7s
+  uD/uE+NMUB0CncNtCT7shqg9S+agC+aeLiraJoQQsu3nzMW3BbMGN9GdL22S
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubelet-airsloop-control-1
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEogIBAAKCAQEApiCHHpPbrEpNZ9TE6iWA/SpiFCZvgoXpXVHNjf0LjZTAzKuE
+  Wkatj07yvj2+v3aCJQ6AdfN5c1oacWVYUHAy7s6TVtZTxJJMCWnkFCO21j/aHnzG
+  SgForHVJKp4wtDG2niA8buTMQwGkgb75PF2qaiKhJA6eutBg/AbKyG9MRIsRQPAe
+  tVKZO+5hLBdhs8miHsYbtWDcc698RZi/V5AQCzKOuqoFjAc3eV59v6m++W2y2gMi
+  6o5BBsUoRBMWb/3l8NP0+a6j2KfBttLOwcOfDTTFLbsLvUQzEY2UtAJUwIJu2Ryn
+  3sClkdP2kPzZAePJTtkRH0Oe+Zc96t3qHzM6CwIDAQABAoIBAFSHBHlYflOh0tTb
+  +/2va3xlTlY2YFKnVGA5OT/f2zsEzzzUoJlWkQT0BKsru5yr7fhw8ogRhGBfHklI
+  abE0BZZg4bMzhpfkYHABwx1ENsm434DXuAT7xojJfJsEtn9ZNDQs7tL188C8Wznx
+  M9u1RPqP+DHihn1DfbV+tztY9hOBZRnSqxeuhr7B+gFqMy2mccWU9mOetRnaD4ay
+  XP1UAFWrym0huSTvPMuM8tT2MvqUbs/hlRLH12RflX49z/L1cQ/91Fwa45kIn9Oo
+  06EpqXkhjQxVtLE5iDgedOANaRjwJza+P6SKGsejM2WosEcQBhVCKnHfQxdJCTSP
+  Y2wEnQECgYEA1hOIJegoUnB4YBwYpU4AJTScAGUFdY0NSVOgb9QgzIRx7BG09cpH
+  qACdfA7ErdRxX6DUwRAkhMPO2j5dmAL+jU+5bemG14ri7kMg12xHn/bsloESg1M8
+  qbERbxyLWcVqf13JyC8IwDTCNVhMNbpK7FMFfbvCMLMACRI1G0/4XUsCgYEAxqkd
+  zeJDwtym7piZeHy+k1jQ+dpKWnHDnUw1DdiUyrzYIGNe/OGqql27iZ9Cor32tctx
+  IoOzdvtfnrmiaDurUAz5ouKmx3+fQ1nVcJIL79WSV3DNUEWvNViiP404qhO6MncP
+  NHs9X/vgrMdIkVkRXohE5Eocr0f0yUsisHlmXkECgYAjgpPn7c2adyuQjbiM2xZt
+  FX/3FMrGCAK3Mhb/1cknA6U+CmXhC4+9T3TQGkcHqqCvwybna30TRMOwMf4mdACz
+  ghD5KW6DnHcuHJZ7BWwQHc563KgsfocmgseojayT1Ipo3C7XdO3XrCi23pGtq9w3
+  vUHA7H82wspztsB2alqBZwKBgEwMcVxfQZFW5pBv2lBFcK73UQhUiCIXasrMYYLr
+  Zgo2QIYlhDdKLAsL1r7YOKoUDl2Jg8WypQDnObOJXKKKNQpv7SBto2q7cDxYJ1zw
+  i6FEIMFYbUBNbMT/KR0q8oYpBx5KdYehpd0YjumVYDJD5mJJyBWcSV7QLOTh3mWw
+  E4ABAoGAJlNRjclouBr/GVQ7XdI7/yK316RzGwzD2zyv7u4JAc2g+9mDSJJaUGeH
+  Nn7vb9Ljai7Pd5HNBdcwi8vqdppUqjxByWw4hfSfRqM8WRZQlOcntY9V4quQv2in
+  XQAmNK4S79v5LYfgVzuwTxGF+a14q1/SRYjzARHoues3Eol9aXE=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_2_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubelet-airsloop-control-2
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubelet-airsloop-control-2
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpgIBAAKCAQEAsf+VNgedp/qsa0/NB/hCQcqdS2L7ZojFCElEvlFK7fcO8cNh
-  t/Gqq47JuGz/DJA5xyfNoSxz/+0pNejAHQsYwoQJqH2pPRVplpAp1a34ufIsJ8DS
-  fM8OHpJrlkLV7vCNh6eI56lwcoWHq6lVLsW/yyLdAnuGvnBwjY5ZA8eI2A7R0aze
-  AjPLFwxTFw+nBgIMc8D807GK0yoe5/AERHxYftjp0IuYNT9VSmi3nCy2eRf4GQVQ
-  u1bAIlNnbug07Nobd66ge6CoRL26HAKJe1YSZmOXtZWq4Tauwehkj5ZZUPhS9KrT
-  wJlVZ26u8zcCKhLqYo2h6OxEbMFjeW9dMhSu1QIDAQABAoIBAQCPJYz4250Vd0ns
-  L0wjSar3QBvJgbvOVNWn+Ux4heXthA+XrFpM1OQ9feKKF9XxY5ejq0X6hUZwnmjS
-  +vBtKvxpikg+IXjWL/8vX5bVSkjKOZD7E13zk4y2V2iAehWUSA559ujp7WEKKIrY
-  KaDgsZWxpsL4eSD+zGwn2z+JA5HwtnnQehfiyXMwBVHZbrxgGlkwTkpNQdNcrmC3
-  C+tYSTGd8nXp3TgCrWeT5oIIbxRBq5SEHOcWqn6GaBgu/EM/ZzKTQLCcpz8/3MuX
-  8dl9rq0bUnEgX3QItpfIq6eHcLWSzZ/tQYe+eAyQrItKRO0sIwRIuANiN3qo4qhM
-  AbZK2JfNAoGBAOfaVUs5TcAlNlGg+NHf6tokmlBYwRPrIhAsyvYtQKAoMUdjz1vC
-  QMmNK3psCDTham2uWIxk+FoqLQEplRlVrJyRE98DKXrPCpaNwXnccOa8CPXzlXMs
-  J67YV8MtdnwaZTjPDemwin7e5QvyWMVHSC3UXSzESuz9O0oIheSwN9/TAoGBAMSJ
-  YTzMQ1XopgMZcI0kJ2dWUWjV+4V4gYomqoFgP9MsiZaev960jN27h3A0KfFltSLw
-  nFz1VAqynaa00y1Uq6IQnkNoy/w0/JtncpfGm2epcWy1RuceyGIG6kAFEFIod+Dy
-  5rwBq/+KFOr1jzfm7ynnDP6XeaElqJH5hreQ3zW3AoGBAJZQpgXMFA1j0tCfVVH0
-  IzXkjytSL3NzeTUVZUyvT/vFsxU+r3wk9430eWC4U6W9Exwi8YOsHpuORnk/dUvk
-  kLE9Ga33Rdg6DPpI00vnUEc3V3PlxVnTIbMozdVbTzrsff2Tt8hvTYsthT/2kfjs
-  2u3jhbj1VkJJdzvrRKtcWA1DAoGBAI9TJE9DIuPWiqJ9/d9f+0BX6XyLeCZosAdA
-  lV1OBJ2KwDfQQ1o0zvmwlV+VGvVI16TIVS9RVV2Lzn5RJiPLuHKyrce49/FP7tuh
-  wCbBFnmtTuMY+8D2aOlb456WUsWnb2zjlrKKgZUUbJbARxZcWhNzxL0xV+jV3q29
-  i6n4g17XAoGBAI45IzAAGkoVX/Lc/k/G7qRniyXidJF0+Z6cIwImxjgfnIYZqXcS
-  d1saX/c/YIeZaj1LvFpjfk+2fMizxKSjOgtUbJ0uGJylpPsFXfm9W8tci4Eyr1lX
-  UaqB7gHSeaCYBiuurBsK/Pb+CkAHmiubWnNqkJ/yn/NdLH+lMlvuhss8
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubelet-airsloop-control-2
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDnjCCAoagAwIBAgIUK7FMQOnx3cHiZ1rsVQoq+qKqFGYwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMEAxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEnMCUGA1UEAxMec3lzdGVtOm5vZGU6YWlyc2xvb3AtY29udHJvbC0y
-  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsf+VNgedp/qsa0/NB/hC
-  QcqdS2L7ZojFCElEvlFK7fcO8cNht/Gqq47JuGz/DJA5xyfNoSxz/+0pNejAHQsY
-  woQJqH2pPRVplpAp1a34ufIsJ8DSfM8OHpJrlkLV7vCNh6eI56lwcoWHq6lVLsW/
-  yyLdAnuGvnBwjY5ZA8eI2A7R0azeAjPLFwxTFw+nBgIMc8D807GK0yoe5/AERHxY
-  ftjp0IuYNT9VSmi3nCy2eRf4GQVQu1bAIlNnbug07Nobd66ge6CoRL26HAKJe1YS
-  ZmOXtZWq4Tauwehkj5ZZUPhS9KrTwJlVZ26u8zcCKhLqYo2h6OxEbMFjeW9dMhSu
-  1QIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
-  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUfqR1G/Yb+PU5xDGr
-  Eg0EYnh1dckwHwYDVR0jBBgwFoAUc3l25WNesqD6hWcsmjAZXC3RgSowIwYDVR0R
-  BBwwGoISYWlyc2xvb3AtY29udHJvbC0yhwQKFxYMMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCPnAGJ0+NqZn3jxR42YV6bkyZkukqGlcBskpUFpTaf3C8OGL9kuWKRkoQlOASx
-  KP+sylWy+u4R25JEr5Oo1jyjYl0DKDMgWWPe/xxHzyABKlsuHXnP+NXdl4penaHg
-  4rom8Tl++sLtNmVAkWYj9g7duOdCK/CGX2hS4n7Mrhyo96oUKsmDsh6F8uyB24Vj
-  E57ikVzBYxBg74S4OjbBXwjP6HhL/iLQKjWISKTccX6rlElIbpa8skCjAauSGJZA
-  Fo9fFqo2PXisXl8Tuz9o0pXJfa0a9yrF1N4YCm3LQ5XR96tfs7qIzho24vEtBTbf
-  On4KwHEy4MYY4HsQ5BNSv1XO
+  MIIDiTCCAnGgAwIBAgIUdY487sxc9qkm+nqLX8cP5XNtUMswDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDAxMTIyMzU0MDBaFw0yNjAx
+  MDEyMzU0MDBaMEAxFTATBgNVBAoTDHN5c3RlbTpub2RlczEnMCUGA1UEAxMec3lz
+  dGVtOm5vZGU6YWlyc2xvb3AtY29udHJvbC0yMIIBIjANBgkqhkiG9w0BAQEFAAOC
+  AQ8AMIIBCgKCAQEA1x7wUCp0tmTCwsBRV7mKlLoDII/79p1IG+c5VEToUNh1Z9Rm
+  RkI2Ea2RD8K7NlhicqkWUnlWmIqUg6d/T8cnrzS/e/87YIXr2nUudQ9gmbvvJT5H
+  aqaXaOrikEMn2p4aBMThwMYCNt9X0uTS9cVpHETVCKKziKPgHr/iAL2K7iN7+pCH
+  kvGr1jNb13Go8W8jeIM0WmYq/g8+0eLhPM91dqmYPIyRebp1T5gGPuVQqcE+E/2M
+  /b3Bp49Y4Bc9rMWn6v4J2+781UvxbQlIOYWx5cioNRAVEVn//juUzYYjOcdG8laq
+  2y0+7m88IiT8/iYBzGFVewSZzEa7npJxY8vk0wIDAQABo4GlMIGiMA4GA1UdDwEB
+  /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
+  BAIwADAdBgNVHQ4EFgQU6yG5VoLDTQYHAqfNOEQkbsroyM8wHwYDVR0jBBgwFoAU
+  3jTq+A8U4Xyh0DqGgDYkBgPw3YgwIwYDVR0RBBwwGoISYWlyc2xvb3AtY29udHJv
+  bC0yhwQKFxYMMA0GCSqGSIb3DQEBCwUAA4IBAQAQcJUZjQ+/rmSV4OBz5HvOZa+q
+  O0QxVu15BZyY1qGiKX5OVH8mneDZYZ97gBBA0kQpY7Pdzv8FRrKBhBeGWWVtJNwo
+  TJffU+Hm618f0tsVr7lXqGhnxDIPM47v2P2PDAC7WhqTSzTx/1p9kNWsHFVO+hD2
+  lOCn4EuqPRfmYVaXroLc83CARqswZpl1YJbogY4Ca2JoXdGcVkiXEAnfnmAyWoms
+  aPGqCHUdlhZAzpJuN3uh79h+jJfGIrT4zrdX6GSzTFdZoW8dvKmjfGhCSEkfG8Wk
+  EgvbqTyJTfgI3E79utRbjdrwAqnYCfe1gqbmUgn80IlXEO04MYXphzK+QWvL
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubelet-airsloop-control-2
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpQIBAAKCAQEA1x7wUCp0tmTCwsBRV7mKlLoDII/79p1IG+c5VEToUNh1Z9Rm
+  RkI2Ea2RD8K7NlhicqkWUnlWmIqUg6d/T8cnrzS/e/87YIXr2nUudQ9gmbvvJT5H
+  aqaXaOrikEMn2p4aBMThwMYCNt9X0uTS9cVpHETVCKKziKPgHr/iAL2K7iN7+pCH
+  kvGr1jNb13Go8W8jeIM0WmYq/g8+0eLhPM91dqmYPIyRebp1T5gGPuVQqcE+E/2M
+  /b3Bp49Y4Bc9rMWn6v4J2+781UvxbQlIOYWx5cioNRAVEVn//juUzYYjOcdG8laq
+  2y0+7m88IiT8/iYBzGFVewSZzEa7npJxY8vk0wIDAQABAoIBAQCSqL0dalR3pOpC
+  6+qI7C3Wh5pqML+OulvW6iTjlrbrpycjymKPs8Q4+SPUouYPfuJfWXemcqLfDFuE
+  BkV9lkEv6b5CQxewDp1lKk6p7/nj1YSM15DI3RqMpNYhlCcvnGoQpkliq5wG3O17
+  EhXhCN1IMIUshf/wQAkj7Z2e85osDzShk/n/ck7X96q9x2JHKDiADvhKVTI4VZcA
+  iDqKw7/L77A3QIB9rhds7+Dm7vqwVvio0KtLlQ+gi1azShHUj8EDyJoEdsnHpAd2
+  GuduIkQlfjJcvKcsu9mSUqP8jOrSoNrnhebp8xBiBhXg7YM+0WLrAmsFQ6ROefK/
+  zbFZXndBAoGBAN6adqzSEidFDeHkuZiS/camRluyJeWqiJQ2TUcLxK3wT6mDoBph
+  aEX03SDz8jElDdculrFNdRPbimMrrzf59K2I2IEzDQfTpQIoDVbMd0qhkNvgRk4l
+  6kNvG1ybgaUDcKQzNM9zepv1Lv752cOos36ZKSl6B6nmaItBXghFI19fAoGBAPdl
+  GAAjCAwvkVx9UW8200XDey7HEWY0ogjzgRh0naBtdvgrvc33dseP2/TiWaa92Z/T
+  s3lju+UXFV+wF96nNeEbXWv7hbJ1xRm/ifXdwoestonZxGRFNsVTDh+hoCjGSqP7
+  Z0NpBAemBQSZoSUAzjj29X2BBMQoP/+JnkmilBMNAoGBALsLV4THz3En2Q5ivoCx
+  ooP021HZU3az4KeJKU31WYI+VvG9JB6GkrOVmOlDkdIxrHuPLhg1WZch9hp2bni+
+  kxXt0t5dIynccN5rASpaDDKtp6bZwLmRqlKXXYpnMHyTc2bFkC5wfinlz2N4Vb7O
+  VmSeFbRAUYg1jsrUVkrkrWBJAoGBAOeT/zJpmGfnwxcjy63iUURVpyJzf4r/q8nb
+  PrXIu6Bnt1y5fVOm2M4XkNsbYrZdsrAUuETiIglhYUWQDdgDB8FvHzUsXcteyKDA
+  lgDLlAPynXBOo7MEwy9U/ryHS+e/LjFv7QrB697I/pt+v8Rmi6PxMH1J309LKhUn
+  Gj9ta1SlAoGAP5OfByXpUl84m+PTC3xrQ7CKC/bKVj6M+CcX++RWyGOcY4cqWCjH
+  YACNM8IHmz29+YkUobzfup5Ye5GZbt/nN1h1cumRR7CAxx0Ex/yJgESdVrNIRaex
+  vmhf2p4uEANvLXLosYb1+INFueJcLNXP4YP0IjjWW2yCdA+LisfbY8Q=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_3_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubelet-airsloop-control-3
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubelet-airsloop-control-3
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEA4+cnHnaDpcMT5Xpfb2QP1JnlJP3Qzin/sGg/vS8kZvpK0IG0
-  yy5u4P1D0FP0DdHYfJQiYxA3wffNHwCMv9I7PGbpcudurLKg9X7BNaN1Y8qbkErj
-  G5XTYxgn9nQs2ibGOyThGCAxBsyx7ObhanQGso73U1bDDFeHK4LHDAxLqCd5iT4s
-  VjD1FGy6hoXplYd8VIHeWUOaA1Oj+W0R1mggleexDySlehy4C2R4qJJIHJyRx6/6
-  4Dt5Z0De7YK47Ka4jj0N/QpXTGKcpa6ne2Mjb0jmGIgXri2i1605mDOHOtKl+IMX
-  KO7jeuj5R/kwm7SxByoVqkIz8Q4d1fRn0qBEBwIDAQABAoIBAQCXUZE9vr7mPsJl
-  KX1YPn3sUUo953DOkkA85tr7R+PJpAIssxJRncDtDfwKxNNUobI19T1nvQrodRny
-  rbDGZFYEYug57MQlUm1g0wqCDMgSvCHSCocEd9RlBVLzZmupZPlVp8T0+drTgvHY
-  M+wTfHo98ILzCLZ06WDMWQbETx2kxWAt2pCwKfCypgZw9RQwBXxzkZBYaBpje65z
-  FQJsftACk/o1INW/y9lC1tPag43wCP1fi1LgY2Oor09vFjVJAsT/1Hf/Y8wJQGg9
-  RXwX5JiPIBvjCQ2s4sAp067WqOnLNHZfPy4dA8B7ryq/JPZt/lYNDmAiV+y0JpRI
-  2pLdCUMxAoGBAPbjaCxQCQrY4oMUkx0Yb+y+MqKaO24Wkpufk2TEluURbL7rsIX2
-  Ed2hlpJY8vTXET61UkVUC85oKl2z82Kx9nwqpp81tXaBmhos19usQFJeqB1b7lIP
-  WxtmW+03k9NN45Z8lonc4KaJPY1dO4/KJynHmu1hUFfyxG5wbvguXtCdAoGBAOxQ
-  X2p1PPW5jZNJi7ILEQQaVuHK9djDSgE9V/qNxK/FvIPVnPt+zwno8F70fuIC6vb2
-  N4ZjzXdFbt6EiXydmInX3Ziz8R1h7k5cYL+QZNW53vmYdfN5YSF76H3jXGiVxHIB
-  WFXUWIWXt9UeLE4GahmB3ylQ7wqBUmbEMCTGV4vzAoGACZhO7SHzKAPD0dpT2Vag
-  yu+dYipiUuX3rqql/M2TG7Xwpv7b7mjgyt9Dzc49KvzMw8YiO2WHy+7KbrfWpqhJ
-  7wttTFS3B7MDvS6u+O+Z1FmvaOywt2m3Xbo9qlt1mEm3pZqT8ymtZWuCA+NytCTk
-  HsCOKdmVWMWrkqs19NlAgBUCgYEA1cydlvZ88aAv64rFnY6PlZOy+VOj+7or0VVL
-  rL7orVKMDQaNoagH7uJV3sL7rMWRCWCXubm/4eHqvd1RenIm2Md5kDd0tO2uKi0/
-  xvD/mbIxfsYmKOKvMxkkrgiuyVx+v9phrj2Q3UT3qBRFZ048Xdl3Kq0zp+B6yclD
-  +XGNMWsCgYByiCaimY4qOhYfGXX6sYn3xeJlsPmoaGeO5algEeHexWuJ513sllac
-  v7Z6gx6u6slfN71dPzFSaqsqajtP6VNiWvfwbc7P+MazfsD5tpQHy/i7NdlEoW21
-  A+NjYoD9IqosA6eLaDYGzeNuSrRNIKAGZaHPwSgEC/1eLso5kKc5YQ==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubelet-airsloop-control-3
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDnjCCAoagAwIBAgIUBxpzMaIMFfszGpS3ELF80hnPId0wDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMEAxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEnMCUGA1UEAxMec3lzdGVtOm5vZGU6YWlyc2xvb3AtY29udHJvbC0z
-  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4+cnHnaDpcMT5Xpfb2QP
-  1JnlJP3Qzin/sGg/vS8kZvpK0IG0yy5u4P1D0FP0DdHYfJQiYxA3wffNHwCMv9I7
-  PGbpcudurLKg9X7BNaN1Y8qbkErjG5XTYxgn9nQs2ibGOyThGCAxBsyx7ObhanQG
-  so73U1bDDFeHK4LHDAxLqCd5iT4sVjD1FGy6hoXplYd8VIHeWUOaA1Oj+W0R1mgg
-  leexDySlehy4C2R4qJJIHJyRx6/64Dt5Z0De7YK47Ka4jj0N/QpXTGKcpa6ne2Mj
-  b0jmGIgXri2i1605mDOHOtKl+IMXKO7jeuj5R/kwm7SxByoVqkIz8Q4d1fRn0qBE
-  BwIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
-  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU5oUgeVAKf39N6+dE
-  3bXePWsHjy8wHwYDVR0jBBgwFoAUc3l25WNesqD6hWcsmjAZXC3RgSowIwYDVR0R
-  BBwwGoISYWlyc2xvb3AtY29udHJvbC0zhwQKFxYNMA0GCSqGSIb3DQEBCwUAA4IB
-  AQAM89QanPR1HUbROKbf3yo2B+PqTtk4xwnsWTFowW4h/phaAaDubOWqEtkwt1VA
-  +DEiGwwrlvT1mm0D8mJ4UZL8SnPI09eTaqVZUnjUvkRia61oZQtAoNyZ2TmvFPUP
-  5K9s8f2DIGNXkvWJuprIon+DHuGvWfQacMVuaQknIvmbv4Ad/5XpfnqKMajHekG+
-  0B5QsK8OUoIGt4PRYkNqabBHo0KrHgzxH1yXLrBa4On7TNX5dZ9toDV/LdBwn1Zj
-  eujeuIUX3+nRNaC3FrBJjUfCNfpzWjWM9qaPcqDTDWQH9ZF0yOU4nDKuCfbe+A85
-  NZWCsdNl0N3rJjNs74sAfuFN
+  MIIDiTCCAnGgAwIBAgIUYsw+lwurdlkS1ZxrvypmuCKiESgwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDAxMTIyMzU0MDBaFw0yNjAx
+  MDEyMzU0MDBaMEAxFTATBgNVBAoTDHN5c3RlbTpub2RlczEnMCUGA1UEAxMec3lz
+  dGVtOm5vZGU6YWlyc2xvb3AtY29udHJvbC0zMIIBIjANBgkqhkiG9w0BAQEFAAOC
+  AQ8AMIIBCgKCAQEAxcXbfIMnzBYRvkCtxJ4TMxgsvnp0xrxFbSvtxlntmbE+0RE7
+  lrSMJYAZp6cv6PvgQTWcmK0ypn6ay1X5Z7MHALsO66atge+6hBmtl3wRl7RpyPCG
+  c9HndTN8+Q5TYDi6w7BL45Crl9azJRq63jTbINEVXqAFbvc/u5uNSjoqhM30oHT4
+  ZVGLGCKS9+0GLuJcVK81JsET2/3JRy2XEd5dgqfwoz3rHHcBVJYUF/FzHkb0wNR5
+  UDPnA0Z9lM9UZy80hVWko98O8+EBkOsLRt+XHlq20Yx8x0orziHwKBXEbFFDzI71
+  5Yi6HjOHDbizEHHbHk0IZDvVIHn009OVT1GYbQIDAQABo4GlMIGiMA4GA1UdDwEB
+  /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
+  BAIwADAdBgNVHQ4EFgQUrO2NlE/cb339I2NVOxBvsroOpvwwHwYDVR0jBBgwFoAU
+  3jTq+A8U4Xyh0DqGgDYkBgPw3YgwIwYDVR0RBBwwGoISYWlyc2xvb3AtY29udHJv
+  bC0zhwQKFxYNMA0GCSqGSIb3DQEBCwUAA4IBAQCIeO4lZKufkR00SHrDQPRf76Q5
+  c9QLUzM8BT1j5ujGmTISpzzos5BOqaR3tI0YSnx4cU05xW1ExrfINIJt3glyKxRB
+  r79PQCdeKe9aQNqv1ed/Yj/xG4qtWGzmyqBxT45YSXk/YHi0zDVCcznSoeo/HIYn
+  jyd+gdrMRu4tN+XwWEXW6NRHbZBasKPFvkNcPin9QyiQDaOarspENMShJKYHXRbs
+  aeItR3vRgfNdzgudJoLEni0c27zWGS7bthGYR3NReHq2t37ncWbFraCl0jZ6QcMG
+  96nJ1a8TFSIJqoUz36ip9Yn+Fu+aSVHLAjzK6BltgkpseE29yg237ZdrJrBM
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubelet-airsloop-control-3
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAxcXbfIMnzBYRvkCtxJ4TMxgsvnp0xrxFbSvtxlntmbE+0RE7
+  lrSMJYAZp6cv6PvgQTWcmK0ypn6ay1X5Z7MHALsO66atge+6hBmtl3wRl7RpyPCG
+  c9HndTN8+Q5TYDi6w7BL45Crl9azJRq63jTbINEVXqAFbvc/u5uNSjoqhM30oHT4
+  ZVGLGCKS9+0GLuJcVK81JsET2/3JRy2XEd5dgqfwoz3rHHcBVJYUF/FzHkb0wNR5
+  UDPnA0Z9lM9UZy80hVWko98O8+EBkOsLRt+XHlq20Yx8x0orziHwKBXEbFFDzI71
+  5Yi6HjOHDbizEHHbHk0IZDvVIHn009OVT1GYbQIDAQABAoIBAQCkB1Th8RmJz+gJ
+  ZjV49C4yW2OI26GMzsu6HwwHTcCdjv7tgSBt/vKZi6Q7g5Nd5cF59BAcJNH0et7B
+  tF21Xyt4tKxMUCJpuT11oKJ0GGey7eQqzyqEVtxkPT7yhaorDQIBmW9nny5iMaTF
+  KmVANJBlqGPT5l57ST+nxvypSpLHL2Dr/wdjJ2HjDWBUrkt4Ur0ZuqvVOnkk143A
+  5I5nwBQ9MICPMmjAnamf4WCo58szvdY3Nwdhm+QE5jlIwQDGWtTXSEXCl1iRQAnO
+  qOKlAq5872M3SsGiNRNZCW88AswSMwX/oX6M22SXRvq3xRYk10XB8ce/fQxII9wq
+  KLdd0BEhAoGBAN/TK55Gr5Nf+o2IltdPft7jUQvO19dXu7s+xuCNWxoHxusop0wm
+  VHL7yF87FksqJve5pYxoBMNCqVMvICIpGrup5w2cyyMSUF5Z43drrHtPoWOPTpIz
+  Yc24ne5Qk72D6M87j6En3mI6BRwU1H/oUis+ep/qhLDgqZFjS8MPGhg5AoGBAOIz
+  9vKsWKZ83k+3no/wL/tcfFk5NhfwYvRbkw8PXTkHGYfPK+IrfXe/L0f4p+AggUh/
+  T0wxNAjtLnFMXjHrqSPZjpVRkmbZwg6XBC4tZdqosWvoEsLO/kPvUM+FPMO8rC5X
+  LFFmZe+3oPu1qQWZcZxcVO+0v6wOClh0zr5NbPnVAoGAeoZ7BjXjv2V3Hyt6h3s5
+  FIKTx0b/2R5p4mLHM/2ttV40gl7K1mDVMeyrD5ak6Zi1pD64ZVg74zgGwUa27Hxb
+  6gdkOItwmE5aOIw0fRcwYICC9KFqfZYrIBbEPcVWWxRuyaLtSWct0c+5JFoyyaI/
+  +PRG5GvZH4qcyL32p10JB+ECgYAK28e8+nz+8PuTBBN+gV8sR9JITjDEkWuOo165
+  2Fj3Rdn55P4MS14og2r3n34fii/qlQHvfGUtEIWsNqhG6TMjX2wyysmmWkmwfZtb
+  xB4hkvuBXJCZ/WnDRRex/oleNA5n4xNjjPDTwxLdQmkstaL4iI4jO5//2GSyvli2
+  Ve0nSQKBgQDMCbsjVP2G1SG1BG6cfAGpo315vAod9u7EI4Hv/1vvkeMApl4uocHK
+  gNDRpK9PQmIPsQa1r7RPPFiwAwee22N3PsZqppjAUzjMWDer5ltlLgmzJamZ0/9p
+  QgwHfXc+KYD0C2uaVHAVy0bZlshpC4FYwQsp7EccweR1MqRaunk7Mw==
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubelet-genesis
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubelet-genesis
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEogIBAAKCAQEAuk/JQyT8Z5vpQoJ5V/LAElZWh130yvDaaH5+PTxoL4D2Z/ax
-  4//KsRnUO/RyKZQ6EYIzZZNMch/idNJ3m33q65RNMsyK1RCXj9b4tTYKYTSsgPNO
-  82ud1XOw1/PjYgiMU8MNRNTG1QlBSSJPByUvyoqvLqNbftXKL54V++3HTaTYNswN
-  9+bWzXMPch4d/Zfj3/MkZK0kmqAIvNzYmE8BcH+rmOBWkDjTBxBF19bJ9IiuwhU8
-  Ri4lXBw6/rtnGTsx9mqVA72EPaMYlHaSB2E1Ktx4M3PF/lXne70++JMuxXEcMkml
-  91jAuial3lV8CBls+yHxrKM83Fwxejg/xMgIlwIDAQABAoIBACdNZ3aLmdc9c5J9
-  NZ3Q7qWvoudBcb9R2bELZhQC5zOGL/S0fMhNEHQVr8jKAz80Lp+86Jy32vuEMGBW
-  ebbKdEEn8rURowPZUS+duK95a+0fkHhPW0tMW2pI0nhr0X6/sOKGlgj8HcmY/zWv
-  UB6AwLkoUlYzTbzO2qz620Ze3ZlKHVTHZzcH/WtFZDJuQId4K1b+ku9k8dLxwauZ
-  fxit/SaavXjEGvqVIZO7uWJV5tWiq73/cLn1BCUceTA7SDFW2G+ETJ/HvEjFvqlj
-  aEeQIAIL4p2x6Xwu2o7f1wwgJV09NwFt5PbAFUGUvUYrHZXbhoCwggV9xKWCkko7
-  0UxM9SECgYEAxQOr0e+VLk9ajGsBkYhQPrcqfL9XLvMMwAN1nryVuhFgjL8pa5b+
-  O7zqPQFXSyzSQ8CbCsaRxbPPUMHQ+XxpMWCci41z8tY1IhXIINSbmcGRD/znP34m
-  0s26HoJAplblf2S/e/A3Vf6YADhmOrlNYDSKU55/sz/cMcb1saTj5DECgYEA8hfM
-  qqVle1MHPsIbspcUTPDAnqWnHciLLkGvw3ALdg+XoP+SS60Q0DIIm8oDHLjChW+Y
-  eVs1+MYLzZQtsXdu9UO0XppCdMkbbHvdkxXXMBUizh7ywWIyxT7+jfR1NOALgZIZ
-  9hf/sm/4XUQoG38IQteJB/31bV4TFaDQm++q70cCgYAuemg9lbzm+PeOquvqznLH
-  6ORQG7/Qpqw6XFaSRUE5bUIO0kZOSIffxfiovbk/Veqg6z5oc2IOdxYQojjPsscK
-  TBWCYrOY9WoBiYv2GtI+msjDMdHIS9WS48/lxKrF0zg/LqBx98DGO9LWMngDoJWd
-  faeohHrx6b3jzGFIMHNG8QKBgFei3ef4L6BREhJZ2gTwQ90GWfQUK0bQzfFUvfeV
-  m9CFHHKfkanrYGa9dfhPTIkdKO181Ek6B3Oi3arxtQjFH1mRxL1qQhxcoJzIyhDw
-  mxFA1XSgJ2hxz8cvYp6om7UkVYX2CYfYcCt79QBuJ8asWaU4uNY3zJxmranqqRmJ
-  zOsJAoGAOQcHLV4a16hYf5aRwrvDHiJLroJpNv25WT1CN8Mg21+bRGOyq4Bamjsf
-  uBbyFdmcgwL3R97TEFrtEaLgw6GJhCGc7j9PuJHb2WIdcbpElzhR9nSwnzhz1/PA
-  YoDq7KFrR6BVcPFemdyGcWei/u7Wyrs3m84qVNX0wZ5qVkSzr2Y=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubelet-genesis
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDnjCCAoagAwIBAgIUKGE6HYNxjOFWMzpGQ9+93YFYnmswDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMEAxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEnMCUGA1UEAxMec3lzdGVtOm5vZGU6YWlyc2xvb3AtY29udHJvbC0x
-  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuk/JQyT8Z5vpQoJ5V/LA
-  ElZWh130yvDaaH5+PTxoL4D2Z/ax4//KsRnUO/RyKZQ6EYIzZZNMch/idNJ3m33q
-  65RNMsyK1RCXj9b4tTYKYTSsgPNO82ud1XOw1/PjYgiMU8MNRNTG1QlBSSJPByUv
-  yoqvLqNbftXKL54V++3HTaTYNswN9+bWzXMPch4d/Zfj3/MkZK0kmqAIvNzYmE8B
-  cH+rmOBWkDjTBxBF19bJ9IiuwhU8Ri4lXBw6/rtnGTsx9mqVA72EPaMYlHaSB2E1
-  Ktx4M3PF/lXne70++JMuxXEcMkml91jAuial3lV8CBls+yHxrKM83Fwxejg/xMgI
-  lwIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
-  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUYvaJ3bXp9Kr3weea
-  ecOdLFtK0WswHwYDVR0jBBgwFoAUc3l25WNesqD6hWcsmjAZXC3RgSowIwYDVR0R
-  BBwwGoISYWlyc2xvb3AtY29udHJvbC0xhwQKFkgVMA0GCSqGSIb3DQEBCwUAA4IB
-  AQAwmp8dfaQIA466kQuTl/7Qkf2Ya6QV5D5zR+Py74jVyjSvKGy8vu1chCCgmivu
-  3jCNiOig2zsrcHuGDLFNAtisIJtbjS/Zx8tA1zT7sByRDxXGlMoG1bUuoPJYilln
-  XJfmsW72SSPrj30g7b9b/IfqPl3pby1UvvrQhUN3l1V84GfczjGksGwnq9h9uh/X
-  BIjnZsWLHIN0jE22mQAuT0N3h7A+hv+U1bPK1KVtCURcAm3hWnE/Q38XTcIAJTiT
-  VxecoJRSdK4O7Nfn/1SOxg4UR3obSNkbRdX/nmy+UOjATJWHFrTLpa0xIVe1W96N
-  iGeyxCDUxgz7MXePy8nJ2XWl
+  MIIDiTCCAnGgAwIBAgIUaC3qd3aFokWyqdk6ETMMhW9oRcUwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDAxMTIyMzU0MDBaFw0yNjAx
+  MDEyMzU0MDBaMEAxFTATBgNVBAoTDHN5c3RlbTpub2RlczEnMCUGA1UEAxMec3lz
+  dGVtOm5vZGU6YWlyc2xvb3AtY29udHJvbC0xMIIBIjANBgkqhkiG9w0BAQEFAAOC
+  AQ8AMIIBCgKCAQEAwkGgNND/5Vi53e8zJJH3xeh/dmDuH38OiT7jwEczuos/rvSb
+  w/+jQjJ+SrdMYPuPlgeXcjCot2+amOiIge0tAWRNnVIqi4sW6DO2bwtdGVvoyMqW
+  2CrcsvrD949PT7f2MUGtU+6KVfVSdaxNW/aKgaF2zRtOT+ci1YYSawwyTIrCg7PW
+  qvd35HmeeDr9wNp0l2ENCwnMhRz1cal13POcGBko3VSfxMhUqam72zXmlxl1S6YB
+  TzfrhrkBHZnbNOQV+zwC2MN2/obpUP0TsSyOCLgNBOt4rsaJFSn/g0qdUvvuMies
+  IQyAF8bHBSc+sfK5d99cUQsWLGt7bNWic7BxMQIDAQABo4GlMIGiMA4GA1UdDwEB
+  /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
+  BAIwADAdBgNVHQ4EFgQUGTcvXHzkKaDXRHrltaIUTGHWG2wwHwYDVR0jBBgwFoAU
+  3jTq+A8U4Xyh0DqGgDYkBgPw3YgwIwYDVR0RBBwwGoISYWlyc2xvb3AtY29udHJv
+  bC0xhwQKFkgVMA0GCSqGSIb3DQEBCwUAA4IBAQCPdF9VhyQizjUW+AaTV2d5ShQN
+  7pS/IacevvyN6AjrzbLRYJnSnvFAqJMcPi4kRfBb/LrXv5ia5KW5dD7zcD3XQuKn
+  AFFAVt5SYH/S5jA+0cAyxCyjGoaRrqErtiW5ZB+edTGvKUC80DrTdwxMnjihmofw
+  +7jUvZ96U5WYIsJ+npaMvLMtG4ky5Gx6VukSJ5bKUUURylff0gYFtkX/cQJl1+0a
+  B9372B9KAnx8hx0cWrhW5KaMIKhu3KkzQNhbk4dMEfovpIYPbXyW/Tx01Wj+g3b4
+  FOTVA/l7XPeWF2lnY2J+0C28Vn9zq7XfBtxFAeodJLxlQQBsN4Nshe0HCwGb
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubelet-genesis
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpQIBAAKCAQEAwkGgNND/5Vi53e8zJJH3xeh/dmDuH38OiT7jwEczuos/rvSb
+  w/+jQjJ+SrdMYPuPlgeXcjCot2+amOiIge0tAWRNnVIqi4sW6DO2bwtdGVvoyMqW
+  2CrcsvrD949PT7f2MUGtU+6KVfVSdaxNW/aKgaF2zRtOT+ci1YYSawwyTIrCg7PW
+  qvd35HmeeDr9wNp0l2ENCwnMhRz1cal13POcGBko3VSfxMhUqam72zXmlxl1S6YB
+  TzfrhrkBHZnbNOQV+zwC2MN2/obpUP0TsSyOCLgNBOt4rsaJFSn/g0qdUvvuMies
+  IQyAF8bHBSc+sfK5d99cUQsWLGt7bNWic7BxMQIDAQABAoIBAQCOAjfCJL/NxA0s
+  p381ztfZgFweCEJMGDBiOO16VRMF3mJR3lQ49ps8+3jD2jgl9gFD5ozaV6QfZaEZ
+  A3U3tlFeYRs0VSrxFF9MpPFLQH1w2nXUw/V+Vec9mIDGa6fJWWzLGX5Ci3Hp4QvF
+  Jo7vGc6rcYRN8RZQ52HZwseYJjRnKwpaNNd6kgPnxmZbWUEdQLUCHcjj2WlhLc4c
+  DJJMmAS+hCIoUF4AgCZHsDdAhwJu2TfjhGbL64ABxDS/dsA34tn615WiAjXPgHUh
+  Tkk9bXxGJWr4czwWGF71iEUgvXHJUk6Qgz/XgN7MJ+rx6F9PqcypwASUef7jhzvK
+  WZcVBZbZAoGBAM1Q20wNRV4yURETAfB4Mj5BgV+/VNqIl+crlryOtfQyI7n0lXBX
+  F8F9wQsKKBFjVA4CXeOtsSy8yRl3FcTJTJ9uWiFcfAIG5uXIzckfy9XoAiV0FtPM
+  iMLAl0A3Y+5Q0DvgZwWtIOYQvKFOSZbMl4EraO5kn2IweLeKzebTVs9PAoGBAPI1
+  2mcTPdDYhaS8i8ZzGwocBboW9KRjGFf9y5oa24NALo+N/hXkr3WUtfdw6kBsNZ7f
+  40uzGrl1xzfFO3Olzp4tolMOJI4anKTkS+sFA8dQx/AP+CG6uukQCyPf1YdV2NqV
+  HKD3bVYuzREh9gEbvCr/Ay6lGDYTcp0lVqANKJd/AoGALmtGeWZStZ5Ip8SVXqm+
+  KkcjGeOnKpVRSqmXNeBKEQC5BRTgKHr4Wv20hGtybaP4YAZ29b/SW9v+12wOFuSw
+  Fyea5woC2252C6OfqwYuTplayt75Pj9y+B0U1Sbwx/OrcK4mfKkM1BcanpmVl6t/
+  4WtQGP3U7x0oXc7bCIHlkY8CgYEAr2fKq9zmZml3l06oFuZjDZYvm41mS+orxgVZ
+  Plf24n1HetTEzkwXuRoiEXknW9JBnrXa4IZrcyXVSRE/tce88xZvOKDEXljtWgiu
+  5htymhRpRvP5qUuWcpQYzTkbZPAJpHpaCkRFXSV1gtPKWREh2y1ku5H6D6dT2HQi
+  4LPG0rcCgYEAyQHPKW1iWC9s945oTzuMlriQkBqN78vLuo2L2MepzZeisWtF/IBC
+  a1Kyd2E4r1eldw+tYQQoo5QQ8tJhLhwCNf/o0yKaxrkDNIzDNbyWUKp2vFxNpx9Y
+  CWrV8VI2DwJw7wjTG/+FJogymUknt7Sjljt+29qKes2TiIvM52JvAlQ=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/certificates/kubernetes_scheduler_certificate.yaml

@@ -1,69 +1,69 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: scheduler
   layeringDefinition:
     abstract: false
     layer: site
-  name: scheduler
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpQIBAAKCAQEAxFBUIGmJN84P4K6YUDx8z9o2ZMTvHOH681dObiFyWSlxUC57
-  CmPKrfyzXyu9xNJZq4lh3H1hFxDvKqHEd2niNOQ4u/RAOqRAaKkVezNM1xjrEJ16
-  MFwZ5/cmJrq3yKaahcujyd+eyg3zuzzR5hIUkl2sj8dbWgLa8vqWJcpXe+ajarDy
-  scbzk6ijoauL5jTGc6/UmduEp9wglRPbpX+OIJwWU5NSnQZs5hZAP9ZiEewgE/g+
-  THKLQHCl6sC0MIGnV0PXb3hcVtz1c7Wup2boswg0/TrlR/NcfMMTOqcwCimI8DXN
-  8+spMJFKOLRSMYRvOneupd0dPP6a9QfrguBjswIDAQABAoIBAEEY8gydcmcS6ajz
-  vIY+yJSUI51ewHuvY+v1c4iJhsWSPIT+JMbZOIhhV4mjk5YEur9rGwxmdx+S+fwF
-  EIUYk24+j6Gj6PiJJuKNzxW/eSeKl8g2sCIBKIYHKpuFJxReSrc7Q+DZSmpuHfhk
-  vqWwMSon7eTvkpdSgxA3kDqP0lq/F3jrTr3sV4BQR3lG7j5KCwD5gnRgiyp04VI4
-  yh2gqNn8ExyeNdF5MD75m9qNg73Xc3R5iZsyTx8sW+STcv/5L7iVisdqYGpAuujD
-  vGESgF4Xnftb4r//jvRAl6qS7drqH50K7A5Y9X4OQPYE5F791FX1d/sTq5IuXqr+
-  ymjalAECgYEA1sE52nqris4TfEtDnwNztcG8gHyhWAuvpxenAFkPtIROmLQi/VX9
-  zVPDhTk9kNaPcF0ooYIkcqY0YBJM4jvQs40dHvEE8dg9UU9Uu0NhZwTudoGZVi8u
-  x/FVZ2F/hBbZMbJNicaLgJIXWI+R0nyhC98XtfXK+2TC7ACJ3ltJioECgYEA6gRr
-  jee4uW6+etyrB3Je8oDMgkTd01SZRqib4LxoPA8fNNy5w35dFpfolZBbrSVd5W5g
-  buMjVNnOQolAmzW2wGiZXqxI0m7HKSSJOXKkSDwGSGnkZYnr7/VnyEVnp6QPJRHG
-  C24ytWZoPRiA2dj0sFpFFyrqVQqs2raDW/1bzDMCgYEArbw2bIzPGIUs+GH/O7ZU
-  NtecAypQcOVLXldhMIPck8Jxv1ID+IVHxYOdarrrFrCt7E5BX5/kkqfpOUu0zVVs
-  usVPqMd9o5W3zX7rYm/ZbblsnYytGy8innicCf2zZo4BehXwaqSoGQSXRHspkmpm
-  8y6xhPBrHUPf+YNaBfw+G4ECgYEAuj2MT2I0LDeLloIaBxIpqDuDBsXB+JciaQ51
-  B9VJ60ppnotvt7rQYNPCwY0iuNi9MoO2cWmJS9UPhvpulVeZOuXD8YmRZw/Mptyx
-  7StkvSwwH99OatTqFY2r68H4rX0upGTRxXUNHDsFCGKA4V791X/x7m80ETwutt18
-  C3DGZusCgYEAsZmAN91yIPyeJBfnw1R2AFUuq8PTDB6Y2jU18SdJ5iuCmb1O/+K9
-  9lWPOZEoC8k6l3lB9DAWDjFc71x20ScF7zNcCl7s+ImYIXuB3e8NPwlaZV0gnSWY
-  lQStHXOqRlqPHnDIeFG+AXIrVK3uQjaACp7ybLTk65SBAVkjrbiGPNc=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: scheduler
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDVzCCAj+gAwIBAgIUHf9PDR4wwjZ3MMLiV1M57e+kUAcwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMCAxHjAcBgNVBAMTFXN5c3Rl
-  bTprdWJlLXNjaGVkdWxlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-  AMRQVCBpiTfOD+CumFA8fM/aNmTE7xzh+vNXTm4hclkpcVAuewpjyq38s18rvcTS
-  WauJYdx9YRcQ7yqhxHdp4jTkOLv0QDqkQGipFXszTNcY6xCdejBcGef3Jia6t8im
-  moXLo8nfnsoN87s80eYSFJJdrI/HW1oC2vL6liXKV3vmo2qw8rHG85Ooo6Gri+Y0
-  xnOv1JnbhKfcIJUT26V/jiCcFlOTUp0GbOYWQD/WYhHsIBP4Pkxyi0BwperAtDCB
-  p1dD1294XFbc9XO1rqdm6LMINP065UfzXHzDEzqnMAopiPA1zfPrKTCRSji0UjGE
-  bzp3rqXdHTz+mvUH64LgY7MCAwEAAaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
-  JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQW
-  BBRNtAWJiI9VwvzHmR8YhVAiKkDUGTAfBgNVHSMEGDAWgBRzeXblY16yoPqFZyya
-  MBlcLdGBKjANBgkqhkiG9w0BAQsFAAOCAQEATo5SWCjE91hGFq4XySJUHFZi80Bi
-  L9uR76VZHPUqsQNE+hEK47/0nrN7OLcT6WYixaTyOJlUZQT3di1I/LVpXd8P9X+L
-  kInPnycXMunbDxMhJrUjY45ZUADZ0laXYgwmVdbJDoekL6sWOe/shjECVzAeaKqv
-  1oQrsHlcV0jRjaIOLcwUPyXEmP5EClddmkT2q48c74dnGZo65GH063j9VtHIqUVl
-  5MSRND9LNV2F/YgPy7OAT3FMR9NGHgmz0lUIPg0JQfq2VowhiJpQjR5I01NrtYFW
-  MWK7+Z8Qbr9Sa3TGHJU2sCGpMROn3+OFAIJFZBZ1vcEFJI3FKTkE8qbF5g==
+  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
+  +T/L02gS9+Kh6iA2CFg0L6CiVeOwAg==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: scheduler
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEogIBAAKCAQEA0TJ5df9udKunKnsn9f95N2mGq4oN3UOAGzZa++uWXUUO/CH1
+  cl7dS8GjY0zwkaKXar4RkydypbtjP3hO53glw+hm8lvi6MoIDioJz+rR3w5h7cha
+  UuF6QStYXkjWI2+Vb7LJLqEPKKNQUwesq2dUllvw2CxPWL4alcFyg4yuTQTRWg9v
+  37KdvGpDXm6Ym5psIPzKZqNoHXQN6xNo5K4YoBezGbSkG7GEA2VY38d9laZlR6Tv
+  ojZJb50SB6WDN3ePWzK0S3J39pKUvFY8rl2lLiBjGAiEHPnNMkOipdkFdVrsiQ8v
+  BG0T1fH7urzvyWoHachY4EZCSviPt3kVeIhMOQIDAQABAoIBAEgCZtrePQg+GgG+
+  eOfts60GTwv3LoSOeqdjU3hKBO1AG0Ng8RsYWnZ8RiClWF3ZKOPeXzBXMNipoyUy
+  5X451k4UTnN4e6gD+zfc8pm2S93LFpyCDc1fvfR21ilGSyfRfg//6854ND6Z0Mlz
+  59Tscap8JXBT+FAkyAPqnd94ansp4FhVTDFTlY14EDvaER7daB5STcwx3xX6ZIBI
+  dTYppiPfiw2Qx64/8KMTjy/h0RnkWhD8Zjnqs5lVEDhMQl3AXUKDC831MP2G8Oko
+  P+PZEuEKgIpzdhsTm5i4xnB58r1VauZOSz+S2gCsU9h6xsOeYC308mksZdTUnIyr
+  fg78tAECgYEA/n8YgD8p/fwbDSqI9NUzevgTXv6JakK7cZvy82Fy4dgWIVvQ4PkH
+  X+jr5au7PEergJe4hkNCFKXIjngE0VKXeF/fOBsWxcC68rs+IQMb1QoDM3+A+/gV
+  aEE+R0HbH67JWp3xr0XMD1XVcoHL1FeUV+Nl6h1fD0bExlvCV9RkUoECgYEA0m7e
+  DiKENgVmiQhrWpHX7FE5/TkaDng3AsBYsbfaiWlg6ozVh27h2YkPA5Fc04QMWNd6
+  NszwlJC4KQimH4EkAe682Q+ha0Eclvv2ikQDYRxY/qb/hPu2pI4EPjkr2sa24S/+
+  2mH+c11ZRq4I9T4klFHo6fQ/GdryfFju3wWILbkCgYB+mwW6TzH5u2BNxXpKqoGo
+  zB7+5AvChB4x344Wi8UWG2SvBbk9IkYL7ZjlMfC8hT8JgvD2QiFumibS0Vw8MiVO
+  agtnIvrKOB4IwSOgUqaW7hs3lFe7gehMbCCqXFXBRje/T9G7CzL/8gh0paOcKFGR
+  A3xg4mm29NLRhzaAcRXTgQKBgEFIvANOmg3YZxMkVYnnrUFXgdIZoQfUK9zip6Gb
+  FGWFF9gskSJPOCow50OIGXBViy8Uyomt0wWEUF4KnN8xRWaEFnqQ6tdHgAMncDk9
+  GH9MOB/o12T+Yo9yr8ZOHljlRV9fcIV32WUZFNVksMrE2LxbHRNX/yuaTZheTt1J
+  7hGhAoGACeru8lU5p838fRKNHA7NLyry/mbGexEmC1WNvqb5eDSCPSZFJaSzq8yQ
+  o+47/PH1++1uLrRgxxRXwy+UpAfhKfk9aPqIvT2AVnAi5N4K1bzY8X4fS8Jormzc
+  x2d1it2EL5WKP3XE8ssoNs0HxK+2R0eg7Mer/yfnYi7SLY8bQn0=
+  -----END RSA PRIVATE KEY-----
 ...

site/airsloop/secrets/keypairs/service_account.yaml

@@ -1,58 +1,58 @@
 ---
-schema: deckhand/PrivateKey/v1
-metadata:
-  schema: metadata/Document/v1
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: service-account
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEArWyE5oYZEKxJZh6pWhY6x+amsB5NcpjXPWQB0tSPgVczprtW
-  nQTXVuTFogauOMTNT3ltRCW2d7SNXTA2F07GgGOAjn4XAUOrMyhxEEvGgcy9fQm/
-  3f+eVP51PUcPdA+d6nJRxqKYaOK0emooS8kcwQD8UxRJGAeHs+ukfPuYoNbs8PAM
-  +O9yEOzTnztKr8juBD8KJs0gdVMbk6YfJ1njE01totPesexCutTov+lq1RCd0Ckt
-  tyU0xb8RSdP8YE+2m/7fMjQouFkWbAyy5gBjOfgGw7mvkwnxOAWs7d8jyHBadOub
-  xRqdfGoVpivTWl+5Rb+PqrJgpV5pPklogoYf+QIDAQABAoIBAQCqz+YewBnUCD3L
-  LYwURSzkU9P+R/p0UwI9X1FEfURTWrZvFLn8shX/ahkWu4nCNGUcUDdFFfgg818B
-  WEkOr/Jn5plqv9qczi/DlaO3L0t38Vb53y5x1CH5CSAkmOcpo3AgyTSudtuzAwhM
-  Ql8qNg3yM6xTj/lmh5QrrH848v6j+yyV6zyyi+jNDcMSg3sQlFVhqi2jrr42oYuJ
-  r5vDMRoWvDlHPn7oi7Lww3RmTZvZS8HNzQsDbiSc3XGaeEuDegu5GR2ZXiiG/1jU
-  QCOp5irEsXlA4xA7jCR/vGom9VJ4FtrkBc0J0k4/4OtD6p8Waao6dta0PBsjXo8P
-  c/IdXA05AoGBAOVu2Sk7wFxudqtBdddymZlIgbvLucbN40pw8qOonK3g6hZJUDzT
-  BnMgPAo3CyLcSlOaXFxphmh2iMKjmkoW8ZCfgC5RLlBL/HRGIz7rZd4EpnoL17Vz
-  Bcrl5WMPzAg5SwtYldbWc/mhWrldfGanNTSge7eCMqL3YpgpbcaKBrO3AoGBAMGB
-  YFHx3WGaF1sa62nhEypKRLSM0pJCE6oI3tkSWuVCq74yKk2phZ+lbCs0aPoDnGvZ
-  z6t5cnFuLYRTC2wTK9kNB4k/54fEjnItjeuE+6q04qOXn2ic9P3kiUhe7/S+O1b7
-  x7Ck4zEAgm5XZjW0UC8Tj5a5ZwknMv0mlOPvQanPAoGBAIZGGHvkR1ERKQxTNDdS
-  D4jBAYQ519D83//KGIclgATXM8i1QWtHiWfJProvuqm9SRaiqVlAPPRYIvPescaY
-  pOmiH297/WHrBqW6ApipRaXpDNEyqxy7Y3F6mIQgU6WgekX6oz7npVo8T49aohql
-  0yKopZ8haKctpxssa92dHA0DAoGAcPSEtVDqWb8JQzVDllq8RUN1N6+8e4P21pq2
-  +x+rz4hLmIrQBuWeCsMVkWLWpJrXBF3wy7fpBi26hDO1xzCpt9nTPFsBXE9wl1Xg
-  Mks+XTeZ1MT9WKPGny54tLY2fDdPjEcNGiAmPsR9XsvF7jODWvegKeuwKbeoG/4Z
-  i7RuMCECgYBnAM7Nyqk93ttc0eOs82Hu4qPaTZ6SY3d73JZHDKI9lekzh59qyxQ6
-  SAOhLvaozUQi16LgdrcuJVfCBxehQWYwWeyTor+ZPJ8XZ+ojLIjJT6bcFDxGicwe
-  30Gnk//A7DM3W5XzaX7Q+TkH5xl3jkDU7EJ526lmeoTfFsOiGl6Otg==
-  -----END RSA PRIVATE KEY-----
-...
----
 schema: deckhand/PublicKey/v1
 metadata:
   schema: metadata/Document/v1
+  name: service-account
   layeringDefinition:
     abstract: false
     layer: site
-  name: service-account
   storagePolicy: encrypted
 data: |
   -----BEGIN PUBLIC KEY-----
-  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArWyE5oYZEKxJZh6pWhY6
-  x+amsB5NcpjXPWQB0tSPgVczprtWnQTXVuTFogauOMTNT3ltRCW2d7SNXTA2F07G
-  gGOAjn4XAUOrMyhxEEvGgcy9fQm/3f+eVP51PUcPdA+d6nJRxqKYaOK0emooS8kc
-  wQD8UxRJGAeHs+ukfPuYoNbs8PAM+O9yEOzTnztKr8juBD8KJs0gdVMbk6YfJ1nj
-  E01totPesexCutTov+lq1RCd0CkttyU0xb8RSdP8YE+2m/7fMjQouFkWbAyy5gBj
-  OfgGw7mvkwnxOAWs7d8jyHBadOubxRqdfGoVpivTWl+5Rb+PqrJgpV5pPklogoYf
-  +QIDAQAB
+  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAskwThXpRjQGZUNDDRso0
+  97JNXlGtDKZRaHt7WDUgrHmO7pXSkY6vOtujFSYvfZ0H/fmKT+uY9sDOqyTqafwP
+  +l7A/NcH4zyhkl6dX9x5+Fii3UUKbPwGAKgR4eKuvhbBZY61FXbivsVBloPVlmsu
+  folgIpoUZXYkMNffJ4gIk3uj3PGkQ23SZmrj3wndGRW7PStjFutoJgUK4fVF7nwu
+  ASMStOXfDeiyVmxKm1HARMNOPaHWTHh9IUVVBCTCjN+drq8OmGCh7f2d1nsYcL+Z
+  ikak/VmCt2JlKsyW6vOq3mD04t81dYL7roUfRQRnv/J7DIuPxlbVthyK21ETKrM9
+  lQIDAQAB
   -----END PUBLIC KEY-----
 ...
+---
+schema: deckhand/PrivateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: service-account
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAskwThXpRjQGZUNDDRso097JNXlGtDKZRaHt7WDUgrHmO7pXS
+  kY6vOtujFSYvfZ0H/fmKT+uY9sDOqyTqafwP+l7A/NcH4zyhkl6dX9x5+Fii3UUK
+  bPwGAKgR4eKuvhbBZY61FXbivsVBloPVlmsufolgIpoUZXYkMNffJ4gIk3uj3PGk
+  Q23SZmrj3wndGRW7PStjFutoJgUK4fVF7nwuASMStOXfDeiyVmxKm1HARMNOPaHW
+  THh9IUVVBCTCjN+drq8OmGCh7f2d1nsYcL+Zikak/VmCt2JlKsyW6vOq3mD04t81
+  dYL7roUfRQRnv/J7DIuPxlbVthyK21ETKrM9lQIDAQABAoIBAQCgp4P/hZPt5j7r
+  XvBV3OWVOwgTsKyo9UPtTTZ66IQkZPOxbzZpCZRDCJ0N9XZdTR1ib3N9R+BwlpKi
+  C4VdMk6DXtWt/WOSEZPUe4R6WANfDx7RGeCnCv+tn8NdMhAaIA7rH4dza8gr9TmA
+  EhJmkvU19zq0cvll4uoBSMI+sIhpukDTxEWK+T9Bw8LQ2q0onMmQQ/LEL6deiGt6
+  EQFtWpxzml2E+IjfqLNv5BQRr8BG9kHUWND6UqGDwsxznzzZ/Ln7Jn/RRktjrf/Z
+  ipffVrxTDvLzv1caQvt3IFiCgDLNMbjhkCRoAPqwycIOkqT76kZedo5AwIIpojsZ
+  /+le50cRAoGBAOMjcjoFGvzsEuIvSCtllg/FURdGrAk8B6h+cSSTSQkOrdwZ8805
+  AlblHOhfQUTiIpIHRpsWDLuATLJ9Dgkn2rVwuYuTZjl337HP9pvV43a96iTIrak1
+  eqhjo4Pu3yn2KjRRi5QrHC7EdZ+P5jyn/ZMP9/g46uTjgLO9ipxE2kFzAoGBAMjz
+  4QCkZVgTGhAysHvGW13LeujQq6o/6eJ9nJmjWqN0ctC/yRphNqpozEVxBgRdWGdn
+  v5feDf8Fi67Ce1mVC8HDf04YxaM4ZT8AoOJ0nMrAhVRODE2l7hgMzSK3uF31qv6z
+  y6LZxJ5357UC3spJd6mBTD/dH+gbv/mbGbPJNyLXAoGAUMm0wSo7tSYKeWSz2Kuj
+  OizGcO70FbzCRI3klEvGuG/+KsEYVDAowttu8r+eqW99OE9aL6MiGDbEEOAl89+3
+  DL3xYNGmlF4stEPxxO/Ind1iwH6YNg0NeYMnD7AQtA4YaM9wQ90pgwDhjUVTcNOX
+  f404d5NXCN5aUpPiDz72Gj0CgYA1lGEPzMWAwEcYvosz1WWTEqgI32qGEFiKHTfd
+  9yI5ptjeM+So9fafZSXh9grGqyThHVaGZZyRvKbLx+sfrY/e8ANHjW9U37qPG9nJ
+  x5HutXpXSiAZq/5Zx0AC2716wAABvWq0VyAHqKzNJKDGiuQu+9yawpi5SHzdTq+B
+  skrTLQKBgFmYZvUJqebhWIYzJPsLgFTFj7tPW88g2cBa9nR5rYdE8QjFVNUKQYGE
+  8uySMNyBSeT8TtuL1dXEYHiNKk0juRMEolLAEBt1Ghe1NGU/Fwv0vWrhDqSiScIK
+  PzBLDJmHxCh68psuPoXMwDJqeAC7xLxUIrbcO/Iv67oYmeYqpyhH
+  -----END RSA PRIVATE KEY-----
+...