Seaworthy site cert rotation

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

site/seaworthy/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-----
-  MIIEpgIBAAKCAQEA7qSQEr0R9CgS9braXsM4zza1aPQ8Z79bZpzONjN/bTpM1yMJ
-  QyKRajEo1ySkPw0cMCh7jBvHPhFUxVs05N1T5viT4D6JCNFXZdfMWMDkaIwICfjw
-  +3JhZG4+AMHBQi6Rb8lrFsJx4YrXTiqEtRRpeHUtbu7ZvbcbKINrLpJkqMnWaXjZ
-  DvfSpBhZuBb4hV1s7ZC+xIZMvM1EsdbN72QoCyBxexX5NtLAtBGzsH2fxTdeBJlJ
-  sczAbFodp5Tqe0eDtyHQF3ZoUrnJoWaZTSjC8ElJ0JtxjiINF2kQowcx3Vd0Dd5g
-  /BbVziH29OVlDnVqL9k+LIPlgQY5ZOjCdvIoaQIDAQABAoIBAQCyOcLDy+LJttga
-  H1eRKDmYP+KSJL2sOfSYGQnE3wcO21ih36++LOXvKhG3Q81KrY7cxI8on2JZD3aB
-  AlHpjwZnXESMWAfdxwJ/tAAQVNcA4XvrfrjzAYSNDexOgmXD+KVzmDjbQZLtf9S2
-  svhziHAQn2q0C7wgfMzSn/t/R6PXjZzatT0R35YH3uBcdYJutQ0po6lDV82N7+aI
-  JB51k63ziuDWIBuU37A9J2SNhIf64amGnrY/hQiT2Qpqr8ghys3vHgN5afQJ6YEo
-  V1QDRSiUxGp2h4RvX+YU4MP+i/sEiO7+6pab7XKiYSiSxopp3ZS1U8C/QQAKmbPJ
-  BDJARMIBAoGBAPhqenwKIn0Y06mFw0bJiPI3Z2wBHQY4Mcba4MxurZusovu5EJCp
-  2zPPKb9Mcq7w58pgCK6dcsLzlwbhrreri+AhNhSPOs7i0WnWSViTFHLAbPEy4zZx
-  LyULAALF1YIslNQPnv1LKeYwQHnEgksNg0GPyrlWedGIAfBduLAmhI8pAoGBAPXt
-  s5i1CRgkdfkFunNUQtczn3z05TRD8Srq1pF5rBsStqhAdHYA1BqHJge0/MOMRmPc
-  rMhMy81hEg45C2iA2q7Au0qEfFKdEFVy1W18NAqXmDAo15T19cKEPnQbAbHdFSQ/
-  s9iLjecTkfuIsNGKR4/vj56XIUHnEUaE25WJSDdBAoGBAKWubq7YG5SPwGvqOQm3
-  VM0nwqS4QWFqjVhxl0kB8GxJwhJdpfy2LOrrGo7qL/sZ1Z6WWnQLswTvbiU61ErP
-  8WS1AdrIhJKDmOQb9aNLxXGbgY2FQSGIb8cnBQTUach+b2zYVlPdk75hJD+Snsvr
-  4UUS4ESotmrXaWOlPo7Nwc+xAoGBALL/qWnr0su8thVjwvrwiJoEXABia3WoQh//
-  v98w1UD7VPGPwHSnU7pfRiHz7MoUDqPe2fAMXYaGMdMiWBhfOUxawbeSSL8EzP+0
-  zn2bGnHfNwlOoOMuRwumn6J4ibpA9YNlzmw93zIiv216Z2CMqlusfTdsPuut2Jgg
-  WYc03dhBAoGBALgXTof0Lr38UXmNDivltJmVacdjRdtIqJJ9MrACxUJWngOHJYHk
-  B0w2vigJI6ZPBiVzWnE4lKJPeXrBaFblstX4MdPHoY7gDedonfzis4Jsq8sDfE/L
-  fSi5Ex6e1yJ31bEJCPR1O91xp62HvVIxUC2d/osJWXDEVQZnoKtAPykf
-  -----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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
+  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
   -----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-----
+  MIIEpQIBAAKCAQEA0wZtW0rL/YLd5NTllUrOdnpOLny3VRtdLqcmJ8PVNsTlq3Hp
+  nVosY0mHwuK/cVKftvd4QTsEIbCKVMKfwg3FScJhtUGipfcq++FEk3SAV7cjdpyB
+  ssyc0lFIlsTjo/QcAd2+qusu0vXPCXUBL4rWjeFqMmQhXgmKsB6CvBtCCC4o1Fab
+  PGCmc7KU63uTPB340TvFR36flHDMviVFjIU3ng2TPDyaBiiV2R3PVioIFuR61iMQ
+  qQHDIAaBoB0rhoG3/qdQCyUt3jefjrRicARgNQA1lp9IYpaolvE2l7Fv6EdTwLTy
+  9qB6R5JuDVY08J3K4di/nqECfm0NWfm0dNZl2QIDAQABAoIBAQCv7lXRnKRA8I/q
+  LYxSURGcOQ9hNlzqOWwQbw4ibOQfSzxnGQs5QmprRGxJEB2nbsj1E5BQYdFp/PL3
+  A2OJt01Z1xL6uIPPdieB4yb3AFPXzTlls8l1tZyww0+PUwquL+ABtks11+kru/8l
+  1URtzIRfuSR+anhfG/liJ627AcalZcHySWNGWfprm8fm8rdB1UZd186UlWA4gDur
+  Mo8Y7IxfcWFp2Pu81dt4BEiEKgKAaXx3vTbxl16Q9zhfTeiUJ5P2dA3aGo7PWT6M
+  arzPbjyaXpZmbPbZNFZTRHOZ5KXy5ewORJiu7R9SvZRZj1iNRkuZz2lGzr9WMIcs
+  momy98J5AoGBANkNlE1zWa6a1J0YytvXWnEFTNOiFWjox+2vRqcpOyXQWrq1hzWt
+  zPufjw35rup3/+hAPG6OGxR92+n/0eeIo65Gaexuv3j60czHZXhge2qiI6NHSw5c
+  rJSCtonEckLLYMZ5qajFQV47GUCz3kphPiiWhVLwMj3eGjbdilXltNdbAoGBAPjj
+  87oyZ64jfEyA0wpg6PAII8Y6wzKASiQ1KFGDMs4jIhA9MWqAqdQD06pamrOR2Uui
+  O/0EOO28EXQgkbJjbU6dCVB3OLaYHNzwI9mRPYF1KPom6BAzWQCeJ2U2UDjuenlt
+  6TaXaST9NEJo3bN1ABEX/PItIn1F2XYVbGzvqXHbAoGAduaucAMZhMHCaNCVB/sf
+  yzwJCwIGUnL6WqUiwh2fDibmHNOmXux3lvugRRqbDExyPos5z6I/CWms17HRDdHX
+  QHfIPMGqWB6mYVR1rIzF7vMlLKO4ZQS1caFtV2jq4tZAjFlHbHGqTnF3cu9VfU9p
+  2pgiLv3vt958Y8PWrRlpiHMCgYEA7TlP+BvM6JSYB88N16mQvB/2AR3HKR5QDHzC
+  Jhc32HRyJio9LHbf592R5KAhLaCJDWbfaISawjVsKVRVqkLMT46r7w8Ddj473HXi
+  pZ+ikP6bhPqKW86lOUqE4BpJkknzYEPbchYUuJXCNr3++eo9mw1TIXzVj7OA1uUK
+  iDZSOdsCgYEAtjwe8+DtXHFO+3M4Baw1K3o+Q+RPrTsBbj8Hu9jAMHAq/oK1govQ
+  cN5390gURGLO0o1uBAytMg0FH/CNyRzoZUmlwwX7Kb3wiaqbak1e8IBu0U7PLyCo
+  oeQ3MNFIqUJNmxaPGZrnRHx7Ycz4xY8VI8eVYcpZCLjPRAHQKJMBt8s=
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEpAIBAAKCAQEAmRtzM5pqgYj8uFWAeMcWsiWlz8/3oWeHcpf6YJHSfBVsscCz
-  hkdOY8mGhlCMrYLwskXGO/aPyMcTEQX9njeskzXD6HQ9rjWVjEA55P0+t3OlUHwv
-  vNyt4mOPGIxgAE5JqV/WsShVmVjArPLc49rfpkn0FKrFsyGgp25nJg+Bt6bbAuvk
-  PqFi418OTdR3WGnhzGloBhgP33Uy1MnIJB6f3qpLQVp5P2vIrh4Xc1QVqHquIX/8
-  uJv4PlM3xQesZlgYXES0E3nYEMh35JXR7856fNYLXNcL+O9mbk0gXRMz2hzmtA7M
-  nEQ5HR7RjBiLwU2UFfjyL8TMT4kXJcykPrELZQIDAQABAoIBAQCAnLptAq2tGnGQ
-  NuKwkizSgSWEJ+KQRvNUo63DKTty2FxyBLnJdmS3FjZW5ZsGthOS7WHURQ4LTo8J
-  ocql+YaSMnva7KpTiNeS9PCtFr50RET+ExPWxlma7p7ptCGAoELocIVcU9Fz+0X/
-  AhPjo5xzh3PtWHayPvFBNFCZfDUvG0HjilmFDTtHZVNEbYrTdE3rfq4zba7Isqyq
-  T9v2qluAMytVmsD4kNQ4zExLrSQZKJqZpkq3vyxC3xhL9daqdzI6l/Wo3kHppjKI
-  AYA9nlkHki/+yJZMg9YGIgnx32gH+mr5y+r4CKiG7Quf6bHXPmhuDaE12V302QBQ
-  r0gDj2MRAoGBAMAtnTL8sSp8sLYbzNdQtcg0xVgpUQ+jacT+hYuxAKkZ5cuG0LUS
-  Bj/pYS7QETmTOZKyr6OtSNfQQtwL77/6DCTS9VqnHOVf56PkPaqdi/ymoS8XXnTW
-  JdgHl2FAWQWQNH06gUnFouGLfWRGsIlQoQbt1aUac8lrlTBahA3Ql2JDAoGBAMv0
-  JWTnqCj6cPzD7dkhGO1qt7cEIwH9k7pWLi8QaVeSpSi65oP4ow+1UMwHt1/4Gprk
-  a9jbqUQYq+s/5pBeBXht5q69iVWvCUiZJemIxBtWcVB7vrDkgKrVFelHub6AggCC
-  ul9GN4oNhZanKjXPhG5x73u3poTl92lhioE/1+U3AoGAHRbKdK1LI+M73FTY7L6K
-  xYM3W+DlJDjYCbl8/WgNcYs5/VSqwr23tHTfAPb9pHlkfZAOhff0zrX3aNdlsulm
-  bSyBdvdUqGOb7HLf4rN2PQf73eTrp0PC9rAveckDsJPjXhE9AK2pufojQMpyblaG
-  CUZ20Ebwv8xJCMiqtGyefYECgYBkO4hlHrQ171632lJ58xodE+VVvGK4B7ciTFhG
-  KPqcXyVr7u56zSbWAXXDz8b/Ex+AH+IgoVN+c+GJq83UBWEK3ngQSHXF9k/JrfpD
-  20MFbGYj96yvopzZV/98thNC3EUHmzecuxVwc1TDxUOpTmL3JGddldPwXFRLJfS7
-  sHSZ4QKBgQCGCOv8VRuTQKy52Aks1JxZStWgKqspY5xll4d+M8d6XGI1kBezYk71
-  jv6ytqCq7XPbcqI/wcCuwYXeuvNIiIUbSjceorRIE2k4+WO7H+BVvs6w/Y/tYnLZ
-  FV3iAScVcnHLHKo7RqbhqeKIZsiqWdxC2DdERx36djKDhAKylQwWTA==
-  -----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-----
-  MIIDSTCCAjGgAwIBAgIURq5MY9ePbqC6vrO8pJqRiFyp3AIwDQYJKoZIhvcNAQEL
-  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
-  HhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjARMQ8wDQYDVQQDEwZhbmNo
-  b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZG3MzmmqBiPy4VYB4
-  xxayJaXPz/ehZ4dyl/pgkdJ8FWyxwLOGR05jyYaGUIytgvCyRcY79o/IxxMRBf2e
-  N6yTNcPodD2uNZWMQDnk/T63c6VQfC+83K3iY48YjGAATkmpX9axKFWZWMCs8tzj
-  2t+mSfQUqsWzIaCnbmcmD4G3ptsC6+Q+oWLjXw5N1HdYaeHMaWgGGA/fdTLUycgk
-  Hp/eqktBWnk/a8iuHhdzVBWoeq4hf/y4m/g+UzfFB6xmWBhcRLQTedgQyHfkldHv
-  znp81gtc1wv472ZuTSBdEzPaHOa0DsycRDkdHtGMGIvBTZQV+PIvxMxPiRclzKQ+
-  sQtlAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
-  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUXdg+bgFuVr5ki294
-  sEMVTS+ZY/swHwYDVR0jBBgwFoAUokWyaNT/SzymovVxAmNd9AJgtSswDQYJKoZI
-  hvcNAQELBQADggEBAIVRDbdpiHcldFU9He5MIHTB3bQls/zyhaPx0pcHfI9WPn6B
-  X4OoEgDKXFGpSpUeKqfbmpn34y8/eBSkWhjAt4T46Gus60cSFhtBXhT1Me53ICKq
-  S9tK8COlqr0SiGGwp5PEBLn7nxgh2Hr+D+TKjQBzweI6dRzMmBI0ehJIqJZL4AFD
-  faSM1QcWOQd37XArmiAcfgjsiBVSwDBoDuAPP5GHCEteJ1X4FhGyKQzIyE73secZ
-  XMyMhbCEqAlSNPS8CjeqSKXr32FoZkxWWuaT4YdHTMw54TGX5/pPdznJQH9SP8MZ
-  vZUhwtZRCrDdb2Bqj72MBRKvgKzvA+SobvdtEuk=
+  MIIDNDCCAhygAwIBAgIULhMRmoA3XGHgj05B3xaLuqxLqh0wDQYJKoZIhvcNAQEL
+  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjQwNDE4MjEwMDAwWhcNMjYw
+  NDA4MjEwMDAwWjARMQ8wDQYDVQQDEwZhbmNob3IwggEiMA0GCSqGSIb3DQEBAQUA
+  A4IBDwAwggEKAoIBAQDEVgPTFQsDixFLqMWu1KrGUSIpwJr1/lVp1R9ru83k+LmZ
+  gn/H+yY1/N3sag9WxwROWIIU4JCSf0ZD03d2opyaQaSMDCXagBttuLcMMzXZNhVG
+  k2T/2N+6cEldH9+sIpWjbz1WcH2oxwuD4/m0WeW4FJ5ogMzYRHyLPKRV2u/LG0EI
+  +DvIuntFEehtn3eU6IEzWa+TwYCESXNNGIztAUnitOdyEAVbg3GvgCb7uIwe2re+
+  j0em7qEiXrTZAyNIIfy3uCp76VULeNDIdaOBO+CxKcq862s1ohZOFkJaXI5XEG7o
+  I/04qOPwOzLqUvlxzEgQyfMl3zIqHnNfoXFrwWV3AgMBAAGjfzB9MA4GA1UdDwEB
+  /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
+  BAIwADAdBgNVHQ4EFgQUAJnkgBDWwCaRuTTqbEXoG0en67MwHwYDVR0jBBgwFoAU
+  g9hhOsdc3UUs7EEvhMiG/qRFkJUwDQYJKoZIhvcNAQELBQADggEBAESTXlIk+n9z
+  parqxeVLkKscnQu3oRRoJ0YZK05/KdjiGkr7GIFAEJEaYzMeULssIw3tPWeWiki7
+  ayKPwm+UIDizZq/xqCm3PQDhNX58djh8nBekJWrOrip94i5C1b5zzhxatcRGbLzq
+  vjABcM9190EmdZMvQFHAMRYTwhKitvzQYJTUgCLKOOHfpNTaR+1+nr9ExmAw8mdV
+  GhTJ2ud15FrPI1BTv4BD41/Cknkw40QyA1JpUAKm4Pb5ACf99Fspd+ru9JLXHaX6
+  muygnlLC+DwWkbeo1Vyw06QFwBUZIEhxIzQ2qFFKfxI+HSzFyekeG3sYkH4G60id
+  Jo0usDEvUVI=
   -----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-----
+  MIIEpAIBAAKCAQEAxFYD0xULA4sRS6jFrtSqxlEiKcCa9f5VadUfa7vN5Pi5mYJ/
+  x/smNfzd7GoPVscETliCFOCQkn9GQ9N3dqKcmkGkjAwl2oAbbbi3DDM12TYVRpNk
+  /9jfunBJXR/frCKVo289VnB9qMcLg+P5tFnluBSeaIDM2ER8izykVdrvyxtBCPg7
+  yLp7RRHobZ93lOiBM1mvk8GAhElzTRiM7QFJ4rTnchAFW4Nxr4Am+7iMHtq3vo9H
+  pu6hIl602QMjSCH8t7gqe+lVC3jQyHWjgTvgsSnKvOtrNaIWThZCWlyOVxBu6CP9
+  OKjj8Dsy6lL5ccxIEMnzJd8yKh5zX6Fxa8FldwIDAQABAoIBAAWewLVGIO6VCIW1
+  6xK6G7lZkTTIwqbQBPnmk+OtmJM5W3a9eZLr6YgaGPAviQje4Yysk+ytEPZglk5S
+  u1S2Cu2Pe3pWzq6WhDJ72yGKRbxWA/3lMjrwplbb5/22b9ypkMcA5CyZQ7+VEwtP
+  d1JmUGEYlgA/z51ROI9zyPB8N+kEbdfQrXtkRv4/baUr6EAgGYhk5tu7rx/joz51
+  F/lL66nc5Ussn0RScePfFnpk7WIoog/2JAnd9NwZX6uhO6Al15LRDm8KeQ1EUC5l
+  7u8EcS6Yu+LR6fphGSoL89ofc9t0k/4wLCCf62uezRBEk0l/tznmtH+06M95WV0h
+  h5329gECgYEA7sa28fYa+OjqAhIjnIwWVhRwnfdMnZaHqJHEkj/AZBmDR0EvdBTP
+  cT8v75QelIHVcVQno5hGPEyLSgcBTnfnKjcLtdzkqr5GJ4Vpqk7TEq2pAI+DGmvn
+  CdfPc2kUNfe2py4tbwP+s8RrfSmhJGoHYUTJsPpHKLJmHkeNs+5vJrcCgYEA0n+X
+  WrwA47ieXLkoJc91seBaKP7oNwvyfXtrHmBN3eaX0DcqeAnhjPMumXQ8qJdJeaTI
+  QUI9lSJ8HSx+YotA3VRf3fSXe/DDqFiXhvx0yTt2oDVZeAxzD07S1KnfRfZ9VdBR
+  8OT3JVEr3S4vb8Q4hWqT2q1P6k1lQAN8cJhC90ECgYBa72T3C1JEX3fXaA8V7KgJ
+  CmnFT0xna8+oXDNvu0XLGYhMl7+5xr8mEvlvlYp75mJicblS7Yg6KLCXdcmCl9l6
+  01HrZf/UIvjWzlFqofBy2Z5Wb1Fvu45WylDgVDF1SCzQyJ5W/D+BORnypesP0i2T
+  Vr41X2vATQjlGT0XPIQqSwKBgQC92jBDuM9AlFHYpXMNbyji7svCr+33QAJMpNT/
+  R7LTUdhZBnh6XccdnnPIGetfz1uIqFOpcDok2T6B/ZBcBubQ+PmiMamzMnr1yjmY
+  mPgoS0Z5xsRUHz5jbx9+iVwEOQXgMQzGrWwvLx/V1IMaVir4QiDqmWg7leSdMMe6
+  scmsQQKBgQDRfFZGz+w6xWl6dPJ0gHqxzuaO90oOVC+4+P9CyStKwIejhDHZudR5
+  bg0WWer9F4d8dl+oqqRx6hrBVCKFsQj4gQsREYd8gl60uqHPzSZF1APhXdGxF5CE
+  CVB5Uatt7AVx1BdvjPWshZsmDokyc+PUNGk20Xk/uF2rG0JrkYmD0Q==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_11_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-11
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-cab23-r720-11
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAo8R4fEYQj4R+w62ye8WZ3oLlIv27Kgf4hXj+L3qhxNrdlmeF
-  fSzvdXczrM4ZXzzhrH1pJrslVnVY6TezJjKsw+eo3WUup4VHqgtfvGMVk00teglZ
-  m3ZELs48lPOWKylh2iTwCrC5PpxCHu6IE+xWriRfVueecCOr8S1n/JrAzjGoI4uH
-  5wtep8+D93N1lFPgGGE3Ikypvu35MqMdChSo1m7a3iQtD3mo00mWwkEcOsDRIsSg
-  izFaFY29l8x6cBAECTYbl9gBNG+nDbwees7JNlKrRbIoybHV1U8RxKCoATk1xhwK
-  EtgQBxTEh7cjID3ovo8PVifVfF/WlyKBZyYCAwIDAQABAoIBAEgDEsACxzF0n5FI
-  Bd3rLBfuEvfp/q0iyCNY6tzR3eSEIUAL0WUTp1BN1Ek+b2WzjcCdfOltDaQRAcG7
-  nmlDizix201POs6rCrI5QiXCpDAblc294ss7nAvA4F7XJcdg8QhNicgJoctoRqL3
-  XJr2J793evzp6H+DEA6DWuB25CVGeIR9svpdpjwBvI8VaCIbe7Oa0UaDUBAQUeMP
-  7Omod7EB/TBMG1OP6JVDwDZi8n5oi4ZI0LkMUdcVenRQMNvuUpc/ZTSwK88yzkK7
-  L908/k9WKhtsrCu7uZ19VcgA+kGs0Oy6Z8e2zJBUdC/BvRmubb0IncbKBwGf0Uzw
-  0vix59ECgYEAz257fVrGFa2delfyIia62bv322YB3iM3kW5uiCw0h3us4Q/v7fTa
-  ziCcsK52SvnfPcQFwuiHeStsN2DjZ/RkhIY5uqAkoVUX/QCaiG07s9YCWxCoWr1c
-  bzzFG4VZO1VCFPvvx1jL1XFLHeq/zT6rSq7fMVtpcPl8yelwH2/LEo0CgYEAyhy/
-  PjsJLNH40umFfYEAmzNUlM7aZfPwPH4HWQhBKO2DZlt5IZizG2TNFC48jUQfi+IJ
-  y/DmFPnp77uM+iRD4NLUVCOpNSGkZ0Cx6tTxzTkLj6xjTJi6DgSokAYLueXN2cxU
-  H+KfKCIeG+gnxw9ck4xVtjkSKg/gO/LqJy46is8CgYEApdeSOcXSa1CUgFVCDJXk
-  e+JxpuLmiWCks8yT6KFXGh8COCqSzDAgo/6k6AmEICuolWxcotlgPrs92QTIq7tU
-  hjP+gbw5rRcoh6ns4zhaLEzlM0OdJncRKQpwGLHDhtGCdN58dWgEB9F9mhyuXn1F
-  W/92CLMqGR4O7CuL7kZmGJ0CgYAVU1EufMYsD3+kqXUnV+w7dAARr33F0iZgC6A0
-  2bUeX2lE7JPsYpNLaahl37cN5Mk7Vj9YYHO2dOQlInHultL+ruAufJDHBWS2bFIZ
-  iBx3XfSFVVgo5diD0CQFBk5IcCH3QCMENkI61ta8dRN1Yn6PJviIQJ9VBtXPHYNt
-  XOhaawKBgFbikVk2HchPH4i51gAy7scW4ngh0biPBCYYzm47G+U657udVLqrYW3N
-  shcMLNagnoOr2YFKiW0MpW61AozaHfT4YKya0PtWW67hAFM/HXg3RwGdo2ZEt4BC
-  r8IXQjxpSYrvtu1Xhuv4K9LzAsRP9LPel3WLRG5JgUKTeY05toMF
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-cab23-r720-11
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDmzCCAoOgAwIBAgIUN3gsuWkIeuMx2zI2P6p5Z1gPc6AwDQYJKoZIhvcNAQEL
-  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
-  HhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAkMSIwIAYDVQQDExljYWxp
-  Y28tZXRjZC1jYWIyMy1yNzIwLTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-  CgKCAQEAo8R4fEYQj4R+w62ye8WZ3oLlIv27Kgf4hXj+L3qhxNrdlmeFfSzvdXcz
-  rM4ZXzzhrH1pJrslVnVY6TezJjKsw+eo3WUup4VHqgtfvGMVk00teglZm3ZELs48
-  lPOWKylh2iTwCrC5PpxCHu6IE+xWriRfVueecCOr8S1n/JrAzjGoI4uH5wtep8+D
-  93N1lFPgGGE3Ikypvu35MqMdChSo1m7a3iQtD3mo00mWwkEcOsDRIsSgizFaFY29
-  l8x6cBAECTYbl9gBNG+nDbwees7JNlKrRbIoybHV1U8RxKCoATk1xhwKEtgQBxTE
-  h7cjID3ovo8PVifVfF/WlyKBZyYCAwIDAQABo4G9MIG6MA4GA1UdDwEB/wQEAwIF
-  oDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAd
-  BgNVHQ4EFgQU93ZpEygkMIPLZoD7DsDf+hLLZqYwHwYDVR0jBBgwFoAUokWyaNT/
-  SzymovVxAmNd9AJgtSswOwYDVR0RBDQwMoINY2FiMjMtcjcyMC0xMYIJbG9jYWxo
-  b3N0hwQKFxULhwQKFxYLhwR/AAABhwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQBY
-  4HKFEMOvFKYMNeO4UlOr0fvmwtdy4SC10RcHm34mvyqjeQLG99LmA5fA+ZTJgrYO
-  cWaC78YBd/tQtEb1mf3n1JE3dTQkdfkoOp2K0vgP9idLQcPQsg5NCZMMqwx5RjLN
-  OvWYiI00kBnJzzcx52ZvR4uLkAG/oIEttjXWTTjN9buHZ+DJJV/aowXEB2mUXKmg
-  U+mXqF8SOXld8jck5VbGtDet8kHAocdt3COvWPpxxQLQV17w1uOAZ2S1jecamMVn
-  2rM5tItW9Pr7U5xlnECaHwkEz9al0eF1kqh2wwwezraqYICY715TBOF5dGpYQ3Oh
-  /R0JlD7Xu46no/YipmE6
+  MIIDhjCCAm6gAwIBAgIUWDKcR9O04F4/uFT0d/KpNThmxvcwDQYJKoZIhvcNAQEL
+  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjQwNDE4MjEwMDAwWhcNMjYw
+  NDA4MjEwMDAwWjAkMSIwIAYDVQQDExljYWxpY28tZXRjZC1jYWIyMy1yNzIwLTEx
+  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx7e2Gnq0FUjOw57m2ToE
+  8D9Ts7Sd9N/csVSyAOrRKqg6x6/nIOmixV4yFeDU3AI2pY3G2tNNrLTb+BfltE+7
+  IJOM8KV49pjVPkX8aO1I296yKoMWI9CFnGRb7sguOeAiPDPQ6RbCLdnfn0x9+P4r
+  W8rXMi64q2zrsLevxfih0ezjzB4ze3X7kJ1xjr0JeHUkDzfKJbKJ1AeDZ33xzDsP
+  EDd49oeCYhIYYe+MVAQX9EqPlzYT6Nr0HL7DVpoMby+uUycRrPPd5lFul3WtOejG
+  sqG9xfgJQsSqSNNI+wwyraUtAINs94vO2bRYEoTF0mvPn1y7fcZZmvmTQfwzPM8f
+  mQIDAQABo4G9MIG6MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
+  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUmdptnUNPhv4SllpH
+  2q8Sj07ZalIwHwYDVR0jBBgwFoAUg9hhOsdc3UUs7EEvhMiG/qRFkJUwOwYDVR0R
+  BDQwMoINY2FiMjMtcjcyMC0xMYIJbG9jYWxob3N0hwQKFxULhwQKFxYLhwR/AAAB
+  hwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQDRs/Wcq9UhthYK92aDK2AzhS5fxRM9
+  DDXb8xPwy3t5Nx/vxTIFpTX4Udi+AUxPoehWAAEV4SdMWQZTJw33FidabOJv4Qcd
+  eZd4MbRtHAQtD4zTFalYnf4H7eLQsAGCG8uBZbQhTuLthP3dqolbz7fonPB/njAK
+  KVRsEUFoXrswSRhUVfj7YGYbVQUeXIJtEQmac3QlqXH7CZAD9unAfhhzfl+Ahbgk
+  Dh0QQg2JDrwZAhHjAZTCgLgRI3yshtpaBEcJgShKtB5aVTyh2YPSoIsPfKOJ2MNQ
+  pgeqjR5h5xJENPJHhFsuD5toScYRq6881lWXu3jfE0E8b2/EJrDRayjt
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-11
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAx7e2Gnq0FUjOw57m2ToE8D9Ts7Sd9N/csVSyAOrRKqg6x6/n
+  IOmixV4yFeDU3AI2pY3G2tNNrLTb+BfltE+7IJOM8KV49pjVPkX8aO1I296yKoMW
+  I9CFnGRb7sguOeAiPDPQ6RbCLdnfn0x9+P4rW8rXMi64q2zrsLevxfih0ezjzB4z
+  e3X7kJ1xjr0JeHUkDzfKJbKJ1AeDZ33xzDsPEDd49oeCYhIYYe+MVAQX9EqPlzYT
+  6Nr0HL7DVpoMby+uUycRrPPd5lFul3WtOejGsqG9xfgJQsSqSNNI+wwyraUtAINs
+  94vO2bRYEoTF0mvPn1y7fcZZmvmTQfwzPM8fmQIDAQABAoIBAHYF2cayJoPBf/bY
+  i6FpiQuU0NkM7p+MP3ZID9085xjnS70/9T1c9ETgkoadVA0j/bk+HHqqjmd2hduJ
+  +8PfrjzlFVAM6XwI+1OOtkgnmXvdkbpPtyC5FIxEPpPQloi7LGAZWuaz/VJtQ5p2
+  8KbZRTQ8nYlZVOZxOqM3GdfLQ42y/fbw52ndsxvtmkDjsHWlycT4L7lG2fZG2hKH
+  C+Bc6CoTJLTcU1osrr9/T40IZfWY4nvyjpYYdVu6u4ONKQ/fl50VMVn/YhUoUdIE
+  XEPjjlhCTH02LZv/ajd1wFnUYfh00sYLMQ4IogadqVwHUWPH/UArOzMiom1Lfvro
+  siQ3OVECgYEA4PEUN5o2Nm09FtXiCCFfgQWZq4BNxmBVWhQ/V33XG2yiry5f35OW
+  cb3nv6+8cfCjE9XM+67cqjzdkQxqKV7lRILAkluLBOrWjIu/lInx+jQjY1hqD+BE
+  K+Tj5E6zuNCWWldHuWE53CEt5knSbhn0HJPi5uQJuaGK4Z/OAA+3YO0CgYEA40sM
+  ARVgBUVtM/2bWSpcASjROwNl0BpKM/90eMwYSi8tLWiDl+WO8+d8R/TMCnk9vE24
+  sGsSkK4SjU0tTGM/tw+iHECORDaeCQk+nJGw+Adt7B948uYv1i+H7ytfVPsHduNj
+  ddCfZ3PNfvJUKq+OA8CWb67HFAimMk7xRK4a390CgYEAuhFROuk6PO1BohkMHtOU
+  T4KVadL5AsZ+88NZ3gJ/I/VJ4QTIU4We5blD8UDp7YozK14ocGxlpgAw+yG80znn
+  BjPuHWLR7SBgluOmdrVgzym/uBbTrQxC99gfVqRvb8pDBLm737F4Dgn4EM0x3tdj
+  IRyHjZxGGyJwYlAxM8XMV8UCgYEAlGqqugJlIswE1NAjIoQgc7lddnVvhAXGslF6
+  km5i5f4MN/xpAUSqpeVgJ/RXT/d/Mnhlwv0HsGWaQ55Dl/+u2TBiIKSewTgQ1cGt
+  mrsfnbXsNyUN6z4Xunpq/ueJZopMg3tTtNi3XewmIWDHSOA9kYGuOdscr54+N9eI
+  f9pYPhkCgYAN8iVREAjr/3IBStpE0thEGjs1Cb0q+wtY1VLZH7ph0bxU4sBNtmqN
+  XEa/6Ssc6VJbnp/eHcedalW+nR+4uKy6iBiDSYxJZbviVINWVcb8/NjNXAKPZrok
+  gv4UL27QYCodUDyzw622yAICRkhTh6c6di6OSzh2kKBy7ygcSnRxEA==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_12_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-12
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-cab23-r720-12
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAyu0yAppRKsUC59ZCIboGs15wk6Ir1ffOWBWoSM1+SyxdXqwo
-  tVGKinvlpCL/edG7KtrSovP81Pv/u9qazJb6XL5fFSPYNxXNUJ4N9W8D/c97rQm0
-  L2i3UZEaa84v+Nd3d6svgyJUXNrtDmBGbNpx5gTuw/U4BkQgD7VS2Z+25vhsDHP4
-  zxXhAr0skkZLIMhFugMXNe8AWm7IRWQAj+T6ECHS9FKgrE/3+rDfSF9Q11JkLXh2
-  s5r2ge01FpWaTpmhUiehAwUiANTCnIYaCWi8udSzC1OOMvF8U3MN7rc/qMz9PMqA
-  qL+9BdPXZBhtJELhqNrDuYvOi1Lnn7c2YvvIpQIDAQABAoIBAQCTFvt5B4JuDf/d
-  LGEjMURKH9paKOK9ZbIcBxbELq+sravAQ+n+A+z4FHaQUw37rxqMJbEojNJnT4I/
-  GGW8hnNTZmplWGYRB6ybEvXrQV0TTKHI+4+wDadTaGpOWlZLeWMPSvZVhzy/UbEj
-  CoYBwRVuNYUcZVMGt7rFqBk1xZ8+KukCwgnfh2brkQ6ihLbklaAiX/fULSzpxnKE
-  I/e+bAeF19dgG7ID9q7BlJgxrypuutMoIr9usT46/qdDbx+RjxrcrX7q8/C5vgjU
-  hrGzogpiq04B1kkX+cL66LU9sJu3DDm9Fy8E6oCmv4MK3cAjL5mubncZTH4Q0thv
-  VuM+jJYBAoGBANvIrE+Hm0Cu+rOwUS2kgb1NQ90XXwEYquObysfn6BP0DHHhOz/9
-  qjc0VUMq77EPYhaiUmNaoRJGkFyvQR3fqvG9upNiBXjTJGSYZ3Ctt+pXrnQ9jzbg
-  xKWJuDksJUR1n4knCwADUBw+f/wAnx5qTy8fBOw+iqPlg4Lg9qfNO3spAoGBAOxd
-  akxoPMTIuRrg/a/YH4i6AN/+HXw+pJ0gHzxv6/eEVQcZiqXsFBsB1aaZu1mbEt5i
-  a0XeBEFJx2gKxuO59GVdBmJBclzL1L1z3nojR6OJyCvDe65qu9N8fv2YjCdONY3m
-  7FwxwgdK563OY0LShvxFVE2Q4ty3IuUfEYH3h80dAoGAcXmppaJBQWNWo2Hcd/Fg
-  3wk+ia9gaOOAj+XHC/GrfGnb5wxAGCjzMm99uiE4AjYMEd2bJhsL4LC4JnKB71el
-  Hg00gJXyd1CkkJ+zgJTgyUieFPwXrmDchw+VI0essiz8wsZ6wnXzbbHDSKxVe1Gu
-  MokUdJlR4Y9FmFRoZXjsRgkCgYAuS02akX/1eurmXNLTMh1bBjNNq9PSleJf8/6q
-  M7Gf1QdiUJpbTRXTBFT4QHv1XO4hKF2iXY2vy+eGdTXnPHClucaaT/86NaIBSUR1
-  35sUaNQP3kXHL5iCH4wv10T8HdFXbbc1h3ldPEqMPDQszlcp6dpNJueIG0Z2YdNo
-  BTdP8QKBgQClPZ9iicQrDT40EsCjmj2WrNpHSNn47PWgnVWGlCN7xu/OtM4t+dKG
-  iWoWl36kdNJYh/YaOWP5IaUkX1eOvRNKASo9493ZFLJJhAfDOhfmXc+D3PjzKFiU
-  p6QktRSKwxhnmE6Ntg19VrqoZygBLndSiLy88XBXtYrCrgs6GNs8nw==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-cab23-r720-12
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDmzCCAoOgAwIBAgIUcb3SIva/VHRO62v1gJOXW9wPXeYwDQYJKoZIhvcNAQEL
-  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
-  HhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAkMSIwIAYDVQQDExljYWxp
-  Y28tZXRjZC1jYWIyMy1yNzIwLTEyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-  CgKCAQEAyu0yAppRKsUC59ZCIboGs15wk6Ir1ffOWBWoSM1+SyxdXqwotVGKinvl
-  pCL/edG7KtrSovP81Pv/u9qazJb6XL5fFSPYNxXNUJ4N9W8D/c97rQm0L2i3UZEa
-  a84v+Nd3d6svgyJUXNrtDmBGbNpx5gTuw/U4BkQgD7VS2Z+25vhsDHP4zxXhAr0s
-  kkZLIMhFugMXNe8AWm7IRWQAj+T6ECHS9FKgrE/3+rDfSF9Q11JkLXh2s5r2ge01
-  FpWaTpmhUiehAwUiANTCnIYaCWi8udSzC1OOMvF8U3MN7rc/qMz9PMqAqL+9BdPX
-  ZBhtJELhqNrDuYvOi1Lnn7c2YvvIpQIDAQABo4G9MIG6MA4GA1UdDwEB/wQEAwIF
-  oDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAd
-  BgNVHQ4EFgQUqnvZ8GBhCq+TSrDmQRPTZkChxtkwHwYDVR0jBBgwFoAUokWyaNT/
-  SzymovVxAmNd9AJgtSswOwYDVR0RBDQwMoINY2FiMjMtcjcyMC0xMoIJbG9jYWxo
-  b3N0hwQKFxUMhwQKFxYMhwR/AAABhwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQDp
-  r1GXxnEjHxa063ry7oHeheZvAT64/V+LMrcbIJHYykOqRUjif7xearh8ZAx2fDs9
-  8PfnHOMUU8Dy4JT2eemu/aBAjqNr/WkKMYcOYnH22FwmeifcWcqi2URLs/uI1TTK
-  NkW0rHlNjk2k7No2CqQm3t6JXqxLDWQpl4A/OYQPUF3UNw7lugPKFeHnD55R8FWw
-  FMhOWdVD5Pm+/goDB4JTwkQdoXMv9gnwM19U3JnR/2tC1/O+SzAkWJrKVYn7R/+H
-  XbniBoihUBVDuxE72LgMwgUwPipppGHEPY3mjGZg5sWuGq+fpDqp+RUaa7WZy0eN
-  ZEQ8IqyvPHGkAyoZtE4q
+  MIIDhjCCAm6gAwIBAgIUazXeqo1zf9IGrzz6ba6r1L2quYUwDQYJKoZIhvcNAQEL
+  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjQwNDE4MjEwMDAwWhcNMjYw
+  NDA4MjEwMDAwWjAkMSIwIAYDVQQDExljYWxpY28tZXRjZC1jYWIyMy1yNzIwLTEy
+  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAujAjASAinRCbdlIdZa4j
+  +y6pQKf8jw/S6FVN1NLP5zMKcW91zwXp8gfjDBiKWcwp10FRMAbr9WWq2I2ceLRU
+  NSUJmRSjUh30OlW5k1DVTwCh5le1V//Hm1NlaOpdzrOI8bva+Kd9zY5JrfIzC4Hq
+  OkWp+FdFlfpPl0hwKwWKj6GvAoSoYmyG2Vlt/vOW2oQ/MC9lTj60wO2c/J/vYsCF
+  Fk8K/hU6f1ZmIdQt1E3j0cYvo2IFU8Gha1zahf+6I4rB1J3VO73HQM9EPQqoR+bW
+  fRbNJJk3jSPqxl34IAHchINt95TfGoqh0GVUTfZjAtHa2P/5mys3I1Ad8wTszmmn
+  CwIDAQABo4G9MIG6MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
+  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUEkvXCuzW6AL+vdau
+  f68Gs7PEsvYwHwYDVR0jBBgwFoAUg9hhOsdc3UUs7EEvhMiG/qRFkJUwOwYDVR0R
+  BDQwMoINY2FiMjMtcjcyMC0xMoIJbG9jYWxob3N0hwQKFxUMhwQKFxYMhwR/AAAB
+  hwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQA6YAgaLtC0tgmT3J8jeY/g6DPZ87nn
+  9HB4wIYRm5wswVgGwhWQkc91e/H3zTjkCB+4Eg2PBWdcfVj6DkJ7dMqNtsr8+fm6
+  NNB5E0CY+HSCiY587YM15uvhPUxftdKEOjuYeZcyvB7ROedSg7zMVftuqGx2GmkX
+  gMain9Ok9RhRj2B99ouVJ6VISDRE9/nmrqptVO/gdMMQF3ltZ9YknFUps8z63xrT
+  wv9oMcvoQ2atJNuiAjtUpRH72PXI05fNfMhCgcmz1pkCTSqgxggnVPSM46/WF9Wr
+  3658GEm3nUbEHvYPxFPmMUD/Ta3LTc0Qq/Fd5KB5aCB/ROSVNbvesDwY
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-12
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAujAjASAinRCbdlIdZa4j+y6pQKf8jw/S6FVN1NLP5zMKcW91
+  zwXp8gfjDBiKWcwp10FRMAbr9WWq2I2ceLRUNSUJmRSjUh30OlW5k1DVTwCh5le1
+  V//Hm1NlaOpdzrOI8bva+Kd9zY5JrfIzC4HqOkWp+FdFlfpPl0hwKwWKj6GvAoSo
+  YmyG2Vlt/vOW2oQ/MC9lTj60wO2c/J/vYsCFFk8K/hU6f1ZmIdQt1E3j0cYvo2IF
+  U8Gha1zahf+6I4rB1J3VO73HQM9EPQqoR+bWfRbNJJk3jSPqxl34IAHchINt95Tf
+  Goqh0GVUTfZjAtHa2P/5mys3I1Ad8wTszmmnCwIDAQABAoIBAH8zf9a3A67Wt79g
+  XmEnVcG3oT5hBjUfFHJSRThPRmaoAkx5X70uRyRpqv6KjYrH5xX+s97h+7bN3KjS
+  JsJ4QMeGJEaHSQVDHaX1BzHUGcc9oV5jMauLPe2qTjAdXjVnhvnP48vZciNLQJ8s
+  Rx9nhISHL5ZQ2WObfWDXxno98Ooq2mcpMrLDhrf4ID2ioPQ9d4NaZCfDcAeXJLIR
+  2GqPy4n8EpKENGl99SjLXlLfzbr+jytkm0vRPap08vBJasKIT757bc542ZCRW2ar
+  wZ4ErY1Y0S5soOSGQiVLI/zgNBq1zjUd70zOD80fi5JzM06ScKTLime4z1wQKwyd
+  aoSf4xECgYEAxqUlTDEWWwyMcMD8lqrBOPDBr9pqnTNAXH4M/paXrsB0/dYSqULA
+  dws6HoCWBPIxzzdw+JpFd14GeepPur8rztwNXraNkxyRb0+5hrQvr9uTcs9zBhkW
+  Bohv1hvJV32vDmEBmgzyxM/LDpUxNNFbNVFVtMRO+8jLX1JIaJkz4RUCgYEA7/I6
+  FQgZlx9P94ablZUk2qETB8j6NOyyVsZTqrVyr2wv26ZgRgduxqwFy8ciEN/9Vuhn
+  V85CfO+rxHzVUO/UHNeXA4FpMlC1MU/Y9Pg004f2+KJw24i2Ct9jUzMASYBOaobC
+  cvMlsNJFWbvAGscMgm2gR3Nj0Bv1jtvI/0jmL58CgYBl95Xas4PfPuTEaDwAdyxy
+  NxulUj/R6+II2GeBM/ouqPok5oNzwSEcunWd/LGFXnF1BeeGpWItMOWwJTfCC6nI
+  KKrwSFMKBesdsVXxsIKeCd95WsWXhr8IoXaO+Hp0375BakgxNJ5Vqrh4BttYWnMw
+  Pkz5Wp+UnXDPwGQM1T+NNQKBgDzdRL5w/4zF9JLlIjIfUuniUeF3qYAjSlmYlUCI
+  Jj85QiqFWYZp/D+JAy9do9aD+s9AxHYRa+wlH30H7VRKgZOPXE8XVIfe0RdhGbeJ
+  /lxp8MvA6L/HPeYkJB3GohwC3+FFra1a4ASqUc0hQumH9DRhenalXnw7m15Rgfq/
+  kyQhAoGBAL4PZBxAfgEGxEqbHFxI7t+ZihbHcRf5ndVz0xM1uBrNrVu0pINd8bHI
+  PiPuViaFaaVhecp8GQ9goUyhR+pQQHDkH8cKnDhi6HsMQbLgCZLVHYxh/h+mupjJ
+  ++9tqCLzu4fKB5IPk7CiYBIzZjyCNYy/mCucnDP7J/p/sjfQPsKP
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_13_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-13
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-cab23-r720-13
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEA1QOZ4S9hbUUCMKb/xcOzqt4xtoDHDAu2Phb/YaIFga2xUUo0
-  1qTbTueMPR8g9j+XFd70qEX4QV7+A3idcaMq2zMN3X/7WJ75K1hhJ/IgVF+DPqy5
-  QhwwAMNb197sB/loN3aU7BOoUvz8JB27ELpHcWZPRdKyqbqjwNQqNcTBaqF7CeTE
-  u8CZRtKGSGAutnMBtdHBgR1IVPJbqgqUhlg0UyqXJ0e67hzetI75IujDhUxem/v7
-  9pOzQqkOyilvxPWIGz6n4n6vxO+nAYc09hMgWp+lvbqHeaCnWk8rggF8oAoCUTbe
-  /Angc2qrfgPtpl/lorx7FHKdquzfE6YYIkjQEQIDAQABAoIBAAxsL1cwmi/zLFOG
-  CbiQ1zOJzcBk9ja/oBsy4CXjewq7BHJHL5ms95U8b7NI03VI9Bi0bfQ6UGYPkiTF
-  rfjomSE7cv2N7yyV6NYcS143AqepAlBvZkZyumHxArQuLfmxE+DYK4sxAkoEsvew
-  PC6Xjn8QhmL+DKlVVyNxvBxyow0CzovOR8q+mCF3G3Pb4hIX3CGIAYOHJx5Luib+
-  8MIiq9PFlryLhf6JpWsw6vnzxsqS8+Au26qyt+llvNJGzYvE96FDnLSikXLbscUl
-  UW7B6tg8atZhz0Xo2UD1CVzX6rnd42UWCOeT3MfzvuqyVuVaPNw9fBdMRRj3GtLV
-  SH0qf4ECgYEA+aWxDmr6YIjgP1+vfOR8kg5Z/nYsvKcvQKV5saZUaKECEVueBpUu
-  lGiS6a7cuj4jihFmmf0PvdXqyKUjI5VYp6egmEiPWUDMypTFV6y9s1/iYtwoQ4Dn
-  SwD85m4XsJW0VV9XumbGYrXVU6i97bvVxBRiSHCRs4GXjkiR260kOUkCgYEA2m9D
-  8swgc/Lpgg4cIuKUF/NH3iJWlLDrqnEipw5nVNe04Ug6v5iWJYkMZHXfPk2bVkYU
-  haNaQYHMdZDjesQkN8dk3IumUs29AiVIdOzxprTcZv9EdQUsn5xIVdS7V1/lEEdg
-  jNS1vHJlU6aSHfGykripNnj8nkGzXt0F0FIc6IkCgYB2YlJSCfztZjshElj/msJP
-  6KpYduXEGGvZ9h59VejVLPT0EkQfzwKlselpE1jsoKbtxE6pW03psdWCjHzbVOkT
-  p/QKAu6nXok+z8m9R9c1hpSuWMRnLmuAL9m91Bs7y+IWUf4iELam/J9K6swWPmqi
-  byAkRe1x+FRMTrGMQNDasQKBgCX/BMrPRzXkI0pEOhC3aRthbjbtsjHbNKNJWsXE
-  c6UGgKhPcCiz2ipdVJKFDng/961iM1+rsp+CfJZWxbstMz+gp6LVh/EPaLle0uPD
-  86UUAOLJtJbGd6SsAskrYAsq2yWhxOG6foJxQ77xUqlyyaVMCeM32HmO5Cy0Nbav
-  EehBAoGBAIptswThmSN/jy9VNWfdZ9F93UD48y1YZRh8sf/hzG4UoRFFvcAdNaQj
-  GNVM7s0+Q1L6DToKUfKIWr6+TLWZeYJkOPqna0WgZ4QDWNkbSHE1jx5payUscw5J
-  3OlJUzZPNEvv765QbX+lgXp5U0wpZf1glMhOm7FC12AvTicwJSMF
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-cab23-r720-13
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDmzCCAoOgAwIBAgIUGC+C9JhgQ/MWvXCn5veIc5labdUwDQYJKoZIhvcNAQEL
-  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
-  HhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAkMSIwIAYDVQQDExljYWxp
-  Y28tZXRjZC1jYWIyMy1yNzIwLTEzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-  CgKCAQEA1QOZ4S9hbUUCMKb/xcOzqt4xtoDHDAu2Phb/YaIFga2xUUo01qTbTueM
-  PR8g9j+XFd70qEX4QV7+A3idcaMq2zMN3X/7WJ75K1hhJ/IgVF+DPqy5QhwwAMNb
-  197sB/loN3aU7BOoUvz8JB27ELpHcWZPRdKyqbqjwNQqNcTBaqF7CeTEu8CZRtKG
-  SGAutnMBtdHBgR1IVPJbqgqUhlg0UyqXJ0e67hzetI75IujDhUxem/v79pOzQqkO
-  yilvxPWIGz6n4n6vxO+nAYc09hMgWp+lvbqHeaCnWk8rggF8oAoCUTbe/Angc2qr
-  fgPtpl/lorx7FHKdquzfE6YYIkjQEQIDAQABo4G9MIG6MA4GA1UdDwEB/wQEAwIF
-  oDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAd
-  BgNVHQ4EFgQU4/0HAFmJsKWG0jyM6Auk/gDQ47AwHwYDVR0jBBgwFoAUokWyaNT/
-  SzymovVxAmNd9AJgtSswOwYDVR0RBDQwMoINY2FiMjMtcjcyMC0xM4IJbG9jYWxo
-  b3N0hwQKFxUNhwQKFxYNhwR/AAABhwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQCx
-  KSfehRN9ZlldkgHV4DFVR92SfxmmgLJT7M5Em/NkyomJVAPk0ZZ2/VxTG8P6i2tT
-  ObkR4hIx4f3pJd/4pRi4RPVJ6gF1wytf8GpNQkp/uolx5FT90Z/IIOXtv5e5mj8o
-  qlua97k3eHnFAvK/JqJgKcwevxGg1XoXoc5bbUITF9tSieBOkVnPY8OMKbWFSQi4
-  ttWrxB/oBfT/hF3CmckdFCojgEtiMMDIllLK2tavQhrqYT9k8OetrWpE+dQJZd4I
-  TxAYX05hZM7RpP4vpm7RhomM2DEoCvxOXPtS9YmwAi32UM0/9AC+fjsxF4vBHNO0
-  5AqvWEsYcNxi/+InOjcE
+  MIIDhjCCAm6gAwIBAgIUIz58vvDLdh7eq5JccKCX9LB5xZAwDQYJKoZIhvcNAQEL
+  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjQwNDE4MjEwMDAwWhcNMjYw
+  NDA4MjEwMDAwWjAkMSIwIAYDVQQDExljYWxpY28tZXRjZC1jYWIyMy1yNzIwLTEz
+  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5YHyKRauf2YVjZ1HPH3+
+  L2d4MK0dlSWh1a0GSkm6uVFcWlSjgUllcppuAMZXR9WERgA8VbCygrBGOnnPitj1
+  SkV5FTXO01YI2st2beY31UHJcJNZm96DcNAngKB0PfYst5IEF+Q4H8/+5cJ7W9WR
+  bglOVlaEdcYRimASN8/e0GzPj0TYrpRc9bqDrTA50NG0B1T6ZZlwkYxBsmPrztei
+  voZXBLrjXEOEbiSQ3dAo15SU5h8f40hldDlPHmdvDJVFMXuiFePHzLLhMnIOF60v
+  QN7bS1ifYcAwvedZcrGDjruaj/NzdMwZhNIlJl88MV3IROI72psImOWXKBPm/s9k
+  VwIDAQABo4G9MIG6MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
+  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUbqzAsCuhvsTYn6Ii
+  4SEqFKIR/eAwHwYDVR0jBBgwFoAUg9hhOsdc3UUs7EEvhMiG/qRFkJUwOwYDVR0R
+  BDQwMoINY2FiMjMtcjcyMC0xM4IJbG9jYWxob3N0hwQKFxUNhwQKFxYNhwR/AAAB
+  hwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQBbb7NKP7Hg+b13+x4IC8zcsXLkittX
+  /L3mQRwbkEuW7cDqAk91ky7K3ixsnKZjqTysEQhchcmhXMvrMk79NnWoPaABEQtt
+  hn7OSaz+9Klokq1P6XiiU82wrfAoeT5/SjMOyDNe3TR1/Y3ZqxMCM2XH2KBkfNYY
+  Vo3Yb4dia5v0L8oKbvodKC5Fo9QngxrzHZZp1UC58IMes0F/Sautg7eWGV16YC5G
+  KIQpPP/C8WdCHVjHG+esgKPiaPrwz1glIhHFxEZ6ovTpeedTEwJK1qpaq+KBYo2j
+  zJ184caK9DGeCLUktzXG+w3eVOIOBbffyIAjd+TW44BspXwHUERtaut1
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-13
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEA5YHyKRauf2YVjZ1HPH3+L2d4MK0dlSWh1a0GSkm6uVFcWlSj
+  gUllcppuAMZXR9WERgA8VbCygrBGOnnPitj1SkV5FTXO01YI2st2beY31UHJcJNZ
+  m96DcNAngKB0PfYst5IEF+Q4H8/+5cJ7W9WRbglOVlaEdcYRimASN8/e0GzPj0TY
+  rpRc9bqDrTA50NG0B1T6ZZlwkYxBsmPrzteivoZXBLrjXEOEbiSQ3dAo15SU5h8f
+  40hldDlPHmdvDJVFMXuiFePHzLLhMnIOF60vQN7bS1ifYcAwvedZcrGDjruaj/Nz
+  dMwZhNIlJl88MV3IROI72psImOWXKBPm/s9kVwIDAQABAoIBAAMATQNeiY+e7R85
+  9EmFOEK0bqzsRpvBrzkVFyT3i9qKhtOjkbPKGuqBvHiEH3YQA7fKnv9b3Sm6VmDD
+  YQRmy+ZZvDibyIWY9WqvCHBtd0Nxpcm0E5LnOP7LqgiTkJGS24jW/vi1AkrgNGwa
+  u/Q6eblfo8ebQAYuPeJ6WSKjtD0zeLYRQzp22yDcGe/kCjDOfCCfIMk4ej2kShuG
+  8DizSaD9aEHhI7sNum9RDIw9dx5SEjWEep3pi+cNzNZmrAkJkdlOFBbvEAMzYWx1
+  zDpfehxaKUVUuZBHGhcYFQVPANAUpIUb5E5Itc6jvN7LTWXF6V6aGY5FnrmZHAPG
+  zhPLOgkCgYEA//ZARztEcKtwiGD/xSaM2UwYsHrTk436Nel7+Lr04E/okFc9MVsR
+  YrxgYxWn0ualrtUIkHY3BJZPwy7mQsOJfFjKHY1MRmN4sPR7NcdRie0Obp2Tm/tq
+  84aqVufGesDNECdN/T++34GBrbzq4hd4Py9KovUidHYrU7DcoNerK1sCgYEA5Yqv
+  8WuFN1pZ39FseTEWRjzNV9pDyKplA8Y0MoN0ItWppqEgA8uWpzUOmYg6c0eBHI5X
+  8GRbN3bxpPe3aLZ+hpGe4SHJtLYtwSrHva1Y0BhJ0OaG6WkfD8CYrnySk/szXWB1
+  PpfsCrYVKxSRRSshPHWjf7FxHJV78owuDrYix7UCgYAIJ6hUnKbJkCy9q5l6hofm
+  RG5k8QTcpqFaJl40xoAWxXT7ZEwmzmf3ZVkMzxvRtFeDAnaLY7jNBJz18wCTD/fJ
+  ZmrKFj5f37twp9llFTyb0FmtXIffaFs39wpmSmwgbRQbd6UcdHN4W3/uMR6qpWTH
+  XpJaLsUyQLGQsQnWdgiWEQKBgQCw4cxvF1HSs9cp+DHEuiTV/yilmFY/nb61x9iV
+  TGMELO3Mr8EB67KuKt6TRTz1dJZzsOTnJA5+kTPo0dMN6ANcI37xMZ5DmVds0VCW
+  Q6x6vxyy09IGr7D17I47d1dknWCZhikTEPMd1e4+Al1nlbLI6kYRsmTdh/u5jng3
+  cfcfOQKBgEmGsLyKhP3daCO+hdoI/0nURvu0nBVBU46DV9CIdMuIZ5f9nqerHuQ8
+  3vmbYaPJyfiQuMgjitgsG6Qpl4CKa04GW0vYzyEJv67hGUOuP+Bd6Iow2lOdBJ41
+  mG5hGH9H9p3GCHT9ulv6NM4Aa588S9xJD5YcZVLiOWf4d4YbkGiM
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_14_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-14
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-cab23-r720-14
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAufHV4jXHmXeEcuBj9xCH4auP5h6dazHHppvNKDyGyWIRixfO
-  dQKesS3/6f34IJat5U6xru46SO6mjH+doRzuUUL5705qT3UxEIncAGrXJ6tn61Kb
-  SZhZGHvtzTBDSwSynpeulJwPsIV0Iwu69v5Nk+j8bbpv4IdV4GIqi/MqEWAGwX1n
-  DFt+FWT621/N6TSc71niBV97jg1UT95Odz34bQ0lVtFQyPvKWVWHApYLQVR0vudt
-  huni4GmFReqLlN8hJCN4m/okmLPF46kIHEsLA3IzgAyX5IFymfnvnHhvgWBxLdop
-  FLyfjVGO7xamapKPjeNtgDJHDd0B6Xne8yOtawIDAQABAoIBAGiJ0tKLo7zfGcKv
-  7uOfEpXIK22Xtq7mXLWJkEzXwnuDvBMz/imAoJFCKEd4NkC0Fe3+URzk6DXKni4N
-  LSTALCfZfMSSlGg5na0LpHlDl9TAo/sEBTPaB/Ug72/Ve2+4o2dQJaF9H8EBNmrh
-  lGp6TEkkyo4yK+XSkHBHIF5wBi2flahuZcoqUtoZmCeo2X+MKdwCpLRPoS7B/dtO
-  KBnXAxmlkbusb0ZrpMSKPHZHwU5mnzQ2pv4+IoPgJ7s1h00bTRMJeEIopinM25Ry
-  Y9pENyPnE3zdh0tpkEuqT8wj0fn4DOHSeNnm7BE/GeRaWz0K8Qdu1KVWF6Q1CzI/
-  pzGabukCgYEAxsBBUyeZKgl3asi8zbL84HDaupiRwyZBwhbKs85JuhmECWKCEJQD
-  tYTRfPV93RqIMCihcOvo1gtKY6hp+I5YlVuREizjtBsa1pVp00nYznECfTYlwsjZ
-  EQm5xb5gX7m+vkAyWHGxZvAh35WQl10+ThAsGXso2pk9PMCes9A0bM0CgYEA74FA
-  bPafJnxGQm8NaKNKSOJ9OzvxWKxAvQjdOBhmTXt5oiA/aqdFh5pxtBKcE9hiDJuf
-  1lDOJMS0qZl2sNBwHdXohpsaoj/O94l1S20mhzFn26th40hMvuF9W8k1/GkBnErl
-  Q/4LL8ZjCzaddKSwy8u+UT8Kbmfnils+h3XFgxcCgYB1eEZj7qChbuzs6W5mKac6
-  xJkS9oAYlrEBFVWDRqbe3pvirB1xzPoQPEtRDwvwNfFOfYVF57k7YXr7Qhw4M3H5
-  /R/WXT/MQMTxFWhx4FDLW5H8DZft86YQYu4xCR+PFIq/idP34GLZE48BxjWqsQrV
-  OsvF17xCz5WZJcPnRWTm9QKBgADM4sU6cb+0LJvuORI/cXEa6KY5Bg5wzOqUzABy
-  /GyH3BkxmGSn2HCikHy0jzb1wyYdowQZUwcGbUAf1iizGZzP6S4B+K3QHsXu/Kha
-  3gUXoiw2v2X+CNueb0fOPVLxmuLF0UxP3gOz2wLflNkd78VOkf09g7BownpQ4b2c
-  JCPTAoGBAKnmHsI3wiawM8o+G+v9OAmAZ1Z2FbQ5uCFYOR0rqkUpi0J8+HUUNpCq
-  Wz3scmxuvymmhe52DhhctNlbirAMLvLsuK/LBxING9otcd9RaoIWmnVvD++zhRzu
-  l9F9dO7Ud4/Cmhu39LMv9OcpmB0fBNRxfLXbzTtARczB42jokq15
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-cab23-r720-14
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDmzCCAoOgAwIBAgIUXk76EnM2W8ynoi7E2jtm46UWf9EwDQYJKoZIhvcNAQEL
-  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
-  HhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAkMSIwIAYDVQQDExljYWxp
-  Y28tZXRjZC1jYWIyMy1yNzIwLTE0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-  CgKCAQEAufHV4jXHmXeEcuBj9xCH4auP5h6dazHHppvNKDyGyWIRixfOdQKesS3/
-  6f34IJat5U6xru46SO6mjH+doRzuUUL5705qT3UxEIncAGrXJ6tn61KbSZhZGHvt
-  zTBDSwSynpeulJwPsIV0Iwu69v5Nk+j8bbpv4IdV4GIqi/MqEWAGwX1nDFt+FWT6
-  21/N6TSc71niBV97jg1UT95Odz34bQ0lVtFQyPvKWVWHApYLQVR0vudthuni4GmF
-  ReqLlN8hJCN4m/okmLPF46kIHEsLA3IzgAyX5IFymfnvnHhvgWBxLdopFLyfjVGO
-  7xamapKPjeNtgDJHDd0B6Xne8yOtawIDAQABo4G9MIG6MA4GA1UdDwEB/wQEAwIF
-  oDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAd
-  BgNVHQ4EFgQU59R+5uHEpWNnbidBd/kCk+K5E0UwHwYDVR0jBBgwFoAUokWyaNT/
-  SzymovVxAmNd9AJgtSswOwYDVR0RBDQwMoINY2FiMjMtcjcyMC0xNIIJbG9jYWxo
-  b3N0hwQKFxUOhwQKFxYOhwR/AAABhwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQA1
-  J+hgSO7BIMX/d7VW7e2gZ0pReGLycGJA3C7GXHj+sZ6uos732b1qVA1NbrDD7hsG
-  sWdPXLmZCDwscrIGEU+fonB2LECnD7fx+8tH7RfXRAFrVbbhTTFng2x08HMwlzv0
-  SNQHaWdiQPY427Rq69o2ZXZRut3xQ1qZOjFFYuhWYPtcOkK0bF9komvSWseM1+1v
-  D8tnLbE9yWSyu6DGxMblgBCjDDGhfLIw//AG8DWv42oCkV0+cnw77cmLbtMr0NDk
-  VEfOC38cm/V33ZEU+E52WxVDZPLIYJPHlkgexxitkplY/iMxINcFMQD0TySMm9b/
-  D+Y2fzHH8voSTqi03Z4n
+  MIIDhjCCAm6gAwIBAgIUK2JsvpkeNEyPohV843S6GvLsxIIwDQYJKoZIhvcNAQEL
+  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjQwNDE4MjEwMDAwWhcNMjYw
+  NDA4MjEwMDAwWjAkMSIwIAYDVQQDExljYWxpY28tZXRjZC1jYWIyMy1yNzIwLTE0
+  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAonZIuobTaONdglUAxPwa
+  8W0KbXYYqdOFRGUGDfg+LfaFpDsVf9Idj4KoZJ5x1BcDIHa3YyIppABURfLm3AO9
+  xxtywRkEK6TpaKCNfk7WXXc7jexRADhyP/gm/dudqSVXZpublyykll0RTeDvFAL1
+  NA5fTnhwJMSy2NCUb7dbtKywyEbRU/j518CaV2/JiX/nfFPo2Dz+G7dqR6+xFeDU
+  XD361fl2OzsuyZJ4p3br7E0X1PB1C7fYI8GipJB+BHh62z5BqLkSxqG01ckWahFE
+  najI2kPuZ8oi4y8R46XOFbBgROfx8VWAhdMojkl+oFk2RH8k0lD00lBJsoHmEY9i
+  9wIDAQABo4G9MIG6MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
+  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUUIl+wSZlx1DTXOZU
+  wyoQimefDLQwHwYDVR0jBBgwFoAUg9hhOsdc3UUs7EEvhMiG/qRFkJUwOwYDVR0R
+  BDQwMoINY2FiMjMtcjcyMC0xNIIJbG9jYWxob3N0hwQKFxUOhwQKFxYOhwR/AAAB
+  hwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQA2dAIUK4MgNXEV1d3Y4rqWV9av9eyk
+  yh2kx9ti/UKMHp2iJ6Vi9cv7uQioagHIXoNXJwV4zA2uu2eoxqSF5Rhy6qmNh1kj
+  Jw+nvX1bwsXTvTeF6jdt7BVq1qT1zW5rze4CkKn9Djw6Rzx8fzw0+bU5WKRqhra7
+  vXZLBkQ07f8zgAsNBIv5vkLVtUjOkt9OXMR5LFetG67VWTGJDLa9Y8Fe374tksKE
+  XlHa6NzNRITblw1rcp1SeXJ8UbMRWYFrunxx8zHlUc0aQFHfs/4HnTEpsVBfANDY
+  8hWYAOp309yJmVCFoyi0p85eVjpNYlyf/mj+05j5nfJEOogsyfJeAxWN
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-14
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAonZIuobTaONdglUAxPwa8W0KbXYYqdOFRGUGDfg+LfaFpDsV
+  f9Idj4KoZJ5x1BcDIHa3YyIppABURfLm3AO9xxtywRkEK6TpaKCNfk7WXXc7jexR
+  ADhyP/gm/dudqSVXZpublyykll0RTeDvFAL1NA5fTnhwJMSy2NCUb7dbtKywyEbR
+  U/j518CaV2/JiX/nfFPo2Dz+G7dqR6+xFeDUXD361fl2OzsuyZJ4p3br7E0X1PB1
+  C7fYI8GipJB+BHh62z5BqLkSxqG01ckWahFEnajI2kPuZ8oi4y8R46XOFbBgROfx
+  8VWAhdMojkl+oFk2RH8k0lD00lBJsoHmEY9i9wIDAQABAoIBAETVyUr/BWRTsbMf
+  QQw1pVTV1q06dIjATp8EDuSsYewnn8hOIHXgGRZNTfwUBjbO6UxAAMPIHcyXNx3M
+  JXTjQO2z+5NFfjbf0OW74Te7P6iqdFlV35wwTng8NIkrHEomwDmBhRMwnyv2kvZk
+  b+gSuMIttMQS07FAhmbHOZ18GycZt5Py+RzntxbldGuIOQFPZepn5ZOF/951yHe4
+  MRL2a+4iT+X6d5vvyqjm3BTXQDZmwRkkidez5GTiODT5ojWUh1Mf11gOys9SacyM
+  Tl/d7lMEfIO+76eQmvlUPDfTnkR4z3NUojnovnsrIrgNT7WOdRaZCAzHvqFr2fcA
+  bBHlCMECgYEAz+GbqGk6WrtwZLXu6RPBx5GrQdws5o89lhTSfizROchKLjD79j1K
+  qKIisV1DWvgie0j10VMcCSUYRZZ7joC9SLvE9dKk1eth6fsnmPFnOBhv85P7Mv3k
+  3d3RHnDSfkEbVCTbQ7I9ktRbJQPYOBAZnOr+jAiwjgdWQQfW1Y/LMasCgYEAyBFG
+  XYEx75bG2VsGjQeysy/JU1DrszPFgqZbT5JUuLOJBZRykdrpdOOkilXABVvyownA
+  WKybjK7Mf0jF4P4G5VkoN8augSuE47f74rJymkRK6DooGfrkutypf2VnWoYd0yYi
+  KmNHfwa2poH14zDBA0mWvEiPHJXsuhenkdmY3+UCgYB3b/JVIpBqjQMYegdYVweh
+  OCqjXnNVzLrfvfrqj6luf4tPWsmJQtHgbbdtHF6Up7h4CQVjTVLwViXJ5Zn72C/o
+  2Clj67DVT7YkDy9DCn/5lODNnBpZw9J5PvblfIEUFSg0gjCQhpomAGiVrc3O+EEf
+  DU1O+7clA0YlevGOJl3inQKBgQCuMHw3RRkZJQmUjPAzMhSgdmavJ7FPoS/CBN1T
+  dnBVL9uJBCqMWzEQGHNWDjrVb6zdzsutaPs1jat21wGSVxnh7bJafZ3J0P4u1i10
+  vzGQpw0hDCGGHS+wkhbxWHSYGFU3VehBR5ckPdAhQN25JOWn2xZmcDZKCS7HB3la
+  Pz4fEQKBgBJnIEFMEwNX3FwyFo3RdaLfYhMXIgq20VHvvvZsYuCNASgZHhudfbNT
+  Ilq/gItEjux4Jd0y9LvaFBwyafbm/nGfwOEJPfD1D+x+15DBzXvrQ7tXowXdVpOz
+  WT5zG6T7qqeQV44AYbebDsQALOA8fbOaymNrNPPoE1rnrFcCVo2a
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEowIBAAKCAQEA1bWA22bzlv6zAuvpKm/CD6SlxJBzgW5mEAv3pDISREifjtTN
-  gpP6fl5Tpv33dH9tZb2OEJ1UlnMjScWUus1DpkHYQOisMck9saRbzQ9l3HvULTjB
-  xbSO9pC0Kv34gONh+3BDQQgryG+0ienGzLCPFb8+Vv9z8w386pH8bDDapSiZ5bXl
-  QwEtck18T9QX3/BOxUde5MnYml9656LF3QPLteGhru9MZ3qMA3tFjw4bdgopqVhG
-  /XxlywlnS8siq8mKIWBcuiDP2DYl63qM4GXPz3g7k/HFGKYvkCB5qGObiSX8Cwt6
-  I05xO9GVo6yiDTfrPBIYgvxypeALB0PhYx5jmwIDAQABAoIBAAk6czwGMBKfIP/J
-  TCJG/SxLwdTBIBvAtquOuLzgZKWKNUmnqtAur6xxSk91vA/NyN2R1+ajxJlSk32G
-  CKwgXQF66mmzImxr8jwPit9KAO4KctkZEFUHPP0stnr8yJRYPUzsRhsyzSE0oakq
-  7Si9nxAjV//NvCYMvpUqhKnvWiGzkOG6AjDQUXNoLHG+FXCNfT0G/A9XKJI6O0Ht
-  mJU4J4A0Hh03MgRWIqQrWwOsI9ywg03AzeC8c/PDQG4nh87JCGlV3owlLCZCKjM+
-  g977OVeez3ulv4xwz4h+IwUG7wzcVN8xgEavaeN/CUZfCIvrtMLUpBEE+j6DdwGq
-  GUpMb5ECgYEA2iJj49GQaKqZjmNkdNxcwY4TJ23Wd7M00ciB4+fBnBBcS1rzsNzQ
-  YaQFTMm530Rt2CWNUsbq3pphNiRl+iF+C2j9KG10ZoNhcVAP1HGCDXvnZVqHfMvu
-  ynjrrJYvTacwxLwHF7u4o/pyib9YedITYZPzed1A/HSwtpJZI7hL0cUCgYEA+s50
-  7jD8xp04jmf0r57mywsKJSmWk0ECuWPM49/X6/NZtQJFIUhvR0rWHQrg2eE/sErL
-  KxK3dXDGNQHEgYYOx2qRKxJDFxCYmVeB9UR0pU2U5ew7f0gpMfQjS8oz73YvrU+G
-  saFTiJrXpkTpVQM3SqYAr92KriRdsELiJr6/ld8CgYBV3c/AcFAOQ4mq2UlEDzKc
-  Jpc3oC8ac3rJUcp/sk0uZ+pM54KiDmog5XYIoif+0WsD+NRGz3LJKbA2peFWszRw
-  vWVaMqvtZq5G8qMol34AXNPbu+U1pPlcznjHOV9pi/TQnMuV9hlaw02vF5l2atGi
-  SaFASW45cp3VYIqiWvvNmQKBgQDA0w4POtZ8lM+wnLgAdbiXDmvEWo8Ls4W2psYV
-  xDkrjLLBeXdQuXHka+Ll/UEWAhmHHlnJSeCGiCe7BRrhQgIGyyXE6YtvJjFMY3zk
-  5raPiHAbvV2Y5A/X+g1Q7aq0RjctleDGnHOuqO13Ra/mzkwqNip9C2TdsdPd+e4J
-  P8noHQKBgD4S9UAwEJ6fJoXRjhz/lqnbBThXPmqgIBUSnS55g3VZYhDf9tKE30rJ
-  salru3Y9s5Z54DufGbtp0JFUXYrHhnkgIvK7ADcqsmw+2Gn5a7cheYoavvMUbRsI
-  nQLDkob1Ok32YFtiNLkV/KysmKylEy2xSSuwMkrYsBi2+Cdbi3WD
-  -----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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
+  EtHCUXT5ROb7b7FJswA=
   -----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-----
+  MIIEowIBAAKCAQEApAh5Np+USA/KUiFc4RcwODwOtGR6f0lUhc7U0MlxP4PYXmRB
+  sbJU5M7gy7NmlipCqcH0MXHHyAWw/01AiWgwBFwVAQQdDzmgSL5lFxnVp0dnS/Fr
+  uubQRcW2aiKCPUVWX1HeW6xqaKCjTT30j8sa3lpdyF3MI2dXgv/2Q36xoLCjkJwi
+  f5E5lIO2lKWkqQ6pTb4PU51gFuDvyOdIA86z0Fo2PR8Nyq2AS+uTU7RfoLUMnFOh
+  /0TVzyS2/IuFsPej32t3DE5rz81lL5Z2cFVc5bIeyVW1ACbZtbGTZH927WI507RB
+  tpG/Gu1Qhs6Nu0cLcEZ77cUY1YY1vihbFtRnXQIDAQABAoIBAASj8Lno3csEF1cn
+  dncvrr+Ig2n7BbQgIPIAHekiKcAAPNi+wVUDlH88kwNwOdC5tVUUFZJog5xW/ODc
+  EJ1Sgzk8WaPDuAa8PJqSOE3k/zRSQsvVMpUA/pdatoReIY0WLxFXQZEaWZBIKxZ+
+  UDLZLhNoPwryDFpcDA+6qf7S0LeY/A6ibEfuyXeKOszu8YQ3GoKqlxvnnVL4GsuZ
+  JF5/g0+bosk7bdgsdSFtntMiuqKIAC34DBIPgKPZwXucLtf3LHehY/Z56opkckgT
+  Nme/EULU1w0jSBGeYsRUkv1XnByMilrxREq70QTU1qLw/WcCRubCwsJbg/ibLXXs
+  rIxkKckCgYEAyDcSl/aAmfTxfPY93X+dN+VWi32eH+B+P82COVmq7KbhmEQLDcXS
+  8VO3rVfz6dFmYx6F4kCao1VVhSdYh6fib9/o78BucKrs67FZ12j/ARZT2lNOKzx+
+  qLFFvo2gq4uTtxUgfOefrOf6vOqfS6Lhq2ImXbAs9fOftcVdEq8/uSsCgYEA0byc
+  vvTlWW8CTINgiSRi+4T5FQcNt7V/cMhQWY22K0DQYaZ6B85omcFrXxzz24nnR7wv
+  OlhEv/V5Zqq3fH8AJ7xsNzp+WzR7Tp3J8tlKnu5IvkAh4gLVtF7Q/+6JiVukIijz
+  bP1TUD7XliA9ki6Idbp+6Dws8OF3MsVo55oFDZcCgYEAuLYGU2g5cNAH0o+it6y6
+  MQ1F8N7teN812ksQrzRIepfjXQS5ZfVyDO59cFDKWJa1bRCF2BxeDf32LigEhvKd
+  9zSNxFK2EP/AIBm4lwDo8enVZoCgh0cCW0Ng4tHqvxjAKJI3LMTMDUrfilayq6cT
+  p3efiaO1dxtR5vK0UT6Y/Y0CgYAlhsfM6uh2XgRdSExnfVkwg5RFjOOJcTICLfUi
+  cNadWpVuQ2kmKGpSyGa7t+Rx7XSyQxt4Jv72EafNFNKLtfWDJpV+NDsTeoptgJH3
+  n6VYVm4xjCwD0loGUci3Yii9qOXvLsCPSaw0eWn9dHtPwn+sANhgGRQ5bT30mZmx
+  hr9MtQKBgAiGmlqMseRzoYYoBuqOHHlT1nDeRR7ao5xX8PrhaC7X3hiXMPGTCXmS
+  331HF8rTd4j3ehuw0FA6e4voZb+O4VDlvcS9P3c/MS4PtYzIO9JgUIeKveeiHbrp
+  NiHjB07XYbzp81T4voTYQ5roSj7SgdALziGhE0Evzd2a5Fsulzaj
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEowIBAAKCAQEA2oTYhgSAv4ohQ2/UORVnkbn3DQbyaJ78TfxHISvZBAC/pCKC
-  D9xSAOI4ivi78vXQ+4+4LT0mf0K/wNBLHpOuJ6CPowFW1nkZldTqBE1Wf7kk2ybz
-  GMdz9Y32yHrhzI9iZ9nEtbmMnhNDyuNKM3sBLgGCAwn48c2sI+t3YfaAJVLplzyd
-  UXfRhjbw5dkRKX3kBB9tF7IwTv0X2w7/dXiRyzT8RgBdy78BssQF0oFz72V3qxRe
-  dIw9EjCsjLUgquZwhytaUOtfs7rOSEcw3llZpk/+ydVfGTjyM3Hq7spr/EnVbzbS
-  5kfsudVlFyDcPsgYPEr0WUbkWcJq0FLGVpGI9QIDAQABAoIBAH9PQm7iFLiDG1oU
-  vwn65HpMZBjc4UH+znQI9M/ooejpHr3btPbUn5oQMm0U+TtV58mIM/93TwR5uQn2
-  0K0h0ScZLlYDo7oUl8lpYGXdQPXswgJEMQFQwshfS1YF8aOiLezfPPG7BqfaBXcg
-  8MwJb+iDzGFE4BrQfuf2eXlDiekzzv9Sk5wZwuGGRkISxHbw2rpH7e8qu01mmBYQ
-  EUINGgUHltXOSKR8ZYf+pxhT/qd3daxvH0qYkma8HXY8GsHOXxoR4a7egMCUepgr
-  bNbToOZ2R1THKrF1HtzhOGBXVxD6p7m/CSHaXVNkO1MNAgSL7BsHk5msBBHMUWuy
-  8MnKlMkCgYEA+reVYCAz9k5wzycGGuvFqYojeKFh2IMBmREj+B96c63o7HGVwKJF
-  feeoFxtDk1gRvCEcnRv7upKHHUsqCnFh79Ihi1mc/RXI1SoMPkb9L0UIvjKmhT+9
-  y2k3EE/ds2+3xHV1//q35ln9hwho6ej4Q1xmzIuEGWaGZwwt487dCjMCgYEA3x+U
-  O0ikWB5NOF1lwGrftUXRJoaWpUaZZSU8R/f9a3x0CU2rs08s03TU13ULmUGjzmSy
-  k+PITMIaThVt2PiKi1nw9l8UrGbnjzuOfsWldqcDVbQQS1s+4yOkxFLlG7ksHAW1
-  mCP6xQuN6NESsda0N5NCH+/8Az6KE4/6lpLySDcCgYEAzzCNeh3Cs0aJhTdbnT3A
-  YGYvAA5lvLYuyN7YWcExwY0zksofFk1DnlOlnkrCom5CYbT/X3pzofBbRkMKYAzp
-  AXYmkHEjAidRi48vBPxHWRv0qLFU2YMeho3RmmJV9WZaeDkVpc/8z5kIoeG6Satk
-  Fs6yiVC2fwMyCNCQz9Tw5+8CgYB8JKXlFlXacYGlitHCbbRqt53XQasv6kgO7tjL
-  cj+ePnCRfJW7/qGCRc7m0kjRzKPHgl+ZyXL4wkbAi0vDHQZ44mIfsmdeRSMxnoF6
-  J54YlnRUiwtF4k7rMjnKwhSXiD/yl3qiW+J7ICKlFy6/pCZBhb2U54HgjDtnBwT2
-  ImyLoQKBgGwGLEof4P2Sp5LW6LDY3JkWpLDgnR9jP4XuSRnQ2ZdymrwaaH0dOucq
-  S2K7sbwAlw888h35pu7hsIP9FBDYPRnB4ME5KF33lwxRuz+er5svil991YMtt/xS
-  LMQFQrMDcyZMWO+ENgJca///nlNdNilvlRbFp2Z3po1kWbRtsdLK
-  -----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-----
+  MIIEowIBAAKCAQEAxfMviy1LE5Ehlwnu8Qwnlbcrpixi/KhMPYbz96bN9tnyiGCm
+  TxOXJ3TYVLwnAVRjYG09K+buvNvlvbWfLGqTZl5k/AMA+228fUYbxLrUs0uFGEOT
+  JdORkvmx0BO28JBvjSjg3czuZG7pnTwqUY2kjigvHIk73t5buCz7jrhwwPTeW9oB
+  oei/6kP8oV0IW2Ss+T1Ti/EPhq+QwWjTlVKaPc43W0p9RFMmrpu+TU9fl9rWjYSI
+  6tAKMti+CTtFBsoilz7M5HEQKQyGQeR2nktWrXvzZ3sKCGteO9LiFLTX85LqUz+C
+  u5EiK4Q8fxslSy4nCLu1nWBz8ezdz0gLWttDXwIDAQABAoIBAQDDYfCokBFNg+/C
+  tERLWnLr/LsxrxgZSEjQZhcCd3tOTvtsDvG4lZ6ZjGRG5twdHN1l/Qzm+27jrKzM
+  Hqu43I0W+s70TEa45Syp/fxEpyBwxHbfZzujl3tVte4DcqIcOoRQsWuaob8gFLWz
+  xAIFMyicRB+ULASTS6j+VjAKRBTO7mbbxewZ2SNx/saYnAFSKm8fZe/Jq4a7IgrA
+  ykVqTxxrZzwbR6MI6E+6U41PyM4m4P34/jn98Vs/cLTXIvsjlqE2agc9vdM+eUwA
+  mnqjZ05rTgt4YTmB2VhRGfFl9iBrKwZyoPfrIgxnlk8pe5raku7Fe24/uBAti0FB
+  eXTWAZNBAoGBANyCIltl2J0tNLtCFg20H8OtJoo1ZTv7AKVol0++dM0axH4PwWA+
+  tJnGQaNa36GA+AHqxf5Wp1LYml8jvEZtXMWUOY6EX9NEfKlhwBY7C9Sd454nBK9X
+  Xz1Jwf6eSJ01fQc26Guwsy6QmGAdf7y1FmLEOIDWyDEg+IrrI14/gFr/AoGBAOXP
+  jSdtwK/2R81P/a6kAlg/NgS66Fn+6k1mKsKbczn2byUjrS5ScwDaPAF8qguB88Lv
+  DWkoJimxpkpBMknvtLrkUjDooxeepndclJVEvWKy+bRmlxttKSL7X36nMXJqbP5g
+  G2qX2o3MqBbfzSc5JLjjW81dfmQfz2iqoTnaqvehAoGAfcwP5ax4o1KC3sGY60Bz
+  TqKddgN4OXu8pqDAkdHJuKkop/I9E7cyOPgNwi+5nN2CnzVctvighHblupkcc+E4
+  J8+j9lY2hMRxigAmIYiV+zoH/NWtqoph3wkRDz0ll+pH5bHBbo5j6pC7HTo3AWUd
+  3EKtKXNeyghRQo9aog4AH+kCgYAg7w2biO8ESJchpUUFshtj6isjomWKAC4zyWB3
+  Yy+wLtDe0a4P5WD1zlCrJeJ4o7b7SKbzWv2dHAhou88pKWENJ4tf1vcIe4P/txTU
+  D3XUnzGJ2Onu1EYA7WVSEUPU0cus6LkFHZ4ElD/Ch3AvHtFUbcDKPYvPbX+b0Fgq
+  olu+AQKBgB89JXLJy3uoewfx6ORQQLNCl/pCKCw4F5Ug55r6dnG2ptTD5hqCP/rA
+  vkbBL1WiTK5hb9L1rnqrzZF/LJxoj+IX8OXdl2G1bCrbajf2FD1dv6sC7Z3Gw873
+  Ijnv3RbqIkVcnwfApbF64dmMmy9TfOPHpj3xT16ebTcLFYfTcKLb
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_11_peer_certificate.yaml

@@ -1,71 +1,71 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-11-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-cab23-r720-11-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAmBibCvBTViGbDjnOL8HfuiVfrEaml3EJ4lTnzoHnkPlvRcnX
-  9BV1Vdvd9WtYKfGIrLV6EE9begL544MGixTtu2cp3zupggGAQT1moUU9vErk4Mmz
-  W9AxbWDEPzPSXxqPxqzkScau0a7BsYIWy3OTapkSJWLY3fh6QJ6oBtMfxFr6QViL
-  9Gt8pOMm2Y4Zj29+mw0DpOi09v7tuaMk5Bn5DKatBcoE5089X5xE2WC6at4RgDYA
-  XhsuZXRd8Ye+gt4AbJlVAWUJU+GMwJnJkfPoDrO4RsMifAsL2SUABcU+29pSN7R5
-  cKpF++dyVZpVizLIM38Jc6MLhPjgApJSUvdlWwIDAQABAoIBACPbsTn7/PnShHbv
-  I/BYegGt7Ad2xLHxoY3tzJUARXMFi7ldY/+Uy4wJgSPqQefpnPpy8qtDumJirz13
-  V6SUs5O6N8H8k/MlnXJEIp0k8PAijCF/DD06MV0DMmFgO1nWrkz91/iY0gB3fgz2
-  iZ8/yWKZYhDUZCK5AUGY5i5tuhCVsVz58X17nSeDuEa1PlICKFCIIl7Lk0Eqbqzs
-  P8moEkHwu7yHR8WtKMmB0DlmbLqAoSCIUDCTX+iH/pIDHzT7VKN+hV02+K/skwJn
-  M5hDl2STrQfBloHrC2+9Hq6Q5WtA9S+fvdgT0MFVLov13h4AnILL02yKCV3vADsD
-  97rkLmECgYEAxpbL1UOqn7Ycigiq4DxWO2/xLl99b5J0f6U+o3MftQhrB7GtpLCn
-  bhf8J1ihwUNgURN9Y1FXIV3QxXZabinjAwu4+ytQesrmQvbG6RyH+AoXjAv50Rba
-  bnCIEHSiHbSIw+9vtezbDAp/ZMEsJHaxmXVl5ymGCOOdnn7stufekFECgYEAxBD0
-  W8Wgwl8Lzl2DMUBmx/QcQ/dulX07pj2y+peAcFqJ2sH1szB1w96e8X5Q9MxGkW8I
-  j6XVOXOZ3kSBi2VhnxLJTnVD1A7qxUHb7Fje+nhOigzIL9orxWAe6KWBxOGPFXz9
-  pNl9qZAEj6gj3TZkR1LPv5W5b2Lv0q/uZZKye+sCgYAsonQJ6P2OjBX6CFyvraAM
-  F+rza078JsS8c92SSyvTOqMjxZGrtHDNU+K+zTL+BzC8yE6kZgHZZAaqeyF0JUH6
-  y0W2XlPmZXg/kMvAVUNSQqJsPbzWe/Z4YB6U5EITvyIGN+i50RSirjFX6fsL7wmX
-  3kUbIcAYe2BP4WM+8PqbIQKBgQCWDE+l6CH2fty/KuubBqlh/xyemz7DIttCh1dw
-  1f8SfQehJe0OHFkT9Ex5jm0QW0DqTiokHQqIdELeSllFv+ms3qi25aFqKZxcJ+HS
-  B9VlpCqfFdciX/o9jCk7bGZasTBahpRq05OK78+9zTTdN6IYv3SEL2aBqxrUh5WP
-  oGv9zwKBgALVUiBUIJIiGq0J5KLvMJO9kM5SpGNGUaQOCGHGpqCMd9zqqYIOF085
-  lrB8NSs1D4MFMwaTRTNlrM4eGafkqtfLg4gdujAxtu0OZx8lKNp2oZ18ZMfKDa9C
-  CHAOW4kjJPI+QO5cuNAW9n5ejN3afScyhu3WoAFitxcTlx5iTCuy
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-cab23-r720-11-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDpTCCAo2gAwIBAgIUduhn2XlCVh1SYt7EE3oZJLnSmMowDQYJKoZIhvcNAQEL
-  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
-  cGVlcjAeFw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCkxJzAlBgNVBAMT
-  HmNhbGljby1ldGNkLWNhYjIzLXI3MjAtMTEtcGVlcjCCASIwDQYJKoZIhvcNAQEB
-  BQADggEPADCCAQoCggEBAJgYmwrwU1Yhmw45zi/B37olX6xGppdxCeJU586B55D5
-  b0XJ1/QVdVXb3fVrWCnxiKy1ehBPW3oC+eODBosU7btnKd87qYIBgEE9ZqFFPbxK
-  5ODJs1vQMW1gxD8z0l8aj8as5EnGrtGuwbGCFstzk2qZEiVi2N34ekCeqAbTH8Ra
-  +kFYi/RrfKTjJtmOGY9vfpsNA6TotPb+7bmjJOQZ+QymrQXKBOdPPV+cRNlgumre
-  EYA2AF4bLmV0XfGHvoLeAGyZVQFlCVPhjMCZyZHz6A6zuEbDInwLC9klAAXFPtva
-  Uje0eXCqRfvnclWaVYsyyDN/CXOjC4T44AKSUlL3ZVsCAwEAAaOBvTCBujAOBgNV
-  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
-  EwEB/wQCMAAwHQYDVR0OBBYEFDP6OUHY7/I5BaVwo34a3yhPxNNTMB8GA1UdIwQY
-  MBaAFCKWQ+9xoL/cCCEyvOWTw1aGibXsMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAt
-  MTGCCWxvY2FsaG9zdIcEChcVC4cEChcWC4cEfwAAAYcECmDoiDANBgkqhkiG9w0B
-  AQsFAAOCAQEAxMpsKxwSpMTRZjSpG41QGN+c1K9KqMarp4GEln+lsyDedg/hlJKx
-  NZXceNzaiGa+qsT41dUGZUPxvlfrVM8DnhNtXNm9sEYdvxsthWGMS2025oIEy7fd
-  QBDtjHFYas32zYAveR1VqLpT72nLV19/FE0Vx4vVNXB5ZMQMqr/uJJjr3RwLTzLH
-  B4nzcqhrT2xCHVAzTJ1f5z6ly+RgWLqvcurqr2g71odmVweGCZWNp+4UXojGSL8y
-  RfzD00Hh3b8QV4bdiQxW8RfR7qZ1psmB2/AdsItnE6jEEomPVrgfrIBBvgkZCgIH
-  XX5zER3jJkr7cbrCp9E2NJoqc/2Q5kNjlA==
+  MIIDkDCCAnigAwIBAgIUI7NuQa0fetFAqm/6Dslt9cqHMe4wDQYJKoZIhvcNAQEL
+  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yNDA0MTgyMTAwMDBa
+  Fw0yNjA0MDgyMTAwMDBaMCkxJzAlBgNVBAMTHmNhbGljby1ldGNkLWNhYjIzLXI3
+  MjAtMTEtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZddpU3
+  sbOfcBS9LQSPAr1XN51xPKwcqwddVxPxVoeJfS4i9fCpkEr2FJvkgg0+wlGUeSMR
+  VGKQSzWJIA7guSh4TNHc0YKhAgk3iEdpdj9byUmD7EbeQlw8L03ROS/SHIjlJ1zA
+  MrnoJlNS03UtZg9b/jtdqJccQja5i4vkpq67kC+Ye7SSthG8iAnAX0aKcOaziziX
+  aknU9Q1th1hX1AK1qUMmFSX93DOTYyQky0awNGk0U9fwP9VFmhCR2wHgVhQE2r2V
+  ltBq8Y1rmvCmJjwcpag3+mqLc592P8d334T9AgggiEBzaw2fl7UU57WKmq1TkqTW
+  7nTC9bzRJXngB8MCAwEAAaOBvTCBujAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
+  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFImK
+  RvfIGQBXTCADrCN3wSHpQWQHMB8GA1UdIwQYMBaAFByG9iaxZoZ+o3oMzaAukBzt
+  6j4AMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAtMTGCCWxvY2FsaG9zdIcEChcVC4cE
+  ChcWC4cEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAZMuw0KqyOXwGbwGR
+  5l7ll/yIHxj33jhLYnNGbM/wfrVuHCRvaWvzbkHGsjc6qFSyds0zBh8XbYo8CJX5
+  u0soq4lsmNtmlPtn5ba0ZaBXC3Kq73PgAGngSPLM0VIRLhcIuJyVDqLlgvk5hfTV
+  osQPJaA4pu5LngBXf8y6FOdpiJ7pPWJ3BIUPsib/ROTYwMoUK3eqiOz+VO5xVk/2
+  1mHe5em/Q0gUSL4WCxmnFPqN4YaOHsVKdSlpNTcsjZhpkMHrpQjROeeSAMqaESTo
+  stU0y/akL67Y30mOzIXeKHHoAG3s0hCow57f1ZlcuX0ioFDJtyU59xqRJrDFbK8V
+  L7XuTQ==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-11-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAxl12lTexs59wFL0tBI8CvVc3nXE8rByrB11XE/FWh4l9LiL1
+  8KmQSvYUm+SCDT7CUZR5IxFUYpBLNYkgDuC5KHhM0dzRgqECCTeIR2l2P1vJSYPs
+  Rt5CXDwvTdE5L9IciOUnXMAyuegmU1LTdS1mD1v+O12olxxCNrmLi+SmrruQL5h7
+  tJK2EbyICcBfRopw5rOLOJdqSdT1DW2HWFfUArWpQyYVJf3cM5NjJCTLRrA0aTRT
+  1/A/1UWaEJHbAeBWFATavZWW0GrxjWua8KYmPBylqDf6aotzn3Y/x3ffhP0CCCCI
+  QHNrDZ+XtRTntYqarVOSpNbudML1vNEleeAHwwIDAQABAoIBAEx9R7ecRTqFNVvZ
+  4p0KZD0Mf5aHTqTzXQO2+1fmTL5wxsNemcVWLRyqrSG7yGZBF/8LKHbcPNTQ3R9k
+  o+b4wo0Xbk/SPTuIyFczgao/wWgHBaQCab6d/6q/TmJMVifZdkVXT4lVV3oWSYkB
+  vCZH/j3X9D2CDPtP2zxs6aFk5t0jKcexNx/gLRfEFtFhbgd4XYcLux4pebkuAzq0
+  tpaIG/hDvA49S+4Z4X1cI5gKr5UsGEO2toZNzO6w3+JBjvGwogorqaI1iA9ZDAnU
+  NwyKelSlcxmvbPswCUK3omdY1MJzjW22xJ47ajb2HdFlHWuNmLJjjDo8LWNAUNq8
+  nv3EmTECgYEAz90v+Pa8B33ntEkysunX+2xE4Kfv0PUloCHuOhwaEVnIbEgXcwps
+  jDhKuhvzLZwGoH77XejZqEMxnQYcx0tOAjJ8zKsoXTqs1kdpaNalmap2uejdOmVl
+  t1Za6Tg5hWRtQwzIpZWLwlHDR3SM1APEnMG43HrGAq6YGqPXBQX93OsCgYEA9E0m
+  ldYGxTBKT6jtY6ijnkIbFy6ZPEnbv5qRWci9anugo/6uIZ9aaTQMCqzREaDcEoYi
+  72uIyYxJGvbPd3ZueDMffj6vDFWobyR+zvMjLOXu+30JdWzhX1f1bgLYzlPl7Ly3
+  a3xlmm0a65flHU0cC5iit+N+vwZTLEUuLa3C6okCgYAZh2/p4tvLC8KWWNsaMDAv
+  l+eJs/Z3MnSRizlH98WX1fAQpHYE0gXs3skGvIIMWvpRYecbbIq26LHCOEr2iyAk
+  kvDS7j6B3L/3fUPL9XjXO6FjSd9J2cQ5VSjLNfWSlXf54SsPcyN8FTCnqP/W1jOi
+  kQRUR9vj3m+d7fttiYPZSwKBgCQTmJUb7BgGj5K/8X58Et12CaYcvYhHp+ndm4VU
+  vZQR+aD+JRzV+XX7t6OD7cPaq2UY5ePRT3vj+Y+/ztdnZ9zcP9RW0WbS53KyQv+w
+  rAsfUXFV/6WVlJqN1LKQPRALF7MkEzoOPrrVTdpore7ryi50NeNN9xOijXnGJZGd
+  TWFxAoGBALW1TmZE+cMvEi1Mxo9yFVc4twaFeJ31wJr8shDYtvrkECzR+hd7sHOw
+  kW3PgyV98pMBbIjRpETELJIf5cF5f54cerve7ppsInmKZ833zi8UWdmpg0SBC1gb
+  BYhxxF2wU440ILSlF8l9iYLJtTgo6dRBxkruragmog2W611pj6R4
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_12_peer_certificate.yaml

@@ -1,71 +1,71 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-12-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-cab23-r720-12-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEogIBAAKCAQEAppTexIXS4O1KMD9ZpT3q9mkYAelb6SMt77cUi01VYGnL4vGv
-  2Paqb4S0p6IvHZrOUi+TyeE64srzDqn0NWPE6AS/TbPXAXucsdw2/fbf1pvTBWU0
-  L3Ay41QUJZeICGpMch1G+70ax0qTFjRn116XLz+YG1EznqXyLHKRkt//TG5j3NzJ
-  0GinVzOOD2l4Vr2mHNV7B9/3xA9/dYJqqpsBLs/mzSuXysGHnopRXdJlrKiBfOzO
-  hka5IWMz7pYFLA9z4Bqf1rVIBve9Wp/XmbyD7UfP4T6i/mmLsxA9OrecSOmlOFai
-  umzUb1mEqsW8fY/fVpQi/MAMutlF4RcVKR7ggwIDAQABAoIBAHt1wlTsygoiU+XG
-  Te6GIWpXIY/pIFF93UHY8sT7n9dBEfc1IRswVckpFatYLItIfLm0wVfSMg58U//+
-  PhyDwSAkxJQWQbe7obrAd5FqMyOfgZpyE2dFRLHvUq85y3xRLC83O7C/yuUBhFnk
-  pUGdvXcrLtSwLg3a982xa+rrUQ+XXvvBKL4zmW75T6pL0QSsC7l8wwX6Hpy1C+qw
-  AYSHr8+tCyEYHsDMtjaoQ9uvrcABOKQ0y/HRVP69mRLPlKO+/QTsz91E3VySbVL3
-  uCQoutlq+8ZfjMPRnYe07JO4L84Osgo4fLGOanpsc9cioZAy+Xh4K4dluaSOdwnd
-  ML+N1uECgYEA1EHnv1LDfPt5kMUhIIzwGQ0WGSijOn0+Phxso1blWSR6tnAVglwE
-  IXnd3kY7MGLvUldgnGIcWLJ6i9uwf9pH/IT/Y8blv91kiuXe0rA1syUHiIdzY3fz
-  YZqT3F2lf5dSZHhzIGFoIr3mpxhRmieL7TlXzAlarsTGenZqO56JIF0CgYEAyOk7
-  +sm6i22GxF7ciFvgDxvjaLAtDRmDhbKUOl6Es7O+erAXKOLyfSsRzJCauKb5lira
-  TeSDDeV7Y5NuQyAMZpMyOyTuXHOdz/7LSnZ0thS6MLOQql9nrIYOxWEwMuGfr20A
-  ayAkvR2AB6d1oJTxUksvoIz49RY5GlirfJuFdl8CgYAL4TRrTOKMGDcRlzbnb3vw
-  qv7VoaShHWliaIzcB30GpDgKBfPuO+AvT3bPffbKGn9yiFlr50HW5QZe1YjnXvww
-  cfEpUHSDbIy4CW2TNTGMOUJWrd4Tbx88Ez67UrJ0la+S1/r5kPoXF7HVIFNQ4W2/
-  dToovU1KAtFpAT+o3pKmMQKBgB35vnsyceSvmLXfuWOW4Z0fehR6hJ45ukfOVxNG
-  WuI85SSE9U+iXK+UJ3mv8YWvU/m1txB8EZmXLYuzyXW2aGM9fvcYEYA1t8v6pfYc
-  KlmoSgdOIz1oMp2o+rc0Qu60fxC7YJ6bEyAsMJfzwjcNQdwXX6nCnrpicG6f4CYd
-  RhJdAoGAatfE/u/qTkiwJMb9DMUn3Uu/FSqPhLJLR7KFOpk0JQ7f0AsZb1qnvuLG
-  Io/4KuTLuWvj1bH2UFG+qYHHdhw5GbLYqp/uG1HD+D+6l90RZ2wq3UihjsavSYi0
-  0LdOe82Rv05+FHjeY8i4J8Oo0PR0qNsdjh/vsdmn3lgOxEcNvxY=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-cab23-r720-12-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDpTCCAo2gAwIBAgIUf8MSrlUdhF4HzdYbFkM4iWArZQ4wDQYJKoZIhvcNAQEL
-  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
-  cGVlcjAeFw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCkxJzAlBgNVBAMT
-  HmNhbGljby1ldGNkLWNhYjIzLXI3MjAtMTItcGVlcjCCASIwDQYJKoZIhvcNAQEB
-  BQADggEPADCCAQoCggEBAKaU3sSF0uDtSjA/WaU96vZpGAHpW+kjLe+3FItNVWBp
-  y+Lxr9j2qm+EtKeiLx2azlIvk8nhOuLK8w6p9DVjxOgEv02z1wF7nLHcNv3239ab
-  0wVlNC9wMuNUFCWXiAhqTHIdRvu9GsdKkxY0Z9dely8/mBtRM56l8ixykZLf/0xu
-  Y9zcydBop1czjg9peFa9phzVewff98QPf3WCaqqbAS7P5s0rl8rBh56KUV3SZayo
-  gXzszoZGuSFjM+6WBSwPc+Aan9a1SAb3vVqf15m8g+1Hz+E+ov5pi7MQPTq3nEjp
-  pThWorps1G9ZhKrFvH2P31aUIvzADLrZReEXFSke4IMCAwEAAaOBvTCBujAOBgNV
-  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
-  EwEB/wQCMAAwHQYDVR0OBBYEFFLFC7bzekzCPIfyInGquLGlOT3IMB8GA1UdIwQY
-  MBaAFCKWQ+9xoL/cCCEyvOWTw1aGibXsMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAt
-  MTKCCWxvY2FsaG9zdIcEChcVDIcEChcWDIcEfwAAAYcECmDoiDANBgkqhkiG9w0B
-  AQsFAAOCAQEApDruRQP1dYW3o/x1Z5iBF+r4l8Ju0djbD2L6bB5AIZpi8wHMG+0c
-  hEdPk1m4jajJIo6gySZ/EjMt+cxvRgRszyCij+K4DXcecLpvgqEcNyXby+lU75uq
-  w4XvJTnZDZFW87FZtYQSl/VJsRiTacIQhj+2tyNqxYA40LFOv13ccxVJJOuvLq5l
-  CsE1FTeW6E3FHE8/WILC0hF2x0qYndKct15CCnE5/NSzNZA9kEpYqYZDZgLQkuEm
-  bklkShMs5/uxKwbEHcWVnSwCN2ThrIyXg1zvvSt1b8SuCfbl/yhgXJVf1Q+hVGOp
-  EkadCOdHQ9keEztpUWdGf1L9/OO0AzdKtw==
+  MIIDkDCCAnigAwIBAgIUE/cRYclONcpovo40Kw0cY90YTHwwDQYJKoZIhvcNAQEL
+  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yNDA0MTgyMTAwMDBa
+  Fw0yNjA0MDgyMTAwMDBaMCkxJzAlBgNVBAMTHmNhbGljby1ldGNkLWNhYjIzLXI3
+  MjAtMTItcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANAGwxWa
+  kHMfEl9yi8lMrpuc4ls3T2QZHou8jRlcw8GdXLee+iLr3cZaEBwk4h4U1IhMk4yp
+  yl2yQ5cMsvFKczPyZDkW9+9oxDZVf4eOPz/4J3VCF2hcf9J1ZwYh2e3e6otdpAn6
+  GF7Ea0Ebrd7s2YNv7MNKjfc0p0erZRk1+doHSGouyIG3DRgFSZjTyMEN8gbDWPa9
+  MAizaHW+pRhFjTqpuSCBekWIJ7L6xhMTaKw5wl003IEHlmbT6WSnARmI3B3+oKvE
+  mdARG++4iQ76Jda+/lIALb9sV2vwLC4cxqfc6v84xbc+6NYkufC6Ic/ILpObo/RN
+  RXheB9BctooxffkCAwEAAaOBvTCBujAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
+  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFW/
+  lti2EgCOuroaCANc7omfJtliMB8GA1UdIwQYMBaAFByG9iaxZoZ+o3oMzaAukBzt
+  6j4AMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAtMTKCCWxvY2FsaG9zdIcEChcVDIcE
+  ChcWDIcEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAYuQQkPMNjkpGTo3p
+  f8YDsoZjia1Id0fPSoycWvEV+Y2gcnxJ6Z2helBdOqcXzkIiI8EcJay3v0w0mu3v
+  c2Rw1HhDb8YARFhONWqoTgZnZw570Crszw22E5c40EOEPFBj7JAHFzVFdyZHsLQ/
+  oi6FCSqPtc+7DSTdZJK85eiTYeqePhr9dMOp8h6pzNznBuevEoyUgIskLLStHqKV
+  dy2hFiKuCW13ykED/qOLbdTsUtmwH5FCUOgqBtfAzpXwlWDm+dvw4KprNCUyFFsp
+  Szqanfcl14u8enUhj2Wl67JFwl2l7QugYP0c0gbKx8GktV/IsCX6a7+Q+J3Whw7t
+  XReM+A==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-12-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEA0AbDFZqQcx8SX3KLyUyum5ziWzdPZBkei7yNGVzDwZ1ct576
+  IuvdxloQHCTiHhTUiEyTjKnKXbJDlwyy8UpzM/JkORb372jENlV/h44/P/gndUIX
+  aFx/0nVnBiHZ7d7qi12kCfoYXsRrQRut3uzZg2/sw0qN9zSnR6tlGTX52gdIai7I
+  gbcNGAVJmNPIwQ3yBsNY9r0wCLNodb6lGEWNOqm5IIF6RYgnsvrGExNorDnCXTTc
+  gQeWZtPpZKcBGYjcHf6gq8SZ0BEb77iJDvol1r7+UgAtv2xXa/AsLhzGp9zq/zjF
+  tz7o1iS58Lohz8guk5uj9E1FeF4H0Fy2ijF9+QIDAQABAoIBAC0W2iALoXWibXwM
+  uunF2i7WgWWeBnI+05UcKEUwCyojLp6KMdNx5l8A1G8VO4GjqDFmz7B0eO14HxhV
+  Y0/TgEbpKfoJ1XGp9qWEQKEkHueBpSPQUHyJWBdI5Sy6F59satAMWurir3eTAWBa
+  XIRuN/M6RkpKFZ1YZ02sg7xEK8Sq3UC82oMGDVTgWrl+YsUdx6HkuUoLqkgNc1ly
+  IUz+r8v4bJpVz7drB1CyK4aQciykUrgD5vSE5zjIBMpoxhyktt7yrdNnRlyrmVPB
+  sAA5atVpeHYLNka6ig3a0VNSqmcTEGypDnrZU9pbJo9Z12Mvz6PQT68F6Cm4i5F/
+  hwCme6UCgYEA8/NUtMEKz2KeE6ViSz6QlPd95i8p0kuh0xvryePIwDSVG9jJg9Qa
+  +yBr/e6PMam/yhYNfpmrcbwcP1olYTJFKeqOrd3lNbLJ2a4pBPIX3Irs1r5yUkpO
+  jx8OIlQj1TlMmESmMoExj4D+p+a+5sU3Ue+W5KFz2fhqv6mK1x3JsS8CgYEA2k0u
+  +TVtEXLDnaa48SosQHcEOV3AmFUkQ8k1OVSsuYMl4xCi7iYeK9ar5q0oj4NlRjda
+  //dm449IrO9RuzLsVcXopQndjpxec/QxUgOFClS8egRXMPjb8963xiixIY4KGwvc
+  PughFpXiDr/+mv0sDQk64D5UbvwXA49PAdwmaVcCgYAL4MI0Ft4m4N9fh4L0tPQn
+  PLG1noBDzAjyFX7ykpO4wBauh2ywbYhux9JaR95TBbff6Bj6HBNb81PQxdviEqeJ
+  dfFCh/ZcGft4DOHUatE8nMsRXa6FUTboAxQWGdCw1hxjoZwSA3ZdTWOY20RaSin6
+  ZFcNhMr2RwEzmda3yKyEYwKBgEX4Y0wBcdob3NNVMwYprFFlVHdGs4qgD6WigmrD
+  1zEG9kfXd0G5+gW3IxYm/k8xoG5nI8XTeKkLrhGwC5Ri+Blt++maReeF+0hTRtOw
+  yR3MlzTM212ZBnceNe1P8aZ9roOIw6luIdzpYbG0nFj1OP9crABgOhPwvTeo4XwJ
+  Ik61AoGBAOKH+X/6OnHVlkRRq71tSOyB5TdexKiEy9P1r8Gd9ID1MRhnMwa0f1u8
+  aTJ+6sQn+btaDvXia9T46qvQBormtBOJmRxFCNjF4llCOo98gEKFtIkH3cCWMBAh
+  ArOQH72FBUhjPhkZmAJaASr0NxEb9gi1+SbKBNGz/qQDTFsZiCUL
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_13_peer_certificate.yaml

@@ -1,71 +1,71 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-13-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-cab23-r720-13-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpQIBAAKCAQEA2DZFRcbEqaXdgpXp84qvaG9ErzE2lxNF5EGe6Hda2w9oisLO
-  yj4ZPY9MtwjD7eBY6NkB47POZ/kckldhoJJC3Cte8YTUMO2JRm/HJnwZW+5o26k8
-  x1wbDZOf+Aj32ROOM+bVwMrf+IiAi5BxWPtjVK2OeHk1aNhXHOUbKOrzBrB5+T/0
-  HcSbwlGwk6h9P6DHSWPMoTeJOyTm8+1161j57ouA6psN66bzKQWdiV7axW0daN5H
-  7/LebIbAel4dH/BwtoRbLUVHP6q10JdSZh8HEmZ1Q5UZc9K2964u1FPqAe7CUo+V
-  dTudw1iPNqwIUfpCpWfKbI8yLoqlRufDSx7j2QIDAQABAoIBAB3sNN4ZSjJoYCWo
-  db5c3TXI4GqWlwWFh1C1vDZT/mD+2usJVvEqcvfQEz/pmKQdPnDLR7WpttEw6sFe
-  EobUdyhdYEBwr6Ut2qfC5H7xAdl1P1HXNDArERtp6OO86gBC8pVARyjtat3Mlm26
-  SdWUxQR9GJCXxcqC1luLYZziF0w/cwJ/DSksEJ0/GTM6DS0gTzDlwqTNlREcfYb+
-  WOBKSAfGSiEBB8rY9Fy1ViNy6Fzdkr3cjBEdYRmHaxt6Onyt/0AltebMyxS9c8Gt
-  ZVHrMBfuwQm+tdROp6gmpKsAw3iM3cAkASFOMYEq9EYmpCCzJSkjKXqGE5vwWnXe
-  JJ8YbwECgYEA3PtthQd+rp3dTEsmqiQm7DLz4xxVsaI/EH/i/YWhn/4QzCy7OO/g
-  5cLwLMc5pREm6ILFEh+QhoNEXjAid7yqtnKYSW6ecIPk2tgtILF/6i5vV+yjMm1n
-  /VRoA13Wg4Q6Fb01uJKF+lU7IATqzfs7RHQPfU8nuiB8da9Vtw0EjhECgYEA+nlV
-  H/6WCODy4hnJrITTbshlidIZZHn5zYx8untqrvOEwb6+rGZF/W7XjCu7xE2Jj/fm
-  dr2oj5n9NwYsWWFzyun4bjH1iIHXHW+3nXzVsxJmSxs6ZWM07fGsqNkROqYdRGew
-  pZWPy00/i7oOKUDOvxLoy6C4E1kUC6CV32LvUUkCgYEA1VoCkU99JcXQpRphiB9D
-  XQSMp5bxvYDx9lIiq7bbJwc63IXLdNtUfUBKdlEa/J2kvROUhTzoYpZV6cH7ZTNI
-  dsII+czNN8B/sjLIzynQYB7Y7UDRB5zNq65UhfuRYoTFN7voI/2DUP/9B5r3wEtx
-  G1QaqFdF+dPnlg/kZ8kvvqECgYEAllJjSERefw2iNxgK9ULyMbaLWd+B5c9eoIIE
-  CVcwe7ciobR8crMepi7zpehJVFLEkGbTJchFdYmRcoh97VaTS+CHfHr3ROnH1J7L
-  r/TPvBz6z3CT521WwsccPGmp8Wzoe7lPRtEv7295B76t6QxACGSs2iim0NXRNfk2
-  eU7DGiECgYEAvd0Fo8UQuilw2Ry815KOu9Dy1gzIGtcrz25G88t/n2QM4FIPIOsw
-  f3gDzzay17jL9bCvIJ7q1cshkj1hsKdZRRnqDNV7LLb7PlaOknD3dap2uzVytESA
-  1lQ6EYGtZjLrOnhIaAq2am7kPQXqWtKiZtxJ0UHzXDv6Qrtz+UZ1kIA=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-cab23-r720-13-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDpTCCAo2gAwIBAgIUGSMJBXpUf0IV535wbTM/JTlkikcwDQYJKoZIhvcNAQEL
-  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
-  cGVlcjAeFw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCkxJzAlBgNVBAMT
-  HmNhbGljby1ldGNkLWNhYjIzLXI3MjAtMTMtcGVlcjCCASIwDQYJKoZIhvcNAQEB
-  BQADggEPADCCAQoCggEBANg2RUXGxKml3YKV6fOKr2hvRK8xNpcTReRBnuh3WtsP
-  aIrCzso+GT2PTLcIw+3gWOjZAeOzzmf5HJJXYaCSQtwrXvGE1DDtiUZvxyZ8GVvu
-  aNupPMdcGw2Tn/gI99kTjjPm1cDK3/iIgIuQcVj7Y1Stjnh5NWjYVxzlGyjq8waw
-  efk/9B3Em8JRsJOofT+gx0ljzKE3iTsk5vPtdetY+e6LgOqbDeum8ykFnYle2sVt
-  HWjeR+/y3myGwHpeHR/wcLaEWy1FRz+qtdCXUmYfBxJmdUOVGXPStveuLtRT6gHu
-  wlKPlXU7ncNYjzasCFH6QqVnymyPMi6KpUbnw0se49kCAwEAAaOBvTCBujAOBgNV
-  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
-  EwEB/wQCMAAwHQYDVR0OBBYEFGvQCPY5pspR3GYWljkSgVun6XyVMB8GA1UdIwQY
-  MBaAFCKWQ+9xoL/cCCEyvOWTw1aGibXsMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAt
-  MTOCCWxvY2FsaG9zdIcEChcVDYcEChcWDYcEfwAAAYcECmDoiDANBgkqhkiG9w0B
-  AQsFAAOCAQEA2VIpOzHoCobd5RQICPDKt9OaYb7K9WAYJxKAQ6BI60onISMxYsbx
-  /uRiLADG3be4HXsWy0i+34wv4Cf3sy46bvJT9b3NCtkO9hg8KAr4AGmsdItVCKDN
-  L4FkY4FsGHhqZOygoVz7Xp9urS7e2mdauV0exxh9dHW/WJvd8EbQ1ujKyHbGBQXQ
-  RXaFGn4tAp9X5XUcKLC7371B5OND1nX3DN5wAQEK6/6zY/181gnZBO3BdmukNIos
-  0QOMnBEJzJ7UY+b3SzXTdVuiov1lxp01uUXVyu4buTxDT0Lp6YONSD1C+PotZfa7
-  RwnG1UMGFNvSK668yDtGwD/6uD+MBmVrgw==
+  MIIDkDCCAnigAwIBAgIULXW40lYSJjmE092Hb+WOi4LdpZIwDQYJKoZIhvcNAQEL
+  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yNDA0MTgyMTAwMDBa
+  Fw0yNjA0MDgyMTAwMDBaMCkxJzAlBgNVBAMTHmNhbGljby1ldGNkLWNhYjIzLXI3
+  MjAtMTMtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCndhcW
+  caENvnzGN2JNT6TGRbwiAWvWROl6d5bY8AMnA1GxUwl1Rz2FIPh+OaPK1GA6G4UD
+  IaqWbgf/S1oUKe0dyz5c+G2fNNXCypjRfNpHOeWL9iMZiZ31RGFZv6oWcf7L4+MD
+  48fXQ5u80pvj5P66I+MI3DzHWQ0G3F7PUnGkpg/edqo27bYBHhNuO+Q+hBIYxRra
+  S2mRDImYTlt1oV5VBRR5T7LMUGT8Ze+6UnkGmMXmxAQLlR09lZJI+yGIpBO1AYBK
+  kqRSNKPwaGSHELd37w/H+u7JwG49FeqXPts5GJVGdiMi+0J/M+n0p3ojgmtBBRkT
+  6SM7YNldpkCmHwcCAwEAAaOBvTCBujAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
+  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFLK3
+  8gson2oDeIVgKYfN5U7htmZYMB8GA1UdIwQYMBaAFByG9iaxZoZ+o3oMzaAukBzt
+  6j4AMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAtMTOCCWxvY2FsaG9zdIcEChcVDYcE
+  ChcWDYcEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAG0M+daOxnXp2b+te
+  fkKN4mlgYn3Bp+AI1TBQT3zrWMwklVGmRsu/IpJ0+/QNUwjAcpzGLRiTWqnxVIyv
+  EZUXdgOYEDG2vDP4tgidtxTdXmanKwiMe7GTqIxEFm3d670ygl6CDioOMOkUnhUD
+  r9gkc5NY6TnT7v7lmDcx3EMG3yC1fRg3fT8eRrzpx3F4j4o/DW/0ZbWa57c3d9Y3
+  IWGaUxvUORIORBRtV2vyANB0sYvp8btOyL2i8+ST5Yp95jW0h0IM4ZY3tzFexPlm
+  tT4JlA01iGpuXUvjmp/BMwev+Y1tMeoPmgiwa1tF5BCBOrtWgUHSm3+qR3fIWq9F
+  gVVxPQ==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-13-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEogIBAAKCAQEAwKd2FxZxoQ2+fMY3Yk1PpMZFvCIBa9ZE6Xp3ltjwAycDUbFT
+  CXVHPYUg+H45o8rUYDobhQMhqpZuB/9LWhQp7R3LPlz4bZ801cLKmNF82kc55Yv2
+  IxmJnfVEYVm/qhZx/svj4wPjx9dDm7zSm+Pk/roj4wjcPMdZDQbcXs9ScaSmD952
+  qjbttgEeE2475D6EEhjFGtpLaZEMiZhOW3WhXlUFFHlPssxQZPxl77pSeQaYxebE
+  BAuVHT2Vkkj7IYikE7UBgEqSpFI0o/BoZIcQt3fvD8f67snAbj0V6pc+2zkYlUZ2
+  IyL7Qn8z6fSneiOCa0EFGRPpIztg2V2mQKYfBwIDAQABAoIBADvIe5PEijRRIIh1
+  tiASH6HhSSiNYOWG01GkiFHONgS0aYpDPaJUu2uy0T1rZhWWznqh7YJEK4FVNwXS
+  Sh7E3RHQyg4rKYhS/EFNNjNf5p+RtLyvxwyzUwoqXzLad+ifGHbZ7Hi470lHWpqM
+  aMqpWJlXR+WfDUDrF448T8w4B7xtspLtr5AfVC55s+27p+SvHDqs0TTrsQZ7ZTll
+  Mqb0qIY3gVhluKNJ6y/n2dPVuN6lStyHT3Ges4P+Mij6k5jLPPTVKgPxkZ+g9yEl
+  J2a08bq5WAVo6onjlZj+LnbRPT/Ywy+MDx2cn6UvCWs92G51rSXbjbUtelIQDt8X
+  s3qppzkCgYEA1ji5RGkPM/fip9BoGsoUFdrGAqacb/rPbfTAN7J+hTHM6LI5hZBE
+  /vEDEnOrOd5sh45H3DM1tkRjZPrzL2jGtWgAMFsEmJTKLyAurpq8Q7rhDzvHdZNE
+  kbayx/NIHjxm2K7wzpDpVNDHjE2BNl+CKn6bP/HsPGiDZuZC+5lHR/0CgYEA5jn0
+  /bcOBGqf/H5eVl6xtrZlwZa71mUyYrDcA+1jn86gKMWA/pNvW4AYeM/JZpGWO/Fd
+  kyATC8O4ilps9n2fJ7ShLoio9frN4yxrGf/QqUQzch16deOxzOoSIoAEcU7GVBY6
+  e0dOKkrP7d+NvfY8vvZRnOmvmukjVt8etnTnaFMCgYA+djmm9c8mAwBGmCDStttW
+  Z/zWZwg0KnhzAitN0jDL23J44wacqC1F/LY9mhZyACW6/MR9Mz1VEOm+VuGzkCRo
+  XpO3hcJ4TuIJDaQu6xU71nCrBW4qHS+gIRpN7OS5VDlUsuWqBVzTizCz+yFS3lRQ
+  2aug4IRWNM8joL4lKFM9bQKBgAWM6CclvqTEnU7NDSEv70DkbNeZ9rVYgzp14RgH
+  JRu5M4tIF7ALhefC0tQ2zjg20lRnoUXmxA7IjS5ot6/Jn4iphilFCi3D+iq762kZ
+  DcLG7iaWJ1moP6UdD4rdYz4IFCf60TYfpfbHDvRBK32k7hn8fkM2LxGhBUUW4/qq
+  HtoZAoGAc1nfsZanijdy+pSY+XxNoXA1+Am3XALuge67hIax0Fk4TJRfK6e10GYZ
+  7Xvq3cHbqLfelfXswzgI0D4JyxQl5S6sX3CwAqBZBqVBVgCldRjyewAto4XZ2csO
+  GK3w9QJv2gWmFH7/mG5pDLHy3t5XItUkJNoDAY+3q/MyIsmWWeI=
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_14_peer_certificate.yaml

@@ -1,71 +1,71 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-14-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: calico-etcd-cab23-r720-14-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAlcHbaV0sWhOEw1At5U5l1MNVnxqDxDd1TMuH3vEVuJHJKXVG
-  gt5Rwd4VYiPXilcdH3+oc9QthTaueZhyyXsNRJesFhaeej/afEIr669WHaTROVYk
-  v8kxDRcyISNEKoun58gPTUU3GiEwWRqBJP8T1FSfq38+oPVnPNPs1Z2HHmeAY7YB
-  PyDz8luIR6chUxNx7eptlNJz1cijFrzAjGGarO6KiqH8dv8SMlsadtTQZD6Zrde5
-  9LbldSjMaFrK+DqHxe10S+rgSkrygHmjtRWdBWUmadihXsMftqlpOjXVVqlHVScQ
-  cXEd+hfkCTVr/kTRB+Z0t2b+Ncb4Z33xEp6iqwIDAQABAoIBACZ7Ea4ZSvQ6X7rw
-  N1rcsj3hk3a2kXUx6uo4wkj/Gd27WD1W7S9jgQ6XylbVbuUVTV5ypw5cTvYT/vEv
-  ww8Sl24wqv9iAIbZMYMMXczJ2Q708u4QvJCrWfdLJo5tSW7FQ/fC6GuqhWYpcQr0
-  TIr9IFNHC2A96hHh/Q0cR5b8S2P8P9VtdDzUX0zNo3GeD+2giBxSc8SqWE7d72L+
-  i1fcGVsWurkwTKvfj6EhGfn6BfIlLLqM/WUeiUTSWegyPo7V7IXM3gh1baQhPX6l
-  gVBUPOxAmA6Vri+aVOrUoDG/mabq+AzG+VcKeu9angdEho493bN5q3YCo71DHbBO
-  YPXuNcECgYEAwGiGLgDRameLobKuwFSmPS8CRNxPXeL21KlW4CReZitpTsC934ow
-  tZF03vd4cx2KO8bCOOH37Ti2KWlJYQujYFxgrwPdgGuxOxlYuGoI/iHe65d39G0W
-  XkclRs0pRApGIX2xUnIU58y1pYoB7YywOcAr3Qe7CIubHLpQ3wfcZGUCgYEAx0Cr
-  mqhZkY0MN9UJ3jOQwIeIck+1W9vcadZiIbzojYplpZhZBIneXJ42c4Pr3xkNKbvi
-  bTfHYrhRk6JViYcYYT6ZPRzypeVti5+DL08ZjbvLPd/pTGxBTPistT2ALAP0vKX6
-  NbJw+lCRWVhd+IDWNAWUa+jcF7fuZceBNXz30c8CgYEAsEyV9f0F5atvBACHou9t
-  S06Rk6sShgJ7DK0FT2fDn3ZTjbeJwxQKQbRAFDVJBqGgkdkzCY/z7kcykotIk0Vo
-  s9ixNmwiP5Nt16sH4iI2jzVV3yTw4uQ5xLUH8PH3x8JqNDHJkrO5eBPYtQ/ZaGKq
-  7p+pEWQN+myA+je19kZrqQkCgYEAmoYLz2gp9lgFlrMP8RPaeYViiwxH4NJUUHwj
-  JHkFfOdMxyysNHnbScalAdbYMO+Tpr7/7aWpamT5Vt45KevsO1Y5rwxpHcEcwIBX
-  U3QrpCB0kSq6GjuGNPRRtEjawsfaoAa0UbpuJaIf5sNCNTttY3DEVx+CuJ47MxGS
-  ofGlmz8CgYBmY7/F3fszWz05EqIV/X4J8yLaF5VzF2FXzr/Qg3mEbu/Q95p8+FSe
-  2cNxKfiBPWIv7F2yvlP0D/q60u0oN18gvThiBVviW8FRccT89t1CRJQL2Xzr412a
-  6LtmZzCijHywhbEXtfsHiAtvTHjovFbF+EdM/7G5CRfJZifOFf/nFw==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-cab23-r720-14-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDpTCCAo2gAwIBAgIUFxvOkjjdFYkePXmntUlwAFx18VcwDQYJKoZIhvcNAQEL
-  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
-  cGVlcjAeFw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCkxJzAlBgNVBAMT
-  HmNhbGljby1ldGNkLWNhYjIzLXI3MjAtMTQtcGVlcjCCASIwDQYJKoZIhvcNAQEB
-  BQADggEPADCCAQoCggEBAJXB22ldLFoThMNQLeVOZdTDVZ8ag8Q3dUzLh97xFbiR
-  ySl1RoLeUcHeFWIj14pXHR9/qHPULYU2rnmYcsl7DUSXrBYWnno/2nxCK+uvVh2k
-  0TlWJL/JMQ0XMiEjRCqLp+fID01FNxohMFkagST/E9RUn6t/PqD1ZzzT7NWdhx5n
-  gGO2AT8g8/JbiEenIVMTce3qbZTSc9XIoxa8wIxhmqzuioqh/Hb/EjJbGnbU0GQ+
-  ma3XufS25XUozGhayvg6h8XtdEvq4EpK8oB5o7UVnQVlJmnYoV7DH7apaTo11Vap
-  R1UnEHFxHfoX5Ak1a/5E0QfmdLdm/jXG+Gd98RKeoqsCAwEAAaOBvTCBujAOBgNV
-  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
-  EwEB/wQCMAAwHQYDVR0OBBYEFH4icjR+0VOH7GVVa6OkmyHlVu7GMB8GA1UdIwQY
-  MBaAFCKWQ+9xoL/cCCEyvOWTw1aGibXsMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAt
-  MTSCCWxvY2FsaG9zdIcEChcVDocEChcWDocEfwAAAYcECmDoiDANBgkqhkiG9w0B
-  AQsFAAOCAQEAGXRYMVMCV3FjTaIU4rnrP660XeoLkn9JopsDk1Cs0Ypv+QBLPR31
-  Ss3sbxEc28IyMf27ezCk7qMhp/RaCMLXv7L0fyO/+73H1DC9FHc6iqPZdn2xplHk
-  zTVXVL5edIYDYieswt9iy9D15AFPAswndn9ZRz9DM8k3itMTKRfNr+lzGysPgST9
-  otHWz8vUZNz6xoSOTwL3yej6Q9oxLJdM7tCez3v0nxxAYzH3CbT6eFcN6niID2i5
-  47bXAZk75Uunu/jpsNoRS4rMmh7EH9Dj8zglBINIl74kYvFykNNsg8UWNvY9hF81
-  iqXuIrZ7ZKSfxKwH7wszmB69XrqsWDcJ2A==
+  MIIDkDCCAnigAwIBAgIUCRQfMuyFn7fH1MhzkLPjzavZw9EwDQYJKoZIhvcNAQEL
+  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yNDA0MTgyMTAwMDBa
+  Fw0yNjA0MDgyMTAwMDBaMCkxJzAlBgNVBAMTHmNhbGljby1ldGNkLWNhYjIzLXI3
+  MjAtMTQtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANI3/6l4
+  UqIVZg5VSP/ze/0T+Ff8p0FnZHKBFHK1h7qHdBbdxmJMw0s5ltSlkJ/E2U3oPiIA
+  dge50C6MYBZkZym/mLZYZgzmAifpLVyveypBnnauYj1ta9p3LUckmKx1e5IyC8JL
+  Lt08fEhamNIUneoYAE/d5ySRgjUygvNkZK/ofMuB/ksIDVMOHfMcBa1Xiq1Xsbyz
+  7xXNTSI+GUQRb9DFs7Dq/f21gUNTuMWO55z1h/GC/iXBEbbNwD03DPHYZn1IKjex
+  7BpG1EcPFroqw+3gvpifQ9HhlkHrAjPsr5Xspsf2NUl8re0kZWCvO8IFC1QuIKR/
+  7C/Dc0ePeS+2mh8CAwEAAaOBvTCBujAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
+  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFGf
+  9oJMzeI6E3vHJC8QGzOUNFR3MB8GA1UdIwQYMBaAFByG9iaxZoZ+o3oMzaAukBzt
+  6j4AMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAtMTSCCWxvY2FsaG9zdIcEChcVDocE
+  ChcWDocEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAL591jwjwzJ9aatpU
+  /RjFMUMLGdhVWLrfYdVKx1/TujALrjjrmKCWR0KSTeY8153dZqoyMo/NzMpuo87n
+  DKGATjHau41cbMJwfpM6xFqfgXLuI1LeMHAlVQTLDIahhPJCmKXyvFHpQfG16k8y
+  lhLCM1jvPDvTBAeLnCQfXgh1CryrK9nsMUKSnWrGHw2H4g/rQkxOE+AhuQHtvsjz
+  MJAsiJrQhVFEnOJTkE6V9nFNpVqztjO8HJXkxM338xYgF10scMK3wdpx6wPYQbAB
+  Os+yd8BYU4C6FFU+Ey08ve4w0SmnOi+F8Lh4+Af6HX65dlBrD5A7PjOY4oa3QkeT
+  zQ1bag==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: calico-etcd-cab23-r720-14-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEA0jf/qXhSohVmDlVI//N7/RP4V/ynQWdkcoEUcrWHuod0Ft3G
+  YkzDSzmW1KWQn8TZTeg+IgB2B7nQLoxgFmRnKb+YtlhmDOYCJ+ktXK97KkGedq5i
+  PW1r2nctRySYrHV7kjILwksu3Tx8SFqY0hSd6hgAT93nJJGCNTKC82Rkr+h8y4H+
+  SwgNUw4d8xwFrVeKrVexvLPvFc1NIj4ZRBFv0MWzsOr9/bWBQ1O4xY7nnPWH8YL+
+  JcERts3APTcM8dhmfUgqN7HsGkbURw8WuirD7eC+mJ9D0eGWQesCM+yvleymx/Y1
+  SXyt7SRlYK87wgULVC4gpH/sL8NzR495L7aaHwIDAQABAoIBAEK7TAk8DN8u88qx
+  AA9f94gLAtbLeTyl2ZkPqLIRNhjcTtnDZOpne8cxbNPsCtDs6B53DuI0S0OAlLly
+  Dj6NeMIj9BJOVXbavOx2dNPrUKnFUsxR5xWg2o/rLRBcaaq1UJjEEj+HJkVMohdF
+  yyVFLivVmqO/yVQubKr+cdtZjyzXiOqiuflTU8yzUQwQySrkefNuTISyoAkCMiw7
+  ToRqh31HoFswlK8obpNjOPWc09S4V0gVIUVYZUS2/8uV5eWQbPZf4dWGO6WYFHDi
+  muHLg+KC6lfTyMUy9CieqPX0WdcNHJzcbYAvyZbzBXdEgKtBmnjYfCBnxeD7GGRk
+  4C5DmOECgYEA3Dw9XQSLCpKIkwQQ/mnXeqNHxgY8cS8tgEDDkk2OUtwDMJvfmbtR
+  UGO9U15pk9i7A2CwwqfiVFasAkoyVi2vcyDykQeqiEE1dvtq8m7Owszb9wTLJwXc
+  PrEJ5fTsFMNFGPnyYFAc2hL3KO/iXZcMUYNxVd8PLFczSxMYFsJUd80CgYEA9FtY
+  EJ0A3FvslzKNWekC4euKuoD5R4QOQ1OayFUNrBgP91uEk3c9xuby1FZjedhCcUQH
+  6oqZDzeFXBDGxnl2cW5jYLal93b5H1z6k8aUfWNJCf4SOPB/S7V3Hg9KcHNf/YNI
+  wwzNBxtvxzdu57hCC1hORz2wdn825uUB73T3VZsCgYAGcExq98MI4BfWFHxas8V0
+  9GkYxP3nYTW3Vi1hjZrnmT8OoL/8wpkx/HiAg3YauG9fPehtCHN5e78zoe+uzU8f
+  0orE6rB1o1Jo1BjgVZT95PdZVW6LCYTS4GIlsu9j/AF9JXGMl0sApSVMsRaxHcVi
+  bLFXjVnoNfRt8XT21V+a0QKBgQCDELubrZrYlzW/o43Nu/2f0AcJIkSS53H/Csjq
+  yzQaKo3lz2C8+Chal2WIHw4cPLLmrebRFqYiU1VknFsB+gRdsyf6p/09TsMw315I
+  BSuAVdDHW0/K2rRsl1jc9ramujuybsiIVkVimoTKBiGmiF5kV2klLSGJbZK1JgBz
+  v/kqIQKBgQDZEvyjO6S4eymkt3cmopIaQHJ6ZkZvbkRpr5QIasWL1WvJ4WxxdOAO
+  bQU7rEsphFWxa4ZU8GKycKWS3huPTqYhQ+7ye/YAfZVY/mbOoaIPtP0tl0GLn+4Q
+  +tohZRWC6INPfbqibChlWLUK4/WFUT/1pOUXp6qj1VnG3ZfW0zn3lg==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEowIBAAKCAQEA37MhA9GYa7jzl7JxIK55tP3H5LCMOnsNb0VVf3TYkvCRECbS
-  D+Ytx/oEfgHWM9PgltNw/DCsbftlcKZWxBXQ6nMlcQJ7SE/u/+UIVp6KTmIvnsCL
-  FLJfSPP9+X4/ZpPdF/xzk1Zt/PrsKszDxntzfOsi6/+xKBB8spPjHFL2sOpE3Ur4
-  pRtFXYfOar+1oXH0o0CawVKMZ+czElEd/4q3EiEZ8ykjej8vQoWPCoTerc6iu4rv
-  ZWKmPQJ9SSeaBkNYVmR5VgJ7Nm84P38LgktsSSKhAlId+UxVIFFdbXT7a5EF8g+Z
-  d0TG42V6ZkjMmOTydvip2ReF2V8OQPzauOk74QIDAQABAoIBAGMjC5qZpKb4zFuK
-  JUCKkj13ysK6yyqPpiCN5ZoaunBEVMWHrsiFBfz9/EeroLZPS9UL16KsH36OTyJh
-  VUqJMJD2fr1akDA33H9jjRJ2KG0cbmY4hmqhskCugPu0y3w2Q2GB6+Z8Azp+KXO+
-  U3T++Ot/eXaFVome5ORvTdMboWA9XcP4krSkJn4oA9yj9RnKaYN9aL+NA++bxDsV
-  0COVoWN98oZQch0U1Hr4jfTTy4YftKqsofdSjhLq2rEnS8TtisvN2jLHenN5xauT
-  ALtSN0NkLWvyJ5jnmgiNDPLjZyZ8aF5th8H9cdO/V0Ysh4SVaCY78kN1XO0xxvck
-  96pR9wECgYEA/yZsFGy9ZpSfVHEs/Cep7UFaM6olQM+o0NvXreZmkhr4FdhgMX5s
-  1D2yQm1EOOhWU6fiWfb2Ju8vu718PCGwVTY7BcbHsowOu2AlS/orp27d0SAHjzqx
-  4yFIk/QKFV5E4VEpV0Faq5V9XnOFAsd1o6h0DHEgV2ounLIzSRoDbAkCgYEA4HHj
-  PV/COAjplj6/qWIX0jvL/kNxqbCS00Gh/XdC6kC/Q1FfIrr+YKllLxeUD+mvfxxk
-  CeudxihEO9D3g3B/RVN9fHBLagudA4GqzQzFB8GF/qswQpASQeePs6adHybBvBoq
-  kTCvlPcYES592+4pNfQr53xq9iRQqrx7GPpf9xkCgYAFh0OYPbLs4hOBtOIQpJtd
-  9KiLrggYm2dA/0JxFijqyYLOll2fNOoOvzd5kPyFbyNPtLeG038J4Ozb2IM0mlZD
-  wmUM/v2ctMQs8yxbtRP1EMXlnhgL1m28SiBUdFkzlVNQvn1y0ouwZBDPVxlusfuu
-  jBvXmSvmOPrBkmriDpo8YQKBgCSZjcPRXLuEgIrWmqyFaXsH80D4QI26VIcMmdza
-  WNgYTNguacQhGCAtH2npf2SE5/BjcdDIUkchA9d5QRN3AdoNPlZPfYzCbg1HVNHx
-  NiQIo9AenFUOZ1vF5gIWtmKBEHCbF7vrY4Z4ML2EhlOZ57B7q7ko6cxPqbPd3nj5
-  QzLpAoGBAOymBqm4YcLejPgEoPJfh6PETFLkwac0l1gd0ZI+0Q7Dpa4Hk31ifD62
-  ZnrPHM8OeQGcKWAxyACZKeDIUvtbyUqiiuCNXYQ55uam5h1sKPVzmRfbDUdm6L28
-  EIF+XNn8RwPDWusmOTy1CZ9f/SHiSg+PlVXonKfJ+TrItDqIULyZ
-  -----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-----
-  MIIDWTCCAkGgAwIBAgIUaiAuk597ZX2om9Ngr8+MzXqIqfgwDQYJKoZIhvcNAQEL
-  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
-  cGVlcjAeFw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMBwxGjAYBgNVBAMT
-  EWNhbGNpY28tbm9kZS1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-  AQEA37MhA9GYa7jzl7JxIK55tP3H5LCMOnsNb0VVf3TYkvCRECbSD+Ytx/oEfgHW
-  M9PgltNw/DCsbftlcKZWxBXQ6nMlcQJ7SE/u/+UIVp6KTmIvnsCLFLJfSPP9+X4/
-  ZpPdF/xzk1Zt/PrsKszDxntzfOsi6/+xKBB8spPjHFL2sOpE3Ur4pRtFXYfOar+1
-  oXH0o0CawVKMZ+czElEd/4q3EiEZ8ykjej8vQoWPCoTerc6iu4rvZWKmPQJ9SSea
-  BkNYVmR5VgJ7Nm84P38LgktsSSKhAlId+UxVIFFdbXT7a5EF8g+Zd0TG42V6ZkjM
-  mOTydvip2ReF2V8OQPzauOk74QIDAQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYD
-  VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O
-  BBYEFEiM9PUoo5t/POBzuladke7SKXG1MB8GA1UdIwQYMBaAFCKWQ+9xoL/cCCEy
-  vOWTw1aGibXsMA0GCSqGSIb3DQEBCwUAA4IBAQBIAEFyU8XwdB+qxZCxxu9D91kc
-  tkDztrHFDFlOc+hLjM8reaqyw1v/EF8TVXaxK3DdkzvInPlPVWw5hw/K5MuMdcYM
-  678SbnvEOvrmyT8zfHNw+1MgzjuQq77Ete7uQ4YEWqLh1Szn9lpMPX0/A1D+1WzZ
-  8pRfl/fX7b64Jl39TSxpQs7lPVQa18dnceYYVYNT/DBq+5PcXzaTtIA0KQ2hmQIj
-  UE8JoT4rgZE25ZzFhAIFfszW19Cru62UNuiCQRs7U4xTwdOhVxIUhzqM26ffiJ4o
-  A4kMjWHsqRMF78kDiX3r4cV0V5KPj8MT+dau+p8edYFusMbS811M7+hHCWyY
+  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
+  g2yaoYZE7DvY7ABK4jEbGw+db9vaCXbL
   -----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-----
+  MIIEowIBAAKCAQEAwxoA2NTr8PyL68yBbPqIDHTMJXYkawesi7yoi2nzpLIOPh+w
+  3kxu2F+tipljJC0OE6g0BHXzDQ4YqFiFoRw+1MN1zn0OIJLosrZb6AVJcF2neJ64
+  rMm8QO+LYEstMVfIUJo7lyQmdk5WzpagCzdBKHRjgsbQyjKyD4rtoVLQsgwTGQTC
+  t/f0Zxo0LPPD4HIdxE4SUSdO+kwuOZVCACHjtDGXkZYAnpRHWwMjEan9L82mN6/b
+  lFD5o28WuKOrnsP17Lswg3TAkrclfhfrvuVPsJ4hmtjsZgbLKpLd+DEFyTV/qIZ2
+  GUUQS7zL7vGtwQm3jv8L17aTCTYqXXEdrUfF+wIDAQABAoIBAQC1DBxdGrkYGEN/
+  vXcdOh+l73zCBrAk4iosQhXlyZxe6Rxuadonb6YtBBx20YA+wdCeTSh4OzwgkUQw
+  dHUM3Lkxl3Bq/YFumOV3ceI3nTBZJY+TTzbwoQQg/inIYfq+H0e0BGvoBZPrlSbY
+  7s31moDMmbT+VqDKAeFaqwF5AvDHRuw4kZQL8mjAzWsKE4tmsPtTK6kDQWsypCKY
+  iFWEJcrlPqlLrDvc+u2YY4RbRntLQF3F/NrDm/wqjfSIZj/xF46i6EthBV8DjCna
+  JlldGHIoBlIbC6TKEkTRpwmfyHpgjtpsUPWEFV3n3c6hQ7TydycUbvDu9gDs6XRu
+  Ug5GJIoBAoGBAMmm79DU+h/CTMzlF/66lZAxNNu57ry5sfcK+FHEAL7/w+pxBGXg
+  xPQi/c913IStyvEi2B5d9tiMiwa2yI30UZ1bMvQmFX4wF1p8k+rYtzGbGcOrTXyH
+  5S8vN+dPTNvUmczS1dwcqZa/y+e8+9uatHJPYQSh87AAJmAPAp+xIK/LAoGBAPev
+  HF4hMkbso7sZy+ttZzg5SmUzszkymKT6TYpH3kSmYRZ80OHkcMmbfjwbuSunRhZg
+  XY/Q5LzpUbabKwarFq7M+UHqZrwvY/8b2VJyQxEVWL+Wprb3Sm2yByG8R4ffJt3B
+  6H6wQM/4H8621VTrNzEhFQOmNS50tjVLPSNuXhyRAoGAESaXowVaOLVH3u1lOw8X
+  hWoJ+t43hemtTzupnxqyjYwnV5tBKoERf0oymCCIHujBJ/00sHCBfC2H7YxCRoCP
+  KHkHPmi2z0K72cBavFCuVBPC/zdkocDVJ0w2zv+Zo+DTK+6KrevqKJ4rc4xJR4ZC
+  7q39rG0x0rhQiz77lCV2iD0CgYBT8Sn5EOEcPmkDKSv+PxbDbE81Wz87fFVVXGtZ
+  GSBQPd8bovOcCzLacPNoZbDtBYTwYnpzGkXbbGvAKnh7ixJl7ZvwZgOpdZo7RHHz
+  yjvGl2h7jhA0ZDz6TmKyYUAQ4WUntOcZwJxGn34QLdDBNfJ/mQmpMfRGKVHzX+t5
+  jZchsQKBgBBPCnA/u2GUznjECLd4n99LlyBbCj28RUoGE6D5vhfghc7rL2yRwh0L
+  ZkGs6iUXxR42S6HsrXd0p5vZkFPwIcvFrKpRCw/TxKc+XS+vKmYjhuICxKooUBkL
+  aJtkSzofYxWm+12MfUydAtjRLkQsJaux36FQiSoNcm+1UxMKk6rF
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/ingress.yaml

@@ -1,7 +1,5 @@
 ---
-# Example manifest for ingress cert.
-# NEWSITE-CHANGEME: must be replaced with proper/valid set,
-# self-signed certs are not supported.
+schema: deckhand/Certificate/v1
 metadata:
   layeringDefinition:
     abstract: false
@@ -11,7 +9,6 @@ metadata:
   labels:
     name: ingress-crt-site
   storagePolicy: cleartext
-schema: deckhand/Certificate/v1
 data: |
   -----BEGIN CERTIFICATE-----
   MIIFKzCCA5OgAwIBAgIMW2h6FCcFdKeaw3vnMA0GCSqGSIb3DQEBCwUAMBIxEDAO
@@ -45,6 +42,7 @@ data: |
   -----END CERTIFICATE-----
 ...
 ---
+schema: deckhand/CertificateAuthority/v1
 metadata:
   layeringDefinition:
     abstract: false
@@ -54,7 +52,6 @@ metadata:
   labels:
     name: ingress-ca-site
   storagePolicy: cleartext
-schema: deckhand/CertificateAuthority/v1
 data: |
   -----BEGIN CERTIFICATE-----
   MIID7TCCAlWgAwIBAgIMW2h3tgSwie0Ypx8eMA0GCSqGSIb3DQEBCwUAMBIxEDAO
@@ -82,6 +79,7 @@ data: |
   -----END CERTIFICATE-----
 ...
 ---
+schema: deckhand/CertificateKey/v1
 metadata:
   layeringDefinition:
     abstract: false
@@ -91,7 +89,6 @@ metadata:
   labels:
     name: ingress-key-site
   storagePolicy: cleartext
-schema: deckhand/CertificateKey/v1
 data: |
   -----BEGIN RSA PRIVATE KEY-----
   MIIG4wIBAAKCAYEAu80eb8b/KWHpo9y+uE5xvirPUGNw22fEfxvNmeD+sx5fdbYD

site/seaworthy/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-----
-  MIIEowIBAAKCAQEAvqXOJ9kwWngLxP9KUxRubLMn1Wf5ZrR0uhLfDPVW4BLgSqFx
-  OA2ffDSYMMUs+vwlf4GutnOdmZEs7oM8zg7wrZ+c6GNlktDAJufoShJJl+aQZHpP
-  Xkvtg+K+g2Sq5s81j/yNlMZVuEvuZ7Tv5P56/GuT0z8qJv9c4nsqPqO0Sw1FXoXf
-  Ty5xJ21dkdq/1PXIofRtAuQaykcmE/2b8NV1Vbt339oT4ITYRiS7Zw2rDsOvY+bc
-  RjFo5pZkb/FEWejCHaCZCgTh3/YRd5hEyohQXtDaNTnGn8ooLrv8ASikkSkHPYCZ
-  YV3sZLgGPWUbu/OB1HoP2duoomBqF8MLfQ81GQIDAQABAoIBAHHdSYGXQD/oTu87
-  okJ4g3M8lV/qF5T11nmD5+Avb9GotHkebyaRTF28c+E9Ap5slmDPLXAfIVOk13ck
-  vt47IhgwqmBJbVMAhqM2AxCqV3X36Ol5+4lQQ+1vMWX8a+4qd80lg9IFmxDVmPAr
-  qtPUAdRc1A9pPF3KSsmh0htTXs0reLfDS8azTu5UAsYTy0xRCakUmbmaPobw3y6m
-  CXQS7mgoHffRODtyamOv6zXJ7YKDIFN82rXabMLO2/bUywcm4lpkFEZwIKoF3/a0
-  6KwbUhXSP4lCNsk1Fyv+imgybEeLeFb/tm3DQeJOCGXVXD5lR8SCa0Ex4LhyKD4T
-  b5fIwwECgYEA9D2sFVCG7cL9uFgRpoVo/NA8XQDEuHhXB1I9RKasExFrzNMaQ01y
-  AVNulsgebFk+rEFvqlmtU1qgKwq/SSfHaH0zmSkFhIACYmleeGIPNhudnDh5rRA5
-  09wN2TIwHMU2qKMddkdsm22b87w/z7y8/Y+5iKkvyKP1/w9UUTLXeokCgYEAx9OV
-  a3zSkFgvwK5ohBY3Mm+CIEQgnN/C87zqp+5EoKdyCwkXjxa5slJhfiVvSEFICcaK
-  aLoVOOU9PyccH9/GiO5HT12+jm0OG05/fvAyerK5Fjm/K7vG5ioRII3FlBe2Cuxt
-  pQIL5fgQqVMNIvOgbdY09bk5p+pOG3L9MMCzAhECgYBY66sfB3ZYUcl1t/qVGbUj
-  ddzEL2dvkcB9ld9ggx3aw1jv9Vt2bVe4S9vTYYBSChvbMueoqYWE91Wg1gTWaXkb
-  /ZkvhdPQbZpwodQXF/xZwqwbGCSUcXfcPh18md0SXGqN8vTi/xX3cGx6zGqfAyP7
-  XLw7mP0gmzEQb1BPT6dLoQKBgH0qyG6CynZF9utvk+Ig9EQwWscRRYheFQSNskKs
-  Wepz2FiXQl2Ls5fCSHU2x6Tv10rgRTRiUwbHePzE57YDep2s+5f4NXOLVgm+utft
-  ZwE6T/tfAqNHRMhJU18bzsX7sDjZbbitNny/TNhzQEhDaJtEUPoWIspOVsyU04ml
-  OruxAoGBAN9vWborMA79ta8Lq2lZ8kBwbvMucw5XESrIGMFMaV3Wj+jrSeZonPgg
-  BEAjoI5FDLZR9lu6IAikJGQRzCfg+7IjObEbzv6Rqpp/Ufgzxh6SjLBhnx9SJn8q
-  E8DGGQZ1BQxY7GJgY00pcPm8LDExxKdbHasZZd8ttnV0bvFDP0i2
-  -----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-----
-  MIIDYDCCAkigAwIBAgIUE5IN8TZIEY+vDdMjXzipYrN8TzAwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCkxFzAVBgNVBAoTDnN5c3Rl
-  bTptYXN0ZXJzMQ4wDAYDVQQDEwVhZG1pbjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-  ADCCAQoCggEBAL6lzifZMFp4C8T/SlMUbmyzJ9Vn+Wa0dLoS3wz1VuAS4EqhcTgN
-  n3w0mDDFLPr8JX+BrrZznZmRLO6DPM4O8K2fnOhjZZLQwCbn6EoSSZfmkGR6T15L
-  7YPivoNkqubPNY/8jZTGVbhL7me07+T+evxrk9M/Kib/XOJ7Kj6jtEsNRV6F308u
-  cSdtXZHav9T1yKH0bQLkGspHJhP9m/DVdVW7d9/aE+CE2EYku2cNqw7Dr2Pm3EYx
-  aOaWZG/xRFnowh2gmQoE4d/2EXeYRMqIUF7Q2jU5xp/KKC67/AEopJEpBz2AmWFd
-  7GS4Bj1lG7vzgdR6D9nbqKJgahfDC30PNRkCAwEAAaN/MH0wDgYDVR0PAQH/BAQD
-  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
-  MB0GA1UdDgQWBBQZ0yZL8NzfNfWaFjS63mray/mECjAfBgNVHSMEGDAWgBQUgj1P
-  ZnJbxSLOj3Gv59iDiiC+GzANBgkqhkiG9w0BAQsFAAOCAQEAshQh/YdeDk3m2Ieh
-  VHaSHtbJ+l4BGrfY8vc2SbS7425/wH3BfLMj/xf4bzuTRkhrCIhi4hNs8QYWRXxt
-  iydz7DRRFZTstzQlJzVCW7aoQGg5esdba69PxZd/19xTPPPE/hkHM8Kg8AvX06Ac
-  vH5LOpCZMKx5WAQLHSqzSVi/Kh2a5npH8tWGvYV1DJNbtF0SC0BISfxB+5xgbeAu
-  BjTbyKQNrTyy7AfUKUfD1Uv+wTUHDuajs3hFsGSH/vARSD2LrZEp22rkrKTxYF2U
-  2tqn76DySBljZQt5PeU3b7QhU649YqxoDryIiFpMZKMY4An6NL6MEQgfNp5NfsLW
-  5R3t0g==
+  MIIDSzCCAjOgAwIBAgIURIb1kr8SyR6CbHMPD2ubJ4IQIj4wDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yNjA0
+  MDgyMTAwMDBaMCkxFzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMQ4wDAYDVQQDEwVh
+  ZG1pbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKwX+2oFwYMUxK0u
+  jtCLo8LjpbM583P0xGQ198vABJb2Ov5p8Qt3gC33tss2RDqR2SRV6NBE4UtTKGEK
+  jz8bvxbw+kN9cu+84ayOM+Y7Z6CklH5V4JMVhPqUugr9irAp/9pzrqQjpzSlxlYv
+  LWn3XKECxsZ1jQ/K+rR4vg1tk/SeiSnc+jn85vbq7M7JwuyN+EhQJcE17iH27OH9
+  7wVy1SG0KEr2owDVOmQXzjY0iOsgph1ZQRmtiizUAlxnrOher2kXRpOZFkQWibRG
+  z/f0OgnoQFYtcY0aAXL+jjrbkoIprTUJWXCEEPEJ2iEonVrN2+6CClK9cWmbuTdL
+  jsP2t7MCAwEAAaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
+  BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTnFxDUe5uwuhJu
+  Ta98yj3pNrxZkTAfBgNVHSMEGDAWgBSI/aZ5EExdyJ4F1MhOC6jgvrzs4zANBgkq
+  hkiG9w0BAQsFAAOCAQEAC+DrLergu9lBFuEMtNLVG51f8CTh+BgHi0pLSLyoxfXx
+  hAKZJaI25s/liAVc/Qk3zJn2Rb38WuUwl8GiD+YCBAPOvfJH6R5qkZMuQY2pJFtv
+  KLEMLyGZKz46fG4ZAWb9VBsbA1mvcHgthJjfwOC4dAEFkxfpCBckpJWiAXZc4Ex4
+  7mEXyZm4schs7Ed578l6zt1PcDBX6YEv5j4efeZeneAddR2DgTMUlTACUH25Q7OL
+  KR3FbSJbdSqrzIZF8WA3sM0XmXqUfCvnDH1TlzYdthcCFQrOsgeOTZCmjugrfHnk
+  egNobER3yqIi2Wjl38Gbo7lqPwhDz2e8dYJNtgMKMw==
   -----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-----
+  MIIEpAIBAAKCAQEArBf7agXBgxTErS6O0IujwuOlsznzc/TEZDX3y8AElvY6/mnx
+  C3eALfe2yzZEOpHZJFXo0EThS1MoYQqPPxu/FvD6Q31y77zhrI4z5jtnoKSUflXg
+  kxWE+pS6Cv2KsCn/2nOupCOnNKXGVi8tafdcoQLGxnWND8r6tHi+DW2T9J6JKdz6
+  Ofzm9urszsnC7I34SFAlwTXuIfbs4f3vBXLVIbQoSvajANU6ZBfONjSI6yCmHVlB
+  Ga2KLNQCXGes6F6vaRdGk5kWRBaJtEbP9/Q6CehAVi1xjRoBcv6OOtuSgimtNQlZ
+  cIQQ8QnaISidWs3b7oIKUr1xaZu5N0uOw/a3swIDAQABAoIBAQCEJq5jziO5mvsk
+  2fnFX1XT1KhrpvaydqVRJrgweDWOD2th7syxN4Twx6ZRCkz+hP0wD+CF/j7bbvI1
+  ArzZg18MKOSlavIV8v+BWHm2NKvxCjEVirC3gfDp08fBpM0ZVkco42ialt5RaXOS
+  vwuqsc8pvU4THDXEiORYLdgTy6+wScJRcZbVgmEaOKWkTp6EvsIsd/qQFUaYYPSa
+  zW8JwdLCRhLaOWnTvue4MrTzFj0nonSsBq2S3Ygpc4K3DrGw+rftZyIgWI/93wjz
+  hpn9RPN4AU71b5CBv/jK9TxzuPxQDyXzqKlILKUVuMs4V2FBtoyQjmVW7vSBcMZq
+  jFS8YYBhAoGBAOKJiFUiNOYidqQRNfDH7ASw39h1NtrLkJDZlWU1MNxOxGEv/lJr
+  p9lrha1uY0or4hwnHOOc+M32CDlgypKuCz68Qq/UCq54aSrKQi3vwfpp3WkxfgDq
+  FghCi+jV0vnzPj0H6k/ZbpGksWhzOzilXeFE77GIOiCP4cWAIaJQ+o/pAoGBAMJ5
+  xd3BL9+PF2jQMaQKDXEbp6bQjMf2ad/lHZ7JGeplsAN+pnUKDHMIpzjvEk3yeH8q
+  RwTgdp6nkAjHb5oczMRFgu1emQPOfXgM5+er4sShfkQUQyl0gl5HvtG/OdtNagdx
+  xSDC9AT9EA26PpyguY2/ZkPOYzseFj+NrpJRKAU7AoGAJ1cE8uvWzeRMQB+xA1hk
+  l0f0B44LcaGKQG1YsVO0YX3YQpxoCP4jDvHKLB0QZxAJ2yO7s5dN6c6BDR3O7/wD
+  feiJmCk1lajZcpHfPkT1pbv+tEbg/92m59ZOn6eKVNe2Bjk6qpUyy14TZPUl4qdt
+  DzK+gVEL7x2tcnPW4242pQkCgYBcxfq+bwqHe5uPRMJpnuIKs0anLZX7TnHzfTlE
+  JmtWhmwRPrnp24FU3yvm3SW+SY1yHJkEmo/737O2fG2g91w3xXFQC3CzgC4atw1q
+  V3U2mFPD5majwBDxKQi+xpqzI5sRMhT4LAh82Lxv0AlObt4V4NjIQAzWhuPWLaC5
+  7D1LQQKBgQCUhx3qMABsigsoaVy2x3FCb6XfCtClPIw5xn73loUEplMSJ6eKDlJ8
+  CNGV3SWSjEGVxzzrIIjVKrkGJL/u8iimWezTROyGarVy2n7R0UHDlpbegzSESYuv
+  LADdLrrjMZYdVgp0uZFFHB70aEIU0/dC0Rbbjuc3O7d+e8VZeLfvGg==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEogIBAAKCAQEA1cG5lkvqEZq/ZckCIKvgMPJrG1FAiVRmQDWu6HqOX/psyoYP
-  /l/1J73HslkebXwtHW5+OPUUNpDwzB0xge1jJdPLNJjYtkrh9AI5pPAAmDRydrxW
-  G3EsYzcCHT5NQWiTkQ9+/1qxbkZzkKw16WmgANMd3M4MQZrPPBMLgqjGI9RK7Sd5
-  B/u/xr4pVJ3klJBJGWXdtF52O2PdY0cSC+c/kxPVKsj6fdiUKJwZdrJFxKjSSp1X
-  rZ8xn5JkMDLIIY4l2iPD6BlNVdzoZqynLDM8u8dFerUQnA8jaCXl0y3dra1XOkx3
-  u5XISW95sAQrKF5JB/LPMl0yCOqB/NWDJz9StwIDAQABAoIBAEFr6zsevOLqc83Z
-  OXd6Y0FX0IQp2BCv7iOUypWIfO7PHGDXqyl1gPjK0sW5FOD5cm1hlewkxiz1K12t
-  Sau0VfYL3lOYvCr+vC0MSUw70FLFKotAlTIM70LmYRVGLirosNFi5sGMpmVT1qbe
-  rhlkJH5cHvWncoTZtrdyNMGmmg34qjzBJRgcfq6IUGZd243eRJPTJqy+3u6Ya22k
-  +VtwLADD8thwSPMAOKu4VNRKVr6xCO8El3mGGw0Ky1BUANYnQyL4XOg8VC2FHT71
-  xX1IG43EkpvT0MkPZY5jPAMXx4fFcRESdU402GWepXxXNJwzfrOD0XgIXsA8yaQZ
-  5kkj45ECgYEA4xcKeFlQzF242ENmXU44yrlW8Gld8boTVW+RGtylIAgxyB4Tts6e
-  Z1WOw6xiprvVQo7ThinSa6mhbrXW3igwBwheThr5iWMexlWjQX+ki6JHjL4xvv8U
-  EgFAoFm3TSODgb2vPo+2IIP/TmE6UhT8UzbZmKka0bBdFkrn1Ol8DSUCgYEA8Pgl
-  tX4FQGizpa1bI16ehtlCVHHbvSDpRzehWnMp1GHP9UEmRpP54R15GUkpA0MHSCh1
-  X0jdo3xp/597hpl3Ho+qWmd9SY2XoVAFlor4aONh2fdRw9s18tMXEUUJE2Q+tBed
-  Kt5MXN9B006gYbLD9+wsx2Xh4M91U2IJuo6Z76sCgYAspNb2Gfj8dGBmg7mYFkyr
-  7gvdb5l8cCxk224XbdE4nuPKh78wbSZPAk7ywO0UAlFGqHWFJqurZsnJzg3T1uq6
-  Nzby+/Kaw9XFAAj8U2+x09FlJe75sYPsljpyS7DxhU3RL81H61DOy6RhcFPa1y1T
-  3rCghn4zQwzJ2SgCf3RX0QKBgHqmAyN+chPXduCz/Lhi95MxT9aFYU/BSZsLEKBm
-  D3tfEacGMwInXT8cbj/Vgf98BV/P3/XQs6b7s0P9m7TltcCjZRTAqf9fBzd+8Gkw
-  cMGKQorbnA1xLONcV9hdaAIrutKVVlS0cu+uXuW7llxDzgUJe709+Rsg3NnFA6il
-  3mojAoGAGo0WOWiOekIb2f/ECXJ0/nEUQiwUWnbJUlDRDtwi4urX8G5YVGjXANuc
-  Um/1uwziKJ90ulyBWCHvgLDoWNvzaEmdwuAP2PkVLdYP8CIg4zeJA2RuOM4eQUzF
-  qCw3nPaCNhkezs3FrDGvzDZOGLpDcyTp5mIZ0G9HG6wfZXFef3M=
-  -----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-----
-  MIID8jCCAtqgAwIBAgIUdty/g00jevmcegQez659nYo8AqIwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMBQxEjAQBgNVBAMTCWFwaXNl
-  cnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANXBuZZL6hGav2XJ
-  AiCr4DDyaxtRQIlUZkA1ruh6jl/6bMqGD/5f9Se9x7JZHm18LR1ufjj1FDaQ8Mwd
-  MYHtYyXTyzSY2LZK4fQCOaTwAJg0cna8VhtxLGM3Ah0+TUFok5EPfv9asW5Gc5Cs
-  NelpoADTHdzODEGazzwTC4KoxiPUSu0neQf7v8a+KVSd5JSQSRll3bRedjtj3WNH
-  EgvnP5MT1SrI+n3YlCicGXayRcSo0kqdV62fMZ+SZDAyyCGOJdojw+gZTVXc6Gas
-  pywzPLvHRXq1EJwPI2gl5dMt3a2tVzpMd7uVyElvebAEKyheSQfyzzJdMgjqgfzV
-  gyc/UrcCAwEAAaOCASQwggEgMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
-  BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUeibKrzsP
-  yVcOxnRcF9CVtLIIf18wHwYDVR0jBBgwFoAUFII9T2ZyW8Uizo9xr+fYg4ogvhsw
-  gaAGA1UdEQSBmDCBlYIJbG9jYWxob3N0ggprdWJlcm5ldGVzghJrdWJlcm5ldGVz
-  LmRlZmF1bHSCFmt1YmVybmV0ZXMuZGVmYXVsdC5zdmOCHmt1YmVybmV0ZXMuZGVm
-  YXVsdC5zdmMuY2x1c3RlcoIka3ViZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVy
-  LmxvY2FshwR/AAABhwQKYAABMA0GCSqGSIb3DQEBCwUAA4IBAQAPSAJKNQOZhRhq
-  vi1Gjsj5Cxk4bcz0S9Bbsc5hWHMdroxRD/QCtv7ivz3Trl8IQqKYSI/xi7Gkc6ag
-  aQIzqPfSUvBw1II36i/5y5bdtjcq4i5dGBvI2f/Exu6pxcZfCs7iZuhHKv0zdvTX
-  MxqczCm68agXjyc+iFHvryeELcv1/lca8MpLwBIrp6O+5WCV/BZO1wykbCu1U71Y
-  MYadtEQieQkQpf5rQPoeQIEb2/FCmbIHCeVMBVgh+aNOodBBeUD9MUZFzOutXrb9
-  C3NfSswUwDK2NHXPLlqNzFCGixdajaGtWTdpHPVY3Yyt6uYNJumiaHm8aHj+z59B
-  Wl/d1Vjp
+  MIID3TCCAsWgAwIBAgIUNZwCyMZINw0XRVjJ1U2m2zMhoqAwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yNjA0
+  MDgyMTAwMDBaMBQxEjAQBgNVBAMTCWFwaXNlcnZlcjCCASIwDQYJKoZIhvcNAQEB
+  BQADggEPADCCAQoCggEBAOh1FFDkRrCtP92plrBDHukEBZSVeyx9qyKDpN3luU9k
+  6JK83gsMTmTxImpx6+sM+L37ewTkP3sotYNFF4TRY0eNqoJPxU3dP2X4FLS4PCq3
+  lBwodxT1cT07ji+/yGqgQOAWyK8mKfQ+CpijaB3KfhPoVNpGFrLK66U8KprYjxQ4
+  /Gzz51uWd1ns/ZiAJJ/xKBiqY1l2WGg4M1iAeXjP2+uDYbzulVV4m+6r7fCXT0yS
+  hHNmTOE26xDmde8qLe4G7Ds2xjUd52q2CQcHM6W3L/Eu9Ro6pv+0xggKdEvWnQw0
+  jqwf4YgXuXf23qlU/O3VH+PBLdNiUbhDMvEB7ABcH3kCAwEAAaOCASQwggEgMA4G
+  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
+  VR0TAQH/BAIwADAdBgNVHQ4EFgQULZEpa+oq4d51mVSzuUF7Vnwfr/IwHwYDVR0j
+  BBgwFoAUiP2meRBMXcieBdTITguo4L687OMwgaAGA1UdEQSBmDCBlYIJbG9jYWxo
+  b3N0ggprdWJlcm5ldGVzghJrdWJlcm5ldGVzLmRlZmF1bHSCFmt1YmVybmV0ZXMu
+  ZGVmYXVsdC5zdmOCHmt1YmVybmV0ZXMuZGVmYXVsdC5zdmMuY2x1c3RlcoIka3Vi
+  ZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FshwR/AAABhwQKYAABMA0G
+  CSqGSIb3DQEBCwUAA4IBAQA/6y+aoMnwwea5bdmtURyUHHW8N8vXAyZ4lOGcBr2b
+  27YzvL7d3s6JJdtJd8w5odgplv55tj/y1epvdxrvAdxFCEJCGJxMEKTbvtzq47tT
+  JBRTMMuEr5RdsFFN6hn4KkpGVQofh0OT7ZpJyePlMQBnUzW+FMT+mxlYXq6EWPh9
+  U8UuZvAUrp9APHkAJblixdcJ0oBQ11Xujs0FLiKaADHIcYD6Pj5GjWEOD6nvMbDi
+  tAQkaU5voTVj0rG1fQnG3upFT7dnwoWB3wrdXz1LpiiYjNXJsJBFK/+uItufTNGr
+  MawfWpPTEFHRZNfZ1NaYu/d6PFtz9rp6YBfFCsxZq0g8
   -----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-----
+  MIIEpAIBAAKCAQEA6HUUUORGsK0/3amWsEMe6QQFlJV7LH2rIoOk3eW5T2Tokrze
+  CwxOZPEianHr6wz4vft7BOQ/eyi1g0UXhNFjR42qgk/FTd0/ZfgUtLg8KreUHCh3
+  FPVxPTuOL7/IaqBA4BbIryYp9D4KmKNoHcp+E+hU2kYWssrrpTwqmtiPFDj8bPPn
+  W5Z3Wez9mIAkn/EoGKpjWXZYaDgzWIB5eM/b64NhvO6VVXib7qvt8JdPTJKEc2ZM
+  4TbrEOZ17yot7gbsOzbGNR3narYJBwczpbcv8S71Gjqm/7TGCAp0S9adDDSOrB/h
+  iBe5d/beqVT87dUf48Et02JRuEMy8QHsAFwfeQIDAQABAoIBAEOXR4D931AgECHz
+  3c0Ct0op0TWTAW2+XLR8csPSuD9NqBKCuE2eFm1jcA5jcaW279zN8sdJVuwIuj6h
+  KGWGPMfheWLKryQk4PpVWC/0IgqJtpc5bOa7N2IGnyFjMnNOhY6jEVdcUXajU5Fu
+  cie3aVGAjKurFY6HUl2JURoVPgUyvs5UEol4rJookTGsLDe1bvn5VIiy796+b/bA
+  je7R5Q0gGf0ioH/Stk1/gT0ZUXvTjgg/rUDsntJLp4/ryAx2L9GDBKtvjjiD7cjb
+  C0xnpOjjsax0Q4W1R7+B3kxr1Zdw5pEzpYcs7BTyVZmEzvkJBSATaztG7K2nHgC2
+  MN70asECgYEA7wO5TktpNKhqYzDVy3ujG4XtQ/6Sx0f66RNULYttx2hR1ptr5qFz
+  VyDfoPdljWCoyyHt2SmOlp34TsaKU9wZG3gqBRKVUFVPCNaZvA2n923IbpI2NmqH
+  e3AhswI6261chPa26KM8k0DL4gxEQK78OJsXwofUlUU64Mj9PoL6oU8CgYEA+PoQ
+  PfWWgI9Dr8MNd2WgSI0J4MdWBIdvms4WGCJDE3Nu7BvAnlWdzDd5Ij6x4k8ma8eB
+  nunSdmzFZVZc5ZD8REyTqDjUxB0ci4RaR/2waYN/9k0K43HOv+On3vkVLCeEBWGo
+  uHra4/y5WpmzjMWCvCwsmU+b0M7DYb3+bErMMLcCgYEAuXy+VlCXuNHqnkfL4zpz
+  /mwVEeuCpTzrL+5cKWxHKbV/rXi4aCdrh3Zvlk/oc6tL0zjliN6DVcgKZ7gUqbfp
+  lDPRCFa/obRSvZ0teY9vhsmf/o9hmyFZOyZuQKm+W7VSU63TjP8Bh5WFpEu4vCoQ
+  ey2BZupaw+0SIFhakCS9tGkCgYEAkv7oufwWSH7NIqdRew24LT1/+IMYCQKBZO+J
+  4ePQoFpFwga8mX7I9HpH/Wzwj0HV2EppAA7i4GJlxOfRXwRTvGtNvkMXc1YQtVqG
+  Bv0Du7gUw7FG3XQi8e4R/bYnxvLpole/SnPWakaalKAsfs9Z2YlnJ3j18LkyZ7HJ
+  1dvvZE8CgYB5hf4j01kQOmvJMRmxgW/yHwAGFgimuak1rOdHSCHf+GaQQWUKUvhw
+  DBdvkbEgoFW80k4mCC3tR8GvqqLzoeUi2M7mk695odyUfEGWTFGI/6WZ97cjeulV
+  Vm6bf0GdFGhu9vRYykJ1XySjo17LXazaQQW5NqjTeWNXPX0EHethvA==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEoQIBAAKCAQEAynxpSRcLfJOMAQsTVVWCf4hadMSPA6T1Lv5c+0pe2eBBlH//
-  VkLCqpmL0bYr+C/uZbjKtoPea/RkhK2w9btema827YmemftBDlnyo3VimVSDOHas
-  j3kJ5nm3XxTdBnjAXXCMLufu7bSbKdmBgONRk56TASV/veuAQXW5skaUaiwBB7HX
-  RSlcUdpCARRwTzZcti/DvZvslFpva7HM6d5n2dEZI724QlB7aKH35Woe62WD8wrl
-  hQ4ettmnoSlN7QDiFkAwKivedDf8010MXTXp43aI2C44Ygkai33PiU+VKCQO6Dzf
-  RHkVrwSd0Gk20vURpFTy+JW9UI++6W7Yu5eQiQIDAQABAoIBAQCUL3x16xGS+AAr
-  +0kI2G2Km+VnMzpetmhhHfI6TXEhDkewQARDwtPoOjrjHOkM1zcm5pgj/lnWs6Kk
-  nuC01Y0j9+DA8khJ9GDl+dni2lNwVzM5LVCYJ0Khk04pnYEr7U8KkwVkhoSLHfO4
-  Kt/lzXa0DAcVfbYA7cqNHXTrDVAsaf45W126GmQAzR+XFgXMtHBMP7mo6v9oN5su
-  hrSl+M5Z4CM6/aB0FkmjPBvJyD/wkVLdRfADbYNqC3pVt7iH0DIUjqfZP8+6ypno
-  HoXm6Ns/slcF+bBGdiqYvJOqLgqwwLz/FaqoIDucg0QxPlG8t7LaYudhkrlBA8kJ
-  zxmvNCtpAoGBAO4sb8vv/BH4dK7SpNd6yxpSSqe6LfDA7WE7II5yRImBtCjFV1DA
-  6bgmHuzMlgHffIXgdYv0N+mVg8XxDyNUdigJjMRELnz/NhT5QVucFHKsK9S569FV
-  ITMm4ANJt3UXdl30/VIM2iej0TwG7iOZ/Z/vHfFx2TChIN1VgsRmTJdDAoGBANmk
-  LTNeA+nBHvI+AJem0EiGVTAfM+jJITj8TXYfptOPBfMS/0DtWCDtBCdHpkEwJ/UU
-  uY2RUdTivhRTA8+13NGosUNP5kDPMGcbMSsuAJBqv4HDEZg1YjE/1Zg0A2fRrU7p
-  LZY3rhx8udTRww1bOd32ureAo/XY5oGZmcFwc35DAn8qy9FK09R3Zi2RPEhib64P
-  DLpdaRbYK9J7piQzdFTcYHH+4XbPC9rzO+ZSpnBN5dp6M9rrSvbBAhyrdKVDs+mH
-  SDADFD1GOJV/L0qPK3yBHm7ByqaU9rcAefvGm3hbkduzBlJ+a9DHTqhKIPSpcQIh
-  utWmjM557nn5S2Qz5i3dAoGAd41Xxv+95onPFgI5ERTxFOW1pdl+CkFxnnv5kQmR
-  +mR2QDAPRvsZjfyka29QRD7PtDDOPJW2/doPz9pKHa8ovYKM3QzmznMBg6HMQIvk
-  g3AgAofFAndQmP0Xt6PauwzSxqYQBJRRcBSTf/Q50PxrrSH7LxHa/xFGjapya2/6
-  AUECgYAFwT+PTZArWdp8ZcetPgLCtEbSq7Wn0fch4nNqOAAjpGnHaTgOrSoGGv38
-  6JtDT5zWY/JzXMyOtu7UMYQI5Bois0yTcHc1qFvk1pvYwGE2y4Z4X/dbezyHPQQ+
-  zj4Uwgdcffx4kPhoxpl4g8sSwm5wsX7vSmRs1L7dHhy0MCqI/Q==
-  -----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-----
-  MIIDYTCCAkmgAwIBAgIUKT/b2L18bD10XFRMUl/XlEOVzDAwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCoxFzAVBgNVBAoTDnN5c3Rl
-  bTptYXN0ZXJzMQ8wDQYDVQQDEwZhcm1hZGEwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-  DwAwggEKAoIBAQDKfGlJFwt8k4wBCxNVVYJ/iFp0xI8DpPUu/lz7Sl7Z4EGUf/9W
-  QsKqmYvRtiv4L+5luMq2g95r9GSErbD1u16ZrzbtiZ6Z+0EOWfKjdWKZVIM4dqyP
-  eQnmebdfFN0GeMBdcIwu5+7ttJsp2YGA41GTnpMBJX+964BBdbmyRpRqLAEHsddF
-  KVxR2kIBFHBPNly2L8O9m+yUWm9rsczp3mfZ0RkjvbhCUHtoofflah7rZYPzCuWF
-  Dh622aehKU3tAOIWQDAqK950N/zTXQxdNenjdojYLjhiCRqLfc+JT5UoJA7oPN9E
-  eRWvBJ3QaTbS9RGkVPL4lb1Qj77pbti7l5CJAgMBAAGjfzB9MA4GA1UdDwEB/wQE
-  AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIw
-  ADAdBgNVHQ4EFgQUsDW5jCyA1JfLEo6HzQYjAWrrnSgwHwYDVR0jBBgwFoAUFII9
-  T2ZyW8Uizo9xr+fYg4ogvhswDQYJKoZIhvcNAQELBQADggEBAEW8y+y1pgb1Xj+S
-  MwYHTeVtjisxO89/ex1sHSb0A7rTQJWN+BkwRBMIsrBdz8yreNyZLVvcuTZOnVZl
-  BElVrvrS3A8uFLeueNc/9LAi6vhKROwjTWU5+41X8cI35z5IN2oKQkDsvfP0RxNS
-  Hbu+rgmy9439wIqq2AJOLpA2D9K/lNF7BOyWszCGDaye1BT3iaPakYw+qoP9VhyC
-  DWc2XSefUAcTo0AykJbB5CC6Bn8bdt43uV5zi+93qaVCfzax1pbhxYdV+s5pHoPD
-  dZOJxc/+GrqjI6HuqKXfCUbUIJn7Wo4zQgsAMp9O6V5fM7yvQvGCemwWuW4j1My1
-  75dN5T8=
+  MIIDTDCCAjSgAwIBAgIUTzagyaAxC3GyRLi/OmAij0q/K3gwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yNjA0
+  MDgyMTAwMDBaMCoxFzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMQ8wDQYDVQQDEwZh
+  cm1hZGEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZhTOjhRYQfDEY
+  VKuhs3FFADID5U/ghGfM3AUBcpVNvXxdFOlJITublfCfZCl6mgecyExnxD40zb19
+  BBCiVh/rN3JIsPrgf92i9ZBq/iaT1fiao32yGoxoRylPjYxBaT/JqZ3hbe8XeeR/
+  f9OK7h5vjFfU4Q7hvjcWUzoWdxGa2Ym9oWi0aZ1knkRF8kgv0eZi+sLrLBlWISjT
+  gZEsxInm4BvaS2sGgHEs27KG0LX3VPYArRucbouIIeEJRwGsow1aNSJ+H4Ff1Sje
+  Mx/+w9SSlNW2G+eE3sMqOwZjntNj1cPVcQSFu9r9hJQekqRXEgSWl2lgLPxo20aN
+  pO/b2MApAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEF
+  BQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUe4KfjI1PveMT
+  mPlhPPucFV44hRUwHwYDVR0jBBgwFoAUiP2meRBMXcieBdTITguo4L687OMwDQYJ
+  KoZIhvcNAQELBQADggEBAHimLcgXhRhgM/yY0vugHQOnvfGTvP1K6JgabEGW8QeL
+  osMWoG/M2/DbYgVKhnH73aflzozuEtB8ui3AuUqVsTag6GWJncT+mAd1PqjO3Ouu
+  b6QJ8jo2qKADcJkn+w37IU512mDiLg2i2V0iZf2+7YgHpydDYVaV8nkowJJnmfe4
+  agc1PmfT+yiXHTKTrMhV6CPfFOoy8/zQupxGWM/YCAB9M5lQOlhEe+CcbCVUI9++
+  wRf83ZnHHKbgQhrIOtiCvgojzFldFK2Gdy1P0kjay5S3R9eLoXeGd1TFahqkfjND
+  xVITTRjZ8zgqETUOraa+Tmko9tIpjt2L2+LQQYhtITY=
   -----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-----
+  MIIEpQIBAAKCAQEA2YUzo4UWEHwxGFSrobNxRQAyA+VP4IRnzNwFAXKVTb18XRTp
+  SSE7m5Xwn2QpepoHnMhMZ8Q+NM29fQQQolYf6zdySLD64H/dovWQav4mk9X4mqN9
+  shqMaEcpT42MQWk/yamd4W3vF3nkf3/Tiu4eb4xX1OEO4b43FlM6FncRmtmJvaFo
+  tGmdZJ5ERfJIL9HmYvrC6ywZViEo04GRLMSJ5uAb2ktrBoBxLNuyhtC191T2AK0b
+  nG6LiCHhCUcBrKMNWjUifh+BX9Uo3jMf/sPUkpTVthvnhN7DKjsGY57TY9XD1XEE
+  hbva/YSUHpKkVxIElpdpYCz8aNtGjaTv29jAKQIDAQABAoIBAQCQsMQav4pfyNy3
+  fIr2cvCjn2+lm8G4bRrG8Iv73IZoQeUZ3bEYThzib6ixveTBgvgRWENKuwVOBpVH
+  NY8DDRsKUcWZiPA4qZV6srIwGYL7z9cgtiQEdxhyvPND0bo8QJCHymYU8BWcnh5a
+  mWLUBXUFamt6VYKasvbdyNrY2rdBMrydQS2I2fnFKWKIg4WzneCPGBkkzPt7gziY
+  3dbGxTjqzw60nsKX0yZ4zWplwvA+Y1CTdi6ivwCv1emSfebIdviCYIZtjnaQ2q2H
+  fo/rk4ncZXnGa2ADJ7tqmCcIXDSYoqYRXAxPgBVwv/EE2GlNit4z4PGI2SSw/LcR
+  fsJ8RlcpAoGBAPr/3hq/tErQo1khUrzYymIQd92xDOJJS0zCoROKpn78ZAghm2AO
+  3ZG2LggfQEwmphKRnfZkxDcodwr8v7Q/3fBcgbm7Xt91qNe/8NJxrGgTRAixNRwX
+  n0/FYoqumyUTm42RanE6UwJGTgGbYFyWR6wp0XbxoE2DnrUncaVIJ5+LAoGBAN3a
+  lfEUDtBVgMxuYTy5yxbVCddN4zik/v0yguMmtCRm35HNla43OUY08ZoVjfVqw9LY
+  f7rXBSGnrrokHXOO0cSyq1v+ZhRxENr9F2Ed90skhV6JeynQ6klMg1kLnN+l6OAk
+  O2S0suQ+fh9izsotu8uQ3qxRJgNu7HHvEBGn5lWbAoGBAJWLs0JOq9XTfy+QmiIo
+  LFTHKROt9FYygynF4ICrIE4ShGsP0uolkT/KwpxWOlHkyRfRKMNwADQ46MxkELgN
+  QWd/Rk9p4rnS+XkqRAqubaFIsUVYh6MoM+QsX2zvYUJy70Amvrudm22Eg9+TOpOP
+  ej6KX+G1TuRAImQejyiB2BHHAoGAfp5uzXUBL25dYE/vN1Viz9kvEK7nbEDfN2tI
+  wJQqZExCdVi8gP4LtkIpUiPTLaqNsRzXaa+mwhqN4rcSCA4PMxA2NP7xC+GsGRAx
+  87/CkCR76gTVQnx1+vesT3oNQqfSTXrgWw22vAXevdMK6uFHOVupevellngMgspK
+  hYkqMNkCgYEAgOEUkk9OwisNGqYVzn/6meEnfA1jcZz7bat1hk7kbAZ+9Kv2zYiU
+  wx/zJFHUP3RIJ8+9vQvsEsXAQRHd6beDlfQFTtAKaKZzbP0ra9CGMe5/IqpSN0Tx
+  cbTxW//WpvyuvEx4VQ3ayaThK1j06df9yXo+uUIjzPn+BfanGv5YbOs=
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEpAIBAAKCAQEA+HXkidicxXP7e17HP2gmNdRE5hyPmXM88ydTQ371nbtngffA
-  0uF/IFHnOko8XjBcOtRxDF4A68itSrSGOWa/t3ofKUzPkdAvF3ygRiQmLa2Xxi31
-  VGtI3iDu6WfDL2+HY5G0GvWGjjHQuIu9/27YiqsEK8aES4Lb7t7jT5/zu55Rf77f
-  DQd8SA8eqYNRqxXLuNm/rvPGDa+zAY7rwPi4qBO/14lXi9GKGGdMvBXHaTSXEFQi
-  mM+fLtfomTeA8bcTnp/xtOgnWzso1K7tdvb4oLbinR/pgW4WG0fIb928ZdEafGqt
-  5vpFAfIs6TbhIyIkvcBlDvuArb46bOa5nQkSywIDAQABAoIBAFBGFr6Ko6wP2vJz
-  HsDXr3C40kHefG7BkrGkxPwLquN5Runw1/XKMT6J98EXdwWfbkz7kkLCpF2JiqOW
-  S7+D+PEYnbTEQlQEBRL7ivTefQ9JBL5c3uSVfQd3cHkssx1CVWXQD3aeWQjcA2l8
-  jLhYYdH7iu9xxhB3iQNWM+7n6OF2lDghMZgVw1CBuFervsYYjbSxd7QmxgIEeTuI
-  HnYtflurXFlvocnVNtrm/TD5IPrTt2DtIQot5z7uEQ9G1XuMBVL78zZQL0gR7UwI
-  +q4vSrar03tKVnHJ2GlXZ5KLMhlrjoH5JibxrjJeHT8KbIwtwUQ/WSLRUyVy6JzD
-  vScweJECgYEA/u030er9KibAgVovXTdctkBqCk3il/l1mlO/o2vGG8YkFX+xKjTm
-  cc1+o78XWudwjaE3m9driWAL7siQSrITWbMh28qNuxJkxErdKXAG4xBxvvZKxY30
-  G9W6F4+DWyamfqWNaNue+fE+lqoL/4awiTPWBFYkmwq2TP5yuenVthUCgYEA+YG0
-  dz8ENdwW9vRoaANW9h4I/Aobn8RBgTYsA+XrTDnomrytgfpkKKlWAO79SbYoHixX
-  uI041UJ8LhPHoQBXO4QIUt8d1NBtexM8AbKe05ltkT+0WtC5txuaNJa2vfKdZRmh
-  kPhmqyJZfqHs0I52t2UOjzglDJUaLt48XDpZvV8CgYEA4OixAsbrrLCbzoOengMm
-  DLUv2P92FtbD5vBUdv2yvvZFB6Ksz6v0VBsUy6rgFBd0ub+urBOWkJDodjcE9qG9
-  aLod+Sfve0hzFqtmDBUGPnZXpD7vIPRoldYuZHL9VQH4imvNIuIAlEs/CPXlt/9A
-  6QuOmizWBuOgirVCyrt/DTECgYBaBeB1Pflo7XYjuF+LV9kiiAe52HPLG2Z/Fmqf
-  JW/WWvaADh+UTCGjQiXTxGcDF4Q2Ds2/usSMvaZMgbp/br4KrULLk9ERnfpCc9gs
-  zKPduPf9djy+n5zCYmUrIE3jDwyXE75lrhptGMGtnQLy5NQUq5OrPRixB4Mg8fJZ
-  XHxQhQKBgQCQPwsejHLPfzAUP8e0bl8Mk5xWBVgYNjcYgYOOk4Kt1kt0xLF0I7AS
-  Tx3Q+q7sTipAG4YZIBgXz+yE/H9LwDW/LmkP4lh9c72iOmJG4z6RBKOpm5VN8fXF
-  XC6xCifdZA6eUDw1RX/18+0PGnrpn9AYup7dvsCxsI6RP6Gg6yngfg==
-  -----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-----
-  MIIDSDCCAjCgAwIBAgIUO+gIZYe4R5EFmtY5s9zSVbdIWK8wDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yODAzMDgyMDUwMDBaMCoxEzARBgNVBAoTCkt1YmVy
-  bmV0ZXMxEzARBgNVBAMTCmt1YmVybmV0ZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-  DwAwggEKAoIBAQD4deSJ2JzFc/t7Xsc/aCY11ETmHI+ZczzzJ1NDfvWdu2eB98DS
-  4X8gUec6SjxeMFw61HEMXgDryK1KtIY5Zr+3eh8pTM+R0C8XfKBGJCYtrZfGLfVU
-  a0jeIO7pZ8Mvb4djkbQa9YaOMdC4i73/btiKqwQrxoRLgtvu3uNPn/O7nlF/vt8N
-  B3xIDx6pg1GrFcu42b+u88YNr7MBjuvA+LioE7/XiVeL0YoYZ0y8FcdpNJcQVCKY
-  z58u1+iZN4DxtxOen/G06CdbOyjUru129vigtuKdH+mBbhYbR8hv3bxl0Rp8aq3m
-  +kUB8izpNuEjIiS9wGUO+4Ctvjps5rmdCRLLAgMBAAGjZjBkMA4GA1UdDwEB/wQE
-  AwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBQUgj1PZnJbxSLOj3Gv
-  59iDiiC+GzAfBgNVHSMEGDAWgBQUgj1PZnJbxSLOj3Gv59iDiiC+GzANBgkqhkiG
-  9w0BAQsFAAOCAQEAwPgy6wG3KLDogOoTgzTLrtkvx4iozH7MvVc3wmKkGHqzhSw/
-  02CL6tGw23r6QsWACzFeYs/iFAI/KQqN6tQ5wiZvd5Dczxjx7QEKVoJWMXoQ/9WD
-  hdtLyeDT+rVPSz7ByFqQ8X6vUY78WaRNmT2n945fmiDIrVZAMGJ0l6fFYAyD54SQ
-  pHJJ3KNN8f2g10jmgzFq8iEb/BhgDG7bbrApEv/QzWtd+bVPJXXIYUuTlH1C94wa
-  ghAcxOYkDLWdw3lOdgW2HZ5vNOfMUTEkbrCmbBdCSBRpFbl7aUYHD5VFllaOiFMV
-  WAQCivhINZqGXDNrVpmYTh39BdBRN+V9guvHAA==
+  MIIDHjCCAgagAwIBAgIUNL6PFhe7mC/M6e5fmq+GWUT920gwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yOTA0
+  MTcyMTAwMDBaMBUxEzARBgNVBAMTCmt1YmVybmV0ZXMwggEiMA0GCSqGSIb3DQEB
+  AQUAA4IBDwAwggEKAoIBAQC4vwgwNup2Q8Wp5LpZeogXgACpf7KGVXzBZ5RGsDnA
+  HSLDRlmRpRWBDYiSqADnn2QeLs/WHZO6nO2WAJxEywkkBeg4xHPiF1PXzFvkrpdK
+  xJ/S4hEcesM1gHbFq3WqGYO7FJeFyt6gsTh1FCDqMyCXuA+5+UZg79x/E1qToQVt
+  pvwiSsNkjjvq1p0M3Ck+UUvx+5bXZpBzfMLcyyFz0zA0u2hp+BbeezwPPtXfB9J5
+  H5UJGCviEr/L9aO2WuyX7iHiBBP/FHkvxlPYv6O7W1fPMnsT8tafCl+6hTwFH2pq
+  Esumndpbm0BFDXGqMFkxLN+YoTwan4JIyIKa2ahqAm2HAgMBAAGjZjBkMA4GA1Ud
+  DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBSI/aZ5EExd
+  yJ4F1MhOC6jgvrzs4zAfBgNVHSMEGDAWgBSI/aZ5EExdyJ4F1MhOC6jgvrzs4zAN
+  BgkqhkiG9w0BAQsFAAOCAQEAdcZHcOImsNxXr9VYbm8ynjZt52Dd4N15LsfCsifp
+  ewk4RXWerGWp6vyl5LG8ahAvqe+ReJaM0cv4N0Ua3ZvJqME/MLqYaCZxA0XIclyz
+  f7V/D/dqeisduwpDTvWk9bH87TRbY8i/6xgjgUUnOW1thcLG59VxK3OFbTxPbefB
+  0D2MxsVBygyAGY56grixgmAiMActcPvfqJr03e8geOKVH1h6UacViblDqYJzxpfA
+  Jn6h8rleqnmMGbbp71/642HIdLcDTliw5DOmAHSrAQ3fuqr9EwimwNO2diUpMymF
+  LnyY0TuOLQlDQi84sArg18sU17qYFFDNHSR491pbtxcs7Q==
   -----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-----
+  MIIEpAIBAAKCAQEAuL8IMDbqdkPFqeS6WXqIF4AAqX+yhlV8wWeURrA5wB0iw0ZZ
+  kaUVgQ2IkqgA559kHi7P1h2TupztlgCcRMsJJAXoOMRz4hdT18xb5K6XSsSf0uIR
+  HHrDNYB2xat1qhmDuxSXhcreoLE4dRQg6jMgl7gPuflGYO/cfxNak6EFbab8IkrD
+  ZI476tadDNwpPlFL8fuW12aQc3zC3Mshc9MwNLtoafgW3ns8Dz7V3wfSeR+VCRgr
+  4hK/y/Wjtlrsl+4h4gQT/xR5L8ZT2L+ju1tXzzJ7E/LWnwpfuoU8BR9qahLLpp3a
+  W5tARQ1xqjBZMSzfmKE8Gp+CSMiCmtmoagJthwIDAQABAoIBABCJOMhoAfB3/HdK
+  e8uKhifkUyrYvTf86t+8z67MEz843GWyJE4/An+8oF7QHtScla+F7SBzIUfwx+tH
+  PrWBnt3UkYaTPvQbtmt4ZTlAz1Xn545Ooc10x4hAaWEkCbIh+oKCQ1W8ZNTpR+5i
+  0NdloCM0XGP/BeejUI8nQlI4dW3s/1YdqO2iXdXjqZLQEWxWxeYk5+MeFbjcXvQ0
+  7c2G52jqErIEvdld2y1JpwweGQj/xHIFI0+nTurxRKIadFcXbQrLEqhCciY01LCt
+  EdDpVmf1p9SD+58BlTeVyhkcZFwdUX+lEqKakmy3kXYXI1WVxYoTrnAvTD6KCkFV
+  ixFtkSECgYEAyc8E207JjlrsmyfSSCE9qNP2hsjhrxet9P9Aqu+C0pzx9h9oyVxK
+  K+1GHWKHZFUMDDTvCEKRc/Q24ZhulP2qLXi0DWNFVR9XiL8RlzDZNNE7dYVgkHYO
+  RNUsi4Pmf3ToupflCy5E8PBCq2Qy2IbcPgREmTKOXzi+Y6JUG3l7JN8CgYEA6lsV
+  xK3YbU+b01owAvYj3IJcFQfjBYomnlvBtmNKTV3EOf1tLlgMCA2C39xgFdmtLRqd
+  sM/VJmM29wmgTLZLGyfCINKTEpRGKvVLIuLgFSUQms2CpP5AQ1gURhFkUgQw5D1O
+  T+7gm6W0Er92Jv6U7KYzl03DQxo9O+N+z+4k5FkCgYEApff1nI89QDAS6r9jNyLv
+  XMuFse+/e4pT7GuIOYxk4OVmMO4/9WpLLbkjssL3alJvaBKYiwiEKwKrp/j+6NV9
+  gYwFOAVuXcU67iGFS/xGhiOVbN9WPTh6H63Zxpuhky0IwXxuSDWzSRuvGNl834p5
+  0x8bc4qagEFggvxbg4Ty+60CgYBzN2ywUTfCJg1aD1DjY9elpYFX5ZS7OHxcBohp
+  /s6c0qiSSgHPcwIXQ21AWbvzgh0du6QjNUp5oPV45oaksEqkgxtxv5UG4VbN7+KM
+  uDWqr5pGQRslusolUbxF5m8H03+l9m315l8OppytSuvvp+HXpq5eiKCi8NeCBgpm
+  d5IzoQKBgQDCNfgXgkKhw8QWZ97H4kuw95gmLu3EcZseLdH6PCEcSq1tu/wgGq7h
+  CchGxSXavR46wEP0NRoQYB0dzE0JJad6zk9kx4SnctamrbjYd5ylP9WM7AxfuSRb
+  83Qhmeyh63wSrqWOtRFxbA/G3P6JIMkDSjM5oPELrkiv/Jh8VUHrdQ==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEowIBAAKCAQEAqoUkVG7J8QmQfzUmNz79z9Y4QkKwIfb0bi0iUsshzCeeTI//
-  G1VDcadWPekCoh64KvMqbELwfCjTRRmlwyM5uC8XMviQTJD4D60Bt6xqQ431vtgW
-  aT2psL1jZTy8NSQCAaxVYufgZB1/EP0dAxiotsK5cogUZfM6UvlQSuyvpfgLrLDv
-  iB3TvjxzFcD7Hil9w4gW1p3+CBHYf/ANH7YvEz6xNy4tzjVay7G9foL1PMpExr5/
-  I5au1qlp5cn1w8VyaVB84Hww9fgNwvVoRxJ9CffQYkM+hq3Q7hXIGcLAT3UHq3KY
-  zHRjpK7uysRarIeDeAHZxifgUZk9xGe2dltygQIDAQABAoIBAF5TilY+du0kKk+D
-  +iDjcomu6a4Vr9MKBgqQYwVDou2JGPMnUKoxDz7mnzleFPvTXHM90kDTAq7b8oqt
-  9lksujgdrIqgn0oLg31AacvNz3aRJ9irNjJ/Tsga68nLwBzxTz7XsuAkfqdC/dBL
-  A+p7kJCQxP8LMaV319KgYX8g0MVQutgcKHHY90/EQzXbiZnq6deoHY5H1SW/VGNi
-  /MrmaAW47A4uL2F+GkJgoBUrLTKiyF1yJmur7j82OoAJyrMtmMhyaMbKarBDwy5O
-  2ZLyG6AcGfcZvwdk7ud4LqMvIcK90ya1PoQwli0EFrJ+ESlGFepmKNwicjH0mf8s
-  1QtSarUCgYEA2qKE2D6k8PcWYZjbZ52KTUhsQtcCJxZGrXkdjaS+CVR01qb2Xxwl
-  h/ppc6PvZf0lxynYmIRRspTsNsYdGtHVP0eNWTGg0MNO7GcV6U70Nvn0V2lIvtLG
-  TLMtIU+yg+OjGO9FK9NdXaIcqFICrvxdCOjoMtkTXA1jig6hTGRXp6cCgYEAx6mO
-  lnM+u8BArRgKFLBnPGHtgNbyK5m9mE4cwyiNp1uf3FXGhBt8gjFyTRNHPlblafko
-  5rN6GjmHvw1eqlAWQuvKPA7QZ+lJ5V7+dh9jsOwmdGGVEuX94pxvMXebrCfrdBoA
-  JyVfLNY+nOLUKPpIEnSFLrkyf1WuaxzNppt92ZcCgYEAsOhR/7vosMXuCTirR9MU
-  xmX0m7zoFAKVW+algCguUNRS2iEtN1ZKFBYOX7DllCva9qWoifh/NrYD0GpLwJjL
-  KTHXcLWUf3eZk/Xxp9/oAdgM2vHpF+bq58MPoGWhd9Co9xMccFLNuGblM1lwrHCt
-  QvlacVJutMxsn5go8ew7dP8CgYA+cHEN7cZtkqbnOsBUTgJK6NkMVKvxJKgdDDiE
-  c5cxAj9Q+WYWhD4AvRPgtKmv/h7KcEfxNal2sA0am0TCgD8l+HULKRrVlCgu2fE7
-  4X8cog04khe7jD9EceV4E86UHPvOGB96Hn7QF8QG7gypL/QACX5o6TO4jIP6LUzG
-  0JOfywKBgFKCyzFR9fBY8R1aTTXowJSY2I2BhiD/tWEL6HrFM/SDL7HvRV6p5CnL
-  xPbVChC22qCY1etL8o/Ne5gRpTEuExu1dG+hxHDyZAs8T9aDWQD45Vdckmt9JhKy
-  0hxq90OQ4HrfWKg0NcpzuzL2TQ1VN5E5uFwnpbLjV9CRrIMzkVXZ
-  -----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-----
-  MIIDYDCCAkigAwIBAgIUde3vkOXnzDbJ9wh1yX2oRoa+VGAwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCkxJzAlBgNVBAMTHnN5c3Rl
-  bTprdWJlLWNvbnRyb2xsZXItbWFuYWdlcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
-  ADCCAQoCggEBAKqFJFRuyfEJkH81Jjc+/c/WOEJCsCH29G4tIlLLIcwnnkyP/xtV
-  Q3GnVj3pAqIeuCrzKmxC8Hwo00UZpcMjObgvFzL4kEyQ+A+tAbesakON9b7YFmk9
-  qbC9Y2U8vDUkAgGsVWLn4GQdfxD9HQMYqLbCuXKIFGXzOlL5UErsr6X4C6yw74gd
-  0748cxXA+x4pfcOIFtad/ggR2H/wDR+2LxM+sTcuLc41WsuxvX6C9TzKRMa+fyOW
-  rtapaeXJ9cPFcmlQfOB8MPX4DcL1aEcSfQn30GJDPoat0O4VyBnCwE91B6tymMx0
-  Y6Su7srEWqyHg3gB2cYn4FGZPcRntnZbcoECAwEAAaN/MH0wDgYDVR0PAQH/BAQD
-  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
-  MB0GA1UdDgQWBBTydSmxVFiRaRXItwyLjN7hmk0xbjAfBgNVHSMEGDAWgBQUgj1P
-  ZnJbxSLOj3Gv59iDiiC+GzANBgkqhkiG9w0BAQsFAAOCAQEAw/Apxj04n20QKaGV
-  Yi8XCuivQr2KqgrFy9kpsuEpup2X5lS6vsT2cNIaVLzyF7BaCEsyyDLWC2ERcKdc
-  4EyneNkdtus5A+IYi6LoFMTHqn9xGtmMPHCV0ZuFDxD+DBVCOx8gcSbtTfqG9jWx
-  L4mmaJTsHaYhociuxEzA3uXTTTTabMtPq6gH/vcdawsX3xxjew1jWX0fhuH+gfXw
-  JgtOWq/9/SzjMJ2L48QQ4TyV/Am5Xha95glAPYogwcNs3FGbqdq6YfAvuRrvrXgn
-  HzN6CRlpAm3f2dbjcwEuFghPXxWe+DiB1R4POnCKd/Pqp7jHec7bl6kYEMeWzpUZ
-  0TbhtQ==
+  MIIDSzCCAjOgAwIBAgIUI/6/f3QuyDbECfeGceDxVbQ2lYMwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yNjA0
+  MDgyMTAwMDBaMCkxJzAlBgNVBAMTHnN5c3RlbTprdWJlLWNvbnRyb2xsZXItbWFu
+  YWdlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMPI3/GMCK2QbpQi
+  mFWuEn8RBBOLBE2IR1nHw7xr7qpMrIo7BxcZpiDp6iBauuyweVVO4CfRcUUa/knn
+  bIApuwOMqN+fdJenm40ikf0u+BdNOfN1Jz3PvydozL4KQy9VHlMY2a/EDvrNASiM
+  v03THH5Ks89Wwb6bzXWyIDsDfwNlZQyW8udOENwffB45/ft2sQllelTCLya8++/2
+  DznUByPK1RAkwFuKr4WWz0Kvye3+CPcimWqw6GKVRhHngYiP9K16r5wxQYLL960s
+  ArUi3lbIcehHYJT+fgjxLXG5dcFdSb0EVdKIxFZy6BoQs5nrXV/muiDvXbgwiKfl
+  Rw1jwusCAwEAAaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
+  BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRke/PDj0APmxby
+  2fv+iTX/byJTZjAfBgNVHSMEGDAWgBSI/aZ5EExdyJ4F1MhOC6jgvrzs4zANBgkq
+  hkiG9w0BAQsFAAOCAQEAfB/hB8mIa+84+Y9CRB6OJ2X/cJgwzF6+w9I/6/bD8nE5
+  703HdrcCJYtXigMmgL4TWVRLoCPF7ztvBRH4n0tTa3y6lMsfoX3OEYoxf0MRi/ku
+  z6jUVKEjGzN9i0g6faYg6eZ4PmWVBhmncY2hvX+ic7zQ3FRN1cT8PbNA8N+Uks0K
+  jYDYjNbBVhj/mXPYmg5u6WlSgIYupNjzoEuTvMOGWJT1UXP1+D5S+xSjL356oYFV
+  +mgS0S9hl+JHDjX4Yfm7G9Po4SeZYbHsqPypGJIR9bBu8o+6xire3gTLR+noq/6U
+  K2B3YsGVPhgTFUpYeFY0IdmJIwrIQa86KYTTLWSoDg==
   -----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-----
+  MIIEpgIBAAKCAQEAw8jf8YwIrZBulCKYVa4SfxEEE4sETYhHWcfDvGvuqkysijsH
+  FxmmIOnqIFq67LB5VU7gJ9FxRRr+SedsgCm7A4yo3590l6ebjSKR/S74F00583Un
+  Pc+/J2jMvgpDL1UeUxjZr8QO+s0BKIy/TdMcfkqzz1bBvpvNdbIgOwN/A2VlDJby
+  504Q3B98Hjn9+3axCWV6VMIvJrz77/YPOdQHI8rVECTAW4qvhZbPQq/J7f4I9yKZ
+  arDoYpVGEeeBiI/0rXqvnDFBgsv3rSwCtSLeVshx6EdglP5+CPEtcbl1wV1JvQRV
+  0ojEVnLoGhCzmetdX+a6IO9duDCIp+VHDWPC6wIDAQABAoIBAQCZ13kpC3kyMQDD
+  BCAhi0Pbdtp2JNF/vusaAB+tKj6CsPcPM2zR2QSybjvbqo+hNtZQk0cN4sSXoatZ
+  FTEr0B60nk2AUoLCPCC9mQGQKd0mKje0N0Vbi6fP5sijN9stETxf3XIIbA29Q2N6
+  ooYcOBv2nOqHrMtW5IRgzFQJKykd16ms0ezsPReJIY/R30Rxs8uvzM0DharwDH0m
+  kskKtrAC/YdvyD2c4cE27KwQBERR+5TlQgr/5TDGixP1Hxvh0BGRGUe4G7p9ewJu
+  M7LGkijhjs0hgN/j9LyToiNi1JPWaR8EgIJ26ySTFMV1oSRuRLJ4aHJYilk3VMRP
+  9JhH/WNBAoGBAOgCmYVp942bOlWhEltOdU20ipXy47MJHsby/kZetXZOC2S7Bn8y
+  6qqNCnfqL8g+IJE0AXgHfHtHzIEIBFe5haV1frjSX+x5T30siJD7Fna7szJWUH/z
+  ks5AycL1DP1GwGfjKWF8lsVt1tfC07Ku4UcduHs1tbnU+llzkxCMPTGLAoGBANgH
+  X0Q1T4jJCPAghtYtXVj+UxX5F+yhI1BZYI8J8Gy+88xFyelsCYWdwqqHnC+6iKFr
+  3vKy21bwhSjMhygxigWPZJkUejWl6U7D4LV/TfZQe3oUSdHB9ret33LGKuYeNsmN
+  x2m3uZ2Fvczo8KqFsRCNFOJWAdwnG57J2qzVzSAhAoGBAL2/eo1peAQBQzlLDXdN
+  eJR/pqQyTNVdDSXLD/i/dot2Es1kRFD9dHzd8wTVrBSJ8xquPNFM1hsBQpj41Ixm
+  d441xNklfTwqjr8iD+L654ldw5XUj+vFanhy9lATGHeASNXuLCbFvY1kYsR9W6QU
+  cLw362whJioArGtCIbHz8Aw3AoGBAIDyjZP6OlpMnZAv6ixH8dNgI5oXEIfHe3vH
+  jdJzvVY7+Oxyr94sBdcC3yLJRZpbvpiT+gVma3SOpv0+cGK2h0tgV0zkozoIqaXB
+  WA0eSxv+2GV7XMDfBXSITbuFvC+V02Alx+U7rIjxPuTkGlu+530YqWGcswmFMoBq
+  vqOyDvnhAoGBAMlZI329MU2HAcX93XIFlwSWFgZfKjF5UYLCUj6tnWU/KhgRvgYD
+  Nku4B+s+64OnXS1wdoAPUNfQ5e8b2YpFo1qaBLyR3wugI+/Yttyminj0WxbyRAXH
+  lYX8/QG73/brKnzP3os6wPMAtD16QVNN+p0I95yZgneZv2HN762Q/JaO
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEpAIBAAKCAQEAyGKiDk5oGOoWiXNcGGTU1yXHEl4bsLNPEYKH6MeED+lJgwt2
-  nFlx1we2zAonbgimNRIHpZAgxlqEsQSRUBVqLaLCdb9s7gUsFMf0T8OhhvgTikh+
-  Ques70LuxZJj/ENtqL/LovHpfQFk0v7dft43vlEOvn7SLFOLYvuY17ukDy1n6tn4
-  4lyq6uRRgZwj39SmiLcdAAkG33ZydxmFIq5rAfVhwKzz7z+ttGjnTSzbISfserTU
-  ObJiZQiGvvQraexQIJy9xfTPGfrX8IrNpkbWB5wU3E9S7liejfLIAytlpvx9SdoC
-  wSA5cEtVN7ISUxgzFnJ+QK1NklhS2vdbLwGX3QIDAQABAoIBAQC7BUNWstr5FdF+
-  64nywnjbbEjF3cteOZv8LaWHHl8lMogHpHVJKznShUKYYIm4ap4lPfShE0ljlyvs
-  wuSUp8f3W8a+erDB3VXs90oP//gLrhEeqNYev3dpv0B2aVCkKpJ4QrleFQXkQ57E
-  RlaXh/Liz2hBZr/l2vtmoIdgIaLW/dLYIGRzKQsE9cvjluNX47pTjsSWZGc2gJlJ
-  T1fjBeUWQRW7u01BG28dWl1mmjqCVxiORujxGkFUUQRxoEp6VF+3mY1nu6o8IaPe
-  nq+0Emf2aXyrIPkSqAIKL95q8LLzBCObOVuKVFTtgC1X406vnttxJpByoayZQMse
-  IYxpdY9BAoGBAMx9Ng6e0MNNjqW7jDZTAmrHOqS0oCPXXFUdmR+q/jn+l/abyCYj
-  gYj1CYH4H79GbAE6Zg65DxBGB80iqCyPZ65UvWdHGOSA5tXLt1M3X8H6nDgxwj6z
-  3CnCfeTYP6MH8qUapE2ZtkHOT/ACsFS0B9Z8RG4i4x8xwtfCarO6KRMZAoGBAPrc
-  x+Gk2WZL03p/hxsEKmi52x/v9uWUtpR5EI8tUNlhSpnw6n3nkF8wL64NcRVW9NPM
-  mi19vr3D9CQITw8KM8NJmlNvU7WHX+4nU5tNN/jmuyjPwpvK/AFnguFuedPdsloI
-  ZjzPbAvdhrrY19OOlYBFBnAbK1NwTnq0/GiYzmdlAoGAOdlCLaioDlgmfqQr6kJZ
-  cLOj12xx0THfoQSaiObqvKVVgCJZ4NAymPgZFHeJI6dcboyCyq93n3bwRgwD33dC
-  MYMvgcQPOrVsmBbladlEca/f+dW5yds/8WBgFRlIB2r8LdD3oixV7w/adV+NWqkD
-  fp3xDec4sV52bGtHnEiRziECgYEAyhyQycIoCVv0EVCnyGNty5xZ5/xMniFXjH2R
-  ktk+tzTEhwxr0G59icNn1sIrpra9X9sLKLWTtI4op9Mt5v8gPymQtcIO3kUoS9bR
-  bGElRFqY1cO1lhFPQc5kyz1X2BNYu2LjBAFVmqWrA+Tq1h6dYo+6JR4upPXptMEW
-  Tys1uGUCgYBIDuli6x5XXvA06c/v7vNBC5bzdhmHPQst8RERLzPU3VfJQclABh8A
-  ZpemyIen0oDMTx4kQ/iWyNhks0LfYwH+eNGNSieRwlJ7CIeniswJeTXj5UuyfNyh
-  c7eabR5leok51ZCa/ciq5A5ltVcwRJZXTfRnvQeg3OceRP8TVjnWCA==
-  -----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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
+  cYAjrKwLHluFZiQ16iM3
   -----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-----
+  MIIEogIBAAKCAQEAyw8/ykK6ebVxE6qLn2kKB4s0Sh1TfWuc9KAnaoCCu1u+0YGI
+  CbBD8SpmG2zBI105f+jdu1o3cT3EodpTAgf8ATOQM3xd1mZLcB0eb4ga/rBQK/o8
+  oQzOtu0UlK45D8/GaZz6fqfAM/Q6g9s5fINT3HVhrE5zjd5GSMiSOu0wTHDPLMeb
+  wnQrrF9GzOficTKm6aOTqc1m0gVquqOCTS61P06le/CJkhTh5D7Ldo+fNr5AvLUr
+  ffN+U/JYxc0Zb9aMS7s3qSA++smnG0icgnkpsAFKpME6cfTMARsaoG1Xow/Ss0x9
+  CGuFRlg2ZApt0Iek/IFiwhz8JjwwnEJhVgSjAwIDAQABAoIBAGOqhW3aGLr6Qpkb
+  gVJp9QFE4xJpmHwb4Lr1DMOqdgBOBLfCMypGOOLbI6jcVWPtMvbELmjx2/qaDbQ/
+  e7SohJl2XJXYuhostWQ+9pxZmp5dncwoE7AcoC2K6iob5WgMXF+kLBMUdTNK8Zmc
+  dXfW4cd4Wct/6hm8+pRo1dVUa/toFmQVGC7oZRhL51xWHdSC1+U39scXSCS1OrO5
+  igROv8PemVqELvbUcDVd2t/iKUV2C1HKY143KN+mZ1tw6jEEVEzOQx1+NF6O1qjz
+  DhZZcsYmMH5+VltyR1ezPZjGZbjHKC611oos/yoM38DiBm98i8e/klud2Pv82p3J
+  fc3ZtGkCgYEAzifnVaU/nHhY62AKtWz4AZJnXD2WUEXtHpGrcAOZ5p338N1agueN
+  uaVbdsNYnfKSLftZAGM6Uf+KxplwM2XesPK4ppzdII/dsF9prQPn1uLlMpsRDSK0
+  KOQjkTNGVY1tSgaiNyG4J4Uav8i0iJrwnxwMVTsJnLHMpBMy96f/AkcCgYEA/Cey
+  zhepX61+syhQW382wD1pPtsBKN4iwnaHw3vhclS6Q6HYQKjMOnrk89TpJWKD6aCU
+  2OmZd0aulZa1r6jGdsyiVVyBPmOCwEqsAESDrHbpcOunftiF5LcHvvBhLDD9NoUw
+  43Z5WrDB/0mUeGGVoMtAyetBVhCtehk2B9Ha22UCgYA3Ubnf35HsONcTghgdivoZ
+  4eFefSBCtiDk3Q315uF7YtRPi/Znvh7nvBmJCu5So+7Z6+J8GiRiMIJavH3BLQrO
+  zLMD8n/b5v8D/vZqeOvTW9tI8xdmQPO7LUzl/65V8rdq79DDnoa+BBejcwYOyhTb
+  fTlJ/aecppFVTdmVXz0srQKBgEWpyhJ6IwcV7Z0dlCXTHZM65CrDYqyhwkSrbpKp
+  VP27PsKUoiQq/lFhxoM+3TLA5uTSwoyy7P0w/+a//m4LWNlVa7vdlK9h2qu5dY+V
+  XjN1nsTdtiarN0Ka9n7f9li5KBu57GnLP3e4wb//2g7wFuCXhszCPAjFDshe0riS
+  V76pAoGAYwnVvoUQevuzWeoDw2TOd1T+cT6tVf2ylMBpVS9KiJ3+yHbib4SCDB49
+  YpZ9ds9T0f3bFl92fT58WFFyQvINhp0pe5LfKpQoWoqGFsv0yeR6jKIJNXojj4mV
+  vvmnyjUIAYA+sLo4xCEv+t/glfRvQWxZ1mRcPqcXhUoKGqEThuI=
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEowIBAAKCAQEAsow8WX1GQPnSAvI96GfFe/TpJ7tRB7foK6lZ6SFmzR3dnXcV
-  h3U+KgM7MstJ8v3+BSXYfRlHAgY1pd6wVRb3Bo/RvtHJrOeKXYGgpAurc81FEVLq
-  GVbDFYw9+4sUAD55kkG33NVZ3NL4uzssX+KeJVl+qCSN+PDvtN/DzkuKEWfMF1Ja
-  9KXDaNsVXEa74cenYYnXeeSL6OT0/uKFCNk/r7pQjPi3/lG+By13WMCDvdx5cpTf
-  db6sja4gtMwv+0DzTWrXhqE6YuIaB5Ovnjk/iOiicCjsDa6tIzbj8QXhyElAY3V0
-  TX5+FXRicym9CMMYsMNWSZ2P0H/yg91DQVNdvQIDAQABAoIBAQCWmHvqiyRvd4cw
-  Xvvig2xpgggKMA9HcFHOSdgBL+ASj+c1gpTRHQ2ix/jtfdPQtXTFCMfRtDlVNsGX
-  Nv4JtwYCLdoelboCMYVeGxDQbNtfIDrqQsIbPzfqe9Bn00W6cvd9ahrXk8ho3jVX
-  TrC961mybQrMbZCl8Sptp/LylHpO9JGMz+e86o3MP4QVPdnjzzR8S1tllRAjWco9
-  /ZRJsKC1qyu79uifuoDeCDiS8kdJRyIYxtx3MTffvBW3U3hGRP+g9JjHZnSXY22c
-  8PqPJWWDulRvm3sPNlyHV+Kp+0JKsUWib7bpj6qsy+82WTZg19EPE/o3TLFx+28k
-  UU9BVvgNAoGBAMy842bRFaqz55m+x7GTGB5vHsYXILZtox4Z8/BDWX5+ToosJ+st
-  lEsGcuikePMJ/Kje1XpGC+GTljkY3tXZYVCpyBdnCLDr/J/fgMj1Q9Qo6E1yIKad
-  QFDHhFNbnozUsok8r1C4oImXm418Y1dEiByZzEdqvLdAdEqTZ90bsA+TAoGBAN9A
-  o9lTMZHqg6ylpvJnDzIyfe18H5f1WuMPvmkX2z9JMr+zB9zQNPSDMJheaashZDXa
-  ZHlYhPsETP/kr/nynFbqEPmKk3KCGWcExG1i4kVaI45qRNqSD6KOEvMgmZfdFnA4
-  lYOhutg7/1q2Wk0sqw0svavYNbNKyBOgJrBSgQ9vAoGAKNl3Nch53jlO+GoMRe3n
-  XgslxLhQmpV9ekALX+DQNmDVItR0koPhlqaOvsQyLavMcZUkWuUm8bcUvgesTla1
-  B/cYKTMxlLtBCFT7yRzGj8opr2oaAaRWdMeaK1eYZtj5VlB5Wk28GjfZnX04BO1z
-  iuFU1NsDFD0T9t06V+9yTWkCgYBj2SYu6a1u5GMV0VS0b3F1cu2tTGlY7kxC52Sy
-  3g+Z42QGJs0qbhhxD0eprfg2qI2IJG/xcaywE8FYZXBrKp3PpYoIAXlmqlcwIwqz
-  HZmziNgENvUqiE7j1gUVpgvrxt7lO/lq0OefFF5ltM74WzT5hHwkImQKFzUayfLj
-  w1KjkwKBgGCTsk4ufEzCSmYLSScUMO+7xYZDLhU5vSOuJyWjU8H8x2Yv2gP0sgLf
-  lR3M1zmtu28o/4Ug4NWfsVVYnrzYzEBTEov/9ofVGVAaR65poJjmPltc/83YMe6x
-  rfGeLcbJ/A/9YQtCpkSW43Ksmu7J8k7TQAPkcE2U0+QWrvbjR3Ea
-  -----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-----
+  MIIEpAIBAAKCAQEAmSRg6gIzDOI/MzCRECDLG8hGwdCrhmDyKBOgpToBh5KZSeDy
+  7lOjIGlx/CoX1dIDgi7/UGJEZ9TEDS4kRc41Z8diXMgTaROlXhBiewxQ3rqu7qhJ
+  6qemsREhDX3YwbTAjw5Ptjcm60Nlt1RSq+h8vJprTJsbHsVMMvHZIBs+CpZVOHoa
+  snLGmJvtK0h3og0RB3x9AoKmF+r5qLzuOL+rKqb7N8PAlN4TPuzT5p6bj1n4xlmp
+  yj38+avhlZ1pKjyUpn+8JogYC7Ndmg00xzpB/mwnkJD1qHAM1NqvzARkxX+yC0SW
+  QMWzejZNrNcQ773Tl9dH4hZiByLjCIG3gY939wIDAQABAoIBAFf366vAY67M79zp
+  0wperA1jeDGxOjZQzglzbN48edB0x5UGoMWCSbw+lflx/IsYvmczs/lq2TyDnbKs
+  hK2MjGT2xWviijPb0yw7YTaplnK67e2twfgHIduoqUHkvnRW7h2+7M8Q00xlRLKQ
+  v4R8Ydq9IVG571Q3pVPGVSD6RSMy4HjetMCmEb/x73G+Wyc1TZlgu+YFmPXX2TXw
+  CFD5+wxsjkt8fZjb4C5nm6qrSR3S+8FRvkoI2gwG2Q3ftddN4BKHUMHORrUk82fR
+  i14z1U0qBrnBF5wg3SO0JeA+uIqBw9wiFBLMql9sEyDIA6VjPsnPkamTT7/fi/Wy
+  uhldq1ECgYEAxDWGgoqljfa10s/ohAHOR6GxwIMWVbDI9PtpWJPr7Q0rNLfoYATX
+  HMP5zKCK/2zKCZqnQFPmKdCvHfLqXLhsQefBvYsbTsXO1wH+j6gOou8qD6NbrKx6
+  z6366m+4o5sdhOCNeyP+SPs6xWhS9bcN0i7iq6hcHs95tJ704UYHgfMCgYEAx88n
+  PNHXdahAmqNO/96IKzvw+M9wBTJRLV7wZS3H7HnjHquhmGx+NDJoBLcI72AacYPD
+  R3MA0pi1Wtb14gEmbnW9Tki9vu1UTbZB16YeazHOxs1DGAO4drfp1ox6Xw7CUKak
+  cd0AcrJLMxiiKQem7s+izrrC6sCilhRdxG3Tru0CgYBZiyfw6X92k3IVXIb7v6s5
+  a6Soe+q0frKngxlnsFJKY+kk7Q1izLKzUQjuhxIIUci+q1LK+78dtDxHCbZFTHEz
+  fqYfb52tzH6CB0n6m7LaTxW9/0p2Olzt7LOHTCdSmxbUrnpDCYEiI22F6/94Xesz
+  0evmdTZdZUhg0u5k5MXGWwKBgQC2utU4gvPXrzK9+UIDMGE5oMzkzti0d+rTYnLZ
+  JUAkHOg/oVjci8PzOnH0deve9vXYAFdznVIQRwX7+IDP2ptqA5VH5bBZzrP9igO3
+  Ez3YbKmdGBUW/jgRomphAwHasyW0GmJjm2iQfEvXg9yxR0U8O3m6NASUKe3G8QM7
+  4/DmlQKBgQDCSSKBE848mmq+mXd4COQW4a1CbhaVxt4VMA/cyZOcnQgdcYB9DkzE
+  srApo4jG4WHaLqkvuhJprwExRI0kPtg/SxBPbdhRAiOhgMSoDI9HKzS3iTqGxygb
+  aaqbRN+eR+RLWy1iJ1uAm9gHUOxuTjtNQHhLkR4sIVb1Xp44NLBZrA==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEpAIBAAKCAQEA701mLY19cglQJgZwZ7SD3EgdbIx965E37+iMeVGTl4/tH7Ku
-  D1VwV0OvbgBol+mwy1Lkh9tsZ6qr4cKPQJ3+16b2/yaqdYOJIRFJaQAUtj0+YLud
-  gvxdKvTNutqH8VfBQqBThVkH91ZZEm7dJ2Xy9St67Ie+xZCE7ZgmcTW6OpTSiv07
-  CIz/20CtkOznEsYLOC2aahg3FaYecLo+jWp5SdPrI/9r084Bq1VM8yr8tcYFr/7c
-  0vDCLM5TbgMBKYR9g2xetagc/Kuyub0283ZB7NJsndbSv9R4KRYCJLMf5xRmmnln
-  J9x3kdQxR5dQPohgnL7JX+693YmOjlfC01zbLQIDAQABAoIBAQDsfaIv/HdvvlJt
-  8ckeQ+BYTxB9GO7MYcxVFI3Wy06/5uXhgJTR5I7MPsDdRhwXnUQx++6LcMbWQG3z
-  A3LM2hdjCcdpas3kqqRXgJz63rCZVTcTI/bK3xo3/IxgT90vHpmIfadszgq4XaZT
-  OCro57DOqDSoEpLu7h7gK5A6K22qu0Vm3WZGluLabFZdzU9hMzYF+13ZyTCYCxOV
-  mUCmoWfk5Jm3YOLZzGOTqFUOHZORkRoiJ/N1mRZpMAqFT1z2gwyz3lLys/Jrgl7N
-  Lqj1D5TDGJgbEnLKPTm7fAbKOP6+GpWcv1yVv9O/ZfgyjWloorZQAWSdgvOsmD6L
-  pbhWOMylAoGBAP2wahzIUnqk/V1bujfGz+pRwS6CudQljcNeC/foXjBeSacn8CtQ
-  j/p0evK2DfKAUG+KwEe+ENKWDAAf+SEduQ5fqiXrRsuw3tr9VHafj6IhqTxFYlBl
-  sf5jpB/kDv7cjUpS9ctIMs5cCPiiXyYUwkvFXVveQxpqWj1u+vhvwIq/AoGBAPF7
-  b4czgB/ae2v2bnavZTpo29jIRvMoFNz0J75Fgz/AtBgGBpZBHigZl4vYrrkkzeKv
-  6Ql/BkCuEuipV0E2zZ16CFqlDEe6muZm6XbUZhTXFKNpb/fZZb7fTtCieDYm19cR
-  RrWa2IeAT1furjnY1tc8m808U8VRX9W5zG/HfDETAoGAc9Nx/0Yu8jQWQeO5d/Hb
-  x94f1350HbovqX1s9XkwV+EUu67uZrhXpEA+SkZ4w7l2ABdXhunugFdlj0EJ2+bY
-  MQnYg4uSPTm55j43rBlZ2OqJfC0poA9uXvlbW/wiJJbKI58Q/gkuuS0oI2zvCFH+
-  C95Gq8Uk2hCottfO2lMbk70CgYEAquYNpySGf4STJnQP90ToIi9Fr6UFuV5bbYgJ
-  fHobignqKrpQ/RN2sTBzdRBTj0oBv3V5OjRAi5PmY+w8iTWszM8pjGUUTMs+huK8
-  RVHKMOOKgp/DEygy/qNxVuw0oTZaOKXMYggFR9hBztxnRx8z5L3LEbOpIZMWfN5y
-  VYVbWisCgYA0ZSzqDU1+pEiVQ3yRrKXH8TzrCHIBlot+2BfEtu1YC2zn62U0uXRe
-  xZrHIq5m7aU957aZGJbTrOY5i5CKfeh+k/DavbeQsnqz6an8ltPoibVqb59Qc2qN
-  7JL2fCaF8CJE/spOp6hIxPQyqTa9sic4D4YEVB1TNv8p26FgE3OVlA==
-  -----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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
+  MIIDODCCAiCgAwIBAgIUbJnX87kVTtvnqlkP2d147gYkeDEwDQYJKoZIhvcNAQEL
+  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTI0MDQxODIxMDAwMFoX
+  DTI2MDQwODIxMDAwMFowETEPMA0GA1UEAxMGYW5jaG9yMIIBIjANBgkqhkiG9w0B
+  AQEFAAOCAQ8AMIIBCgKCAQEAvZoZIHpQNfrOl7KO13re1ZFOvNEEHDAlULz7cEzh
+  Pq6RQdpLadYqFiUzaD+w3L3BwznN3aKv3wzwrYmhbe54NuCQMQGZNN91r3DrgWQm
+  kMyl+Jo94hubhDiH0cyIULAvkXz0Dr+iB5uTtYLYfgVnd69nKddl/BU2sesXPyOk
+  tGzylPSklO/nHJ/q59YKTNUNJwNX5gz5IAhNVPozOAC38X77++6tNxPbQc2f30Aa
+  jyCYX6+c3eNGm8LTKDzoHcZ07bRQTmfwDW7vMu37SxDa4rKbHCaBATOBP9bpf3JQ
+  Z18Z5iNk6uhLnNXhQ5LEGmvf/TY9CK6uETBk2WB4W5Bm3QIDAQABo38wfTAOBgNV
+  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
+  EwEB/wQCMAAwHQYDVR0OBBYEFK30K/oM4amCmvOm75EiG7w0shUjMB8GA1UdIwQY
+  MBaAFDlx5Rd2jy2P0G9Pbp54+T5MdcobMA0GCSqGSIb3DQEBCwUAA4IBAQAZQnce
+  hCEgFBO2FH9mJPfpvhbRIefvQfJBy2LYuuKuk/3/VitkMpKqLJUuOCrh3R3li4gK
+  dl+HFtM6zINl/JpKzJOk9QcoSW7X7gxd2ENbwIyVh37NP9+ztttkIZVsRoa3y3pl
+  xuLG6JQPyt/GfdZRtnwJQSv0W2adh8GRC5VgShFU4OPsjT+ZaM7GtkcQHTTn8ygo
+  HK5X/G+0OrOToWYCyk9dofJ91PQQFSXOfqFcaFYok08cwlov9/9Sh1mvV7AnWahJ
+  dcCt3vEiO2yKn3ONTFaP0n+yLNdu5PncBa9TUKZSgDALCKIGvvdonKHgSUKxdSlB
+  S85UtjKQkOX8h44Y
   -----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-----
+  MIIEpAIBAAKCAQEAvZoZIHpQNfrOl7KO13re1ZFOvNEEHDAlULz7cEzhPq6RQdpL
+  adYqFiUzaD+w3L3BwznN3aKv3wzwrYmhbe54NuCQMQGZNN91r3DrgWQmkMyl+Jo9
+  4hubhDiH0cyIULAvkXz0Dr+iB5uTtYLYfgVnd69nKddl/BU2sesXPyOktGzylPSk
+  lO/nHJ/q59YKTNUNJwNX5gz5IAhNVPozOAC38X77++6tNxPbQc2f30AajyCYX6+c
+  3eNGm8LTKDzoHcZ07bRQTmfwDW7vMu37SxDa4rKbHCaBATOBP9bpf3JQZ18Z5iNk
+  6uhLnNXhQ5LEGmvf/TY9CK6uETBk2WB4W5Bm3QIDAQABAoIBAGKn7U0l99iuoZLz
+  mTnsOEjebB75j27vamtBen/rsQSBpxmh8b2nb4zIXKBxC6FAp7LiwAkEXwjr3cwe
+  oj3maOz9Gmo1j7egUscwNYrFRv/vTKk38N1XSiuZkqqLB58cnhPQ9dk6w5+7xzca
+  V3Xzb+wp+78c0ndBvo0Da7wx2sD6THn55Hisz0DxIN7EE98O4pehur9WqeNEgnSn
+  hJAgCWuKrMkDg5zm4u2FrJnpZX1J51eS7sQ5n0nGKMsfpPq8bdsVOW7Zjpa/Fr15
+  PFmPtdxuRx5ZOsVcMkthM72fC88dKh6hnyWPH0InkkuR55b4Hmop1wGfqsd2e12D
+  syK1ZS0CgYEA+ivhDkOI4riwfnPNTmIHcFBemGWDDmHmWLnD4wRuLTeriDNAgB/2
+  3UF/X0VnRf6PzJRgKFtT6UoddKOxtgEGxi0BoDARcKdFuShFYKlWpj5kl67Dz7d0
+  o7E5pqftuy9HK9rnhbsn2HmamwQV9Kc9KAPNKgOaZGD+dZSGcJc5hq8CgYEAwgT1
+  evUyrZhTEw8y8RbL8t22fAkB5sOzLsFRhmIJdTx2yiAizzXy3v5m3+9cSrbIB1ZF
+  vvEbWITXUyRxIVqDouUo0OTdDzAgkRdWmu0Reuox5Sdm0CNLXRdQqFq2uickgpDs
+  JeEwFPV2QwyFL+UNc6ZhQCgYST6O1iCukwVTDjMCgYEAxx2ZmULDdsDNKTh+Vj7L
+  8ObnA6D4OMBPGJtygAQMtUyz6Enysoe+csgo2ulgk2NTjN8j0bsvBGWLIEURsu0K
+  OT2lJ5xapTFd20tkPNVLNDJA2kGtdGxuF8N9QVoza2Lr4MnwsI4P3sqa9XrBBuL9
+  WBX+e8w2XGKe5XL7ti2HCd0CgYEAh6s2CKPaqx7fwG0ZXxJkzNASYctepAHmkuQl
+  YMW+/Vapbg9op+J+kUXto9tZevkzCEZggPNR/uTtOLs7zGnhsI9zqhbPKWaq7yoV
+  qkHpvjxzZVzW/OYhNdgu03qTWbozQoWaS6aam51E8/+WRnZxoJQQXu9qhBUVhk/W
+  IwJPIJcCgYAlhODW94doFjpppWac65YgZHr+jGU5tDXPf/pa4wn112ZFtOlW6p6B
+  HbwFxNkHbNJQPz1IGRblwUyAGCNGzXgqZlXTbpDmdYvzoglGR+KvNzWriS+lPV3S
+  +piJwMv7XAu+td50ukO8i++7wWNuY+ga2hR3FXcM2OPdfP1DCJZi+Q==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_11_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-11
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-cab23-r720-11
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAsRbjn4tW/0UcmE+4NSWcj55Qn6MQW8jz77OlPw5M+q2PxIys
-  /1+S/SdfbOQljgp9lxOsq+9uGmMYnrcEjywWqmYkevp6W45YnseP068SIFW3TqCM
-  bhX5k510UPmqi7Obu1j1l6m9fQsvWx/jSQ2V4Ij/HuNmCRS6P4vjbEZR53SaiQRB
-  hnndApbvWJU2dXB/NgXComkNF3MnRZQ4qfV703mq9NF38lsdA85k0isldaluZhfI
-  xoVHznzPiFe4uA/tfnTtKWPDFvegM6GtS9fu32OxYJ+mRPUZ6PNXbAGZVIksXg/v
-  gDcORU2iRG/+ZWVact2uVPeYF8bTl9ceq9JNfQIDAQABAoIBAG+iDzGG4/udNI5r
-  SqLuJ8h9MzO+1lQV1HhZVaTvPeWUPZnYWEHPnNhK1qPNGkN1J4ByHZpxH4Ywy9dZ
-  Zd1fHJakNwDzHujSTdkh0e/OX+3UOu6s1HmdDqxYSHe3OyQ/v78VMBRAIzxNLbgS
-  3PMzRjS6B6EQFkVJNLNUWrPpjD4Lva9Cw22TedKV8b/JrQ47psxdbiIr5+PdReOa
-  zyM81/BVE71L27cJ1SPXEesSv/tKWXVdF2X7cuAJRa/CWZd9MedLiNlwocaGtNjw
-  FpU1L0USYh+zOOu6i3KxmO/L+nZJbAnQqjkEf5REXx6d7rffFLK8j5Br1palWoXH
-  PtCEsCECgYEAzPBakjxIUPIcVkl3AV2cppnS1ugwrWFtQNFrvg6FmgM3KNDdgr8z
-  EWEdGs3nXTku7nUowVb4dNF0mNvMfyOJttjP/heWerW2Ddl6KmqXynBkWu0+DSbY
-  PZt0SPS+bxIfobh1DyNnOQJZlUbgwfiPlrNvIXj8EKHus/CmNEtkNykCgYEA3TY1
-  YfqeEM63Qq+01DwRKUiWOXEAQDvWaTil2zSkTd/305em8LOlSjq38h320FwXbIdr
-  vK32keo5eNdQAhDcPQbJHWn+vIcmyzuhW59jbDthxPkCOoh33m7QrJaTBN4Vef7D
-  cf82x5S2JooC4YwMa9ml5XiDJD/z6hH/PwLiEjUCgYA5v2SWHlx2SrLHca4R+XHh
-  1CiAHC9TO8fQYvKMPIVTD6LkYm54oC3gsM/FtM2EDE/4K5VPXZVnPXowdIccMERm
-  /JMnUzg43akuH+D3wM+C4Ma2hHFevVpjicFrqWNb4ux84oBBwsUcYFgj4zQEFGlJ
-  msgu02ubuDWOCLqcs73KeQKBgQC1jfQqQiLQ8JgAJ21mcxYyp9yDsHbgQTwsh824
-  J3Biadtg0iq1ivux/JdUI7uaLrsa29pUtQKVp4Mb5rtHtsbLX3JYrdHgsZvpWTuJ
-  kztqbSJFI4nsuGyJJrIltD9d01gVFD8cpLY0/5yv7L2ImATpz2wU9d/MNKDgD31K
-  HfelsQKBgA+3OQefQmB5LxOPzUyLgX6ZIgxLe6w2WIPeN22GQr8cj3LLBwjZQeJA
-  FqJSZG/2zvy1NdctlgucE+CwKp7i7vzWP4nq044JF86e3YX2TXUodQno7cy2ScCz
-  lGFM+ycth0w1hgXhctRjdkx0DlHxugyqo6PuO5Cazqb3Uxo0Qz+c
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-cab23-r720-11
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID0jCCArqgAwIBAgIULv9pH3Noi5bhL1krXd0WSxLx52AwDQYJKoZIhvcNAQEL
-  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
-  dGNkMB4XDTIzMDMxMDIwNTAwMFoXDTI0MDMwOTIwNTAwMFowKDEmMCQGA1UEAxMd
-  a3ViZXJuZXRlcy1ldGNkLWNhYjIzLXI3MjAtMTEwggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQCxFuOfi1b/RRyYT7g1JZyPnlCfoxBbyPPvs6U/Dkz6rY/E
-  jKz/X5L9J19s5CWOCn2XE6yr724aYxietwSPLBaqZiR6+npbjliex4/TrxIgVbdO
-  oIxuFfmTnXRQ+aqLs5u7WPWXqb19Cy9bH+NJDZXgiP8e42YJFLo/i+NsRlHndJqJ
-  BEGGed0Clu9YlTZ1cH82BcKiaQ0XcydFlDip9XvTear00XfyWx0DzmTSKyV1qW5m
-  F8jGhUfOfM+IV7i4D+1+dO0pY8MW96Azoa1L1+7fY7Fgn6ZE9Rno81dsAZlUiSxe
-  D++ANw5FTaJEb/5lZVpy3a5U95gXxtOX1x6r0k19AgMBAAGjgewwgekwDgYDVR0P
-  AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB
-  Af8EAjAAMB0GA1UdDgQWBBTAFQChWOyUUYcLrSQJsDkyZNv3XjAfBgNVHSMEGDAW
-  gBSYJ0ww6wDNOLYck6PoaZWDaDkgkDBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTEx
-  gglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1
-  c3Rlci5sb2NhbIcEChcVC4cEChcWC4cEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsF
-  AAOCAQEAB8lhKtfU6YthpsRKNHrix4zyQtzjM6srAmhJ1IvXhanNTNWVvd2KgEr1
-  D4lD3kX29y2SM/0DN028JAnutGrwP/fxWR2O2a8hZyUnvjo5HFgG7bWHF/jqbtg1
-  S9HquK3H9tq3G2l0R/99MehjqKJJ/5dIe5iF+gX+DGhKFDzfiEwVarTCZROtLdTp
-  cdcH4UQWYU1/QJfPsg2kJtjrgtmPee8EQqRHpYzBCc8/rO9W37uQpLtYM/YQyheo
-  nGhZNSLvYEk40VKdnjwH0ehx2FdMbhyj/MPYp+zaiKLvmaTlpEdKxDOpFpzmoGJI
-  0o6IWhsQKEhnwXcqUeaYGjuv7Y9HtA==
+  MIIDvTCCAqWgAwIBAgIUUrCuqTl5QYoiIhayER7XnMHAb5wwDQYJKoZIhvcNAQEL
+  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTI0MDQxODIxMDAwMFoX
+  DTI2MDQwODIxMDAwMFowKDEmMCQGA1UEAxMda3ViZXJuZXRlcy1ldGNkLWNhYjIz
+  LXI3MjAtMTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCmgJDkIEHj
+  Gbu0TjNqvqZh8ODhNMcFUgyXAljyaRERqMoocB7hqBJ6XmwF/M6KLqSYDg4mQSVU
+  qHoxag4KsDWeaqB4dLO3WICgQIXy8a1QAQ9wUKxdGQcmHFOKCts7ma8rRs7/g2iW
+  rL1xLOBwAWQkoZnbMECDFfKD8UWvHNnD+rzMqCvE7h5q/dl+7d6CcaSeXeY7v43V
+  6SXVgf6SOAxWEH9kfhSWbXtXb8szEIZ9FT4RTgCqop4OcgY0p1YMj1CZ7hN7CPkZ
+  33tzXyqMP/+hAU5mH37c1zgHYFcO6++7cHFljOEhcTUe+4ozIrTmx8yP3RjBWA3U
+  y5FsugdaTXE3AgMBAAGjgewwgekwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG
+  CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSmIi/F
+  Ryp9FDiQkJScvJQFeaTo+zAfBgNVHSMEGDAWgBQ5ceUXdo8tj9BvT26eePk+THXK
+  GzBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTExgglsb2NhbGhvc3SCLWt1YmVybmV0
+  ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcEChcVC4cEChcW
+  C4cEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAKQiosx9jVLEJ2cD8sElo
+  PzWgYQ7BrP6BmX/ooDjtGqAhPTRLMVnulUfrIuyR+cr4K5JWimmtMsIWbXM9+S+s
+  ukCURSiQS7QPOLV+4VnMVbRXTdG9ApXCmDRlTQJlKYVn4shvAzyc8wye7Q/Xp6ln
+  PyYFkYiyJsVzIuW3e/9esRw2hGNW+C5yEcQRuzuJYD4crZ8Jj43Qo/yezvetRgWB
+  xIaNSNQ7KdM/L91aMNZ883lGxkVazFKV/+3pwJJuK8ZKEAmRkzTr3SgiD+aGz/sC
+  z+XAOZq2OL6RnYpCukXhwRlzw0iZMKtXWw9LHAxVGGfxEQ0MzqlN4Qky+bYWWYSQ
+  4Q==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-11
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEApoCQ5CBB4xm7tE4zar6mYfDg4TTHBVIMlwJY8mkREajKKHAe
+  4agSel5sBfzOii6kmA4OJkElVKh6MWoOCrA1nmqgeHSzt1iAoECF8vGtUAEPcFCs
+  XRkHJhxTigrbO5mvK0bO/4Nolqy9cSzgcAFkJKGZ2zBAgxXyg/FFrxzZw/q8zKgr
+  xO4eav3Zfu3egnGknl3mO7+N1ekl1YH+kjgMVhB/ZH4Ulm17V2/LMxCGfRU+EU4A
+  qqKeDnIGNKdWDI9Qme4Tewj5Gd97c18qjD//oQFOZh9+3Nc4B2BXDuvvu3BxZYzh
+  IXE1HvuKMyK05sfMj90YwVgN1MuRbLoHWk1xNwIDAQABAoIBADO57Ulx3AY5kF7L
+  jJ207OuwcayFQO8eNlsTl553lZ3u2h8F9hIUrOjnPJf/mgrDws6aTzsDMh3C2XNQ
+  h1w6se2tIn1JhCuJiyw9319CRZ19NtaluWaSx+3HDwzrooA5lnnTXatzn6Jvt8rZ
+  LkCdrgbTTYES1Hfk8Zqb8hIc3GpNkuI2CWSmqr8bD/fN0Cnt01kVKyDqvApG++Vz
+  cOkSI4oUWxQPfCr/rYLqoH/fdOrt6iiIKuTZJtPdCL0uE61q17FzJk+vmWNFUTIY
+  KeZAgzedQOifQRe9VkuWkcWn3e/v4LVWuCNupKsA0YVFNFMPD6Wz7PcI/y/G2L/u
+  9ODADQECgYEAzgN5UkO6zU+saBi5xBTSg7Jf6ovIUq0N+/HFMKe0BFjJb6wBuKNJ
+  YtN+0LGM/tVkS0kcYe8RvHUKAOCy+/0WF/8dD+NMZ7HoZLUIwWx13Zse6CT/Wya/
+  zc2oUR98yTBYJFOOW9BbEZ8QK+KPBzrsFKKPJhT5XJhpAU5Cd8GcdKcCgYEAzubY
+  ZeTIf5tlXw5Q+Qkod6TEseD6yjw7WZ0h0RQFVMlf8VZg/vlURYv8mpzf6Uweht5+
+  1GJkk2DTl/Wd1YpP0IqV+JfDS0JcbUH98T3V4iWqKdOupzG8Tj/+q42KQ7d7eV1X
+  xni76KJaQvp9BpbK4tGY9D7aikxNiH1TlwszYPECgYBqtun1bxgomgjYs1Ym+BJE
+  HfYJbPcLvJDt3UMj/PsG9WcC7brGhe7RvnSGbjJ3HtqhFPIa2Nf7IzVXVw3f8i2r
+  qH7JaBh/7mxPHme2qhQ0AtJzthaAhQX9+XYi74iYPu6pgo7PiJJkAl1CHk2wlRkN
+  Z1d3ho3VJS3fe0Z6+lOtKQKBgQCx0OvCBnHaWa8xlpg4r4o76TuytGxVSpanWcgq
+  bE54o+j0/Qu3loi6jKi4KIK3elfyCV5vIXDWyKyROOJBF/GohLKHR8br80iEDec1
+  YbNj/ILWF7tOrgvsJEu3HJnrwNE5aON7C2BTetSgI6837njHnuMZZrtjiFhKKYuh
+  kFrDwQKBgH1l3tzKpUfvPoYv2zhPyuvEMLjt/v41vhjc7+NO1Qm/La4f3T5IUazs
+  NyuecRr2glp/ntM1UZmhlo5rsSkGPzfe49OtBspcZ6QnWgsDfZK+K2lGH5ttAXYS
+  1AUUD5mRrxFu7znb+gtRF1XIi0R2m0itTCK5fIRbs84Tz5C/zen+
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_12_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-12
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-cab23-r720-12
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEogIBAAKCAQEAmxmklEVQ4ZfSiH//c7Hj+RbuI76sT9K8yi1wi3tnk7CIklbq
-  R0ler+7/kCQ6sER5WIl1G4ijugA2yEz+FOo7Abiev9JzaYxew01Q1m5vYF1zgnMG
-  /2jgNvwyK9OJWLC8IGF8+flpgPeCoybgkqUBbBylf4GWi8zwu6t6YhqMwtxJVrAx
-  SyHM+/ptkxSA9+aRcimdObYAMLpc49iQqmJ3o8bscTIhroXCLgq+tgRo7wXx0T9S
-  W1QRlp4zHUkZ+wR+Es1CE7I0nBuDP1DDBKeFxhb54b/9WNwjbOSn9ci43HiaVj34
-  6rXR+XeRtql+BkIC9wmc9dNTdVQsEKSCOEopIwIDAQABAoIBAFVCYWBIQk/gn5D9
-  m7VDoqg43Ku1kw9GLxWMqQNj0Oo07r5THPIW+QAJh177K2/eFD6BQWjjUe1bVMIC
-  4OEqaUlm7Y1Q6LSqvyTpCXj2uC7m8CpThRM92ZMgS4wf+q5QaPn73TGk00RbyupY
-  4rZ6EjAWBzvyRomPHP5tIxdutNYgWvTBhBR0MPXeHZpBY/AkBlMA9V8wnwRjGYAu
-  dnSsLeI4fJnyhqmlQ/ibXkFIx8b3UxPXv/IgG0LqVr0tJlYrztMfoXmtarYwpe9W
-  cGqp9vgQvuYfiBSgv/JlzDjgkI4Wk4x7acRBJF5Z5sVTTcKRPCp9HcK6BjASflYf
-  btowyXECgYEAyBHnJ+uzv4JtIyR9pT65DnVYnZZZj7r85F6jMigLQ3LMNEhwx7DR
-  oTijnvYVx1vgyYxexHpUhE2jbj4KswWiAwfrpWR/fUpI55K0OxzxbhkNNLsHVPXU
-  Bs5brxP0h0HYpAHBqdWm3hT9393WV+LHLM79fWmWolW03EjV1ygihAUCgYEAxnV1
-  OQaTJmb0fM+M6JaoPip8CW3aZf4lSjkPocQqeZI+TjwBJQk646YtBPhC0LQUpIe1
-  yrxCjSoDuZr8CSoYh1uPMVFkkaHedcHBlUyVxvAFahbNBaUDDFpG3jOVrezyWf2v
-  spUhT2SF7/y1n37TxQ+4ucbvGjEcxZuCoJdw6QcCgYBKRvNFy+kI4Zg5ItQO5FF5
-  /7DtmKMZjHdVJZl7Bojf+p+7jWVpjcjWDRwZ6Qy+3ep/iUCpuyzjjZtuU1RPkHjM
-  nUUsOzplvo2Ag+OrypwLnvtbJ1Cah0W3XSeGwWbYTGbsxMYskmiILMzwLwDj0grW
-  JObRh8Dn9d/WpKfXYEwoLQKBgCCyBy7u610/RvYtB2zmLS+YtjijdYCqHyCcR/wB
-  onHG6ybecd3VKHOK1A3mjLNvh5sXlJai71/sVRLF+tHTspjSN8QLQcNQZKMH2cms
-  BVzx/CJfQUW1ysvFL7m5y+YMjFzRE5obQZKf4AUKoC13qpHjpi5NHOU2xCO2HA4z
-  BPIPAoGAflXwQfJ+iqLEefh6mq0MChiAzX6hT1yoB24gOoMoUj3rgRf852SN4BtP
-  yqq3In9VQi6VoTqtQdWd9V9ebXjCWL8Tl3yzTwnpazmUev17S6av/qG1aWAslCo8
-  6VWnroSp25vvg41U4NLDsQOMnfk2zjvIbTDpSCiGyJXRJz+jrIg=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-cab23-r720-12
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID0jCCArqgAwIBAgIURkwRsm/AdRVIjE5z4NXxtCRN1eYwDQYJKoZIhvcNAQEL
-  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
-  dGNkMB4XDTIzMDMxMDIwNTAwMFoXDTI0MDMwOTIwNTAwMFowKDEmMCQGA1UEAxMd
-  a3ViZXJuZXRlcy1ldGNkLWNhYjIzLXI3MjAtMTIwggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQCbGaSURVDhl9KIf/9zseP5Fu4jvqxP0rzKLXCLe2eTsIiS
-  VupHSV6v7v+QJDqwRHlYiXUbiKO6ADbITP4U6jsBuJ6/0nNpjF7DTVDWbm9gXXOC
-  cwb/aOA2/DIr04lYsLwgYXz5+WmA94KjJuCSpQFsHKV/gZaLzPC7q3piGozC3ElW
-  sDFLIcz7+m2TFID35pFyKZ05tgAwulzj2JCqYnejxuxxMiGuhcIuCr62BGjvBfHR
-  P1JbVBGWnjMdSRn7BH4SzUITsjScG4M/UMMEp4XGFvnhv/1Y3CNs5Kf1yLjceJpW
-  PfjqtdH5d5G2qX4GQgL3CZz101N1VCwQpII4SikjAgMBAAGjgewwgekwDgYDVR0P
-  AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB
-  Af8EAjAAMB0GA1UdDgQWBBSXPDi2/Yjt48tTFlYzB3c8XN/UwTAfBgNVHSMEGDAW
-  gBSYJ0ww6wDNOLYck6PoaZWDaDkgkDBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTEy
-  gglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1
-  c3Rlci5sb2NhbIcEChcVDIcEChcWDIcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsF
-  AAOCAQEAfxkLEHqTE3yleRLy/WVEn0B9vW8wMH1C+7XNolrculj3pJjdhfGEyQgn
-  LhNtrUEfxr3ZdNnO7xMFdvVehrUTxfHG4E5lc1Dl5sOfuEwXiCspzaSL5NXurfuE
-  oTNU40EX3m4ec4bt4HtN7srctja3SCYrsREQI3uwnxJGzqHtQ6FuvtnAmUZRGXEY
-  Yihr+S59ooNIGADutCpXdhtASIseU389NwyqlfgN8rbMfix83eCN54sg32U5eCXf
-  lGHXAfX/2kheY8pI187xqsvMQp9s/tRZinMgTt/8TlewZTCqx4IgAnz92+hTFfSt
-  z/q/euwYpF/nhbrHrPyRLZcbctHtKw==
+  MIIDvTCCAqWgAwIBAgIUQFeCgqWmdx1+5NEdgystXiOQWpQwDQYJKoZIhvcNAQEL
+  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTI0MDQxODIxMDAwMFoX
+  DTI2MDQwODIxMDAwMFowKDEmMCQGA1UEAxMda3ViZXJuZXRlcy1ldGNkLWNhYjIz
+  LXI3MjAtMTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKMrhK2RJY
+  KLiPgVNLGOKLaHxA/XF8EDJpORRrmmkzKF7Dn0sljQqOBOwS0brPbI9q3vNU180i
+  H+GPxeoG61azarH0YM9U2ZWaHQyQtB94YSOT5jtkR31MKds7fnZcsubqwSx1m3k8
+  u2oEuBArMiegi+iR6l0xbuVFLlv4SZsl3SZez4uwy/j15GSjGJ0rMmN+EdhZUWKt
+  /PVU5CC0kdq+YSPCrS74TrXSDsflhSAPt2r4cGAZQw9JNpIyNBCC+gt4IghEXOLY
+  O5PHACcq9BNR+uh4Gckd6iVAQQCWTx+CqjeqgxiWOFgIrfPA5ssBMNWAmV9zEfYu
+  H6Rmqq0oHeCfAgMBAAGjgewwgekwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG
+  CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBR0n1v4
+  Il9FRFwdSpQMbhQ7xp+TxDAfBgNVHSMEGDAWgBQ5ceUXdo8tj9BvT26eePk+THXK
+  GzBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTEygglsb2NhbGhvc3SCLWt1YmVybmV0
+  ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcEChcVDIcEChcW
+  DIcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEACD5382azlR9FNdNt4jTp
+  mBmYPudmQ8dEnrYJgh3em7uWYX0hD25TYbEmCTIyXxH2v2aCQ7bovCTYu8IgGmUl
+  e3gs40qBEyQ8B4gwMSK8aA0CtLeowT42tmsimN+00sVMFCfJ4LVCBgGRRsfgktA7
+  cRg7s1drk7qZdp20zX4UBBUJIWpe520HJpij7m/uZNtLciiefTEZkqYiAV8J3+uE
+  WxNTJVRnl2A5CZN24W+81Fo//qenCb6z894YOvIwFKKxp8GuEtkle3Fvg8AGg1wG
+  RGWO+wnYWSK4cOvUG4bkZTd1rJeww0uXfvYtr0YBnumhDtlodRy9Q3TrbSNBCTnJ
+  dw==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-12
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAyjK4StkSWCi4j4FTSxjii2h8QP1xfBAyaTkUa5ppMyhew59L
+  JY0KjgTsEtG6z2yPat7zVNfNIh/hj8XqButWs2qx9GDPVNmVmh0MkLQfeGEjk+Y7
+  ZEd9TCnbO352XLLm6sEsdZt5PLtqBLgQKzInoIvokepdMW7lRS5b+EmbJd0mXs+L
+  sMv49eRkoxidKzJjfhHYWVFirfz1VOQgtJHavmEjwq0u+E610g7H5YUgD7dq+HBg
+  GUMPSTaSMjQQgvoLeCIIRFzi2DuTxwAnKvQTUfroeBnJHeolQEEAlk8fgqo3qoMY
+  ljhYCK3zwObLATDVgJlfcxH2Lh+kZqqtKB3gnwIDAQABAoIBAQCs2FSwLwW+dPjo
+  O75PKPOoBmaJS94yFspxJoktPq8FO1Je2ZHshLfsFYsUv1J5NC0ZR4MtGNjTfftc
+  4uuehJj2AJQk+ojh2KpJNuHh5Qgt6KP4L0y/+VjDvdgZ8I4PyiMZtI5j7sbhwrfr
+  VskDk/lKBa+G5JhLxKeazvlxssI8x1wtcEddTPFcLSQgXAg2J4td75m31F9CDks9
+  V+1ENJ2AGrwEjyaXsLmNQtRyqAm1eEw38XkXt7ORF+w080yTQuPYrrKLgxTGR4yp
+  LtIlk0VIxHCwMz16u48q4wYRvRsr2z0uKHqHloGrCSvycsbqjCKBoxZB3IczNqEB
+  mwoXvc6hAoGBANCQVq5vDxX6cIaRRjSC6HAUlj1/elA+h4B2Zm8Eg4lTLDd0+yP9
+  s+OnJ+WMruPdI6NU7wP/WfVHCiXOW+bW4DiO+13ZWsws4u8/uGQxP0nMukSO4hpD
+  Z6i3kHWJcC/79TQXQ7md5jpdQqaRUDfd7BJ0Brz8nY72LH756LfWornvAoGBAPgv
+  vM4m2pAYNzSM+HmjESYfa3B8EpAHDkUmo437CvX0tm2cgE6kGN3K5ys3JwhEUPTF
+  Y9ObmsFdXHwM6l2PwPpC2CMMc77meYsyMWyU55CPleRvSdpfxE1bGSwh9DY+qDbo
+  YBJ2MYd9IogOokMSuy1R1K3IH2nwSUpWK46za7RRAoGAfl9XBm6ot2p+ECuqXFsN
+  uAvhVPYPCNw6gm47dv1HLkhFPH0XRyGMhF5eYEq0FcGCvI7UHJn2yhX3Yhz9totw
+  ZRTN3nm6+IgiIVF8ysjETlVMcAobmkpJXwOK9o0Geyyx0JRgJvIz9B1aK09VSeSg
+  DDZddtmiJmOnZnDKv8m/4+UCgYEAwRzT+kx9MDXHbtpp1KuvgkxcWxAPmYYD8oaY
+  KLe31Z1t/WgS5h4FQz7IFPY7JtGRdIPKozKmfeLZPaUHD3n1nEU6zDq6LUZEOKz7
+  jBNpAzDWXwLBImv14IML2S0qSrMCTIcPig3xiA00O023sBz5C9BqfjYDS3kubesS
+  xVySZ6ECgYBoUaGLtW39pl+SduZwwTZRdUH0vE7rjF7+dtlTjfxmmTMgrUMWSGNs
+  nzp4ROj7o0pKm/9S9xgzxnBGtg18cP8cO5glS24jJcKWcT97D+JyZGEqqEPv9dUK
+  AXBB8dIjh/rQm45eJrySyS3hTj3u+WTRapiRIyTnBJe7c945LTwNtw==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_13_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-13
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-cab23-r720-13
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpQIBAAKCAQEAs4cOjRpmmA6N0je2Y99Fp7CyOnkOUVmFddsvtibKjYHQn/GM
-  u9fR8WG1s2EbzM8Viy2ID8h1Aa3RbmkpjyKtWmGsG7U2zDkqKT+mJJQDMlGFa52P
-  W+ROa++I+D0ZUOl82/+SLmqHMc71PU7RdmZoGRy78YDh9bav+6nrC1f3yNeca5xZ
-  GEskwIgG/DXavuXws22rwBnEhKDrGgmmEWpCgA5LvL718HZk/HxHq1+Hx8QF563M
-  OXijiOZkOv5HcoMBR/+3so70prz4OhhXUG3DwFGXsgHYpBSPMeSzTrue0YpimOoz
-  PTxKGNzpRg/eVF2maVQE/AboJmN0xTwYdOSUcQIDAQABAoIBAHe0v2QgzXXohnI8
-  idZQQw7MiBrrKzvdGFt8mnS3qunuPGDZ3IBIKQntoA2K29GV54SVCJuVi0diUjpv
-  zrFNaw/P/sW+8Fn+Z/l3Il5Tf0onB3K5baTVN+FKqCb1/pJwDbxXzm46xAjXObj2
-  fD6ZjCHqgftHd+OyO+fv5fT7ZBI7bE3oxfcYSkY7LjPSeMbUoE4zaPGpZeU0CTEK
-  16YbA7fNjPQd6otAiyCYebExpk3uO/gU9wDUeep/kiSPWqkGUk97MwZ+04SQrQ7L
-  3LTLdu/Qp/kS7eXw7YnnFvIR/7vLewkizDQbzGQADwAx5S5/2gmkdx7q1E0lsL8f
-  zV+ghgECgYEA3o7O6QCO2kNw3ZgycyMJmwWUUWGtF3w1bfGTtUcSA9J4EMplvyoG
-  Ews7Z56WhZa3J20w4mB2onIijZ19SLMX8BA6BAOHZyqfJQE3iUGFY7VaKrCxhkFe
-  SmpXewO1lgSue5p+KjYyYCHHtlS0MZ+ll3paa53/m8xHtS/Rg2WEBdECgYEAzoD9
-  zetaEzsBtMmz7ZddcyurIuiGa3C4f842y9Y6K2lNKWE0fxOn6yiQRT3XGcGHgaQL
-  +7vxNEpNl21kmU3NpGbhow9MkxhBaQzakxvM/UheicnQLa8yy3q6h07s7VIClFwI
-  NuRwmbPNz21WRueZBiSpuR9nblR8CQqbiWxNLKECgYEAmbglrcXW5WaDhGrlHaVr
-  swlNglBmz7vY45FiJmlqRf2PNHm3gSwzed/eLhnZeXe6FZ9Tjmh2SIlw2EOZDye0
-  NvneOHt/gIBt349RnpoE2fOezbGxTDvGNrvwpGTRfUbKhVEWJ227qa5rVMJ4m3Xb
-  WB8IaSB+NkwIk1rt6UWqxKECgYEAuSC46F9izDStDed5r7lwJKz0aoIs56sRLDqx
-  s0Glun9Xlo43Yuk7M72UwQ50hPmTwqxPtelCjw9Bykxe0HUIs6csB2PS0VgAY+4L
-  EbDtr++uGTbcs+gJ0JOBH4apLwTDnT94ecWIELM6AghSPZSpAfHiWj0GG8oPvIdO
-  8v8tnKECgYEAuaXh18KAT1QBhLe31A1kAqUrZLUWP1vv6to2IDbl1+gf5Ra28SHo
-  F978kMYv6aQACm2sQkZ672HpNnkfCoUmgTluhvuNjS2LxdOjjNF8sGmImjcaqW5x
-  VM8K4i+OzOeDWF+OLJnsE6me2i/YUgrRL/BieYd56tS60OYHy35/Dpw=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-cab23-r720-13
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID0jCCArqgAwIBAgIUIcw/IsKIbfpglMdCcCbQr9v5e78wDQYJKoZIhvcNAQEL
-  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
-  dGNkMB4XDTIzMDMxMDIwNTAwMFoXDTI0MDMwOTIwNTAwMFowKDEmMCQGA1UEAxMd
-  a3ViZXJuZXRlcy1ldGNkLWNhYjIzLXI3MjAtMTMwggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQCzhw6NGmaYDo3SN7Zj30WnsLI6eQ5RWYV12y+2JsqNgdCf
-  8Yy719HxYbWzYRvMzxWLLYgPyHUBrdFuaSmPIq1aYawbtTbMOSopP6YklAMyUYVr
-  nY9b5E5r74j4PRlQ6Xzb/5IuaocxzvU9TtF2ZmgZHLvxgOH1tq/7qesLV/fI15xr
-  nFkYSyTAiAb8Ndq+5fCzbavAGcSEoOsaCaYRakKADku8vvXwdmT8fEerX4fHxAXn
-  rcw5eKOI5mQ6/kdygwFH/7eyjvSmvPg6GFdQbcPAUZeyAdikFI8x5LNOu57RimKY
-  6jM9PEoY3OlGD95UXaZpVAT8BugmY3TFPBh05JRxAgMBAAGjgewwgekwDgYDVR0P
-  AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB
-  Af8EAjAAMB0GA1UdDgQWBBSnZ9k7sqqA6JFHqbHN4pZNGCWbMzAfBgNVHSMEGDAW
-  gBSYJ0ww6wDNOLYck6PoaZWDaDkgkDBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTEz
-  gglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1
-  c3Rlci5sb2NhbIcEChcVDYcEChcWDYcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsF
-  AAOCAQEADXXYbdAmj2X/0Oylu/6zE1SYmn4oHCb0KApAsHNnqN2tlqjOiCn6gFpT
-  gaOQVhRX6aELLRlLjtcHx92qgKI6fnbca5ZdEFygAUWUJ9NUzUJdgp3EfWPXYVDS
-  qP+cyibEkzJQ5ed+DJ4hCeuACgDXyYXAJwmB75EClLshQ49BpCpq9yWpaaoKVolG
-  d4u0ohgZjQklKRP6+YHIQ6o+uCfqm6vXFSoXtfNT7qNFcVroW7PJOh42pKBNg6z2
-  Obtx0V9iMvC8op8haKL6ta5cJBrWFgzBM+HaDKq9zO8MbSg4SzlJQPWkk3W06CnL
-  nDpjm2zqaAQzmyXl1WMJKp8ictp0kA==
+  MIIDvTCCAqWgAwIBAgIUCnYnuvr4t7HE1eF19zTsPVJe+SkwDQYJKoZIhvcNAQEL
+  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTI0MDQxODIxMDAwMFoX
+  DTI2MDQwODIxMDAwMFowKDEmMCQGA1UEAxMda3ViZXJuZXRlcy1ldGNkLWNhYjIz
+  LXI3MjAtMTMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/VePCyj7w
+  v7KgEt8IJkLm8Lekyu7mShAU6DEcFPFU2BLch8v7F8KnhjrIOnZXi4NM7Ln0hZSt
+  aU++dLk31CmJrduNZdv1/x6N5fjbz+fwrOJ9CXtWT5s+FyLH/vla+9eSsnvDLMFs
+  LY9e0nhMDkcbpBnttg5+J+4pHdCLLub3glOdS8BGHbkIW2vxkqp4/Pb/7nK1x3cR
+  Ukxoy7nlg1QHodBK8ngwvMeNUlgwavIhFBnFLfAFcXnNQisxtH0Fh/1FSbT9173V
+  i1JsyuOwEMRUv2HMpLK2T3ibYoDDUlZyfnVZDdjbLgMPik8OJwkuCURAshODwDm4
+  tF6dq5QjdPwLAgMBAAGjgewwgekwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG
+  CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQl6Rg9
+  kCcyP0x/L5xyxGBee909+DAfBgNVHSMEGDAWgBQ5ceUXdo8tj9BvT26eePk+THXK
+  GzBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTEzgglsb2NhbGhvc3SCLWt1YmVybmV0
+  ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcEChcVDYcEChcW
+  DYcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAFTEOf72bj+0UoUzM8wjI
+  5V5y/+NUw2BLln5W36+IXFB3I+r7xRhgPSRpat0SJUK4WiYM3TyiKmu8iI5G5Szr
+  vEVvCxfpP0Jwsu70KWNXeSEs+5im27qUci0UOZy6fQ+ycZvFVpkieZYcgVgPsmM7
+  RYy7ZFdOE1HPibGCjf2bsvgah+VI5i9Lc7rqiROHzOH/YyQ1wtohOzgHqlXM5CTa
+  RIiWpSnU7KDnJS38ApRodubby7qkwGtP/zXU7QVVMS6aR+5In4Xni9LGnolBJqtn
+  67H8OyY0a92GnbCg/XiDLHc0NaLW25ordF6oDmPh5/f964BJMWoiYZiZjU01Nemq
+  dQ==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-13
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAv1Xjwso+8L+yoBLfCCZC5vC3pMru5koQFOgxHBTxVNgS3IfL
+  +xfCp4Y6yDp2V4uDTOy59IWUrWlPvnS5N9Qpia3bjWXb9f8ejeX428/n8KzifQl7
+  Vk+bPhcix/75WvvXkrJ7wyzBbC2PXtJ4TA5HG6QZ7bYOfifuKR3Qiy7m94JTnUvA
+  Rh25CFtr8ZKqePz2/+5ytcd3EVJMaMu55YNUB6HQSvJ4MLzHjVJYMGryIRQZxS3w
+  BXF5zUIrMbR9BYf9RUm0/de91YtSbMrjsBDEVL9hzKSytk94m2KAw1JWcn51WQ3Y
+  2y4DD4pPDicJLglEQLITg8A5uLRenauUI3T8CwIDAQABAoIBABEJCaVPMnlm5/V+
+  mKL2HSDIr+EZPFn+oB3samrwpmgCcPN3l768Z9VYiyVGp0C2KDOSJCBUQF+ML9Bq
+  Pg9tcWFTvGeDeSkW1NaXcifIBAOWsPem/3c40T6e+rbJydPC9neWMpS3CGWkTM6J
+  eLJ01vnsC27xtaqfzYGVqPqra17/8RYYeF8gArfP0kkPejju7uSTzIL3WKymhxrY
+  aKjqV2HCsY1AtxRE8AwuVydyBtEAVq6JTrvCRcNh6dfi1g8LbWs7zkp1LbzeNSQp
+  3evxD76aY6sLUVpkr3nfD4o7Dgp0tdr1yRek+2JhFYB20v4wZ31u3PoPdfR4hLCb
+  IhusrqECgYEA5r3hxDscC81ajjVj2BDPb5oVlzn0DLqkp3Zmo9DEiIArP/I71dnt
+  XuS0NfvxNItuMVNc1fsLqqkaJB9IN65UVgliKlEfLy9SilsfwUPSupqeUk3OcvS0
+  zXZC66c9Jk3H2y3MiGTGGLD9tF5PjqUTZHLkXrvRJS4Jk/909g4FUXsCgYEA1Ee4
+  UlC/hdcUmtVrniLOugFNpNP5KX6BmzwJD+F1HnHrCI+3+snB1o5G2uujXV6Ul4xF
+  1h88uI/KnJm969g2IjmzcPQU/UugRydA9SdzLqOdx7MtoIJhmGMBP4AWZ5Oitsnq
+  kyGCEAphQ0R4QPkJ+3N/PjH0yHf016SVLUAXErECgYBo+OOX+Wg1+lODNMjaiDNG
+  y2udI/FiRRsZUGU7i4ONsfl7GwGbtYwmypctpBPE2tXjvNAUTSSunEXXPyAErNuT
+  VKuDIuqz9axwYypcKzXYTPVP7jPI2ojSnEWvnaLVJTeSABD30BjLLOIOx4UcGP9s
+  iFRawMlSR9J1sRcNxa0ntwKBgQCLg5dggjFdhT3FhP51r+qt1K1y5t2ap8oGfC54
+  gXS3zabquYnxCSicGmX2+2citkZyU36Se3Us11QSF/j6R99MHyAP3FrvHgT4vpOy
+  i3rn7CCGXvxdwVLjFC59zXDsIduOxqWkjSEt6aSC0T03dnVZDU9TUQHPvwbrsv9X
+  /gcsAQKBgQCOjC9Qd8MR4J9P8quECvtyKPZ7svYGSAr7SbwhyIMFCbvtD9Ni920r
+  +OaBvz4BmgW0VO2Z99EC0Cmi3SPedjncYUd/pQXB3H34tR98weF7RzIkJeFM//ZM
+  mySenjgQe9yCUBwIvnfG2zf/ZOk6Tw3Tb65lZrmUJH4ixOsKoMNR4w==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_14_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-14
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-cab23-r720-14
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpQIBAAKCAQEAr8IpwSOueoHGm9lU8qHFmq+aY8TcNgNLv/2w8vkH5a87+0B+
-  /2zwZmJ88NtlW8FmytqT6xakELd2GIbYDA6MXUefa1+b2oo+fmrEnZJUsu2DK2Bx
-  0zVJjANPHrsoc/Nnllceu/k536Qpq785t3qaV5p+rVm1EjL/pNJIFVelU4V9t72w
-  iBbSvbxEpqU/h8p/G8PsT7HIu+E8Hs2bdTlNARPVjR0w1/ouvrSUFs+xlkTlt32X
-  oNIvW1xK5a5I9dLSAGZgeBE9qpmvD6FOoZiRyjMT5RiVphLvesgFLW19TlFFyYZR
-  bmfcxTf5BXK2ZwmsHb81jq0DzMOcnae7LVhJrQIDAQABAoIBAQCVcRZnrpswdyAU
-  a9qa44pNWHqB0mUbV/oUqPTH448fcLwjildxf4N4ys1JToMEXZG1cdzLy1h9DkFP
-  4XfZ6JTYy4l1lrnCPEGe49GB2WZDLUiWnU6rM2fxsO6ZRrHCxXeSkUkEs4jN65uy
-  +MluhMSvMCH964TWkJ5l2paH7xoXxMQ/p+gFJgJKvWKRs5f5WwRysbmRv/AoisiD
-  rXwie9C+5VRyGFLwaKNbs+5TpKg3RtpI4dzuRKu+CJbtJ9+V8nng0ael8kqCnXfY
-  tWTajNMhuIDgmwunLYRQhTE/eyMaEF1on2rK9spnNMXfRlBXb2AEwO0GPvg7zgeR
-  ryc/4c7RAoGBAN/JWEoD0Xb86dM9FzqMDoK3lfywhbz1esdKQ02N0ej360tQPlrs
-  rvVTZ3mabb5N4N9VasN8wp3PeEHKacMTbCYLiFqi/xJbWJb7eV066pf6roMeYrfh
-  2q5bRh30QY+CEXfJPR1TJ7+b/ihus4h37lUGGaCOyzSKCFrh3F/XYtHPAoGBAMkO
-  9UnKKjzSjn/4dQnUj4s0NRVLqc30eXPdBVpO3NGZ4WPaNGQOabF4RzICbIRv9Yof
-  t1MoOZFG2XuxaExXAepUL+x5kQl00MRT+J3q+yq3clMG3MSGj9tBBNN77k0lmOCA
-  YhsorR2hMKPcWvT6VgSn4L7YnKqpJoWin+3o0TfDAoGBAMW2UJ+LwgsbJcZwSc57
-  IPLSGdxXZMDuLJxX+yBQtOzb5HD0ozKXu3eZSWlBS8X/bjZCdAHkftkIDJorp8cm
-  qLzwIXbaXPqt45X49V+uBsdhPb8wIE2PaDH1B/y86RNN+frXu3vmFM8PlbvJGiru
-  so1Bx3B32AZCEWGh/J5cX703AoGAb8Sw9uQ7trQWI22rIlvXsDrFh6EYNDXDjnU/
-  lIRinOI+OZQDq9uXReDnMxXF3Zmflbkr4D5sQiZwoCJvKID1v54tRfgOeINHytwj
-  SSZnmceA9kbKUzW6otfyJt6uCpTr92FnKFHkaqRAtda5eZXwW4Y3meAwt25wy7kr
-  zsWuCKECgYEAxsMD4HpoFXsXfA3vfgesTbuTNoyMIwCbv8bw56akw3h48FJD5zMn
-  G/2Taps6994LSyDmLKL/TwZJLBzQpa/2nefMF40p1l5s0fDcvwnh90ET6Fj3Fq7O
-  1M7BQh3IypvHm+53zE+q9IRiSZ7T7DdeGrkDxcsw1/1QuYR64GZ3B6g=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-cab23-r720-14
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID0jCCArqgAwIBAgIUW8Uz1gNYpw25g6BbSOaC7gi9lHYwDQYJKoZIhvcNAQEL
-  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
-  dGNkMB4XDTIzMDMxMDIwNTAwMFoXDTI0MDMwOTIwNTAwMFowKDEmMCQGA1UEAxMd
-  a3ViZXJuZXRlcy1ldGNkLWNhYjIzLXI3MjAtMTQwggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQCvwinBI656gcab2VTyocWar5pjxNw2A0u//bDy+Qflrzv7
-  QH7/bPBmYnzw22VbwWbK2pPrFqQQt3YYhtgMDoxdR59rX5vaij5+asSdklSy7YMr
-  YHHTNUmMA08euyhz82eWVx67+TnfpCmrvzm3eppXmn6tWbUSMv+k0kgVV6VThX23
-  vbCIFtK9vESmpT+Hyn8bw+xPsci74TwezZt1OU0BE9WNHTDX+i6+tJQWz7GWROW3
-  fZeg0i9bXErlrkj10tIAZmB4ET2qma8PoU6hmJHKMxPlGJWmEu96yAUtbX1OUUXJ
-  hlFuZ9zFN/kFcrZnCawdvzWOrQPMw5ydp7stWEmtAgMBAAGjgewwgekwDgYDVR0P
-  AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB
-  Af8EAjAAMB0GA1UdDgQWBBToktSxjM6sRjZ04osKruDfBkEU2TAfBgNVHSMEGDAW
-  gBSYJ0ww6wDNOLYck6PoaZWDaDkgkDBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTE0
-  gglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1
-  c3Rlci5sb2NhbIcEChcVDocEChcWDocEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsF
-  AAOCAQEAd30qunuk0RH/gGgdFI4bF4mP/iYFXkGE41ZfMoVtAsP0YYo96cwEHW3k
-  p6nXByUxYHXP6n/njaNHVveNFyeCnEs5wzwISusGxI5fMNBnwMsbnITsy41Hsd8n
-  VEl0hPspW4grt6rZTW+lYreRInbF5mRQwC/GRqZ4017fuEKI5B8PEDWpCyA9kcRC
-  QOy5mxe/ApBXeosB9TuFhw2hofrtOoxPPfZb2Q3gijdTurZwFj5gsCU9OexxrZje
-  FDfarS7yjW32KKZXh5ms51abXr+CoyYjgh7xDpdNKc6pBU5qY9ugjPBSOk5f66S+
-  Qo0EUOuCkZWEvDcvJqMa1zbstQqf1Q==
+  MIIDvTCCAqWgAwIBAgIUHkt0Lep1G3thFbsoMnDv7tcl1cAwDQYJKoZIhvcNAQEL
+  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTI0MDQxODIxMDAwMFoX
+  DTI2MDQwODIxMDAwMFowKDEmMCQGA1UEAxMda3ViZXJuZXRlcy1ldGNkLWNhYjIz
+  LXI3MjAtMTQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnc3YlDEBy
+  okFYz8J8E1AdzngFkSufuzXismUPvQ8TdBdhuQaMjW9632AtR9ROW3N46fucaMfM
+  /6Wb1ENBzcStem4V8Oq24CQH2s+MD+r4iG4p8mtsMh67ca/wMNr38X+WR9TDKeDp
+  LuYVZMlZ1PAVSUCW6JhaESxbKx21sFQQHM5Xy4czwCkeQL/OCyf2K/W9okqFNrUN
+  ejc0qq0lzgi5/wIigDJ6/EN8DGvOtz7IfJBeUfsSNFY7tPjEKlIbjM9BSMsHvBIP
+  kR5oZzp1QW8TwyJU3e5HEZEQUVcB4SCSPPaM5g9MMcnqkap6sNRA6EEvTmlqVE9K
+  Wc+XCAgEizhrAgMBAAGjgewwgekwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG
+  CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQwm8yR
+  SuOp8YJ1AiUUPZ3RMnwEsDAfBgNVHSMEGDAWgBQ5ceUXdo8tj9BvT26eePk+THXK
+  GzBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTE0gglsb2NhbGhvc3SCLWt1YmVybmV0
+  ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcEChcVDocEChcW
+  DocEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAAmZzJTubs0JQ80bt9Th4
+  u0mGeFlr786YJTi65FdilLjoxoqlaG1WOcjwTWcP5Lc33B4K1OhrX1wgRJPKwMaI
+  oE5U2uyvLEd/DZtUzZaONC03rOaMrjHOOJTJ96Jn8n3afoI0+qS5dKYZS541BaHg
+  dfb1Rlo04fcLE209ExuAAwFka4NSlCvLh7lrsIxMDzIUoObeGxOKntvgCoHbyq3+
+  TlB/+zccn9e6IUfgDZSISvyDeKqfxgfbzbUQQF/+gBR1hj6IaGQhJo1F04WeZaw7
+  Zc1AKZpnO6hdscVCQnUunG2a7si8EOJOGc8Tilf3tbsh+H+xAdA9mcGlZmhNXC8t
+  wg==
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-14
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEA53N2JQxAcqJBWM/CfBNQHc54BZErn7s14rJlD70PE3QXYbkG
+  jI1vet9gLUfUTltzeOn7nGjHzP+lm9RDQc3ErXpuFfDqtuAkB9rPjA/q+IhuKfJr
+  bDIeu3Gv8DDa9/F/lkfUwyng6S7mFWTJWdTwFUlAluiYWhEsWysdtbBUEBzOV8uH
+  M8ApHkC/zgsn9iv1vaJKhTa1DXo3NKqtJc4Iuf8CIoAyevxDfAxrzrc+yHyQXlH7
+  EjRWO7T4xCpSG4zPQUjLB7wSD5EeaGc6dUFvE8MiVN3uRxGREFFXAeEgkjz2jOYP
+  TDHJ6pGqerDUQOhBL05palRPSlnPlwgIBIs4awIDAQABAoIBAECId/uSc/HCfdfm
+  bcKsm90DsYFT3cb2quqfdQAzZZ2188MClOnhkaC/4ZAeg/qpEwQ2sToGGRd2fFV7
+  lJknZ1w7U7B4cOk2i7VI9C+ITKqpV5YIip0rSFhZNYYSCSuywTFEq/USmyxJMEvs
+  wxtx/NLijsjE553NRgHRfsIm/PlUlwMTjfE8HS12p3XY0xPVnnGrkqgnYTHG/hRF
+  oGJNveqFFs2khP7MLG3YWNGj5EBYuc5J3DIz6Kr4gg0QjoGliYju2PBhyoMT3SdY
+  q6QL1Ji+SXEBO8Xhf2IZzTQxU/V3CqLHFK6XCIy9QuscHiYmtB4AbZzOcrz1fQMg
+  OBKCgkkCgYEA+r9NurLTAD/CW7JZZMSUyQ82x/I5ZrOy5tHTmwXucvnS88h8/Tcx
+  jHsvQqAPrI/75PAlSepzKMlZraSgEz6Hip7fv+PUGMWMS0Wa3NwwAU+4Xftr7ZFL
+  ZCX5lQFTl22fW7QqZmMe/TCul0/XkcGcVaoVOJjiLWIsKR/OK/8HEK0CgYEA7Eyt
+  P+QLZqFGBFSgQFj2T4/AnVnCWSLQ1CFHVe7A4vRmfHU6m487YMXtlcIG799b5FZ1
+  9MeIwxm26rbSnKRHz9QgI3xo0qbwsIPRdyCs/3kbB5sn0wXO2AILcUcyUPBYZTSy
+  a8M1hySWfQimf7O5G7ClXYUbHD3GUJdnNMqDWHcCgYEA8YTUhND8BhBjz9jw2+ux
+  eBwsYtjAS1kpJ8TRsk87Rwm1FFV3dpr0IeEBO4ZaspcZRIG/GPw3IgEXXPblrMOc
+  4Ht4/yaeQ6H8KQCJUtTPdGPqLLQgV/qMCJG/XbOiZYgUZ8sYz/gHgE6kzF/+Pomj
+  YKvrttEjgh0+dfoJpz0E/B0CgYB/ScKdwxMdIszbslZssz9jllU0rdBSQb3qN079
+  DFKdLvgyHNgISfy7YYNdA5rHBjOy6Zw60m1qY2S0RO1o8dm5K1RwqSiyKLlI7Ike
+  OdzW9X7I9xxZwSwuEdPmHmsNTJrhUaS3Bf3EocHq8oj2C3MwZlR97yCuctxsN1Ki
+  DmD4ewKBgG7CtZ1Zrhshd+fKNNFiWtAdzOhaC4Xq3XPqj47lhP+VwDRM18/rMykY
+  HrgSClCPmgHmZjXYFlZrFndMNHOCLH0mVvc3CTlcM6/GPq6sst/mjlVmPv9VphVf
+  KVSmiBQ6l9KI0FrtCUFJ7R9ieF2qtzw1CJYInCGUk2HFBoH6Bb1S
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEowIBAAKCAQEAywG/J7f+FYxZS7c2upu0aE6ReotBIzPIc3z40+etcOs8jHtd
-  k+AiDeUeVsHIrAQm6rbFsQG1XV24FXODFL1MGdXXR17w4p8f/JFVEBLszBRPtYWp
-  nDvFZe87MPXaH6xXWS2x+9giU6OcanRRdTJLs1GVY73qxSTx0USW9sPSakdQ1+rh
-  vjInVDPqUoovUf2uFSPMfHL4YBLpiAD3TGWtHeKOUtiXKIW1n0tOaHHIBWmvIqNn
-  lxJnlA+5caaO6ywmAJeZudAd9U8fV9IkWEDqJt+Jy+hqvRS5oATeBd9tI54FaevZ
-  vnRWyDTkOgkx3UwYcEuWzLZBEXo0OJ16z8iDYwIDAQABAoIBAHHW7eoJDKvqw1xp
-  RoCItjdT79LHamSiMkNJDoROQ/2xfIfO2mAFbTNbi5LdInoL7gLrMZscOSc9WfB1
-  kUk9CgLm3s1AGVcMIrTQjuHvquiab0R8yus4vW53JDtFcucWDvmMXWW8Ayvh8OHl
-  jpRo+vh4xIxlQNUC7bQLgZipoUJE8fgUGhA9Z08CwSeMffPrCAHpVYZ+4Igwb/pg
-  kjc2e6Bs0pigCZOSaJvc8sLBulWB9Et4z6M4GdiZQ1GrvroTkRjTStZhZYHQUeGw
-  OoLx9J/vtn996X4ZSCg/og+LQIe0aRTQTVmzghvY40Lqz2L+EQes1WCAi+bMDQL9
-  h8bLs9ECgYEA6ayzQh/+k+84fuffhk9S11JreOijgg9A0HdJtEiuaDr7WYBMJaDy
-  O0HpKTPj0QsDDsKUNEV3hkrc8pu7BxiUAKhLiO2P6pSej+sqPTKkGOO1mxQaFV1C
-  fJxr4XtVqSNp3SKjZXiFSJMr5a8s2biGtbB95ZBfCRlVo0Rz9ntUlHkCgYEA3mb2
-  YYBnzvaLwbiE01FcLLgNkiNtq03W7I4eBifl+dLUdhMuCN0/n1nsqa7Ql4uJyMKM
-  TGcDQUwvmAo0chyKilwzxXGzZRWLO5AqrzJJfRTaUwfwCoUP3OrNAwn9OSNP0CN/
-  PvpT+i9bqBrvDWUhwIZLeS36TldPVKEyHUTGx7sCgYAN+SzTBHTFxeVb+WOtdWrf
-  w2b32PmGGoFmtetrY3lCdFx5cqmbCm/RyVQ3CYpTAtSQ+mPAaHMITcu+mj9p4jdf
-  frDdpE8Z2P9OXeKtvCyB7IP8nQweQPBr4TK2ThjGP37iIWMh+z4FI//ZAUuuTVGI
-  5d/xbVuxgJlVZQ+GKsPZCQKBgQCRs5SgJdZcYWsH29Gw+3FOnrnNTsaPXqx6R1Tm
-  JYdl1rh4LnKPPhtrUydXtv5S+ginbMUrXKVmRvo7OhxH0ej1YhhMtwOXKrkPqZA9
-  PM2mU14A3Ydl7OyKh40N+6JYp4inTEoVwTv5AMOkaxjHhsTI83JIjlWYs1x2jjBd
-  umwb9wKBgEcF+cMteVfq2aHNoXjYAPcHPJDg8zci9Q0y8Z4UsxlrT9Ge6oRZSjm7
-  KJQeF0SZW4DJ9tsCs5B20W0kf4yjiOmuuzOsgIP2CzlLnBmfbL1ZUXD2HyUFrxDr
-  3xdXvsqd/gkyzgOQIhkrR+c8aPmJ0IcHFZxNXEjmdHotsMtBnUt3
-  -----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-----
-  MIIDzDCCArSgAwIBAgIUI/rsG+dCRDAv39cOh+RdQMGV8XQwDQYJKoZIhvcNAQEL
-  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
-  dGNkMB4XDTIzMDMxMDIwNTAwMFoXDTI0MDMwOTIwNTAwMFowIjEgMB4GA1UEAxMX
-  a3ViZXJuZXRlcy1ldGNkLWdlbmVzaXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-  ggEKAoIBAQDLAb8nt/4VjFlLtza6m7RoTpF6i0EjM8hzfPjT561w6zyMe12T4CIN
-  5R5WwcisBCbqtsWxAbVdXbgVc4MUvUwZ1ddHXvDinx/8kVUQEuzMFE+1hamcO8Vl
-  7zsw9dofrFdZLbH72CJTo5xqdFF1MkuzUZVjverFJPHRRJb2w9JqR1DX6uG+MidU
-  M+pSii9R/a4VI8x8cvhgEumIAPdMZa0d4o5S2JcohbWfS05occgFaa8io2eXEmeU
-  D7lxpo7rLCYAl5m50B31Tx9X0iRYQOom34nL6Gq9FLmgBN4F320jngVp69m+dFbI
-  NOQ6CTHdTBhwS5bMtkERejQ4nXrPyINjAgMBAAGjgewwgekwDgYDVR0PAQH/BAQD
-  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
-  MB0GA1UdDgQWBBRd3i2k0Ovhfi33iU0IuDFho8q4LDAfBgNVHSMEGDAWgBSYJ0ww
-  6wDNOLYck6PoaZWDaDkgkDBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTExgglsb2Nh
-  bGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5s
-  b2NhbIcEChcVC4cEChcWC4cEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEA
-  DQfPpkPLpzYfiY+41+Gk1FgSRpTemrmcf6ZN95oIU44oYNyEoyfTyVNpE18b5D9g
-  gpvpt+n83vRpD7gVJR+JUt3Rry4Q6nUPXFJBYtTtaS2CTc+8DcRSPVcrpkCt2Vh/
-  lVPUqNwRBniEwL+QluYYV38ffbX81S+p21cgcgEMXYzjtNmiNJfxTFAzoLKkvvmH
-  7ntq34R291gnVftpN45pYrPwrhj8eXFQ6UD6Jha7HbaCkUq7mlLC0cz0mwlqlX6U
-  Ud+6PV7b6BgiSJvYAX28wTlgnzHhNA7rVjXlOc34fK/uVlMiLmRCOVDyFEZXwqf0
-  ihocgoim76OdvEI2NqPhxQ==
+  MIIDtzCCAp+gAwIBAgIUQeeYZP0m000lVZg8qUy501WqhscwDQYJKoZIhvcNAQEL
+  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTI0MDQxODIxMDAwMFoX
+  DTI2MDQwODIxMDAwMFowIjEgMB4GA1UEAxMXa3ViZXJuZXRlcy1ldGNkLWdlbmVz
+  aXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDL5yNl2t1FXwdjZiwG
+  PrA2d/0WgYalSXor3cW9lZHcAgvcwNvveEc5DUscNbQ5frESerzypVLXP7XR6j3t
+  ga1FAKQbBm1Iv4636aCMXnKLwcf27QzrOxqWiDXYE07dQmOkVakF1fzdqR86f7UJ
+  bF2DFv9fzuYFs3+0/3AcUEnewoR+4upmMFbJ252+SPYEmppT7K87lFiixMo/kTm1
+  VNukGNU+YsvExM5D0N6xeYDqo+HTBLamG2BnSZyCsX0yocsCUkBtRdUz2XKNcVxb
+  ms5cohqqWHrsyrT/1K2Uc0Malp+FzjsvHN8TgWoUKF9EzAsFB2lPCVh+KvrwMZmR
+  vnafAgMBAAGjgewwgekwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
+  BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTwKeoccbSNEmsP
+  YRdvn0P1lI2VOTAfBgNVHSMEGDAWgBQ5ceUXdo8tj9BvT26eePk+THXKGzBqBgNV
+  HREEYzBhgg1jYWIyMy1yNzIwLTExgglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRj
+  ZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcEChcVC4cEChcWC4cEfwAA
+  AYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAV9bd6T5MWudn+GEDQOfqbkkfBiDn
+  kNw6LRDDJPsOSp9U792B8yj9f6SSquWX8DUUzaQXKw1pajsHLC6tzebTAOOGLE37
+  VyvXaFUpvxsu2gRQolQ8UpY4VzF0fzYane/p/+bs3zH5KGxsVrFnk4PNVqZhvF4/
+  Yr+8a/9E4D7m/XNtFkeGl/LjWXDd31PtvZh+2N1qTu426hwaCapudGkeDilTYYCD
+  vmEEXaQKoRCKfxObW3wq3ce0PiyVvC/ayv+E9ccrz7wtp7Mq+9UQBmmOV/RUfhSu
+  TmTdMoMXYIvkLnUCRUTjLVNFgnBszWEgKvpZBXr1DJ2b9cmeO2xTR2js4A==
   -----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-----
+  MIIEowIBAAKCAQEAy+cjZdrdRV8HY2YsBj6wNnf9FoGGpUl6K93FvZWR3AIL3MDb
+  73hHOQ1LHDW0OX6xEnq88qVS1z+10eo97YGtRQCkGwZtSL+Ot+mgjF5yi8HH9u0M
+  6zsalog12BNO3UJjpFWpBdX83akfOn+1CWxdgxb/X87mBbN/tP9wHFBJ3sKEfuLq
+  ZjBWydudvkj2BJqaU+yvO5RYosTKP5E5tVTbpBjVPmLLxMTOQ9DesXmA6qPh0wS2
+  phtgZ0mcgrF9MqHLAlJAbUXVM9lyjXFcW5rOXKIaqlh67Mq0/9StlHNDGpafhc47
+  LxzfE4FqFChfRMwLBQdpTwlYfir68DGZkb52nwIDAQABAoIBADWVCeJMP3VpYYGn
+  ac5CTwAhS+rMItvwkSBR6RLG6UuNZhyeua0WSHEfoytImZG6T0Hx6xFAjKJv5ZHC
+  In/1YdkOMBHCAJnrbM+7nysD7sn3JFspNAnkwDnqlWuwtzrBpXmb4QzdjNObC8/N
+  m39ccL5wHq/IqP26i8a+kXF/T8ovjyDmMY4rw+IborpScM9+F/DUp2KQQO/GQFwy
+  Yr9D1rhOnVU7uqx9bbfJUx5e1K4AIbqG7erB9ISWN+NwtAL3e5qXr9WAVWvc2qhC
+  la5HyqDBTmQK1aOgNW1IMCuQJ0kuwkZs4K19puP8UUQ9gqb4karJNERBnUHfIUxZ
+  b1ZIJYECgYEA+aaqqJxK1dKJNzvVnljhIWblIoDdcvvbDFjDLu+1KDP+ZNPX1JEP
+  rStu/V+lomfonPUjlnPAYyggidAp0capeVuHIOPf+ER+XIfektkqTEnFDEeZZw7m
+  qqvCc/egsddx7ZDjIUGSlg9OrT2XNM7iBZSRR8wSAOPMDQpCLiL6R38CgYEA0Rah
+  woqVO8miidvFJBdcfLevovqE5k4+Bc90x8Rd0h3SeDUiDUmldXMDB6U4KR6AaKax
+  Gy1VQyHs7GGZApBG8dy7r/HOHEF24BN34gX//5zl7aIzUwjw9P2BPio1+FB2Ic+X
+  P3h9lch7yz+mJD1wmMmyOmczX4TIEJmjftIKYOECgYEAwCooRu03NWt/r4JhJifn
+  8xwO2AY1b2Kp89EHPMPKwA11jgr6oWafmH5MSsAq8N3m0ZpoMFEdD7Y9hZcz+YNf
+  xEhNtWVyatneIj97dbGvu1U1VgRu8kMoDstzPGypxvq9eU4DZv/gY52YxAUatM1i
+  cUUwpwFQAltWH9t7oaPO3uUCgYA91tq6xfADQcx/x28UEJC7FjytEDj0QJnZcBUS
+  7EHvXgCcquJKWcjE5uIzhasJhkrmKL7i0dKQy1zeQLNXbcJ90BH2pKaX9sio1zky
+  sSGYwRfD46AYY+GYI83wy90wduOpdlM+Y22JOkVaxJVnzIAbwDOlUFaCXqwpNLeF
+  T6vgIQKBgANn10pFkSPJG0Q1BqfEoplsIwDWy7A2xj7TTKZ77UyytKsuhuRuy/S+
+  tewgxOqb3VMIpQSal0dV05yIk/L23Wk57yfMk8Rlgo/Iq7MhpsO8u2+Ce3otykY7
+  ph5s116rRzeir/vDeSY1rvoSkmcVNKiASeDV2mbn/9GrxNfh6Z1h
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEogIBAAKCAQEAyBO10tLgzhAvNa12CmodL/b9PigsdvjQ94qmsdPabTtelxkj
-  DH1ye20oGeXLKdvUiGc6TmBaWpcHu0URBNUknTli7drWmSNIFtEgJ6ZTFXX2yt4I
-  KtwGtVxDipdYvGrM980LxfoU9HmxKQCJo8LSugPOCmpgcA/pm1ILYpeeIi6lBQVL
-  ksVnYVuqZ3NR8V2jCbskaBD2n5t2GoVsu8LVYHhYkKYOzpLUuYvAHpju4dC/Rls6
-  hzW9UC/ueVakD+C4cGFZzZ/+iNQlGpgMgSgCLgDwyj8Iwx7Vx+TZU/gzch8doSmS
-  1X/yjYITi95fWbWxB7Q9i8EphQCybJ866rENmQIDAQABAoIBAFqkq1xPE2/n3yuH
-  YZIITx7a3BJb6wEfarSrSSgJXczc99ammb1f3AzVADTzaZ6WLGx7r+uwNV8TS3pp
-  KPOyiLr+M7akzVJlrJRBvDqaXMu9PMjd3H9mXVeu7B6OwLHkBOZDLBFOYk38D+oO
-  h0z8x7FkZeVMGlLKssAeZHAPVqIPCHe5WCKDDnrF6Pn6TX7UPX+6QmYDP0lK7rvt
-  PCaQzHekgQcMZLP5YXICs1ihfAShyZk5oa/uXNKK7L4NAn8KjbVd1uMk30PRCvGI
-  ms65r2h02paeUQGx+aSe8xVaDYFScCpnr+3rYE1hxUNbOu+dfaffZej0alWQ7DJt
-  oIXV/n0CgYEA1vlV84PE2jcrxg+XYowGJaxscQbya20Gk9Btjc+1/3d2j3RXTUcV
-  Pbt0OFMS/Od7NnK+jQLnlFxTC0cd1hp5YeJIdsB7UBOwicrJhEn1/Mt+LxEFaTm2
-  jiL5ssM2NG3IqT+6y/fa148XKR4qmQChvOuwryzhRbnwE07+henLxHcCgYEA7kKT
-  Onf5noo1YLfzUquJcY1rymyL9MVjjnLtj6+yEezTqyk+772jDKWcON11b9WSLAj2
-  vtV3EMbkVaWNxWEPLcpPPRwYnZYzzRdNF/PVwR0MbRNuRfGoZlnkZu1ZjHxd9dW0
-  HPqAKFw3oCxtqmeptY17FjWbL6Rxs0VyQo7Nkm8CgYA0JFYMsrFUnH0plS6K4Ju9
-  F41V/PFfzRoDUFLCStdCF5/SO83RGKS2THlsD/pTDXJ9SmednE6/VYVu/tjlzZYT
-  f+dDpnxCeAQh5+XpCGd54YHBuMcvNqho4WLfUSocnWRGaQbN4lhaYIKlnoOGiPix
-  8hjw5Fnfp7HrfQWPRZ3/EQKBgF6lj7rgQgbavE2JhV1HyzeSiElHSWmYp+3Edd5o
-  WwKH46XQorG10XmKqD5mquocGw7nGK3COqQtfjMPqvvHjLIR9dw+twCS1E0afoOP
-  V1B5a6BA4cNjNhRCjVrd2n7WQLURiZUhZZui1m4IeCADQgVfCJBQBy+r0Yb3hWYv
-  ODZ9AoGAcRCDsFwRqySeQoE9h5YAQcyzm07ZVR7GABXgB+c/YVbsHTx881gSey1e
-  usR+GtcqVePUK/X2nCFh+UPpde6TShYFZmvX61/8mgysuoum4Z/nb6P45F0AjOdS
-  elB1cO3zM5Q/7uBgtHWyNuRP9YMUT26Q8AM55o6XCHCFBJQ80zE=
-  -----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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
+  qHf+UKfY
   -----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-----
+  MIIEpAIBAAKCAQEA1xKwEwTYDz8AqffryouXPLDBInWEizlw42NTmLJzZOvQLf8I
+  mDR5+qYy2s1IEorKaVefADdHkJlJzSVfgWi9K482ZnNjocjGRab+gtlzxVtFG/y0
+  y+7DSoSt0/euXwY74U4j7NS8uI4tvi6UhuqVy8Yh8kbU5SEHNT4NTcy9o/s9ZErp
+  3ryRkrrqoVZQbBnHiykMhucrfRl+WJ2QngEkOvVFZXvuyErLAWzmhN6uaMVe+svb
+  4pGF0B74HdXOJtwrzzO8C7piiI1FhBgckJrgS9mMlsnSxkDX9q8X1u8rrN79LYBL
+  2e3NVGhsoWSCEEeOLC6XL0sga6ue6jPVWOgXTQIDAQABAoIBAAh63CZj0oEHYudQ
+  tyNNTbE+5t6M86TppuHQUMN8hcA87ABkRdp6dzTCyM6HuYfBoSl2IvbHNzMkWByW
+  lKVtk8fb5bE0a4E9gVPNucs+96mYZ6kq1ZYU2+5cPN5WrbFhdYr0ocX8vVQphvQw
+  sfp/1Vgrf7slv88o9jfLMosWv4NvmfyrJ4Ri2w2mK58B4s2lGWh2RYUCteBU0jPC
+  kcGLkdjDua6zIOrV746nfc6RFiJywdGkxMdR+CPw2MB1SiJIEmKDRcoOUz7pF8OC
+  WMLtw+hl9JOTvuNNfTHNsvTqmjRfyAR6BFSS7eum9NUurXExOAEUBXXVdsgqsbHw
+  X+1vx6ECgYEA3q5EH5ARdASjHSm9DhWwKxijN87lGos32M+jdk9iy9PnIZVsFCOc
+  ggO8MVgj7fxqS7uFcoZ/9dYYeXb53N2XVkOBXBUPazxG56xsYKBvkE/St1HJ/K1P
+  hJYEVSXqBQP/5ZZGTYfOqvQrfjkvr2u9rarR2K2EcXhYyQfHgtAG79cCgYEA90EC
+  aajJSeORu4SG2cPL+8wdaWWO24qUhDCHbR6JZwgv+lvewLCu1zLi/X2uZbhapwWO
+  sRQRnahK+7+fc09kExwtMXdy9fyWjCXtGCVq1VFwi2iiEaJqiiKPV296idUPAPoY
+  oCUEu3t+qqDscGCCoBRhpPX+f6GK7Gj0dZ/knXsCgYEArI9a1yKrg758MINBsAJ6
+  jEsBYKQBwjoUQv1U7L/EDbPeLpY+NLUL+Wyvj4WAAlJShPGCDifQTU9lk+rw4YkO
+  V5jkS9k+I5mIUMu7CH4LNkfFQK4u2pHrRxGBtgI1gUGCMgXr4PTW4H9qnNvv6f6R
+  9FylVUXRlqTuGIrgvqw6U+0CgYEA0uo4xar+sjIXIc/GPMMCIbQXrs28VFjdofnH
+  vHSdHy/jxXxTAyp0qww0h6qLdygQ5IMgGrwU3tktxZzLxtCFfKu/fX/4qA+k2L6N
+  hth8TqXfDHzgK4zRty4N+rcU37jIyLuPACUz6T5KagFGUAJzy1w3g0F4rKU/3bUW
+  O7R+jzsCgYBAJ83hL+29H32jLaU3Lnk950aZFBP+KkNpTb97xNqADxr/2xktNN2H
+  qTFkS/smktlF2pyaIZ1Kiz1aGwJ5ooAEuOPpwZHF2tvhWqiNqFhuUvqrBl67Ht3m
+  mhnQmrmmuz1kdEItD9b7OujEVaQPyvY6zlpCuQlq8TMePk9t+1nFFg==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_11_peer_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-11-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-cab23-r720-11-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpQIBAAKCAQEAyQJibGOvV+CFBszYqWtig8OGW/V09jH2ccTe7he5bdqeuvL2
-  /MDiHchJ+ZfGp1y7Y4rAoPGLanjtyxkfeWrkFP/Aok3UrobThHZ1LMP1zI1gg9dp
-  tabwXAFgN9C2M0o2G37hdPHktSNQLMMABZodcQ2Ub0v+eASSqis6JqmiPtXOXeO0
-  SglIMUDo1jN4q6co45JyX8/66vTIxUOfUqgxhX0Uu9WInsMuFNUOrQM8Ek54fl0q
-  WrSowaX2GJ/iyxLNjTeREmIHMA2uKJWlPPX7mExVOgl8oNf0On3zRxBxU5/NVq+h
-  9ugB03g0wPLJZ2jCPIdsW2jkMFUtIATP+10W6wIDAQABAoIBAQC7VUORLJ4/0flo
-  SwUpb/ESR+kyTuJAiHPbt9TkJKwmG3ePV9yj1sdlZkK7IJ59X8ksjiXUWQjLpARK
-  IhHZQKtsfqZzHQI33WPHsfamT8MGbkQi22Gjb//WX1ni6trDlkgy+9729HFn949D
-  CEE+91C1CijqSPLRu8FMYpkBa1rQHx8w1+JqmgHAQ4TQXxyjwh+42czTyTNQ5B+z
-  ug6n6/+VDrpwNGADUHWN3MkJS6UQcNEi4/9wxnd4FD9jLouzeOEOPCUUogQ4T3Cn
-  rq2K3SOc48po5ontZtUHzq86fe8JKSZWRTTS8IGkl/MCMVoalVtUCW/3p6ylpNey
-  Bd51i0vxAoGBAPLxBNYRFyZoNUB4J/rTQ52kG2xX/TK3SMO51oGjXWB5f6CPeGRT
-  I9g57zbJEvIWhFCa4L6y/mgQcTOt9/LQdlQMMuKyGU2mKywCDQsQ+Qin/IdEfghs
-  NpfsMS9q8uKcEtEKAEswXnS0kX3GeVwC30/Hz/gK++DJqjHxZ8IUuBl9AoGBANPQ
-  XFGRElZAbU2zRbjdR/mvq3EsAMpJ7Ath8gFzqcc1oDCSM7856GD4Hlsa1ZA412+S
-  DS4ublpiCnQ94lgzhwmsfG5lWd0lpUblj9kgxOZsVi2nR5ehmBqu51AhowvEELsE
-  b6acqxz9IQKIA93jnwqWkBbM4JOFCmeM4QlCZx6HAoGAQt6SfTWxEJJIbhlkr8as
-  6tw77CN//xCyB6XEZGSKFD79IT28Xqj/ycmQjZzlCRunieRHjlYIbq5v6lCtWfmF
-  SHcfHoT1MAlYAsIBwxUF5xsOCFGS+1CF6mVJ2Ipwlm1tRHqjQA7tQORe06boyqnD
-  u9r85IJpeCMqJJsU+zfmwKUCgYEAwOj7q64crUFwS1wDHCMs8lL0KdaRwashuBw0
-  dO4KqsxEYPhG+NqcsfRIcWE3MGsUiyDRsEXJa7fvHX9fLkV/r2fQzBqyhZ9LsA5T
-  vMUDj3kL4/h+U7Nw/JxfP7Pi80xWkH2x0mTN01EXR17pZqVwrAwEnz9pKfH5T+YW
-  7n/zuvECgYEAnQ1E/pxCitCtyYBqHc4ZaUOsDzb9WFm2a2XvturD+y0T+gYgQ7/z
-  ODdCgk40xrqVzpgHRZmJmM5vPSHdJHjugoeBexcLyEZxAtDZw3b/shekporZPCis
-  OfjnhpWiQMcKGbb7rvfyJ0vvL7WHzViXMQPYXCodAHQyhSFYFrSrYoA=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-cab23-r720-11-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID3DCCAsSgAwIBAgIUR9Ud85YoTs248uMh3xEYunKAzbAwDQYJKoZIhvcNAQEL
-  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
-  dGNkLXBlZXIwHhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAtMSswKQYD
-  VQQDEyJrdWJlcm5ldGVzLWV0Y2QtY2FiMjMtcjcyMC0xMS1wZWVyMIIBIjANBgkq
-  hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyQJibGOvV+CFBszYqWtig8OGW/V09jH2
-  ccTe7he5bdqeuvL2/MDiHchJ+ZfGp1y7Y4rAoPGLanjtyxkfeWrkFP/Aok3UrobT
-  hHZ1LMP1zI1gg9dptabwXAFgN9C2M0o2G37hdPHktSNQLMMABZodcQ2Ub0v+eASS
-  qis6JqmiPtXOXeO0SglIMUDo1jN4q6co45JyX8/66vTIxUOfUqgxhX0Uu9WInsMu
-  FNUOrQM8Ek54fl0qWrSowaX2GJ/iyxLNjTeREmIHMA2uKJWlPPX7mExVOgl8oNf0
-  On3zRxBxU5/NVq+h9ugB03g0wPLJZ2jCPIdsW2jkMFUtIATP+10W6wIDAQABo4Hs
-  MIHpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-  AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUsVnw3ZY9kNEv0tm+AiFJboIuauIw
-  HwYDVR0jBBgwFoAUZDZaRSnJLdSUkLXs71Y3Kf9kipQwagYDVR0RBGMwYYINY2Fi
-  MjMtcjcyMC0xMYIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
-  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFQuHBAoXFguHBH8AAAGHBApgAAIwDQYJ
-  KoZIhvcNAQELBQADggEBAA7LTGlGV3EgiEkE+VVSF2kI57+dfnsPVcVmnovKUAev
-  Fsc1NNEGFka+q7wsFVwqlcujVKVp00Wd37flzX1h/MNtiUmHZbfLXpUYPgL0c+KN
-  qyxqvCVgo1S0cQee5pF+PIqhKLQS+j2LlBNtDaJSwVpbl1EM/oknwB3JEuunyUR7
-  Xgns1LSKq6ZOqXmAxqWYyC0AiekAACv2M3I7CCfQ+nGV9W9gFaSHMxhE1X/kDqch
-  RQftzsD3yfp3RI5A7feLmirP0WK2Sgj1wJvHv+uQNhwjUo2RkXsFo4lbtL2w3sIq
-  LwIPIIGGC6CcEezHQ5LqBDvIL21oXWzKPV3pe0e19g4=
+  MIIDxzCCAq+gAwIBAgIUGLBa7MTPuhHjv/J8WaRajDTABVEwDQYJKoZIhvcNAQEL
+  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjQwNDE4MjEw
+  MDAwWhcNMjYwNDA4MjEwMDAwWjAtMSswKQYDVQQDEyJrdWJlcm5ldGVzLWV0Y2Qt
+  Y2FiMjMtcjcyMC0xMS1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+  AQEA8qMppoNP7YHTPk586EEp42hlMco1tgfhmTT+R8Ajby4laTQz8hg+NUhb5yU2
+  x4GgPTd7AvOpmPHxNjpoQ+DqRzE5ipIJ4Ma/mJZ6O3SYI70RWG3eAJnWcvwEytFV
+  noKwE6y0exXqV1iLfl7DpvhGQVcl1u/T2ctTrhPX5YLHolqaFh6bgRN9L0cm/H6z
+  KUwnq0kUVGIFFXMaSNPMLcCmJuZ0B2qhc9cod/LNcBAVk7zDbtyliuyvKW0JNeDe
+  M8zRIop9sqQ46GujLWQANzHwXEAAUhOaZZ3YypsO03r4vM2XdX1+E+6a6isnXdsG
+  zcdDCz9BARFsbba//CXG4Fw4uQIDAQABo4HsMIHpMA4GA1UdDwEB/wQEAwIFoDAd
+  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
+  HQ4EFgQUnvgtvXiHCWUxv7newA64eRATPy0wHwYDVR0jBBgwFoAUYsy4WY1jbZG5
+  IhrfFg/qiQluN5swagYDVR0RBGMwYYINY2FiMjMtcjcyMC0xMYIJbG9jYWxob3N0
+  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
+  BAoXFQuHBAoXFguHBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAIOq66im
+  Npwx2KOc2h/47fjakzU8mP257uwXAToKwdyQl//PGy9HQtxESDaYWID4H+FC47Qx
+  r6V6d6wZYDcl71lquiQN0sG9klJiTwhdPozEaF5X4RwzGsCEZazDKWT60BrcsBrv
+  adtCENlNIKKcMrdDHPZ3CrbgI817vaZuhl81/c42o6ahw4wQ3Nx3WPUIracPX+Nt
+  F8NPFlo7chnUc4JOW2/I5H05pVSqOJJOB5jqZXQRvTnivei5wXfvP/eIQm2PoB4a
+  EKMQ1rXxp6adpCUTwFHJxM2g8Pw5UcadxxVdE5zGJUl2E9qP//bhRO15oRvVaITs
+  /TMpxvetDdNLXuI=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-11-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEA8qMppoNP7YHTPk586EEp42hlMco1tgfhmTT+R8Ajby4laTQz
+  8hg+NUhb5yU2x4GgPTd7AvOpmPHxNjpoQ+DqRzE5ipIJ4Ma/mJZ6O3SYI70RWG3e
+  AJnWcvwEytFVnoKwE6y0exXqV1iLfl7DpvhGQVcl1u/T2ctTrhPX5YLHolqaFh6b
+  gRN9L0cm/H6zKUwnq0kUVGIFFXMaSNPMLcCmJuZ0B2qhc9cod/LNcBAVk7zDbtyl
+  iuyvKW0JNeDeM8zRIop9sqQ46GujLWQANzHwXEAAUhOaZZ3YypsO03r4vM2XdX1+
+  E+6a6isnXdsGzcdDCz9BARFsbba//CXG4Fw4uQIDAQABAoIBABojYZVCiBW56pvH
+  sMUEYBLTaDNY6ThW2QK8JrhsBmUvv2/5466s1ea/iMb5x1DusehmVaYXwalsRuPk
+  nt7RF+vbbatz2ASS5Ij3jOtiwBD5iSjRjRzbdbKlW47Nxj9xLK6x6C9qSPhn3X8b
+  jlAqZscbMERbSaMouDcEhDmBQShIDKH7Wlfyx6W/fBgcW8SL128TzqLccW4yPcZ0
+  yN3drM4cvX0ezccykQ9OOokWDQbbDQUGXuPIAoTanxM0MXuqyxrzBBnv7DAScWUy
+  biSFyBzj+wKtzhpNSxW7nXaNjlJ9oHkifVQ3x4RoRrzD+i+h2DUa+WZGus+QVT47
+  ZhjMNRECgYEA/+4QYF7BU1HY+gskVujFvTbl2Mw3RpBfX3LDbwUVVhps+ajIEF0U
+  ScihsIIABNI3ZTXy8lWtz3fBZKGhTMYW+EGF/gSHA2FKEErEwoDFMGr/salcOCsi
+  4wDLj2cAodxigaB25R/+UFpQJ+HTQhs09jf8l8EcqYE8ao6onodyv88CgYEA8rQq
+  yuWB5a0EhJAoeFuEYs58jYd5owLXP4ZXv9YxYVEGCeTvC0mDeho9LOjR6SBgPeAG
+  Iab/smjRW0Q2HYtvHGfUhiwnuFs7oNKHVT9ZAD6OMtwIJN8gHPwv+uvcWznpT1BZ
+  ePIDTSp6bkJZnD6ucbRAP+dUmFfXIbMWBT1qWPcCgYEAqltlO0DXnwaUT5yrC87W
+  ESVByhXllWr0kSxrOrM/iJj+gREAWyQaJSMPvdZK/OqRRSWsGfM+RyOH79xG6jvR
+  fl7fOj75QB66li2u22mr2JbgrPn3EMxl5ITa+xGtMhDo4TBW9B1fw0zanjGL1i0W
+  C+8ojDtXQN1tweBEDYJLt7ECgYA6D3vFOg5PIYrZI5tq34nWEUuel/AzXPSdT8gi
+  Ll11yGpHZ6r/6kA3r5s+6Rt+R65+Xt9YoZi913FuAe1oN/kGtJgU2O9PnROwr2yM
+  qjDibBSceiLAn1gRVwsrXc1DTaFQxgoBcvPzO9w6EElbpWsZ7GMKZo7IOwtOFoeI
+  DV8plQKBgQD/wFnqkBQuG9RFBYbrJIqpl512b3gyl7tOtgWc8f6adNgfM0rQvwtn
+  0scB0IcAXedhMFCB7Mbd+Aeq+L/P4FFFeamXJDyMPjhVTTKTYVdlq3Z+dfT2LNA6
+  0UGqHDYmxNKPlVl07ySXYMJH/OjIf6LZE0PIDWtgmhwOfPqJXhc5Dg==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_12_peer_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-12-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-cab23-r720-12-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEogIBAAKCAQEAvLyYfdBHmTSp93v8fm2ZCYMRD91yrp/LJ2/IbHvOGHiOjSnj
-  Nzm4Vbu8bD6yCNPfJk4zd+AookFM1ESrzwPqlyvY4XBNxAc1BTKLSiWTCGV078JR
-  4C4LgO6adZCDpsvI2iv3GgcWwtZwnkDuCMKC0H1X2jQVYglEidgRFCGnq1tuJS2D
-  t+JIMenZ/7gZMsW9caI6GTxTlNGVleSP1BWlMLsGfaZolyFKuZvbPDOh1qzVlr2w
-  dYyuBJtD9+KxRfMJ+hFI85+UQ2XCx0sNPx8vn4N9x0mZhALBxj25FqG36Ah+S2g2
-  p2io+jaiL5dDU8jKERpXqWeIFaYYjCs1ZH3FcwIDAQABAoIBABb3gDr3KG9NSE2U
-  aeJcpd3RdDcRBI6ZZVhUMvh4jFjP+tDUwxCKVpMgOEqXyoRme+YmZ/7zaR5tgdLm
-  1F1ppZdlv4uXZe8vzVTnlKmeLuk7p2IxrFLyZ3X2ExexUUPv0m4yIWyqZiupeqTX
-  U9//A3opdpJX+i4m4I9Bmrpvaf7g+JR1MIO5zycGz7WUD0PFHIa8mgbfjEzJGx3m
-  GteSaAen6HidH2rtYgov1wOoVDZRncMcUWct3jAofhT+7fheFWjnmWkjCbCB2zdz
-  w+dqWE55NR44OvESijXzYXZm9/9Q84GBzYiO+1VvJ2llfunBOBUIK+0XW08ULzi8
-  EacqF9ECgYEA9NPrH6RJRaECg1Y0xmWJG8GSDLCZHd0jd6vEN4WmE3V8VmxVIjrv
-  UC8coJ3UssU86D75pEFuf4d0Aii0tY3v4xKrrevjtMpuWAK61u6By5Ujv6NLY45t
-  mDXVfFW9CVlDjL7j1hqUCwynfIAuapk0v+VboX42RovjB2iu36bkZPkCgYEAxVlr
-  k5Z11P0lp1mO+xvvStx8ZSbYdW0IrMr7X6rw4dHYcbZLRWVBAK+b2yLm6jt2R8c3
-  LM0yEm6vtTG6KpuaEAyBK20HL5PRIVgxeQN4QngsM+cm2Dd4GjyKy8ypBtMMX1lv
-  grmwszquOaqATU8iYLSMYTDVPmDZsCJSHE5AVMsCgYB+vtcSYnKsYVZzt8VKkHYS
-  sHtzplkeZMVfxsSmGcKIgGIGO783IVuTH1CqtgrPId0OPsvuhRE3ZGBiXcBv3TM7
-  Uwcd2ujfR40ocwFXE9KOGn+PTnJQ8AM8sWH8JEbg+B1IV+qLhObvcXWjtphRB0+P
-  qKVvTW+7xd+ajk856aSDwQKBgCYaw+i1Tn8XeeO8KR1XIXcE54foXjceHGSwtKSe
-  LvCLQg2Cszns+QYW4jMHpCpp3MazMnYWEKr6cDa+KUH81Vxv7aji3lZTZjfX/YVu
-  JBRBe9dxtFBfNXNraSk8lQ5aRbNLY3qMPA//LpC32RoUQ4EEm25QrXvj22Rk3BHX
-  EhjNAoGAGBKMT14W/5AaNQOtN0pbZqx0n2XJZ1jPfYQ2Ve1hMx3byr3YYc+DixCa
-  PYM4qJjvu1iGT21LCnpcN5puT7sMLLE9s9/zhHFoptVTR4MeCjOfjRA67sWJRAhz
-  GuErLF65pHtsNc4ps0FdMXH+UrP8YZemhZIPh7MzYYex1+BwvVE=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-cab23-r720-12-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID3DCCAsSgAwIBAgIUAYGHm5GamqgBCHb11EpPaBrPGxMwDQYJKoZIhvcNAQEL
-  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
-  dGNkLXBlZXIwHhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAtMSswKQYD
-  VQQDEyJrdWJlcm5ldGVzLWV0Y2QtY2FiMjMtcjcyMC0xMi1wZWVyMIIBIjANBgkq
-  hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvLyYfdBHmTSp93v8fm2ZCYMRD91yrp/L
-  J2/IbHvOGHiOjSnjNzm4Vbu8bD6yCNPfJk4zd+AookFM1ESrzwPqlyvY4XBNxAc1
-  BTKLSiWTCGV078JR4C4LgO6adZCDpsvI2iv3GgcWwtZwnkDuCMKC0H1X2jQVYglE
-  idgRFCGnq1tuJS2Dt+JIMenZ/7gZMsW9caI6GTxTlNGVleSP1BWlMLsGfaZolyFK
-  uZvbPDOh1qzVlr2wdYyuBJtD9+KxRfMJ+hFI85+UQ2XCx0sNPx8vn4N9x0mZhALB
-  xj25FqG36Ah+S2g2p2io+jaiL5dDU8jKERpXqWeIFaYYjCs1ZH3FcwIDAQABo4Hs
-  MIHpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-  AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUoVVXTWHC7AUZJ3UX5AJGwa2thTkw
-  HwYDVR0jBBgwFoAUZDZaRSnJLdSUkLXs71Y3Kf9kipQwagYDVR0RBGMwYYINY2Fi
-  MjMtcjcyMC0xMoIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
-  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFQyHBAoXFgyHBH8AAAGHBApgAAIwDQYJ
-  KoZIhvcNAQELBQADggEBABzgNfui8VwZRV5I8vzSyxFmq7XdrGUX28MBm2jXic1L
-  1lY6Ag4G+ztaCzYHqirgWBGzbUdzGLSv1iUoACVgRA0iGbzuQ5tQMO+xisiM2tNk
-  4Hv1mcvjqAxINldOCMGgNeGf1blMq2GVq1ov5BjXfvNid6fikb8zosb7juoD1sz4
-  vA6zroJmYmoczrkwu3iUdyqeW8mHyDZgId4IgbJdPDUcr6Q+hrVleDZ5qR70tLzo
-  CPWuXIbvQ3nSFNZW61elfk/fTpo1Ml3049wXc85LtyOrPdwoGvOKljyZb22eh02s
-  ucv0x6tNVyP3xKELVeQAywrC1oUZ9CAUzrPsMMsWkko=
+  MIIDxzCCAq+gAwIBAgIUY3is7QM88M0ZBsuDk+1w0d5JxXQwDQYJKoZIhvcNAQEL
+  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjQwNDE4MjEw
+  MDAwWhcNMjYwNDA4MjEwMDAwWjAtMSswKQYDVQQDEyJrdWJlcm5ldGVzLWV0Y2Qt
+  Y2FiMjMtcjcyMC0xMi1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+  AQEAsvkwK7b2aW/TtMyE/xOEGBv9m/CgNaKYEn8DTOvwBpxgyU33iR4MZTGz0wYu
+  mR0ra8D38G+eXUvNGRu5NywJAUqXK9uJ/iJcIZvjh9KKz4YOJSDWZekH+Wwna6s5
+  XME5ZkG4VdCbzoDIez4ZmDz4fE6X2Z4q6GGFye34+C4Kv/BBRD5SbodzdwFapu1L
+  8LZMUo+k4wO/rQ+sCEDfmaasMsHEzPoIjVP56/Kd1X/ukjBuOBU0isG8BybvJPr3
+  GuR2z9E2jqpIyavqvtHNK5RfO2sAgzGPm03WvA827UycGu0QUKzoJR+0KrL56eSl
+  q++UOlSgBaj6fgFrxLaLBOrtjwIDAQABo4HsMIHpMA4GA1UdDwEB/wQEAwIFoDAd
+  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
+  HQ4EFgQUkIgETan55TPkCynl8hD4+ozlGiAwHwYDVR0jBBgwFoAUYsy4WY1jbZG5
+  IhrfFg/qiQluN5swagYDVR0RBGMwYYINY2FiMjMtcjcyMC0xMoIJbG9jYWxob3N0
+  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
+  BAoXFQyHBAoXFgyHBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAL+d4ArD
+  KiHfpdXPlLPHI5NvMzeRtAB+kH8Xc3oOHpaKO8gWMMId2dk46WttAeHAZPGmvFAm
+  RZbooYqxv+HO24P6Iw5iZ4m/rqxZi1x84qycac0LvMgq2HaNCR0IN01JaB17zNdi
+  5wReidAhwPSIg0Knhni9YR2rf7ie90DYbbh6HTnaEuzdiOxWWj3Kwg7lYfITgzUD
+  fignJRAj0ukh/WQhLVDM7YLAQjJV7NJL2O1UK6E/+TLH/BwSi3VfSQsqXV3uccmc
+  hqAYwIw5lercJAldJZBrnxoVyhFVICf8E3ZWxZh3o5/XECCx8xfLJ0N6aDhdh2Bi
+  ZK4+EA9Zwquxtjk=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-12-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAsvkwK7b2aW/TtMyE/xOEGBv9m/CgNaKYEn8DTOvwBpxgyU33
+  iR4MZTGz0wYumR0ra8D38G+eXUvNGRu5NywJAUqXK9uJ/iJcIZvjh9KKz4YOJSDW
+  ZekH+Wwna6s5XME5ZkG4VdCbzoDIez4ZmDz4fE6X2Z4q6GGFye34+C4Kv/BBRD5S
+  bodzdwFapu1L8LZMUo+k4wO/rQ+sCEDfmaasMsHEzPoIjVP56/Kd1X/ukjBuOBU0
+  isG8BybvJPr3GuR2z9E2jqpIyavqvtHNK5RfO2sAgzGPm03WvA827UycGu0QUKzo
+  JR+0KrL56eSlq++UOlSgBaj6fgFrxLaLBOrtjwIDAQABAoIBAQCmyckVhB2hZuCh
+  xlNPL03T9gnjkFyNf2g/HHTj86CtWIBuOaWs9/7PM4GE8GbutBtqANxPCoZIJcMO
+  WiLCgtwlgvDco2y3FChN/ewOAKzx9tkpyq9jK8cNr7gRA/GiOkQWwrpZ5t28lZHA
+  IMBTesaLeebTnC4af//hjk+OYcIM2fdbgkBUzQflQzw5UqNjM9inHr0LIAkXXTqS
+  D54svlKk+se6wkT6oiPM/5iX+N8cHGvtjrQA+7iNatTCfE0ltvcUVeGjBOJ5FEIQ
+  +Ipycj/etPqoLwiYG65A6FO1Z1kxpSpwJepa05VsyFywcjEmWew/TqWYxtCb42lk
+  q7Dgy7uhAoGBAOCu3GNEy0VbZ/kDoyuZpoNP27Sm7qDHh9bleIqe5JP2ubtriFHi
+  4i0O+SEt/3MPeJYOf5Vybnn0AE9R6C29ekWFtrt+CmWXGnkvZFSZF4jhZu19lsE0
+  J7/Uys+U8sLhhxlmUXdE/wm0C2zXFQTplvoFsGhwG4ov8ohIdrx4E1OfAoGBAMvr
+  UMZNrAxMIfybLN2/0yEvPJU0/XMzLqctpXPzEq0Jv2CFZTCzExCXBzhgHymMfIiV
+  6sVT3y3EHgSuQSA7Gzp8CJdar/ft3pWoNsk59oefIIq6auw3ijDjfgsmBceqb1uD
+  AzouSbvaT1ZpfBqyrpGkK9CTG2nykqqHrNPEQaARAoGAQ7yz+MGOvtQ13l74XHaw
+  OrpitG33V0WQcHsyAiixJOKnUBe1O2q5YXg4J4akkt3BLwwj7rxXDjE/vqok41VS
+  fY84bgIrxEDv3EUrbE3TSJMb4tGQF6NPsIfItRhkr9gqUMAGI30LnrNHFoMpdRev
+  SqVYb8QMqXaXGfsuwNc6jGUCgYBRKe8zjtTM7DyW05ivBlvdmHSPmtDKWnPWPLff
+  B7/GOdv/afjVwmDzOHm6OaANpIoovyr7sZ9iEu4zxLvNPVlgFOBChekGUJpIjPSJ
+  cVWrs217aimGrbCGNvYDL/Ya+75o+SN+s8/LQmBTr5ai9b2/4E1ELlk5+T/hOjFS
+  9Il+UQKBgQClOf7/RkgMZ1rqlFOPSRa++beu99hPecKd3HjP/dehzxtPrA6yEaij
+  ObmIt3LCNCRH1VTYmF2NMNLsHI7o0k4PSYVqEV7tzscgdqWkd+wQ0SINw4HNDPhS
+  BNF0zogprHREAJ3dz+zwyLfYQRm6iAZ3E2WM97nmBUPc2Ovh4oXGZA==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_13_peer_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-13-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-cab23-r720-13-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpQIBAAKCAQEAm8dBTNTWmc8D54asl6pAmvHvY8FxQvi8lcGZLxx4sEiqvp3F
-  uxoq+HnYT86/fM9HL8E3XSXA+CUNyCTNfCvhuXt4xn7QFyGZbL2TI+o0pO27W1Sb
-  CCx/nqDEG3mxoOPOoZN+KIh2EUtTFPnvUD/B6L2sxpWsB7lbCMMylNud0EXjVd64
-  ubTk3w2ett4eFTGtHmNkBPI7wW/4gKC53S07CZzNjXuC+oBvC1A3n4zz0GOdMggC
-  JxAdu0b7EcJEtmF5Zftct84+GVewrV1Td1+Dg+GFh79u9IaB7NaMBs7gRRfEjXTg
-  35aCMEPRAhtlN8BWrSEAVcEM5oVwStDAaPIeBQIDAQABAoIBABMVCW67873LmhLW
-  cHXzqQ5R7J0vqQwnJBLEMFuRBUey3xeShBIzVmgxpMnB7bsAORwkcv+6DDVZdKK7
-  v2Aij/gEo/rMtfjfaMflQQz5N5GsfXLmnkcWDFwGHX+wHI402a75Pk8AyFW+AGNl
-  amdOKBa2hV+eHgCkN/6OyrdpX5+PfyA+0e0g3/XgyWivnODwDbfdaOukR22hTH+z
-  cSBkOVr/r5Lb2tGnSA8LPF+JQESl907zk2SEGAE5MwR/BmL0+y03d+bLl2hpoYmJ
-  0yKypkHc3hfdW+pxxHYYB5r7zwFOJrmSCbKwNWfnM53pOrY7y3w8+LpIO+g7/Q8q
-  se1Yq4ECgYEAwHQUl8BLqed1kExj12vFajQ/1S3nO4XSYWUchNM3PW/McEtDVNd5
-  a/3mcJzAQBmUrO3wH2JpMvubt7OJ/cuLeikaNQGd48n/lckRW4uM6eMCE8X5BYjz
-  Xw5Jp0vS4MeyjpR9ynT8vZGCiIbg7Usk17RW/LHtYP4QrbUwVdsty40CgYEAzzcP
-  k4TdhkN26kV0W9Fx6qZvjgqJTwAGXxRgFUiL8Brda5dQ30K4o7IbemPxkjwH1CzJ
-  XZltgFO4ZLumxicPtfO0/GYZ9ezW9Wri18LSL97Do5tmHajf1K71DPD1TUMRBka/
-  oAYHFBUa9/WnH81G34dhImd2nXrDa11iIpy8QlkCgYEAiZh0wKpzbl5V5302ROaA
-  lpYUrU3MbPoYmBm6chyw+fPcrsygrx//Z/53qzvnF+0yJxFXBJlPrWvGwWhT2GiW
-  qBiK7Crjv+DEI0tGZbU4YmAzM//vMs3fcq68aigD9UHRn6764K0TplVKhmIonn+D
-  L9V3++MaXKZJNmi8ziWOcGECgYEAzUlQTiagTKbDxZ5fg6OBByYyeHcpxzFQHpwS
-  AKPpt0r2N+QmA7mXMN1/6YXgSq7cVrC0Id2hpTPMB0f9FmyWXP1/PVptt70WzPZC
-  m9zv3OsFyS1oQlQOxCc8sMB7VTrvP9eRepjeJGAwYp1lH9V/tG3rpmj4E1YPCmvu
-  kDnVLKkCgYEAmWJhQg38fXMnnQxan4hTUqeZD1sqGmcN5Df3+evZnJEVNk7DG0ev
-  4JHJrFZh0W90dd4TPlhkzHq3ESPF+jzqI7Ra3mqL5eEAzUZHlKTxfMzPxfjTLIJn
-  se0t2zTgnyV7zc+VW6uKWWx1XNCq6KNEBhl53NvfdbGRMg2KrYqcM0k=
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-cab23-r720-13-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID3DCCAsSgAwIBAgIUO4yjODAHBgSYStpTWOAxfT5o/FIwDQYJKoZIhvcNAQEL
-  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
-  dGNkLXBlZXIwHhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAtMSswKQYD
-  VQQDEyJrdWJlcm5ldGVzLWV0Y2QtY2FiMjMtcjcyMC0xMy1wZWVyMIIBIjANBgkq
-  hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm8dBTNTWmc8D54asl6pAmvHvY8FxQvi8
-  lcGZLxx4sEiqvp3Fuxoq+HnYT86/fM9HL8E3XSXA+CUNyCTNfCvhuXt4xn7QFyGZ
-  bL2TI+o0pO27W1SbCCx/nqDEG3mxoOPOoZN+KIh2EUtTFPnvUD/B6L2sxpWsB7lb
-  CMMylNud0EXjVd64ubTk3w2ett4eFTGtHmNkBPI7wW/4gKC53S07CZzNjXuC+oBv
-  C1A3n4zz0GOdMggCJxAdu0b7EcJEtmF5Zftct84+GVewrV1Td1+Dg+GFh79u9IaB
-  7NaMBs7gRRfEjXTg35aCMEPRAhtlN8BWrSEAVcEM5oVwStDAaPIeBQIDAQABo4Hs
-  MIHpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-  AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUhoZMiBgy6DO0DImN/U7WjWEW2KEw
-  HwYDVR0jBBgwFoAUZDZaRSnJLdSUkLXs71Y3Kf9kipQwagYDVR0RBGMwYYINY2Fi
-  MjMtcjcyMC0xM4IJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
-  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFQ2HBAoXFg2HBH8AAAGHBApgAAIwDQYJ
-  KoZIhvcNAQELBQADggEBAJ9iPBGe8FhJW7tYmXuHaH7KY+BsUQqoGMFFbm1cC04Y
-  eu07ry5QpZcgNeW+nmE3CLjJmoG+XQ3e9lEkT7fHAyNddkEd/5lx+4i5cyyXdmdI
-  rSOmht1W3KTN/dVxWAy8fxVBsaMUSylXsuwo+U+kxONPB4nVjCsTjEitA2thMQmF
-  8Sqr3q+nHizs1/llb8nAkbsF98ikoM62QvsGe2dxaLUoueOcFaqKYcJpRJoeHs2c
-  UF84ok08VVDjS1zwIa73cRp5agFMeF2LRGsZ+EXBWMKBxug4o/kK7smnRCbe33k5
-  HReiinvDZwc1qCtXAa4vUY27baq6+nPd3fzHU1ovyz8=
+  MIIDxzCCAq+gAwIBAgIUfWkm7gk76URs9g4nmlL1a42GvcMwDQYJKoZIhvcNAQEL
+  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjQwNDE4MjEw
+  MDAwWhcNMjYwNDA4MjEwMDAwWjAtMSswKQYDVQQDEyJrdWJlcm5ldGVzLWV0Y2Qt
+  Y2FiMjMtcjcyMC0xMy1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+  AQEAyzJEe8OK4QxxtzA0pjILRK80c1l4t+7Z0/iTRZDjm4snap3t7wUNSvA+XdB9
+  l30SGjyLQM/DjH9NmSC5og9IiB0ys1jWHeTypJv6wFdABw70gv2v67bGVqY3Zd9p
+  TkXRoExUkGX/pfHLs6TzauCkrsxxOD4b79JNGG/wE8Nhfasi1cHgIT0uN7jjQ0xT
+  nxYcFkzGJiGahBzWKD6qmta/sLRhyKuK8CJnQtMZRISuqkJ0Im4Syt/bo/7FPd+m
+  99AKj0KTtSKa7Lde4l+RvF0tN40RVuZKFeUd5QBKERiU7um3xxTOOk/77xyfFiJn
+  Ygy1yyEDMI0fbHr7kYoB7uSsPQIDAQABo4HsMIHpMA4GA1UdDwEB/wQEAwIFoDAd
+  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
+  HQ4EFgQUpXKTaZCm5wzB3NJPH1NcPh8nQ/YwHwYDVR0jBBgwFoAUYsy4WY1jbZG5
+  IhrfFg/qiQluN5swagYDVR0RBGMwYYINY2FiMjMtcjcyMC0xM4IJbG9jYWxob3N0
+  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
+  BAoXFQ2HBAoXFg2HBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAAvifour
+  PC4wZ/S0duZVg5UJ/1LjV1cNijfE+BYEv4w6+0xIgBylff5QaurX10GRmrSITBLZ
+  llsaEKSTS0O4yQmqYpclnNJ15u5FcOgcER2mlw0V/aV2yFrbycuIqfb5Hj+ToQyE
+  WNtuGXI47QWhYAL5pWDCcBNsLqpKH/khhmROC8WuI6rA0jXi/UsHweTGoYl+81ZJ
+  Jjdlkm3yWA4JKDYNHzjH82TXcL9jrYRKqTD1lH++nUbjz9GW0NM+kMNnS23qoddd
+  zmmVJy7KXYE5HwCxxoQDAtQJXLompbZGUevlsSEBLgzRuYoU1t3b7vRvfHD+YFcJ
+  8nWqgtWqeNeDcco=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-13-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpQIBAAKCAQEAyzJEe8OK4QxxtzA0pjILRK80c1l4t+7Z0/iTRZDjm4snap3t
+  7wUNSvA+XdB9l30SGjyLQM/DjH9NmSC5og9IiB0ys1jWHeTypJv6wFdABw70gv2v
+  67bGVqY3Zd9pTkXRoExUkGX/pfHLs6TzauCkrsxxOD4b79JNGG/wE8Nhfasi1cHg
+  IT0uN7jjQ0xTnxYcFkzGJiGahBzWKD6qmta/sLRhyKuK8CJnQtMZRISuqkJ0Im4S
+  yt/bo/7FPd+m99AKj0KTtSKa7Lde4l+RvF0tN40RVuZKFeUd5QBKERiU7um3xxTO
+  Ok/77xyfFiJnYgy1yyEDMI0fbHr7kYoB7uSsPQIDAQABAoIBAQCFOLfdzR7I3jfQ
+  OzLJpBXvOk/RMOAM9/SpHVixS4Vu/ZUiOdk91LoaX9kD+SXepImx2fAS1iUHgI+H
+  zgTnU83iMAKFw8DeaLUNZ5bHdGzuM8fr+hfVG0h+lwvLJucMAoql5mWrJrSuQBGl
+  /of5kr9mO3Qfw9jdK6yQURO+YWMR2G5zmRfr9K1mnA5I+sjk9MSFyuSiRe1eRupr
+  ENwlDdR2ikwXGlG3PO8PZufEjV3igeipb1slHYzDeAA0BWXn6AxZHifacy11bfX3
+  M4sXOQ8ca1kdgQ4FAyhyXYsAfH/hmzp8KKW1WFnJDYQmuiaLgXH/BrkoC2pZaJ+7
+  12nFwm+hAoGBANRzs81zCJzMyPjplO7w/La1MBWn1F2QGgIFY9kqQ2yeB3IxCjrZ
+  spmjGK7fO8Hb6HqmMYti1Ne6/EvF1T8K23rEEBpMDacUvLHzCkk+ZekoLYJ4uJpu
+  T8lwnAEfkcHUHY6FWanSVq7SYNww/uhDGtrdDxW4BJtGx27rcbad+2ubAoGBAPTY
+  4epsKga+0Oey75PF5awk6q0UF6qmMuq3f08j9/sDPW+DMSfyIBKRJ8Klyl0+pcnB
+  HCNhy4Q2xJXmZUndtxknE8X0SdwCJBMkX5zKxkcgItmA75uBKNz6Md9tsVaSUZgg
+  HBQRz1zVMeNH6ERp3yNsU3azdzM72NzvW8y9LWEHAoGATtkeOzrdUGyEjjUKzF9u
+  O1UlonPmUk9AB83+T8PqwC4qb0waEttm+LRaXdSF9h3qu1JhAu1MN0CzkF+9FCew
+  a3DG1SuyyXbdzWF5SNO6uPzrXwf044PbYtTDYXtY+koCKjn9nBRvjXSQ9EfO4168
+  Ycw3ZAUm2IY9UEJbsr4RaM8CgYEAkfKJz6uD7ZtmeQY/Kq2m9tLWlC7K4KzK4wBY
+  QbtmANjwkPz5mx8HoSmnMq6SjrxeJIIYnLqZjoj664N3Uu13S+XwMmoocJ1SFZrz
+  50kzoYf1XgMuUFpQGlCE0/LV5422V2CkfA4VtfdbEmh1efpFyR60LahSYFbHMQL4
+  jHUjjJcCgYEAw3HEe8xxYa6tox9GGfs7pmTcaILJ7a6kUd3VDATCwKUSh8k7xAS8
+  /b5MiddodaadhXfycDX7rBScdGcZsl10DXwMNKLFci+ivK66RYtf4XK3nNRkQRTE
+  Pmhv1pUbPb6vKL+yq7H4Rn8w3ud55mV3UmRSro6tNAnuscruwVrfNjc=
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_14_peer_certificate.yaml

@@ -1,72 +1,72 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-14-peer
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubernetes-etcd-cab23-r720-14-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEApVwzNhFynQhs8HiFXnObOi31y679htHwqIt3yw4yCZ2nq4R/
-  SEO/BViDtyx+FQIQW1siNl15wJZgBy5aBvtTyJWDmQNPajUDZRVSa98VcxPQxkqu
-  td1LmFpyY4c1LL83SzMcP+OL9Zc2XqPORW1aYsgZOfs20yhlzTkU7c2vSCg9rjr0
-  4rqsKWVtT237GMQ9bu2GFg4Hc5GVPrzgxwEXtB2v/XxWAB/E3sAr0pjlJM05kRdE
-  6d5ukFAYNFLLbhZLOE7F8HAOXFyFHgFmumW+YcygipIMC0mPZZ4iZnqAfLQAwR9j
-  4bhHcUuMeIph6PK4aUbEKGflQYtPl2kZH2QkUwIDAQABAoIBACBfQm9NTyDK63jQ
-  P1vUSglDwiDT6zIfm3uDgjowVz9mq9J6J+jfyl+jinWrsisuskEQQExgVFuNlNMT
-  EfDX9vkHvDGSYlOqeTWqzO3tSGe082Q+bqGP5yK2Yjp118Ug0hRYtykSxO2ZYr14
-  WANjexRnk/iz43HHMNbSW/SKFcyMM6fijX/XwzVUFx6b8bVv3J/pV+/47nky/RTk
-  xYR67c3kRPafffm9urnAalAlIShPZfW2I4skK7JLfQ6cWburvQPhE1lOLepms/TF
-  6O4p/1BVzVtIkKT+u1FaAZdMX8CXuwsz3KWBqCn9AQhx3i+A1YTnAkjoJpwkJ9b1
-  uUxQtTECgYEAzo4wzpWGiD2feSZ53Ii8XQfURXomspRlTVC/RSu6sWVXYhb/Crv4
-  CwQvNBobeKChMRwLFuL3S+Nrq3j3GQMzBJL4uUKte51lsJDjuvXCFjtdtg2IojJ5
-  2+OVCac3SxQDmCBpwodGoStufE7I4pkHJbrivx91eUWjTr+4xywTVc0CgYEAzPGL
-  YQk3wDZ9/lJ5maWCTvK7ZTeFgwp7cyaUubYA4HwllXmJImCdR/iX1I1ISEra8A1e
-  XLEmSmm0v9rlaEVYqsdf4cWNwKqt6f3Qf245KCnXy9vGuy9hg2EL3w5l05QyjQsz
-  qG3piP0XOfTIMGPF9e8RjJlR40I0yKHIqG1PQp8CgYBiZOOlFR9v+QLloEl+n3gz
-  TM52hji26u/Sw7tJhQo7BQ56QIAfqej/vm+J/0HE1afTkAtMTLQG53/bwBTdSmPc
-  MvLetX+Umibd1DdXUUiydHcwiQPkV+0qrR/K6GfzkMYhipc2vmAL2HeaKaGSJ9l6
-  xKrM5nx8V4rysWuhHULcpQKBgQCg/dX5gh4zdhr/X5Z6ZhO5JOCkoDrXN7LGQDZw
-  tFJ4Bc4YX4KkaLTkxpmutNVlRLg7/qRzuA1WQzdjxvaTNHZ0oW3mkyPJh8pal7Hj
-  iJiJvmTwlVLF1HCLnf6PWGYREMetGHGaC816eSZ3tpxTtuzZRtXIVuCG34lLWhug
-  g03SDQKBgCdpwfBHVPZK5o+AN+dQbxY1IebkBVhB66sDfKuSXReHgbKTF/iK4hbH
-  AIxcD4WRiGXQ6HwnYry7tIb1lTiJ0PVNtv9ndhtbnekcnvekr8gZMw//1C7T35V2
-  H+y/tHfzvme4HnnS54Sya2ozfyidWqUmS61ZHiALRklP19DirSjO
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-cab23-r720-14-peer
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID3DCCAsSgAwIBAgIUL/kF8wF5es5Et465tJbrZwwZOg8wDQYJKoZIhvcNAQEL
-  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
-  dGNkLXBlZXIwHhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAtMSswKQYD
-  VQQDEyJrdWJlcm5ldGVzLWV0Y2QtY2FiMjMtcjcyMC0xNC1wZWVyMIIBIjANBgkq
-  hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApVwzNhFynQhs8HiFXnObOi31y679htHw
-  qIt3yw4yCZ2nq4R/SEO/BViDtyx+FQIQW1siNl15wJZgBy5aBvtTyJWDmQNPajUD
-  ZRVSa98VcxPQxkqutd1LmFpyY4c1LL83SzMcP+OL9Zc2XqPORW1aYsgZOfs20yhl
-  zTkU7c2vSCg9rjr04rqsKWVtT237GMQ9bu2GFg4Hc5GVPrzgxwEXtB2v/XxWAB/E
-  3sAr0pjlJM05kRdE6d5ukFAYNFLLbhZLOE7F8HAOXFyFHgFmumW+YcygipIMC0mP
-  ZZ4iZnqAfLQAwR9j4bhHcUuMeIph6PK4aUbEKGflQYtPl2kZH2QkUwIDAQABo4Hs
-  MIHpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-  AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUGp/oW1Zu/dpeZqncIAmi41rMhv0w
-  HwYDVR0jBBgwFoAUZDZaRSnJLdSUkLXs71Y3Kf9kipQwagYDVR0RBGMwYYINY2Fi
-  MjMtcjcyMC0xNIIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
-  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFQ6HBAoXFg6HBH8AAAGHBApgAAIwDQYJ
-  KoZIhvcNAQELBQADggEBAIvvv5DTLKOCm3lT03Nv+3vnYx9Mzb2pV768fPW686xe
-  FvYexnc8XU1ksuvXigXDyku0L2/9EpiKbwO2b0X31lTpuXZ0JfDMU9TB23xaAKlf
-  4BhoCSFDbyaeHXhK+aSx1bhCUmb+T7/78W9CIvW2Wk9gtPuvyslJ2Vvb5eLTwU2c
-  O/JzXPuLx09QMnG7AJC1EoBM2BySTM4HmoywXCtLkq6subHJtDSeT55XLakMG/cY
-  i7a6cdeG4FxBrBPuuiXDTFNUZs1K+JUuzto/6ZIFATP8YBz+YCPb8uVTgPiJ7Q5G
-  E0JtyCZfr5oxgcaqLNgaurTqu0HqrZnwRbx/12Tu8bM=
+  MIIDxzCCAq+gAwIBAgIUNTLL4GSnWZn9sFxR7fATV2rIQugwDQYJKoZIhvcNAQEL
+  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjQwNDE4MjEw
+  MDAwWhcNMjYwNDA4MjEwMDAwWjAtMSswKQYDVQQDEyJrdWJlcm5ldGVzLWV0Y2Qt
+  Y2FiMjMtcjcyMC0xNC1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+  AQEAp5NM5a2vtmD2jVCW/PevaA+5AugChi7lkXzCWU/IciVVufg+MalAsWjFl2LG
+  Ub0frif6cfhXQas1Zwjxa6mfyo2SIZhG+vnGFloHwK1EjuvDo9ppWXoEUdd982Hl
+  r+MEtBhjw+/2K5NxvyJd9yyy6eL4D1L2LvQxZUMfBzyCPmRlh+C1TdNHeYLUJDQY
+  YBRqpnac7qqAHf38ZGIuv2pkDvgpPuPmpBvc/UiKgfQ1fJJR8bEKoxzBVvI2Xcqx
+  +mciMT+aW/jsxs1uO8KDJPDxeGG4BpDNffY3Mn5tvJxQZeJwhvLyM7xiO7XeJq/W
+  BsppxTrk3Wy0yoyFU9Mvj4MDkwIDAQABo4HsMIHpMA4GA1UdDwEB/wQEAwIFoDAd
+  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
+  HQ4EFgQUfZQMnGSp6bb79IW+Y9Dm9yK8xC8wHwYDVR0jBBgwFoAUYsy4WY1jbZG5
+  IhrfFg/qiQluN5swagYDVR0RBGMwYYINY2FiMjMtcjcyMC0xNIIJbG9jYWxob3N0
+  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
+  BAoXFQ6HBAoXFg6HBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAB5xKl97
+  O3oIrGOUg3RUvgbC88aRF5OAD7KPqgIgAcyhsyphOadNDM3aEDjQmzdEd8YMEfXx
+  Dug8N6REfo2n5NGyeWXLQ+J8qQIaPsoDl7JOYdWNBrR5lVxYFQ+i7tl0a4/EDTmE
+  CVf5xh9v7wqaHSDHnpnDYqFBQv1VeecFAUIJaa+SFRh3yTvwIkNEUrSefX2b2vk0
+  8Zg+nOe+JooKvKOF1IJPigOUuN52Sm6ATLLmk1ipF4Pb89lW+UJ0NX6OyyQRxbnA
+  Y5uFxlVHpGM6FucyvsOMDyIKkNaDhdNsaq7R31BvXRJzpb3rFwyfgb2VpqYkZ15A
+  axgJa2i2kzFoHko=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubernetes-etcd-cab23-r720-14-peer
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAp5NM5a2vtmD2jVCW/PevaA+5AugChi7lkXzCWU/IciVVufg+
+  MalAsWjFl2LGUb0frif6cfhXQas1Zwjxa6mfyo2SIZhG+vnGFloHwK1EjuvDo9pp
+  WXoEUdd982Hlr+MEtBhjw+/2K5NxvyJd9yyy6eL4D1L2LvQxZUMfBzyCPmRlh+C1
+  TdNHeYLUJDQYYBRqpnac7qqAHf38ZGIuv2pkDvgpPuPmpBvc/UiKgfQ1fJJR8bEK
+  oxzBVvI2Xcqx+mciMT+aW/jsxs1uO8KDJPDxeGG4BpDNffY3Mn5tvJxQZeJwhvLy
+  M7xiO7XeJq/WBsppxTrk3Wy0yoyFU9Mvj4MDkwIDAQABAoIBAGGBJuw5TJVNBAij
+  zMbyg4CELX2Qa++RmAg4VIlND+/C44eq9t1Egxz3Polgcs6awbU/E81+156hNRh3
+  rqmbcBuWlmGvzhU4glb9Gae16b9TVWmgq03h3mOUhHe6DcBy0ojL7DjVBiLCzxuM
+  rqokuxG1++pGtnIJqjgmfwZh4dLU/F7JR7TN7dm7F5dmdX4+X4JWs2lD5f8/vY7H
+  mZffhuRlq3BhGZ8ecQKNl4NrqVvwcbYW9qPi0glrk/ulOYl9jQg+lAoe4IfDF50m
+  F4u/+r7g7rRvb6FHHM6KsjsD80xzDrA+qX5uS3CGTdYi41+oegEj9qfNsYrwwxBe
+  xQbdaLkCgYEA3YcgY7Ah0Utqnd1cafhpPyy1mTQYdubal8vkYE+9RDSUNkrqPnnI
+  aHZX6pB1navJxJYRKO0lpBuKVvrtfb7a3Y1Pfxt81VGgQW9VnEcjZx7ZhkwUqTRD
+  S3WaoQ9RkDdUxvVRkwcRFuOHBI0ukox2yjTMPHK45TqbnR5JAFlpSLcCgYEAwabm
+  9SArZgDQPiem5x8NIDuRHBykxWxL2U92bQktFRXcNM+EpK382iddXfpZJcB1Nw3k
+  lMbhPGTPPfLpMxYnbGenmbTcc1vv02+CCZh6NE/83/9qpy4OGdc5ETckgmcobJij
+  AT9Y2T0rlANJ+cuSk5w8CmZPPF/nrtKUWIOoKAUCgYBSaL5H13H9Jg0XhQ2n7l1Y
+  vw0fXR3svZx788GVgpRqFxU7zUquyycelUfHXs4iRZHdq+XeT7o8/nHMQbSvnpxU
+  5wi3xEYAJUl0jjJO3Lfy2KsbJppZB7QxEiLf3478E1laWlBqXaqh1SqZKtw0cESQ
+  nGuN4S+fNtpE7MtDcf+UqQKBgQDAIVW4Eki8lUYGxNSFLnuZZUAdghXAgifm3T4E
+  BDykVOH7y4Aw2yapUrEB0qasG/yvuKr3KTLC9snfDqhsNSi8F0Nj7tth4O9a+aEs
+  4Aku6cVcgE9SuxDmdnB6MhmY/7xNskrXq//82QHpgjHdEirFJRc0wjkPD6AQBYGF
+  KGqn+QKBgFiUWMCWgv3yiALVVpj4nGTWZD9GAJY1CG/U6MrAdOkGQQ6WB2ldvcC+
+  LJ1J3d5IdASKaf+T59YlzH21RUbC8ATs20/cQrm2dXGV2BSTTU0caBdW5Jh77rrK
+  hmJfXoWW0lZJ1oWbigAX+2IU+CgLv5ReY7FFyoN7NTzSOlC0Gax9
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEowIBAAKCAQEArreAPHbkIEUxeiBGn/Vt0BZQj3mHkmToajpPLaS+82cVGIh9
-  9WTT/UZMZZvv99L1D4s28xX97b8eaJa7PJPCoGUeeVKtMix5Dprcrg6FQa1U0pu7
-  vWA70wayqmrx6dwrInzp5ZHgwjmfECLO2qOEh4HNWYdETypjzcugz10UIPmf1PsM
-  1oqS0D/QZMFoogjuIQ3bNDdkgASFujz3hPGJa6Ibuil4FYqkCsKdClUshSKKgZfx
-  7RLXUCHwCckeKnRQ+DnNhOFoEqnMOrsKBxcG60HGniof1IFND1aQWxEpwFatNtAT
-  6O2poBwD6KFd2Qla97PW8NZGWn0dQ3yL+EV56QIDAQABAoIBAHlDJx/QLLkxDQwE
-  RsBSqWrZcgSChtPWcXD5E2dMhrONAhlK8pFU78VD+1YyirTol+m35+WDiABwu3w/
-  0ahTrauBQ0tVVJwUPdkjJrMvpNFWqh6atAzWM+9dILgjDdAQXWfMZtJNEz/6mimq
-  3wLkpuEd+BaBSangc/CrueryYTwYn2T/Vj1GO+c7SSja3vN+6m5to5XXFMMJCIaF
-  q85Thvlv9NIvlCkmMtueH+nrRmLCMiBKjuRoVstITdb8I7iT2M8Jnm+z8w6wDhYx
-  tyNp12xCCsmg+Bf0LpB/TmL3jB61jC8UpTnwcSkgy28/0Wk55f0cjAQqQmh1JO0n
-  Us68cDkCgYEA2WukTVQ6lIbdTmores9NZtT7itciukV3HXrqqPb/NtVZ9o99znvW
-  kydaPkxsjkpy++cfJ0Ms/yhl++rwgGxdvgQ0FB6oUQVQQ5N8J7mXRu8EXb7PfhJR
-  Q2HC70RavM9E9M2IpUhVCeQWA/RGM5fKCX2KoCX+JsPbySBl95UZKWMCgYEAzbgJ
-  xWpEPDXH8k3E1bATTgpeXz9LBI8k2cqPSok5A/q/4ERA8L8vPh3mk82pIZ9v1KXn
-  gEb1xsFXbefKyiILtxpqNhxVxyEkpdP3udpR6PIzzV6pw7xgvZIrJOW8uRDkdEBY
-  xrcTowvUiXAIRUZwuegY7mNujzZTFxfL/CWVV0MCgYAEQnuhmDjdmBbV5nabnVwi
-  26FiAv0HMT04MqROUyiE5oEwt3b7iKmXkHnQJqcp0oOWM90EY+iJxzzYRq4Xlgfw
-  JRzwF/msPLJp4IXaMWSpWx12yLo/+hPlghDTpz8v28+6DBzVQCmKXBGiWjLV5+9p
-  aDBDGvtzvvqbYisdQqqPiQKBgQCFgoxs4AO649iJK+m0GVreCiKnRCeGpPPwmOKY
-  KCilqYX/oaxX0mxxruwnPpEmrhfg9W8iNGtr+6ynOojE2IWr5uvJhGgzHRJwwPmE
-  V+lS+mWeQnKBAu/x+Dwh7SunHAx4Wg6DoOuQpKviKqBjfUzJipUrmcJ2FXalhR8w
-  3J9oiwKBgEfAm/iE/PajRPDMqRCs0kzJan2mfvW1Xw6l+8KgdK5bbEHY13y92TVf
-  cz1+BbVnumc8TYm8xLX0s6oy+Jux5IxaxGiuJiwn4IAedrLb0FDkV/W4OpK+4EXM
-  xSsigupqibDn0pFjUS4pxm1R/xVtIyQVloiKeJwbXkYN9idbkZPC
-  -----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-----
-  MIID1jCCAr6gAwIBAgIUXCCUwxKtjG1P8SU9NfqXNuhgJoEwDQYJKoZIhvcNAQEL
-  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
-  dGNkLXBlZXIwHhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAnMSUwIwYD
-  VQQDExxrdWJlcm5ldGVzLWV0Y2QtZ2VuZXNpcy1wZWVyMIIBIjANBgkqhkiG9w0B
-  AQEFAAOCAQ8AMIIBCgKCAQEArreAPHbkIEUxeiBGn/Vt0BZQj3mHkmToajpPLaS+
-  82cVGIh99WTT/UZMZZvv99L1D4s28xX97b8eaJa7PJPCoGUeeVKtMix5Dprcrg6F
-  Qa1U0pu7vWA70wayqmrx6dwrInzp5ZHgwjmfECLO2qOEh4HNWYdETypjzcugz10U
-  IPmf1PsM1oqS0D/QZMFoogjuIQ3bNDdkgASFujz3hPGJa6Ibuil4FYqkCsKdClUs
-  hSKKgZfx7RLXUCHwCckeKnRQ+DnNhOFoEqnMOrsKBxcG60HGniof1IFND1aQWxEp
-  wFatNtAT6O2poBwD6KFd2Qla97PW8NZGWn0dQ3yL+EV56QIDAQABo4HsMIHpMA4G
-  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
-  VR0TAQH/BAIwADAdBgNVHQ4EFgQUrE+VZW9g+YfGB6axImqsSl/pw9MwHwYDVR0j
-  BBgwFoAUZDZaRSnJLdSUkLXs71Y3Kf9kipQwagYDVR0RBGMwYYINY2FiMjMtcjcy
-  MC0xMYIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3Zj
-  LmNsdXN0ZXIubG9jYWyHBAoXFQuHBAoXFguHBH8AAAGHBApgAAIwDQYJKoZIhvcN
-  AQELBQADggEBAK4eDJKblEy6x3BjlSKqDviYwWHH6Uo5CFQSFVjM+riCRTHuRoIG
-  qifxrMGsFFBTMtyKI04SRQsDKgjd78//GqNR3mYmm6VlrZZSI8F0UTCcZndCLMYd
-  ZMbaewEMfHSmK952Q01Gjx9GyNwCzXK3fgut8nSxVvGiKhDKlDZt1IN3iHzenh0K
-  2KvKcX5eWMymODRBqgQB1H3k8wH/ZzwPE9vHe6zb41IxAiYyXLDl8T0mPp7/wdMH
-  YX6ySt+F5r6POVtL+qFZAC6hIbFahPd6YdTRsHYjsj2dkIsprjvnWkuuRvyNWcdS
-  9a7ZoaB3GuZdfH+QTH0kDAw07JJJm0g9Ytw=
+  MIIDwTCCAqmgAwIBAgIUc1lrgh8Kcbo0pKSJMxFLuXi4w1UwDQYJKoZIhvcNAQEL
+  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjQwNDE4MjEw
+  MDAwWhcNMjYwNDA4MjEwMDAwWjAnMSUwIwYDVQQDExxrdWJlcm5ldGVzLWV0Y2Qt
+  Z2VuZXNpcy1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqPQa
+  J+efpmvZvf1a7GuWFsUGLlXYrmOxtpfgkcVQt0F4+0uBv5tWjvGc4hXBRO4AMpg1
+  WGKC3eQExq7oMTxv2EqBeC5q2ux0TKbUhtjAa5pmorYcSXHbGA3ToIAIDR+v+p3M
+  /DefBQ8BI5AvTxT0JsOufef/0N+gQWqAgLM4yoZc+pKdDDUcXb4/9ZZAKAQyiulU
+  MpoSLYlf6+HK/gSbMVaf8Fwq0klMkijxDaa7eQOsyaWKPaKFnT8ZmLu4NHhOG+13
+  50W+J9TCOiW824tyEFp4Nc5khxgAdhaq5eaFRhQlxrSgZbzcP84JUrkApjwTXcwA
+  t3Q9g2vDmHQ32VwLjQIDAQABo4HsMIHpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
+  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU
+  9V8vssqlsF7+UhDJHKk0Wf0MwsEwHwYDVR0jBBgwFoAUYsy4WY1jbZG5IhrfFg/q
+  iQluN5swagYDVR0RBGMwYYINY2FiMjMtcjcyMC0xMYIJbG9jYWxob3N0gi1rdWJl
+  cm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFQuH
+  BAoXFguHBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBADDKXrqbnDO02mPD
+  PzSJazUlfPCz9eNKu+zsfKVrAOvoenBU66yd5G8oA1IBdL/N6Og7zavXAxQhorRq
+  3+ESsryOpdiVpUreGFdGGmVIISkJfCDIwMo3HaRMVhGqDk4CrYAgZlj+zjvlwHe8
+  iBlU12LlEMgIGpiL6NpIjoruhw5YRN3WHj9MVnKzq94RQaZZCvQDcELbKgikPf/6
+  hTVjDS5AFyC2PP0E4Dnb29avan6HgiM4DH5A2CUPGRboODOwTieZtFApFZGGdFr3
+  VEpFOqbMdgF3AEqY+8v5CE/wectqoseA9YnNj3JKYEXAA6uR7oy9LfsbesGX3LTS
+  NoR4v+M=
   -----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-----
+  MIIEowIBAAKCAQEAqPQaJ+efpmvZvf1a7GuWFsUGLlXYrmOxtpfgkcVQt0F4+0uB
+  v5tWjvGc4hXBRO4AMpg1WGKC3eQExq7oMTxv2EqBeC5q2ux0TKbUhtjAa5pmorYc
+  SXHbGA3ToIAIDR+v+p3M/DefBQ8BI5AvTxT0JsOufef/0N+gQWqAgLM4yoZc+pKd
+  DDUcXb4/9ZZAKAQyiulUMpoSLYlf6+HK/gSbMVaf8Fwq0klMkijxDaa7eQOsyaWK
+  PaKFnT8ZmLu4NHhOG+1350W+J9TCOiW824tyEFp4Nc5khxgAdhaq5eaFRhQlxrSg
+  ZbzcP84JUrkApjwTXcwAt3Q9g2vDmHQ32VwLjQIDAQABAoIBAH5x8gFbgEh0/wkJ
+  zDqUakewPOgAp6IcSqx1DkUKf1YnUfwAjqJwB2ADw34Q+gw0c0FqWMJFN9wJAuoP
+  jQcMTEh7ulnPo3kk7gVP9k7VeW0OqTGtSY5N/8MI1hGQwHXR+Up/PyKkHgcTK68K
+  Ad4VuIQqfzULpJEWTEGpC3NGroIixT0dzAgDLH3S4u0pA1Nq51ngw4Zl7rx6QI5A
+  QNaTZuTW10I8KSaPY90VDOD4dwHtaS5GsFOWsCzg124/YF7qC4kMtp879aGotzwa
+  PUEy/jtCGr57UAIPTNiBoWUW7mGxIoc2hf4iMMmcmWKHRQtYehLrVXwnSGH7yM7X
+  2FDw4aECgYEAxMRw4Se7ojTwAgkgcYRMy8hcCa2LXI+idDcXeJjA9sptLAch5aR1
+  08vvSnYuy/fM8DOi17/gxDr4rBlW8u7dGvg5j1u4lU77l/jYR3Mr6FBUehhaJFIZ
+  A+MdsEb3AK7wVqals/zCqfDzrUNJ9giG+QTHDJIDaOg2uywBq9COH5sCgYEA29A7
+  0ylVKydY8rj/WH3P5auWCAzWUDkZqyZ8KUXiUw/dUosNXazM3KEERxEH/ZBOWpFV
+  q/cvgntytRILITmxhqIiulftwVlLnGNd8dyIy4X7cGU9ugUl/dPo2gRQqeqG9Ikx
+  IqrS89KaitSY9zpim8VDCpJFbGEP+0yAX0+H9/cCgYEAq/AHvwdMMzJU40J8YhU8
+  UfmzSxWlqG0uhKS7UrsQKta5zPYyjYtHFpqmb4eT3tGa9+33BtX5Hx90ulWuH7vP
+  40gya+22/mk0+hgNTWn7XRYMq1/qLMC8cSQdhjKMlcFH7D/UndFpfLw7AhTBZUcQ
+  QjsFgBt69UmswaNzlmI4Pq8CgYAmdDpTCZMNtpd39ucsyu24xxi7FcvUQvj7mQL1
+  kXUzhL36N7tB3P4FxuFhsVgNgtZCP9SV/etAz2nUxXBPArHM1MZwhPth7MYueK+x
+  pRwFRs4i7oMq7MWlrxG4OjMGVrH/S5Td9LZs0zYX/XM5JOylRZAh5E7i0+Qg2VRH
+  2Dj4JwKBgD7sjixFoFbRxYoU8TlvY3NJuL3ON9kZwNTZ3E8/766dSO4G57xfrJzs
+  VXIQ632ZhpvGxqTMMVtuJSSi8QlKyTlKBy2sBSb+8V9pA6kGDbN/6y9hDKsZ6Vwp
+  mMHOldcM7jyjiRR3+Ce/RJbaNeNebwhyeZRhmqy+c5QFQO9FD+gd
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_11_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-11
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubelet-cab23-r720-11
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAyE7lzuBpA7t+TUSrnhQMfwMK63OGypR0kLkvMspMaFTdmZK5
-  vChngqmudffvI1Z2uRKB8zHoUvuKBigB2VXjlE2wGzwRQzYpBBz4vGxTQ+MKzO8i
-  yMdo+mreZvneSJKHD7Jhy7zBhkVb2XExEyhh1dQGtq4comc7Gw7t8q5pJv5xBzMc
-  WYtoyqbrz4VN1YIdNhQD+joJ1IHQIg8cdSmI7eG7csaLDY5GXgn7gYjonpH5h4kD
-  pk/hTIcE6JrticX81zA5Fv06a34fPrP1hpYLAEcxSG0kSNNHequhwwZ2jok2LOS2
-  bv0+DXJ8fUoWWcn9tQd9ALIC/UtD4tSjbEV2awIDAQABAoIBABgmEuSO/3oYt5Bf
-  MAV9y0fguQdLxTtVDHyKJtuLsgx99r1WCBhcEqaZCFRmkKkE+okzZwFHygd/FdPK
-  LPbjuO0fNJUD99zPgcBiMcadlKhBjgLI7bug9tIB4lAt3ZOIPsowqkOivP4QDJO5
-  Zr41hx39UtXhRch6g5CuixdP2ZN+sJbQxCln2KTLbnwrVyQoFIaCCGxbHuUqaMZU
-  gd4mEriM5J/IL70TbFTbeL+vpi6EdhSVff56vyOm3XYKX75kjKJzPLNAAE2tB6MK
-  epd7jivdu8QfCntjeYKupS+yA6vv26V3XDUdoj3tITko9la9o3z3gpeiU2YO1+w4
-  FCbr23ECgYEA93QW+i4ISwGbHI7DigpZbj5RfIoTycXYA2ON79yEeZWPBeZVpiPT
-  5LLV7YodthWvlIJCLZxAXU8/Iu7vWtiXryBsBZ61WwziKf3/RSQsJoXd+Sq0CFqF
-  odscp3Wnew2E5f0GbJkltZsOjLZCWZ9HHS6KxSR7fnabV1dLCgH3lZkCgYEAzzn2
-  nSiQPLUd+jrEtAfWuCaPqWoCDNq/QEtf9PFLs8rGmgz7U55bsVVpds+VxsvNzPYg
-  fK2pVdZmRWq49iut7hlE/XEQpLOu71Iy1n08o7o2Ks3UHKmEeQCHj+s41alGKl1T
-  n3Sk6T4l4koNv2Uiq9Jey0OCh36cjIGwA8mgpqMCgYAHrCHKQAMh0Dru9744WXnM
-  YUJFikJyzx+Te1K7TSsOWgTFOg8Nx66aOLFJXC7vplx7Tk6e+2lDe2GJw77IIk8R
-  rv+qbPFSkWOxyZ5Qln6H8z6eqyRJ3gSmsBSDXLKErjagque4FkeFCfm5gy0rejTK
-  QtcqpabulN7cJmi9NrJmgQKBgQDAOQxCC/Z/2aHNE+aS+RJ8D4kDpYnxUphFk6WX
-  GJ0YUeiXzaL0ldiITqpdw4EzvqlQjp7kCFMjhJWpnq2j7DCSxG3yiobdwK9s39q4
-  i8NMPNcyLWusirKPa6ZUIeW+jB7B/YAsUY8HrNaHahoGiFH5AFNeSWkzNocQ7tvP
-  J6EV8QKBgQCbf37ZKRnV2qsJuyfryL84Dw+BwXrhDm+Y4fXpjn8nA/7N5TU6muMw
-  kLHQ3CJfWxgvd5kh+cYnWUnS7POzND8CrQoDdFOJ3+5Uc0OCzHB+j6H8Pf+40XDJ
-  ga4fQrpWIm3/1jNak6D+Eok8bbP1Cnk2T7kiLVVbeTR0EQJxVkgysQ==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubelet-cab23-r720-11
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDmjCCAoKgAwIBAgIUTP9cAVwvXVXpcK9yDs5UiGx33RMwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMDsxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEiMCAGA1UEAxMZc3lzdGVtOm5vZGU6Y2FiMjMtcjcyMC0xMTCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhO5c7gaQO7fk1Eq54UDH8DCutz
-  hsqUdJC5LzLKTGhU3ZmSubwoZ4KprnX37yNWdrkSgfMx6FL7igYoAdlV45RNsBs8
-  EUM2KQQc+LxsU0PjCszvIsjHaPpq3mb53kiShw+yYcu8wYZFW9lxMRMoYdXUBrau
-  HKJnOxsO7fKuaSb+cQczHFmLaMqm68+FTdWCHTYUA/o6CdSB0CIPHHUpiO3hu3LG
-  iw2ORl4J+4GI6J6R+YeJA6ZP4UyHBOia7YnF/NcwORb9Omt+Hz6z9YaWCwBHMUht
-  JEjTR3qrocMGdo6JNizktm79Pg1yfH1KFlnJ/bUHfQCyAv1LQ+LUo2xFdmsCAwEA
-  AaOBpjCBozAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-  AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFHG9UPcdPLcMxlEO6a3SkwMb
-  7zT/MB8GA1UdIwQYMBaAFBSCPU9mclvFIs6Pca/n2IOKIL4bMCQGA1UdEQQdMBuC
-  DWNhYjIzLXI3MjAtMTGHBAoXFQuHBAoXFgswDQYJKoZIhvcNAQELBQADggEBAAt/
-  4slMqd+21qiBtTaTv15ej0se4dgCdd9IdxswWjy7c4niNaOQkzEwrJLyX6ncCicl
-  NzVZkJopicbtmGYLmhE3AEeW+KGHzeeACwCs6HhjCQ6bwLQBiZIbECSZLVURMmBr
-  KnoGkYEb6G4Y4ZIJyy1FAaCSKa/olNcoNtHT8aM4m7M7c7gB00lgnjwVtEQxW8G3
-  MmS+VOkuJy4rQClHiDnxEorCSuHYCTFyDe1YEMq7JMni9z5NsPr/odsgOouT4Ss6
-  Et5ctjLbrG13/x71oTMh9BnKU/P0uiolQGShmw5tbCohcNtbKAmb7BL28L0OpXA+
-  e79Hwl9YLemNgOYhi6o=
+  MIIDhTCCAm2gAwIBAgIUKyjgaX+dlH1UdmKE7vvC8RK2CMUwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yNjA0
+  MDgyMTAwMDBaMDsxFTATBgNVBAoTDHN5c3RlbTpub2RlczEiMCAGA1UEAxMZc3lz
+  dGVtOm5vZGU6Y2FiMjMtcjcyMC0xMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+  AQoCggEBALTX6KpRNoCDi71HHLlM1Rk89qJMiL9RiyC1otOWJIvuim2I96kO7orE
+  aqjpUYzNOTO5u6wLBoinsHuF9JVFa9UVEQxk9PgeCe0C9Z3NTbQbghuRPDypvgzW
+  RFRBiZan/lXpTmcxzr3HWGWUbqWpJnU5kGkLTXm749W7fE47XjR5DT+kNHLacD87
+  zZXKhXVmNnFIT1eaXyLzSuMB488QgsylpasnzYwVBNxsZnF863zKQLEJ7nUu7Q36
+  1W2NG4QW8gFVoziVj2ROn1oSz9uHDAeWWUak/O8DH03+ApfIU7nW86FEu5yjWr51
+  WAgSM6teqahxL9y6azgTiprPDgsB0mUCAwEAAaOBpjCBozAOBgNVHQ8BAf8EBAMC
+  BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAw
+  HQYDVR0OBBYEFGAOeDBIHjPg8VU9+N6qGlyC9xjvMB8GA1UdIwQYMBaAFIj9pnkQ
+  TF3IngXUyE4LqOC+vOzjMCQGA1UdEQQdMBuCDWNhYjIzLXI3MjAtMTGHBAoXFQuH
+  BAoXFgswDQYJKoZIhvcNAQELBQADggEBAJewg3fpb6H/200wux8+kB7lU1iCqzwj
+  u0yT5bUAFZetKbp/1H8kBK33WFZUBdMoXl8qIt9vAnlb4zknwayKkGPegUQVibEN
+  rITnzjHTJ1TczC7teojzGH8iu7fdIa8GmQO2AInQfUtbgmYNSYjHdW6f4Ykkbri6
+  i0YFLDTWy7EacJJDxgH/jo18W+vNgZDqthlrW/GUPTINtuQvEesiu4yS/etSD2MW
+  mgm2gVtBy5QQueI/5NT1lu4PV9XYCZqbCEk4rYxLgB72MPCk3w45yYEzPQWh/Jdg
+  h+FZFZJ0KjZgWRN/SGfM25SOrAaFsgtyxJvK0PJuzJKur/IKVTrL2DY=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-11
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAtNfoqlE2gIOLvUccuUzVGTz2okyIv1GLILWi05Yki+6KbYj3
+  qQ7uisRqqOlRjM05M7m7rAsGiKewe4X0lUVr1RURDGT0+B4J7QL1nc1NtBuCG5E8
+  PKm+DNZEVEGJlqf+VelOZzHOvcdYZZRupakmdTmQaQtNebvj1bt8TjteNHkNP6Q0
+  ctpwPzvNlcqFdWY2cUhPV5pfIvNK4wHjzxCCzKWlqyfNjBUE3GxmcXzrfMpAsQnu
+  dS7tDfrVbY0bhBbyAVWjOJWPZE6fWhLP24cMB5ZZRqT87wMfTf4Cl8hTudbzoUS7
+  nKNavnVYCBIzq16pqHEv3LprOBOKms8OCwHSZQIDAQABAoIBADTx3UE345/+Y0P3
+  9NXfQ6hO69oaVBLHGddqthACLhL1tHtbFT7ei0H/PUbUgDabwrp9Dw/QbopFpeqU
+  DkZBe893inU5fWrCyJ8mNaiMecpYH2BYxezwuR5jAMA2K8T6zAB0/KpDr8Zp/VxH
+  95jyi7rYLopCb91K/+oMKNlykiMEK7eosl7of56iynsmiTN9NwJ3yJjIFMxI3ZE9
+  KH6zs1ZRihyNa8dn71aciJFmGItyTbF0wEZWx/zu92KJmZIZoszxWObKax1T19A0
+  E+rwjJU5zh4YejKvEbKTWUI+scxfDXRfKCLqFQGTwIspmPXIWeTIB4EDXL8Dz4sL
+  tN2uFeUCgYEA2kAJGjUcMAn1tizji60kgueb7C1jeCTxM9G48mj78+n1sU0ArYYO
+  0jrAG7EcZCT6OG2K+oKoNwL5Fuou9G0hat6i0yJ87/VB+9ejNuhMPuq+hR/kkhJ9
+  yGAhZT5olRXiFOUEck4OgSGQqlJhwWHZhk+AR27aHUiPb9jYUJ6fwusCgYEA1B+H
+  VCb/BV3Q1lAqT1i1es9uF0rrwBgmfXSYiKLn0hc7MJSmOFXsEEEaSLluIBRGjPhV
+  Gfw5sdE4vLfzQ/rbeLfS+72eYZvQRqVhi9xr3hLl2NKREyWDbTBfc71cwWNa0kgB
+  FxJuXylCGaaOnzSzqs+K2S2l12Wg6qWieIFAS+8CgYAGD5kxHSB3RQ+Jy51WF6zX
+  5c6ytF/6yivYoI5eTQQSNgEYt2a5auumcvM60aRUM6KvRnuBkXdSb8azGDXNm+o9
+  qYkkC+UkVM9MSyTBNZpIdQRtdgFG/TR5CBJlWWJWIZFxuxpwgjJs65203SzRzgHY
+  dQS+9xkfjxBMrtzzADS3mQKBgQDOYMZ3l2EyxW3ztRcVD8exbrM7skbgJB7+nDvz
+  ZBuLidKql1WJJf+AaPa7nr2INHHXoZyapY00dcxvv8DMePqi3qZFCt1XNhNTSIA5
+  ZQEFlPlPFL7VFABkcVXM84WVGac5Q5jb67C6oReQgT3to4bSPw5l8kWR5WzEHtaN
+  y6LUvQKBgDXux/CSWCtVjqYLSpMccbK5P2Dc61Gsz+dhTD0KLPgZtSOEWGrTviu9
+  UwajIgeL0Hjv6fKY6dc5bcZG9SQ4nalJTGvOoj/FdfVHF9dd8toCKb4CgDEaLXEW
+  yjyJTi6tt0hKqLxAVNpA+LoPYRku++3Cf+lCoRVUMJUuVeNXD5Np
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_12_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-12
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubelet-cab23-r720-12
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAwnBppWUaejt/Dr2iS/22tFgkLJjNsLVAQxaW6T+SodZXVTVU
-  KyVNG5fnjZo1Vlz2oCkFoy2KWuzOrdsANpxsqaGlfIonPXNYIz7XVXtLH/gNetpk
-  exaRknnUXqXj2kLxdopLWXiuBw675/R0Y/pjM4yRsKz+M0Kc2cQKRTZzNTSZf/HM
-  ikbgqmqhCiOc1+hi4yGi0gzAAVLO3YR8LGw7q4MB+VBvIjtChU3RRMgLzuMams0l
-  2iOs9Uhjk4qL/OrFlW37+UBZmenrK4aZg2ORMfbNkKlP4xrB57M1/bxKKD08XpjW
-  eZVwSBoU7gKg3ksKWSTQazppCTNKnaLBsJn7WwIDAQABAoIBAHZ9jsQOIt6OV1Wi
-  Vr88dBTfCdxrmh2vtuOrZnfqF++r8Tip8QsCBkVkguWWLh7dNCZSGW9hl0jluuXT
-  6gNdvBJ7wZ9tiZA3NGT2LL+ZDSUEQyK06Drie//pYnPzYDFoTkHQ8S4rDtKaNgSa
-  wjsTIVUOutIR+i8+ztseTqvzDK5EuXt3+0f8nm7DILKw688/BstuxZhjcVKkOz4H
-  NKhW1qiYGzyWrIlY/tKDKrRxoQFNHz/vYLZPq4FhHvxp9qdgQ2iqubTqEUsCoHhv
-  npxjIpMypH86q7GrubrmIAn3DwSodiQnsogwSNrOpysR9YrI3zL7lMgY5kbiRZQG
-  YAHUfOECgYEA6VzjncbwR27WnrFLpUG2EJFyggqy0+1hQh21mn2GgKn5rs5wqBJV
-  qOyYQQQkPoTm2LRiDVDBNvStzvnIwtplDTP/lskg3M1PREi4SxqQFpu0hr7DxQ6J
-  GWjaDMsO/CiF8/fJKLw5lEbd77Mg0R3X4IR8zUXGMKdJ7zs+QAxFvvkCgYEA1Uzt
-  tINRBOxxpH5yXc+wNmGy6ofIn6UyD2UXg7qx5LMp5RQrs9UH8X4iOs+AmiG67IAI
-  6sjXLJoUTYR1A3GgvU9uZ9tYvV2zLfzePBO3cs2bd2h1Y15cVNQ6w/IvnMQYFJ5C
-  GrwmBaZLP1VCFbfEpYfSYitT2QEHPLRZr60/nfMCgYB69uRFTf9sVH4ojpmikZaC
-  8nEZDtQeEbYu5YK8zinigC49qy/3j/mtEkZD9A+5FcSiKaKFC6lT8Ofo6PudmQCo
-  TV7/MCntzw1WmM7rXCrSjuc4HSsBGeCqD/LdzN2vhxbWcBmCKnRYqmLlnEjNh+Ep
-  wAYXEA4Xsv6lXV022ICj2QKBgGvBVUSgIknueOq0xmoGBeszKAO7XOrptYR5eYue
-  wUfcCwojSoCq2jxxkDFNqpYy/A+GDvstQybRH/iZNdPrj1yTyB7HfOkNcPuGh26q
-  Nz7UB/om10a/4L0qChX7P3pexhuEZ7jB3CN2gwUXuS7ni3xkRTA62z0Be/p60eQi
-  DcVpAoGBALCH8XgAlIdIBrCwUghOp0fD6qaB3AK2NA126WeWAqY3vJ0hTVb9KJYY
-  iFaUNvHzW8ZJWvCUbmT9N4gToE3a1BxN2UsCc8pGih/iI+OCR5eylaOe9/Hzwhwp
-  xG1AhWquSMQ1MDQR6SYqXHSCnBz9WpelM1w59CqJXX6Xk7faqBS0
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubelet-cab23-r720-12
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDmjCCAoKgAwIBAgIUQQd+KIlfrrYkKgmfkmV7VM+4yyMwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMDsxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEiMCAGA1UEAxMZc3lzdGVtOm5vZGU6Y2FiMjMtcjcyMC0xMjCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJwaaVlGno7fw69okv9trRYJCyY
-  zbC1QEMWluk/kqHWV1U1VCslTRuX542aNVZc9qApBaMtilrszq3bADacbKmhpXyK
-  Jz1zWCM+11V7Sx/4DXraZHsWkZJ51F6l49pC8XaKS1l4rgcOu+f0dGP6YzOMkbCs
-  /jNCnNnECkU2czU0mX/xzIpG4KpqoQojnNfoYuMhotIMwAFSzt2EfCxsO6uDAflQ
-  byI7QoVN0UTIC87jGprNJdojrPVIY5OKi/zqxZVt+/lAWZnp6yuGmYNjkTH2zZCp
-  T+MaweezNf28Sig9PF6Y1nmVcEgaFO4CoN5LClkk0Gs6aQkzSp2iwbCZ+1sCAwEA
-  AaOBpjCBozAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-  AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFgEEPhfk8RmQqr4udNdxJlc
-  J33tMB8GA1UdIwQYMBaAFBSCPU9mclvFIs6Pca/n2IOKIL4bMCQGA1UdEQQdMBuC
-  DWNhYjIzLXI3MjAtMTKHBAoXFQyHBAoXFgwwDQYJKoZIhvcNAQELBQADggEBAAG3
-  yjewP0wk0lwnKG+7ahBM84NXxh3w13aP7lQp058H/Qclq59aa7x/6Au+o6BEr6Gu
-  FTEeVCRApWMtocluMedMmRl2rLYkdngczBGhgC994/JsDckOiNyrplgblb9N61nB
-  HrBy99Y7nNVLA5EOtKom14miw5jjjKpds7AFklkVnopBHYvw5y+n1drRYKqarajN
-  5Dee7cz2/VeRwkfs3a75TMak2QAMvyGMp9KuBd5LgDWZpG5+Fyps+e86Im0AVVxW
-  yQFhLqdtni8zapiilb+qk4ogS/nxANRL9eac5Mwxt9CuiHanI/XVT8x1yc3lBBgd
-  0nij+uyu5OlzUoVpGEA=
+  MIIDhTCCAm2gAwIBAgIUIteLuPQNU+/NhL1s1xF3V3zf58swDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yNjA0
+  MDgyMTAwMDBaMDsxFTATBgNVBAoTDHN5c3RlbTpub2RlczEiMCAGA1UEAxMZc3lz
+  dGVtOm5vZGU6Y2FiMjMtcjcyMC0xMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+  AQoCggEBALsgMyDLMh/veRR3Kv28e8vbZzf5bV89whV446G+HbOVXVBvjAAdR2eL
+  K0dVFK+OuPpR/YHCAA6gi/NVejuRRI3LQELRJW2ejDxleCh5R1bJhWyOA/2bHx+D
+  SdlztgH7tUVFye8/9r+EGUgXFkrWUaoFEyeECc15qbd+9CmzI+vCq2MGJyJ8FUuK
+  krff3OKC8rkcvtb0cptp+4Z0qvWOeWT6omkIzV83zrYn7NW9/zzIywauq7atNuqJ
+  wnDjZXEUhA1FxofT+5FyjdSjjL/P5fiujMsDazjJoetcnkOGyBnh54Gm8ONkEZB2
+  /JJ//9n1LNGxIyYi0sEGHUQZO4ykyXkCAwEAAaOBpjCBozAOBgNVHQ8BAf8EBAMC
+  BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAw
+  HQYDVR0OBBYEFBzsw/WmxM697yY0G3L9I64i5DlHMB8GA1UdIwQYMBaAFIj9pnkQ
+  TF3IngXUyE4LqOC+vOzjMCQGA1UdEQQdMBuCDWNhYjIzLXI3MjAtMTKHBAoXFQyH
+  BAoXFgwwDQYJKoZIhvcNAQELBQADggEBABBFZLOfsOIRAWw5dDXvSOnp5DxJtyKt
+  tR7RkU9E65H9cUrmMKqMuioca4d+LBaUXC3BvwHO4enV+WL4YR1eBa5NCxeZrxrp
+  z+JkBuurjzgAGHwGTZY8Seo7SeKDBte6ofs5F5sa4L5djkU/e/HIKvXea4dEyv9o
+  4HLxa0JlgDNKutPBclrEiJhfSpdOXmBwgmVNa6d8hdD1HnCYVJSgUhsHfw8ZQJgN
+  qqQWT16O7duu/Jwlno4G+jJzuKUgDf/ESYw/bAPAcIYF6v2uHAvqOfM7tjNfhkTd
+  dXg0qdiQ9UMhVZYUvNqXY/8fHhQQQNcQbLWlIIu6ONm6LlaNQlXCuJs=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-12
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAuyAzIMsyH+95FHcq/bx7y9tnN/ltXz3CFXjjob4ds5VdUG+M
+  AB1HZ4srR1UUr464+lH9gcIADqCL81V6O5FEjctAQtElbZ6MPGV4KHlHVsmFbI4D
+  /ZsfH4NJ2XO2Afu1RUXJ7z/2v4QZSBcWStZRqgUTJ4QJzXmpt370KbMj68KrYwYn
+  InwVS4qSt9/c4oLyuRy+1vRym2n7hnSq9Y55ZPqiaQjNXzfOtifs1b3/PMjLBq6r
+  tq026onCcONlcRSEDUXGh9P7kXKN1KOMv8/l+K6MywNrOMmh61yeQ4bIGeHngabw
+  42QRkHb8kn//2fUs0bEjJiLSwQYdRBk7jKTJeQIDAQABAoIBAAhNmXcvDP5Vxe2e
+  jA3OO0AEcEQPkUbUmrQRNSiMIw1A528WRAQNSInTpwv3Pn+7uYGB+dm0HgSIIy2c
+  8VuLSptwFV3hoeOHUXmslvRUzVGQh5cVhh/OrkbbsH8xnzXfUV/NhPRUxkIhPm3w
+  eFDBycXdi8gJF9ZCO8GkpHjlNgbT/Omvbgg0RVKxvRlNhEpqzNELKy1/ER0X5kFb
+  rfKalvFtl6zijAzZ0IGk+KikELqafpbMG0m3pGvNLRQ/eJidH7cCZnK07/qJmlgq
+  fDvS8XmaMshQ9akTqqQOTQvg8BH9LMlLrz+RqxMz+782ntwD+tn52XjPWk6R6qRc
+  5x2RU7ECgYEAwJi0oCqUERMv4gFufZ1i8voeufWmpLmGAWXPIRTqDdbIyRjNvovd
+  2diVG+yodWP6tgoCSx+8GZpR610ADFuzhJDUSwRAhdP2Dh78/SqIF4wxYV1mqTDv
+  eid4SUUZ3R5/BwWt2pXm8vy870M1KBdc7xgRINXiM6deyqWoX7c5TD8CgYEA+Lpx
+  PnYedmbrFSeZX/rnua9/77GRiTPZHklS2UIiswlkz5Z2Ij7wjK6cHvEeksRzIH5f
+  bc9gjVcewuF8GVcTgACoo49AHs9OSrvqfLeCf3+IZ2vf11TaLiDFmXe8gRWvv97h
+  ckZdjANvfhANY603gSmKk9yuNlkEh/E7YW0mXEcCgYA2n1ijEFBcI1/yLkvC7o8w
+  sEVkokn37/IUlWZQUJktAZyChDld8FckQKvRdqY0XP2vAVmzKrXzYPQY15B68MsS
+  Lu02tWcDTaE8UgeYWaatXwJmRdIm7A0PTQBtb16tese2GyM6mkcc5RdEmIAL9cxS
+  tzWsZVy5H5/fw2nkc5eZiwKBgDlM6m3TVG0+hIXZG5JrARtb/QNBSx/qm+hISBfZ
+  DplkXp8cMJbvHQer6jeOoNZ6/3LK6j0n+zxUh7eprqc/0jQ48qDLjaALbiP1aq3U
+  sPGiddAtn+HBoInj7uHOHdU3I8f2FsX2w/JPkE3gcNU3wIO3CD/MJS5MD6kpv95Q
+  APhdAoGBALS4JMug8tN+Zbmf0TGHgjYCjFhdW5XUMvlmW76WLA7qzvCyu3ZSHDDB
+  dmddETkOzZkNl+0+LsmRDYiimDf2DKHQqeeA+cObZrlmKbuQaVbwbjlJmg0BEFD/
+  6Osdug/FNMmu5MT5gjvxoyxHXeavyUu0de5wBA58Icv4KT7ErVQi
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_13_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-13
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubelet-cab23-r720-13
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAwtgKvd0AsiRoTfFSjHGQbEfOwZQnO/0taYFqitnJBf4tzz+c
-  YV/jMgfr6WAs7H08I8/D71Nq8YbIxrTRLl7JRM84vUIB9UDfNa7jHYtsQauoXrDU
-  CEBzvwl5PaEDintM3Y0KHcVLbf1vsyCVWnyiCnc8ZNh4WCHZeFlFxUwfZkXk5Xf9
-  2QYrm+zJlrjCz72vX7mb094bzYJ7mRJz0+Vof6hRMlKiPfUpY5AQnDVWH2ut/G3Y
-  QOt+non0I3TK6SemnpB0TkZFMnFKHIQW77Y4tS/AEx0+GY/mfAHKTvYEV/NZpW7V
-  YUXlKCjar+lApk1v3pGjb0iQzgWTslACa4OhDwIDAQABAoIBAQCma/NY0jCq9+/j
-  SxFQBhvucLMHouyUD56/NBv1dyl9peooz9NZVJZxAFUfI9ebMyiwCeD4RQ7eN1q8
-  ZmsZKTrOPBThikSz33IHn1Y7wP95ZA5OusiQN8TlUkktO58TpFc2ESan4QGZc9P5
-  cwY+oJ+jQs7h8Adyd48RfWbbqzZSmjh3Q55FhpgDjjN073b8mlGQSGdTrkdIdWYd
-  5ttBhjNhR++iFwl33Z5/i9jeJkAQ8nFuPIP/CJZK6Jk1LEmbzp0ZnGbDTYAwPsJN
-  bgIQYL4sfsFlnqg9gJWclCijylBkV0zirFIQs24XnLLI2UrbODS4nH/aZc+lEdMm
-  9OrVGNphAoGBANSONwCmdvwjOBDnOrBAQRzhchMZhuNhvm1teshKxwTA2+sgrW8c
-  PsixJrJ83PiohK+Bhvjm9DwOPrc5BoS6qOYcUD4WtgYfMml2r1kZo4CeEiDiIj4R
-  AevSY+dnsNvmWe8fR5t6n90MdtGD11wzlz0KDG8Tmo7xIZgfzD0PrzBfAoGBAOqr
-  FQqso8kkoRjpbpsef0GJ1hl9r842MOW9qfxFYs1avyskSaFj1mOjBVV16taGCHbg
-  4LAz4/II2x0YgSrfvLiBJXhOqE8S4nLQevJtb85l1hwKd+lYMenT1YBW+AO9bkG8
-  HgfLtHdKJu2ASqOqNDUH33vqyNtiM0c77ryqL41RAoGAa3QVtDtzTVXUox7yGWXy
-  RNJn4+X0vgCMzy8YcibzY6DHzJ7xbok96CE+ad8bqo0uvrbhb/T5pV6iL+ghNnpS
-  pjnMCwdaL9AXoR9B1+5RLNU8XulS3EOmz/vFS5es3g4eivcqMRyVsp75dkOLXO4r
-  18y7qm+jo/2cuRXiH0BNlUsCgYAdOcVbGPkk+dzeX2QZCYlLvkDd19tnUTRxyFc9
-  Rd7yOFUKqHBLG0X+DrWBWTgwE21GcOdKyoue/x9a1kxv7IFycRMbkqA/iNiO+Av3
-  2U1NZT1vLJaWhxdgSbOTUkF9JcBvi2AqFGKbYK7McWfaTj5GRH6+zhTJzccZHguz
-  j3ZwoQKBgGrlqDD5Fd1a6oWPuLdHIaA2wQ2CjZ2KtZJNJHiLPBrMtPW/zUthU2sK
-  WkX/qt4ICETntX5oEgi/d04E0uX9nju2GbFBunSo19iGcDnRqDUxFgsLI2uyNP7m
-  17WUdB5ea8M8pQI6pa8hGlFwTFTue6vZciJIxV79faaJOgAE1w6k
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubelet-cab23-r720-13
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDmjCCAoKgAwIBAgIUavL0cfkhea0R5xFIIM99AP7L4zQwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMDsxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEiMCAGA1UEAxMZc3lzdGVtOm5vZGU6Y2FiMjMtcjcyMC0xMzCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLYCr3dALIkaE3xUoxxkGxHzsGU
-  Jzv9LWmBaorZyQX+Lc8/nGFf4zIH6+lgLOx9PCPPw+9TavGGyMa00S5eyUTPOL1C
-  AfVA3zWu4x2LbEGrqF6w1AhAc78JeT2hA4p7TN2NCh3FS239b7MglVp8ogp3PGTY
-  eFgh2XhZRcVMH2ZF5OV3/dkGK5vsyZa4ws+9r1+5m9PeG82Ce5kSc9PlaH+oUTJS
-  oj31KWOQEJw1Vh9rrfxt2EDrfp6J9CN0yuknpp6QdE5GRTJxShyEFu+2OLUvwBMd
-  PhmP5nwByk72BFfzWaVu1WFF5Sgo2q/pQKZNb96Ro29IkM4Fk7JQAmuDoQ8CAwEA
-  AaOBpjCBozAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-  AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFdFJlf3njTgCalXrF60POzy
-  /XDGMB8GA1UdIwQYMBaAFBSCPU9mclvFIs6Pca/n2IOKIL4bMCQGA1UdEQQdMBuC
-  DWNhYjIzLXI3MjAtMTOHBAoXFQ2HBAoXFg0wDQYJKoZIhvcNAQELBQADggEBANSc
-  umifb7RcL5RA7Y8H9oplj+SvaW0L97HxUKjzyhwbnugi5Wj3u54FbRBbRJ32VDhx
-  VNjr3/kQx4j2YXZlRWk1Uor/TgOSrZl2ctU2R3kevLYJ1Woz1k/fiyK/SgtHCuCd
-  tjTmyqUtkmFHS6Yg//RDDMtERJEmdUxU7+6NNx8HbFv7iI1MQSc6MiNYG7gp940p
-  P2GMg+b5E0jDP6UdPwzTA9h/aAtBufuooSdQLRW9UxMdknGYBKEaRA7+9Ov5xOY0
-  IGcE1p36Bf/yA/RGQni418JGFNvt9tz+q/ElVkCab4/ZhpwTatiAm7oCYnwaIYMy
-  znxsuaN1nBImgmvunro=
+  MIIDhTCCAm2gAwIBAgIUOmB5vSHD4CjZMJnUd5Fghl1XBEgwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yNjA0
+  MDgyMTAwMDBaMDsxFTATBgNVBAoTDHN5c3RlbTpub2RlczEiMCAGA1UEAxMZc3lz
+  dGVtOm5vZGU6Y2FiMjMtcjcyMC0xMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+  AQoCggEBAKnfsltrhnVvmxGrBheJ5T7kAetthILTlPXEqso3VnEvRCWBlO0Tcvl2
+  H5W9PPzP2NQp8ctUbBTBMXcA7+krZLs8tov3XcktSaKvEybi/FJDR3kx9RlVzeFh
+  UPULd1/zdw4v6GjOhZeW1MKffB7j5YyrgMHErvKcVZugf+TGAVOTUJ4cm/fyVAJy
+  h1NViW+C8kniG4T1Mi+g2YomP4oN0hqGvuLigwn+2VeZYP67p/omOoY4L//wU0Gb
+  ZXSoK0+l5IxyLUPdISoU/5IW28oLuT+JHuHZlGdqwqkhcFXJXpsXha7yNGHZHpKC
+  CNL763ywkv62wg2yN371XNFKmLvrVr0CAwEAAaOBpjCBozAOBgNVHQ8BAf8EBAMC
+  BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAw
+  HQYDVR0OBBYEFI0fXf5GP9X1FDw/yiGvpjU2fOlMMB8GA1UdIwQYMBaAFIj9pnkQ
+  TF3IngXUyE4LqOC+vOzjMCQGA1UdEQQdMBuCDWNhYjIzLXI3MjAtMTOHBAoXFQ2H
+  BAoXFg0wDQYJKoZIhvcNAQELBQADggEBAG3nQvo4sxcmU/t5YLDuV7H7+FY8mcf4
+  0A+7BjKrtDIFUP3tN4m6DOFD196GqkrOafrh8QFGURLTuwNFwPH/j+0tvRaUinMi
+  6AkwENYCSlrQpvr03sUibn8NxhpJb487wamAyMVqO2wyC7iXHbnawDl/ReEdzaG3
+  sIxOsUPj8DmsUohmR5Gxht/Lmn406DIaSpzwJ2lVrnMODrCKSTicN7mLcs+AwIat
+  Ikb02RlnT4ga69XdI9dnJggCfNJClDdLdML9UVpRhBnccCkrTneO/Yos/Thl1LE1
+  Qzm+y6bIjArkCxzoG2CN8s/oOy+QbnE3YkNCc46faZT6LA7iLAqNwJM=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-13
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAqd+yW2uGdW+bEasGF4nlPuQB622EgtOU9cSqyjdWcS9EJYGU
+  7RNy+XYflb08/M/Y1Cnxy1RsFMExdwDv6Stkuzy2i/ddyS1Joq8TJuL8UkNHeTH1
+  GVXN4WFQ9Qt3X/N3Di/oaM6Fl5bUwp98HuPljKuAwcSu8pxVm6B/5MYBU5NQnhyb
+  9/JUAnKHU1WJb4LySeIbhPUyL6DZiiY/ig3SGoa+4uKDCf7ZV5lg/run+iY6hjgv
+  //BTQZtldKgrT6XkjHItQ90hKhT/khbbygu5P4ke4dmUZ2rCqSFwVclemxeFrvI0
+  YdkekoII0vvrfLCS/rbCDbI3fvVc0UqYu+tWvQIDAQABAoIBAG8U10WOp2sNowJH
+  qoEj6+NXJ6YyhE8kWijoBKKc0wrKVK6N8LuiVzGnO3ooN8Q9idUa5IEIYHCl8FmY
+  JEl91a3WQqx+Ajb2RUt7XnO0RDjqw8cNku+RO0Kg51aFu/bjdruxOjGmspbwy4nE
+  zl5IuidlUpniql/9OMG+j0Mi82UZRAeE5nN2BDJyVXcZp2gtIWH4aPVGnjEKUFWk
+  9KXlK357PRGH4Aw2zrzx8M0+xx/jDl+D2wm+8yv941RM1hV26juuhrx72irNuLyw
+  BrIStfoqYqCEuTdCa6e/Kdl2g6LSfsnOEHyxfyS8Y4ZZ4HEtLfhlPmFKLiVf690V
+  GJSFUAECgYEAz6muI3JqFs6N0PpLsvNHoHnc/HN+5MAKwjVaB4y5fzSZ2wgHPVz+
+  4QBzhsLgPbSSIuC+eMgSJWWJLDqYVLgQ552Z4+ecbsJ09ogcUBvfjYNxfsfy36V9
+  IzaoaMjbolwy07HC/VII3sNS8R9EDuGfq1R9uc3o7eUdv6NIV26mdAECgYEA0Wo5
+  2u9exaxtGlBettHwLIZJ6H0v6ZIcYdKbTguMN35Csq/0SUoPOh4YeqF1ieFaEB2/
+  SAP2i8udDIBH6pob3MwZAiSFbPUX5iN5vvCDZcNp7mwK4kz0aM4rSoLcZK6ipCPs
+  oBFWO5o8iaUG0ou6XrpZrfFNJZg0fx7Rb0Jfsr0CgYBfICYx/KZWXjYehZmJluG3
+  xDsTtcBp/wKupgvgq3kJqUnVSN8wH9ptrWw+TiS0f3P14CfAYj3VvaZRiWHgZRTx
+  VIN7H8zL++3iRMVbePk19QFXhzZddoxVRiNtJJ1fyYZK7QIaUqrXiHgFFkJx4q7m
+  p+ST6ZwK5cpzz9NCoeBEAQKBgQDDvsJjljoFFd5JqXRO+T/BrqipC1NcxXmIKr+G
+  nR6sxHV95yC13OcM0RLalc9zWVTBGb0xiJrNIz8ib0pJzVFb+t8pdI/PP+3d7a0g
+  QFriJV4AQbeOvpX63TP0CwwNhHt8aCQHnwz2233Yv4v4BCnp39Bx2crd6D6x0FG9
+  6NHhFQKBgQC6pGvXX//1hy5HH/QLLBL4qh3toYk674PKP/YjRyOrEAXqb8KOPAVI
+  2apolLq0AjukoXeZqAiLJfTMbn17GaXeHF4s0Wsf+pHRiT1sLs1QanK82X/grwaw
+  UQnqOP2OZ00btSIguMQotfu7mEBh1V33eXpFMzFOc2+5snpLKdlJdg==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_14_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-14
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubelet-cab23-r720-14
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEA0q6biMioi3d7IKtSe6pe9bN3d00GKTpdpsdPTLTML46Ylm09
-  4IK08DNWtdAHVxJd1IO0tY5BAGKn7KaVo3nfOwlhyWyA0RlKl2G3U1P5P+D1cu+r
-  deh3QFRqBHbNOXDRDxOoegLr5NVu9d11RuaSVo92kz2NqdAMhauatixZ9jwvBdhv
-  sCIO36dgVzu/XNaHggkppTnNT10pcVmoyE8Phx9U6+mJEO0csUCm1KcaGOOL7ABk
-  qXCi6PUdpzyCoJZrkyYp4IUTjPvoBWks73v8JGnBc63sxrIyHk+VmNZWEorq3l+1
-  rgwVetOFDxlBNsvjVRXlEmVtqlztqw3Ed3k7mwIDAQABAoIBAQCDUumKWqGMxb5P
-  P9tbUHh+qQ6Xo8BqZIJJ2kTY6H26SyVb5t5CGtdUPnwXOoPIx58LP8mdvf1Qky5f
-  OfteejImp5N3rZWiQSSYtgVDAL4GDmCQ80oqZewngjbPb4o++s6lmjhTTYzjCBNx
-  WEipGEIxiJ197Eloh1G25J+8XGr7K6j/BRxmKxhaSvWNB4gMcKe3dash+/BlvXB6
-  mJBU8JtZ3SzmrGtkJ1VU4sZdy+Kc5bBm9irJ42kRHhy+Gv6vI5mZyoZ5ix11kXZc
-  i/djuFs6gNbWKGk8axvz6SpyZTOOCav96pdXdl9xExc7X7XYQTyrXqjJu0JPWR76
-  i8O7hevhAoGBAO17WzdSKzUpkeRoK9O1i21XekEPYcZ1Laa4ZW+9boMAu3CC7+vS
-  oC7UFyd2qL3x8AiQ7BfDZo73l+HY5pIvUlqktB2i4FVeDr8Mzkdx44GiOjNklWvt
-  BqOwGdAqEV00eG/QlL9RRSvuerAY7t6Qs4qVOIdzuD1btAUCuFWBQVURAoGBAOMc
-  RSmBy0TJm+LyDqEMg7uyBCxS8laRAR33dSKUXlAi5auY6cJWp4+hajl1dFcSPOtI
-  1va2b7rdb17JBFX8oPPTl41df+auOM43kHZ8Ewx93IAiahFiztREJ1Sfa3phHpgP
-  AtwHjU9Cha/UIBZ73Qur/Biz5sXexzMroOOFKdXrAoGBAMH67Ps3Jwv5tK25WXNI
-  62aY+ceC5P7SYEO6g0DOnyJqyrCQg6FBHo6ht3gIuLTOlp6oofCXL4LAQ1O7dDsc
-  ZEyeFHHQxSV1+t2bfDNnl8of1SJ9mn/Z0H6MLcmXUy+q2GWdHqNXowTLe3O0Kgmq
-  cL1WPiKGJ4wXB+i/3Aob1l3BAoGAOdgVdYDteNOwtJjaSQKa+s9YaMGnn4zHMA66
-  8te/PcHlpVMJFspjWx3NpFzaCONISNUAi03kH0APAaFJTW1OwUt/Ki5KSULOjRdx
-  3/uyDlhwNOKPCWaVL1M8gT0pbr4VwLzyCYCS6UEUM7hfg9qAblyblN8dRAB90/ak
-  v85G3YkCgYBvpp/NfcEV04THRVpkgJr6Pn2KHWUJLYtfDZxL+2h5QIcdaawKV8ht
-  DtZilFnemJ+DhpdTcDlSG2qkBECRXv/potTYaRsTsnVjmod/2eC9oc7TmKJeQybz
-  yU4vyiLBSIYAYoLKME9QGDcGCFUwNVFH05sdp/ecu1pq/RT628mRpg==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubelet-cab23-r720-14
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDmjCCAoKgAwIBAgIUHCuDsmsptn/usUku92PWyy/tnvkwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMDsxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEiMCAGA1UEAxMZc3lzdGVtOm5vZGU6Y2FiMjMtcjcyMC0xNDCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANKum4jIqIt3eyCrUnuqXvWzd3dN
-  Bik6XabHT0y0zC+OmJZtPeCCtPAzVrXQB1cSXdSDtLWOQQBip+ymlaN53zsJYcls
-  gNEZSpdht1NT+T/g9XLvq3Xod0BUagR2zTlw0Q8TqHoC6+TVbvXddUbmklaPdpM9
-  janQDIWrmrYsWfY8LwXYb7AiDt+nYFc7v1zWh4IJKaU5zU9dKXFZqMhPD4cfVOvp
-  iRDtHLFAptSnGhjji+wAZKlwouj1Hac8gqCWa5MmKeCFE4z76AVpLO97/CRpwXOt
-  7MayMh5PlZjWVhKK6t5fta4MFXrThQ8ZQTbL41UV5RJlbapc7asNxHd5O5sCAwEA
-  AaOBpjCBozAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-  AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFGkZnvWtiPP1mt3ZbHBlkbXC
-  zijmMB8GA1UdIwQYMBaAFBSCPU9mclvFIs6Pca/n2IOKIL4bMCQGA1UdEQQdMBuC
-  DWNhYjIzLXI3MjAtMTSHBAoXFQ6HBAoXFg4wDQYJKoZIhvcNAQELBQADggEBAIWW
-  Sv2zULW/L2vhu1AJDnItxs3ZqcHBOO+XGchrBIiKLBa0uPZj/o3YtpThQz5FmpjE
-  hzTrm0y/BgEuB1Yfw+YEumImuonTLhabWsehLYTPWdf9xI3wUGKo/0zGkPfBSH1A
-  uzr1Vuo31k1CcwgJoj/K5oX2zn5RqcXJ4eroZjn8XAXgq1qBsxHrKwfQOzobG5qv
-  7KWwo4CWxKVTa/BO6g0xykTE15RjpJ9zpKSg0HIbEOk+796SJEvr4cmZmCE1rgjp
-  nFKTWxsR3nGvARF9Al7nrbVUVcVswfarSfOpEaWs+67qannDXxwE74uP8cx/q4SV
-  HHXPDepHqOPnW+ifAE8=
+  MIIDhTCCAm2gAwIBAgIULnxXbh+veHHTQ9CRSuccmDRVVPgwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yNjA0
+  MDgyMTAwMDBaMDsxFTATBgNVBAoTDHN5c3RlbTpub2RlczEiMCAGA1UEAxMZc3lz
+  dGVtOm5vZGU6Y2FiMjMtcjcyMC0xNDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+  AQoCggEBALEZQKQ3ZfYrysV9T/ke2w9T7G22i02OueABn2HuhmL3J46wS68WRYzW
+  pjXmOPyfmmXAiuz2TbUR9UWfWT/QCTcgSEXBeaAhFG5qfPl4Yw57B7z6679nKMBF
+  Sbk/8gr2fvPCZcdOXHS4f+7rK5m2cgOcH0GB4v8AEZMos32+42csm9RbqJS1Y5oO
+  G10AjVMv85QGno4p5eiEsS18bF5KvScfopE9BPbgRJ5QTrJO9iNgtikwvlSS5irk
+  IiW+vz+MOK+bb62FjdvZNK39heruTgSAEOewV1/zXpHAENOhDbPIgERjddgvAnwh
+  Wp3929C4WaAgF2aP75ZETl+ugJya2nMCAwEAAaOBpjCBozAOBgNVHQ8BAf8EBAMC
+  BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAw
+  HQYDVR0OBBYEFE8rZ1tBhCxmvPcGdS/mXm/xVRL/MB8GA1UdIwQYMBaAFIj9pnkQ
+  TF3IngXUyE4LqOC+vOzjMCQGA1UdEQQdMBuCDWNhYjIzLXI3MjAtMTSHBAoXFQ6H
+  BAoXFg4wDQYJKoZIhvcNAQELBQADggEBAEoYNcLctDm4bPFP2jrKjPKnSvcnv0+i
+  lB6R5TnlyTGrh2JLS5g5UXtZpaq7OP93dAE/v6pocilmlIICI573lGbFvd4rBIk2
+  NEN2E0+389K+3WP3bpih1J6+R+XCpNABmd9pM01Ql1SRXJ+Yc6dJJA7lRm+h8glu
+  heVQ0aWT6+chyfQc838VRhrprtI1Re9LOAZOjEko/dGOUT+6ZvPFs2823xtIvOP+
+  vz7/u8QKZ57xmBoJaMKAMpXsmMjZwLrcOrsNTYOy/lKZGt1AHGOw9T1X+cOuSgSL
+  PQpMCaprFlyEMfuGFYtX986HPkEMr3JpUv9U7lVET7AB+Gjl/fOMCVI=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-14
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEpAIBAAKCAQEAsRlApDdl9ivKxX1P+R7bD1PsbbaLTY654AGfYe6GYvcnjrBL
+  rxZFjNamNeY4/J+aZcCK7PZNtRH1RZ9ZP9AJNyBIRcF5oCEUbmp8+XhjDnsHvPrr
+  v2cowEVJuT/yCvZ+88Jlx05cdLh/7usrmbZyA5wfQYHi/wARkyizfb7jZyyb1Fuo
+  lLVjmg4bXQCNUy/zlAaejinl6ISxLXxsXkq9Jx+ikT0E9uBEnlBOsk72I2C2KTC+
+  VJLmKuQiJb6/P4w4r5tvrYWN29k0rf2F6u5OBIAQ57BXX/NekcAQ06ENs8iARGN1
+  2C8CfCFanf3b0LhZoCAXZo/vlkROX66AnJracwIDAQABAoIBAQCWjpRQxzPsYvBg
+  kpcBf8TVtBAkeXLV/Ydxs49u7xvaWKmNebzt3W5FPFpTKiS6R2k4Jcc1inMng1vT
+  05NJV6/t6IjonIGsq1K2R9t1Lm5v6hH7DAqNTsLrKjxxu7YmscXdrx9dn/Wj2RIR
+  6GXJqLwm63v68dQr20AVrh1hwn2KwIuQzTYchBOfSypj/XHJudPS/vy05lKYV0fD
+  wrMLQix5V8h1A1n/7iEL0xxd7HO64DykkVpX7ykqSgDalpBETozQNI3gTRYewkT3
+  OhfR7w/HaCyGHE8ir9L7yyTvjjifMoc7RxVhGMDDCcWtTVHJIn4J9pRv+KWn2K/K
+  iTpLyb6pAoGBAOaDoumMegl0qrV4cOpHdZiedkdkNjcyE6SBAk+fWvFmCPh6tj/p
+  w6s39Gy2RrHKOLAVm3wsJG108VIb/14Z2srBdTkv+rce6xJjKYhOd4pNUiGbu6kW
+  a5uoX5mMKfAr9GVFizScJl5jwJmm8WVJgTQvIoCjb/pKU18epJhCoMY1AoGBAMSt
+  xIS+XWF0ZtKWRVSicbVzRjDVn4a1CUG9MgVEPF6kuTwBo6lvYo4rmrTtd7KHxoT4
+  61s/tzmvq9OkbOmWEbtGoBN7sgV9rkpQwCLiWgCXDqwF0kKLIXISfsZJ0S6biiLc
+  2dK/LtHoDnK87c0pSqQo3Or/Eq5PIgqAEfxvcZMHAoGBAJKgUwVKBOp02o1aEkED
+  uWqeCVB6Dv5nDRWLtkOdcsSwia48qCbZdEw56HEqNKesoQhohiGjFnzFcScwhex+
+  d6yXCBCbU1geA5sLloSMnP9NFZwpKmJwz3wQytap0Jdj7i5o4RZS6RkLTJywE0bB
+  Tb066jB3RagolQWhQUNUxl2tAoGAIXJPjid1Z+JMrhlB9w+c+Ld+w0VA2L6msVhE
+  TmL5RTsMCSlaNLEteHHv4D7V8TVnzCsskxr1xMicFuTKZLrRjyCGjmmlr4tc/WRY
+  GFaX6avGofhndkuEx4pfpsbc3Ok0h5M5M76xbp7g/iAk7JPODraoQwpXme75IgH/
+  jQdCsDcCgYAVy6udsds2gNY4ejaWzlO8rRtPg3Pocr/DTId809zjW6yyv1IETHSD
+  kbYiybSgWTfYp153c04ikHliYEeLqAXCYa1j1xO0CnLoReOouMpQfvTszV+vCNOg
+  fvZQnvqKEiwbT2rnxR1TTFM2pKh5LvZKsfrcX8yb4z1khLXY02plZA==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_16_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-16
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubelet-cab23-r720-16
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpgIBAAKCAQEAwuEo03nCEy5oL+A/+r9dn2SNlrgJP9O0C/ituXNc82J6pcE9
-  iCFzePIe3BH+bD25pgJHwLitthetIaTzg2fuynWBfi+Nv9eYJV4Q4Q+ooX+zxe/n
-  +QjtnjurtdyQO4a7lfj0qzT9/LEZISz333yAN9UhItVrAPSlonsStOREdgTSdMmR
-  liIheDzCMYPE0IQlU8pzEMlBtW7oVcN/XOsNs+KYlF+Bwbo5Va2rhoOvP46THY7Z
-  eL+5oof+fftQAfWjBd4TuJdRbO1RBskWZiegSgh89wnCdr0dlXB6kC7qlC5240/e
-  UeXYSDS7WNYE2wp7PIuJdQNbDylvZFnbirVzuQIDAQABAoIBAQCkw1sSGQJl1zmN
-  KMrPBFZyecBf6m8fgKzb5j9y6L9woxVQ6OVOIAISAprms2vpNfKtEYZ6wWlU6AWf
-  yWd89TVmBR0bg7cTuILRLQuWTPfkuyRSOHhnDA5iVs7hbn6fZVVaAedSjPYkW9ME
-  QpG7aPa6vb5LRic24qDbk7SILepX4FdTCVWvBE7Mc7OscGiZGrvnOl+IEeZGNAdh
-  PX1n4jFfzLPdtZH472es8SD9P/fTEcjEFgU2AEJZJ4kLSL7VwucfAlvgi9XGZ/Aa
-  sy7n/dvA/4SjJv1bhruegvykBfyGeCURr/GgocG4aJLlEntoJujvkheE/lE6Zhsh
-  8L+tWZE1AoGBAO5+OMmBd4SYh7eV2nWIro/4SbcScnNGz5i9C5UHEBX5cRRDdZa7
-  kVoh+LDHWWIfaw4Ao9DBXaO+KWqu+eLunaxNtXhv8JXPw+zPQM3ZI0Vbvuedqkvf
-  4p/hU6iVJzyHFKX0QRgyGVytUK23MuU5I2hJqML7SX0cmOf8buyB91SfAoGBANEv
-  WWfAt7nJwR43KaPN+H+G9+PeSW8YFIW8E8tIB2rV8BRHe19Opz2NyaQq0zcKdm9D
-  wtGNGzNzOxa7UeZj3r1jSvQd2Ln3z6RXmYl5EXDUxzLhbOC+tPEsv1zEMKm9CgRp
-  qLGsL58G+pDm3UaRhclLz3shCtNU5ivAG8CdWsCnAoGBAI7o1dBxoxOybsjko/aA
-  A9JDfrCT/j7zdJxa06DmjY4NXeQ9lC3RkYTIDISpv/bbSsQmQANsi1b+MUU7OoPw
-  Zk0Ed7SGp0yuJgI2Iuf2sHr0Qg36XTyAGQWi+QVw8wUDEK1tEsCT7LyrIkgmGfpf
-  ZcctNFI6T8wHodyJWFKignmTAoGBAKlU1d+p3k+zpPNLnhZuNfktjV7U4sbeTEaR
-  n8hPT0nJUqVn09OrvK+UJiURUZbdjk+1H3A39EvqvGtDSSHhuD3Asbz4qCaqFlin
-  XK8u5NJcO7/RQSyQ07HjEikK24WbdA9sZFUm2Am4QX6ok3h7djwjdRnr/nJh6EyE
-  HzMFbaBDAoGBAIlEYmUMZkD0f/tEoNAG68QF0922VHjIP1DRTLTh8kTEKpu0aglL
-  TA9n8v8f5Ljv65ZyTDpSR2j49OwAg9UzMHruucMRCpC3LbqwKhxQhteZtH1b7UMh
-  NVmzzTFO1XNNEJF5QayLKYfwI97T7tHep0/mAfvGd/gd+7xw8uvi6Rm6
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubelet-cab23-r720-16
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDmjCCAoKgAwIBAgIUEOgg06gJTvl1lHg2VQtKM15uOyAwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMDsxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEiMCAGA1UEAxMZc3lzdGVtOm5vZGU6Y2FiMjMtcjcyMC0xNjCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLhKNN5whMuaC/gP/q/XZ9kjZa4
-  CT/TtAv4rblzXPNieqXBPYghc3jyHtwR/mw9uaYCR8C4rbYXrSGk84Nn7sp1gX4v
-  jb/XmCVeEOEPqKF/s8Xv5/kI7Z47q7XckDuGu5X49Ks0/fyxGSEs9998gDfVISLV
-  awD0paJ7ErTkRHYE0nTJkZYiIXg8wjGDxNCEJVPKcxDJQbVu6FXDf1zrDbPimJRf
-  gcG6OVWtq4aDrz+Okx2O2Xi/uaKH/n37UAH1owXeE7iXUWztUQbJFmYnoEoIfPcJ
-  wna9HZVwepAu6pQuduNP3lHl2Eg0u1jWBNsKezyLiXUDWw8pb2RZ24q1c7kCAwEA
-  AaOBpjCBozAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-  AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFK/cvFtJDY4rp3jaWrMsrFA9
-  ZQg5MB8GA1UdIwQYMBaAFBSCPU9mclvFIs6Pca/n2IOKIL4bMCQGA1UdEQQdMBuC
-  DWNhYjIzLXI3MjAtMTaHBAoXFRCHBAoXFhAwDQYJKoZIhvcNAQELBQADggEBAPEy
-  nMnh7f2Dy1yaNmUlmH1vnH/iSBPcSr+KEZ5o1FJCKoNT1p57iiAqpu4sFxsIKsaR
-  h/p4p30lvq/tUHTRmmABmwoRS+6xSJzHPsLG1NU4ko7JhKZTg5Vlq7MGAzWrKa1z
-  Xhte9dH92egGjrY1AT6HOR3kT2Mo9Mvsw93oQXrlsBPcUjqTAdOInjuDI3YYWzaq
-  fO4vHkR4D4fnUMVQhimm7SjC1OlGRDSh4TiMgGPqo73R0FtRuuvD63mnDLScu2U4
-  gnmVJTXJ0SDj4opnIkScSGr7djCrQEkafu9X2JayKSkUxGrE1w5eRp/pjJ2RkU2E
-  49MivV1+GjaAA8FNLZQ=
+  MIIDhTCCAm2gAwIBAgIUfTqefFbxKLH4JTkk+/Vu1DrAGb0wDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yNjA0
+  MDgyMTAwMDBaMDsxFTATBgNVBAoTDHN5c3RlbTpub2RlczEiMCAGA1UEAxMZc3lz
+  dGVtOm5vZGU6Y2FiMjMtcjcyMC0xNjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+  AQoCggEBAMKG3c2IO8zWRFdeWVY+FUEYuYkqx4cyv+4EJdsudPL0Mruh5oFCcFUA
+  kCuoxW+dVJ3dWzk9920A33f/NjoZORIEmyrJtzztOe18/pZ3wqvBl2wCazj/ajO4
+  b+kk8YRaoz9mcuvinEl3/NfaydTVCHznabo9VtAPlZwPUXUFe5s03nETTanjuwvq
+  m3b2NKJlxHYu9YsbbO3yRKbxHHdcbNXZizu8akdxesGEhzPSDo38YifEuJGCK6MX
+  +krq4oSH5VgXkL3q38SnGs+g5ZNyMv9IwJQUIX2UjGcovCfP/nqcW5sALrOjbqKQ
+  RplTEWKbeDB/VtHl3mVbynqsXJnFq3cCAwEAAaOBpjCBozAOBgNVHQ8BAf8EBAMC
+  BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAw
+  HQYDVR0OBBYEFIe/PAXfDRYafEKjJR4BCBtnJJjHMB8GA1UdIwQYMBaAFIj9pnkQ
+  TF3IngXUyE4LqOC+vOzjMCQGA1UdEQQdMBuCDWNhYjIzLXI3MjAtMTaHBAoXFRCH
+  BAoXFhAwDQYJKoZIhvcNAQELBQADggEBAI1tV1mzhyNwZVb6kCFwMRy/OJC03O5D
+  34P/4SEIoOYJhhNSKlpZLvc0TVbgVa5Qund4gPrRnxHRHkK5qbsFuCeTlRJJMN1C
+  39A3NzklD6SxZoOZIas1dysNVyheYSxDXPo+8qR6eyr/tlcdN7hJRm5bxr1DQGKS
+  vEN6aaa8OmHZ8lNNc+DRZPAo54gpAuln4dbeOcVacX5+Wj8jxEpVtUG+fTVQXBOc
+  21aHSuRYhz8Uey5WjxkBbCqnj3+5OH54LRjD6n0QI7fFJvXRqiDzZGS9F2dDEQqz
+  akHxG0+jZphfCwxWyBKgwws5eOK2TJ2gzI+HybpMEhhRqJu8YeRUc/U=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-16
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEowIBAAKCAQEAwobdzYg7zNZEV15ZVj4VQRi5iSrHhzK/7gQl2y508vQyu6Hm
+  gUJwVQCQK6jFb51Und1bOT33bQDfd/82Ohk5EgSbKsm3PO057Xz+lnfCq8GXbAJr
+  OP9qM7hv6STxhFqjP2Zy6+KcSXf819rJ1NUIfOdpuj1W0A+VnA9RdQV7mzTecRNN
+  qeO7C+qbdvY0omXEdi71ixts7fJEpvEcd1xs1dmLO7xqR3F6wYSHM9IOjfxiJ8S4
+  kYIroxf6SurihIflWBeQverfxKcaz6Dlk3Iy/0jAlBQhfZSMZyi8J8/+epxbmwAu
+  s6NuopBGmVMRYpt4MH9W0eXeZVvKeqxcmcWrdwIDAQABAoIBAQCiOJAtv4eHGcRi
+  S8camall4PWQwwEj6RmPpxvevc4/cZABU1GDx+EfsdmI3zTPEJgpEhjqEpgM6eZy
+  Dn2tU615LigsNY2+nGJrf4pb9sF8NHRPWXELVky9lviUp/9VDbUHwSrjNdZ5mjtb
+  0xPvjjyG1QEhk9eaqPRt8YRPn2PmGGjk4GDZMeU2SVhDAy/xPf+AaUZ0TCMNhTgB
+  CS3qneSQLB/aSqipDFhtbxm2J70G/98+6zDp1EjyHrfwppS0q5BJvAnQ3VphpzHO
+  xBjSNaNlE5/rQGZZHe4etfgUMbnrcPJ4LybWpcy8fVz29OhKVenCIq5bsk7bNsft
+  e/j+JNKJAoGBAMXR+4ezw3r+23I+AeTtovf1SKb0f1H3pKZZv2Y7U9rkR0Hov/+S
+  vpisd+xXI3/89HXP+Z+gVcR7rGsZ383weI2Q109HfOUONcILmn95C7uODjNGVUng
+  qgxYKUwwx2AUWpEf3m1UlIJluhYDPwmBZ7t+pDAZUm4rS3IxFnCE5w1LAoGBAPu8
+  64Afn6RGmv4qIbqD/FbpeSFzHZh2+pEdVzCF8Kgsj0sM9zjt59bdZlGbMjF4p8a5
+  1r4toB/oLoVE2F+UNpdUrSrziB2OwaJ79xykF4Nlv3aYhCg0gsd1wJ/lhoIOIFZo
+  jna7LW20aqLW2b2fHi4wsdcCi0kUUP+yI80g4psFAoGAVOpCMoozy0RDJtL/NSnc
+  3ttniGNDlAfdoZq80kF9SWTcQaqLYEW5kwfVopn1HyeSOFBCMwc8Sc9cv8yniVtE
+  JGCcS+e/8QMciGM6uqVXJ/demRwD2GacGBhwAciejNuv1MP9UqkP5rmMG47hLE9k
+  G9PM3ui/vZLQHAB+RWaHV+kCgYBFTF9j+NCgj1MxbnW0e4rmfgT7YU4fX3lgozwS
+  PnzePs3/cgVIZa1xp6b4BgoONlGxUg08cyDmR6suwqHxxcI1bHjzHvE0eczyJsAC
+  4WUbpdHMGvYefz4VHGQ3YB7kBHGAd+3n32UFEypbw1tTaM8NFhiOwMOJDY+yo95Z
+  JJlc5QKBgCfqmLAFcoVK7ss16ds7/Dlan5Fs+5+sycT8g50k8DqPvazBYGBWnEX4
+  kdolO9/UbRrW+nuNfcW2mMHGy8Cgp6pbxlqfFRtG6NkpwIZg2DJeJrCvkQW9laAr
+  UXJArRm5R8JBhYE0yfWHyX3o+NpS6y3BfNHZX1jd/hUbpWjWBn8U
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_17_certificate.yaml

@@ -1,71 +1,70 @@
 ---
+schema: deckhand/Certificate/v1
 metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-17
   layeringDefinition:
     abstract: false
     layer: site
-  name: kubelet-cab23-r720-17
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAsNOLgfUZlGpXbZnLhHHrJAj4VTLKkLPbFR2+Ilo57nQHSuhb
-  gxoZkHJYE/7N3C1cEGC5Jm9B9P/otnFO5b0iao3QmrA4GRAX7vdPEwtgiEkt9zPY
-  dxByhXmtN8+b4fuuI2XYdg79trd8myDsHseWqafGIsVVs7mn54rAgcymPTjCSWFe
-  JMmsNQutcP2jMZ74ND4Ag5DZGvaRUwoOOFmcd9A81MbXSm8o6Lpy0Uqx8v4/Rg7K
-  gTWVmJCT/kEvaS+JouAomUw+B146F4N9cAtzaNDUxJS8Imph+jL7339tr5VWGuYi
-  J9iN80EtNLUuNF29q83Lol3lk1e0/a2mHo/Z/wIDAQABAoIBAC2Ow1G/SVDguRfG
-  2RWNmCyXlwu0Y1Y20Io3OIZ3Qpe6EyrshK9ZaR67JxA3xOgmU6LwmKNbZN3vlRB0
-  TwSH3zcexJEmN73VVKU/2IKqmrtiR1J6bBn5Bdh3yfYoKhxmEK6UDdoU8K9DxPne
-  2Jbxi1K4pCbPOs5sVeMk74ZBqM76xAkpGERMqegR2X+omMlyA6GOKSUblDSZh0be
-  Tvm9iW4Nbu0WD0tM4GGUM9Nx/a2p9VE0ssJhQF3cO9w3yrjdJ0tgMjGavg2iEOli
-  YbLS9OvKmf2PBevkmb2lW7eLWwHXjY88PbwTOnl0iEqCWOAO2TudKdD/LB5Ee4l/
-  Z1/r3gECgYEA06dpj8wdbtLJdIR+RZL3fhSbfKA7NN4I+rrVlu0pHrUmmYcXw5ht
-  w5we0J+3b+cWzjnK5oAqMx4t3pwFSVZTbwV595mCLrpYxw50oBSmyBFoyIuSLTZ2
-  OyMHecoXmggGysOveOuPANXpT3PY5ajJddjIycZ9Vu6crARQZ/iuBv8CgYEA1eAR
-  KiCfSfEFoPvepfQ+RWI2LS0NqmvPpXodqmbpbWCOLlNS+xz/K/t4c/jQU4CjGCd6
-  ymFRsR5U6njYShF3gXoQ0vyH0ypFA0YjiyYbL5kXwaBRyM8joKiT1+Ik0fvYevRV
-  f/I9WmeSwcPKyAQZ7HwvLgGk9L+trktMGOBZLQECgYEAnSLdrHTOJUk5Z9g2J1FF
-  jcWe6pfLXSS7ZerwSG0q6jFzxugVLJIua9usxRbPCbV3qQQfL6JXsjvlsjADfL8q
-  knJuavT9QdP3tVF2JKMwb7j9Imb8z7Rvctg+5Jy1iRYMdN1zmULJmMU3wlUv4tG9
-  QFECQUusIq5kgxFw4MAv8+ECgYAyYKYKY0bB9vjZc5p9QqvMUhbqyzr10pFFrB8C
-  vVzse5riBJR+O9VLOd+kiY4grSM9lEcTFptUeg2McUyZHcYlhGgkGoGv1rwMyl+i
-  7iXnL0tuO2IoR8pflHXGmykLISRbyeO90IRtIApsg77nIDgvAQ1n69E8KU4yyN+y
-  2F2JAQKBgQDMo34aCS26tSXq+i7NVlJ+cI7cSXepEqzWRyWWzBopEfwLABxaA8Uu
-  J4CkKwJlc9oCqyrNfPGrae9HVVlIQtZuxWfd1jjukKUFf24/urRMv5hN96BHHpnv
-  W6S5UQ3L9BGgh2/RhrRUo64Y3c1+G8RUo7vc3H42uEXDJXmpj5MBfA==
-  -----END RSA PRIVATE KEY-----
-schema: deckhand/CertificateKey/v1
-...
----
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubelet-cab23-r720-17
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDmjCCAoKgAwIBAgIUUnd2jfqgjP3Ywd20xClxh+0T+8EwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMDsxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEiMCAGA1UEAxMZc3lzdGVtOm5vZGU6Y2FiMjMtcjcyMC0xNzCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDTi4H1GZRqV22Zy4Rx6yQI+FUy
-  ypCz2xUdviJaOe50B0roW4MaGZByWBP+zdwtXBBguSZvQfT/6LZxTuW9ImqN0Jqw
-  OBkQF+73TxMLYIhJLfcz2HcQcoV5rTfPm+H7riNl2HYO/ba3fJsg7B7HlqmnxiLF
-  VbO5p+eKwIHMpj04wklhXiTJrDULrXD9ozGe+DQ+AIOQ2Rr2kVMKDjhZnHfQPNTG
-  10pvKOi6ctFKsfL+P0YOyoE1lZiQk/5BL2kviaLgKJlMPgdeOheDfXALc2jQ1MSU
-  vCJqYfoy+99/ba+VVhrmIifYjfNBLTS1LjRdvavNy6Jd5ZNXtP2tph6P2f8CAwEA
-  AaOBpjCBozAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-  AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFK5xPSEt7TFSVJm5u68Oc+Q+
-  eKwcMB8GA1UdIwQYMBaAFBSCPU9mclvFIs6Pca/n2IOKIL4bMCQGA1UdEQQdMBuC
-  DWNhYjIzLXI3MjAtMTeHBAoXFRGHBAoXFhEwDQYJKoZIhvcNAQELBQADggEBAPD2
-  tqnv6I2buDrSXGVL8RqAreiPFl9UAj/jHIuVULV8CBAybh5qFBljtH3U8PmTgtaM
-  v04Ul+ViXSkiOrd/BI/DJeMMDss8AaKPvpmEvVQendDXUgW45tyZzfU2teE8I7Zo
-  RAs4cw5RTXC67uBRkP32NVGcv1LlP+Gr6Ctpb58YURsxJOwMoFq2bkeqIdlKR6ee
-  k1zvPiGUHau5cQZwKrpd19R7AiMuAHDVhnAlRLOempVLI0MCw3H2s0sNLRxhxtdK
-  hWmec5u4QmR/s9wqalA1M0EjT9Hg/hDpBKvAOI5ZOd3u1somtkhiI/Qwn8n9Q+E9
-  tNKrQnt1rW0DBQDLHlI=
+  MIIDhTCCAm2gAwIBAgIUV+yYgDj++oPUvT3FUixBGlrGdcswDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yNjA0
+  MDgyMTAwMDBaMDsxFTATBgNVBAoTDHN5c3RlbTpub2RlczEiMCAGA1UEAxMZc3lz
+  dGVtOm5vZGU6Y2FiMjMtcjcyMC0xNzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+  AQoCggEBAKpNuI4kChEkwrX1ngh7bSs7DHaeNr+WYqRO/+oiqLKzom5j8VHUq17L
+  XFc5/c2+sWFXJSWhukZ58L0fyEX1qzenhSatUySMQDZQiYYBuEYJAuEOsB0olIpf
+  p5sL8dbNugnLDHELsuG8Pp2R8gC+4qOLoSLuftvDAWwKjjorz7I03roLOxA6kTsk
+  rVG1l7JoCdj+CUliTpQMj3neZbJuTun7RRfjXWlSj3XHK/6UKJ95b94P5i+eWdjM
+  GTZmkFEdighIJxmftVZVQxUdP9q62fMX3oGFO7E32ccNQZKqIm7Q9GcVICp5j0rn
+  Cai1WLfB/LEDsSV0U2rYKviytyM62C0CAwEAAaOBpjCBozAOBgNVHQ8BAf8EBAMC
+  BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAw
+  HQYDVR0OBBYEFNQ0/9uUJuqEMBTJ5G2pOefp2y6WMB8GA1UdIwQYMBaAFIj9pnkQ
+  TF3IngXUyE4LqOC+vOzjMCQGA1UdEQQdMBuCDWNhYjIzLXI3MjAtMTeHBAoXFRGH
+  BAoXFhEwDQYJKoZIhvcNAQELBQADggEBAIEiIH6da6akXaucT4GPDsu5OhqqsGBp
+  pFjcG1G0wv5qWUTa/OGJpRQF2yxPCnQTLEDqrvUZ3F7XVUqg7koRf/SoGoxKNNc5
+  dKIVQiei2mWkXy4LnsEpl3eTAjt12PUzdmSrSe8IIJtsyBpudM+ChCVti2S/ZCiW
+  nYAd2G5uzmXpkCNKCMw0oFzTEnuyu2jM8hpTrw1ZKbqxRytzSDbOWOd5NkCUaUky
+  zAolzd8LiooV0GhIroMM7vBX0rZW0XvY3e9J047N1wVGb+Cf9CGq7c/O4nSPii7w
+  4/x7rQYd2616Oex9Ha0J4/mr39xPfHY7K/yYfE/n2dm+ICB1vTIW3XI=
   -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
+...
+---
+schema: deckhand/CertificateKey/v1
+metadata:
+  schema: metadata/Document/v1
+  name: kubelet-cab23-r720-17
+  layeringDefinition:
+    abstract: false
+    layer: site
+  storagePolicy: encrypted
+data: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIIEogIBAAKCAQEAqk24jiQKESTCtfWeCHttKzsMdp42v5ZipE7/6iKosrOibmPx
+  UdSrXstcVzn9zb6xYVclJaG6RnnwvR/IRfWrN6eFJq1TJIxANlCJhgG4RgkC4Q6w
+  HSiUil+nmwvx1s26CcsMcQuy4bw+nZHyAL7io4uhIu5+28MBbAqOOivPsjTeugs7
+  EDqROyStUbWXsmgJ2P4JSWJOlAyPed5lsm5O6ftFF+NdaVKPdccr/pQon3lv3g/m
+  L55Z2MwZNmaQUR2KCEgnGZ+1VlVDFR0/2rrZ8xfegYU7sTfZxw1BkqoibtD0ZxUg
+  KnmPSucJqLVYt8H8sQOxJXRTatgq+LK3IzrYLQIDAQABAoIBAGzHihvYr0l2Bpz9
+  Tz0xwXB8niBiPKwxnb4/670c+E506UrDsc/IHNJG6SuaEiDKLjjz1flsjTQZDYlv
+  9JejLQM2kJk82r+ciiNnXABpts+dT+Z7YEivs/mS0db6UTYYYD2DIeZPR6pieEhj
+  gYWyZ8d5F6rdVdB/hbgCIgjMFTVI/stcmfV1z6sDXxx0FUu3k8LbOFbF30p1AtkH
+  jaaSIaWvdvDtKVfLn/sAkRthzfRdYdeDWY7kRx2J9d+d8gN/xDmMCNVqL23ZM9o+
+  SrjDnt7FlH1amBmRf3wXyoynOaKks6GVADz4KpAfanH/L2O28oFyuECAio38+4jU
+  Z8FalOECgYEA3W7QEFscroYK4sA7D71O2oPLCvOdiuA6+VYscxAL/PwAK+k8257D
+  NlBShad/aRNBvwBRapA5a66miEjkFTrX0WApyCra8UC89nCOxxPpMZrpPeRvyFvv
+  V45p8SBrqAXtonaVxg9jfvXJyP1qYvHPuAz0u5HFhc8QztM0rSG2UFUCgYEAxOOd
+  Of7tBBlYbNykjVP5hBpYDVYaii2f+2MUX0sZZEJB76yRRbzOcvfX1HUQ1qBiY0xR
+  HP8SaHT7O3Xfq7PL0Sv3fH3+NBbQbEaDB6oXrQnrbD22YGR7j3OW5uo05kmcgd1d
+  SKPjDrXJsYDV1xYcsiqooX5rqscSsw39rYEzYHkCgYBKidvWNaVxBkQx0j3PbY1W
+  t1ipBhq5PgP8HMr3rKYscfPo1CmdUFMsPFubDCgyib3u+r9tXMFHg1IhvE+y6czu
+  eS13aR2santxhbA6SXSNMzVilTwfuPrXgWQePCihNeWpc7u1IUb/3OMhGlUum3Gt
+  5gaYAVj5Uxu4U5Z+1UNWxQKBgGJ4WCUuW0oGhxQDEgVg71TjfBBHdQSQpweqWQED
+  5VIgVSvSieFv+WzEidxHJEHDexGglJzE8WbuwsvNOy17wb7+l0tbFCznEBxm85d8
+  uVSgtm6vOqxg9O8c52bb0dMvE6hblxECbkfoIVS2U7y74WQ2M5p5SM3jvHVy1OHW
+  0WQ5AoGAEZ9Vn6Lc5+rDCLo84YB4j3+0ppVkJrq6ABrrRzWOvnve/8uzGib/5b9q
+  eHs5JjUinLK+yXs73sDzgN/gmuls8cq2dR/se/b6zBmisyWCuHgBmIuiSmSmL8wI
+  dskTWCBIUry7N5zdtM6ubhkFJK9K9LKFBd6SwAXqNnBie3VklMs=
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEpAIBAAKCAQEA4+8mRxvOjjpjC9BKCWOHURbzRWF+9offEpH32BFAcLkDJ8V1
-  +oxohg9sbeoFKCLTus79U43sFVsNe0CpEOrJwawgggxkpax6MHGfbyl6IqlMQ1re
-  ML7vVxE8hEbjRPPZMW5V+vza2EOeZzunhuGJ3WzyUusUVwaEwgT24Nj177eE+4Ct
-  YKKJoDaNV+uJuJlCUTHMXZMIKvWjpuO2MUStdtaORjvr10RIhtxuGm9rtUV1o8eF
-  j+hgKDRQM1f2CmZzC1KzYO1layBIDYw7aTZRHA1XDawB2r+WimLBnZUm5IW5LXlp
-  BbOEap0vrqWKGzRlPleY7GjmJOk7OhTDiEUAWwIDAQABAoIBAGn/U/CrmMIBmv/q
-  bBOzqkDmiFkSfuWMyAstwHFFjI8fKr17EWNjmlQFpinzM1S35XixO5N4o3pG7p0L
-  s9O/K/YZ4sA3nTKCZAxVOoyKYFbwHhwQjNVkZY8638av5I6zS6S2J9vhbLA3udlO
-  H5kVF3TWblZrJflWebR0dI6Ztr0z3RR9BmF9I/nFDslRJ7o8C2wvmqZoXH0stGRf
-  ET1sQ8DYQAyfiBDYUPxWktSO7HlxQ57Z+Oct+uReRyqnsYoAoqkW94V5E5sPq7Ng
-  PK9QJVbpCaXnVFMkhZD8qrYcBVOT4mcgb0bk3xCgmr6r9yDBpO2H3zB6up4Ih7xH
-  F1l8XTECgYEA6AkumGoEMVJb81pZdMxea2GiltzUXn3qawZZWXXmEoGkOncLz2ZX
-  6C/JSKGpgz4zN/uBzAhLBBfSrFqU3FuNc+ZSjwuytYiZvmU4zBBF4soaxnRRWAcj
-  cxqRipoMIjc7g3yjskIXBONb2qpDeAOC1mmL8YvMMAJyUAJAaueHprMCgYEA+3mF
-  xnRowkSfTYYxiMk4s1XpFF/EZG6ddODJWNa04ual7Q5Q1tiF4jhrV7WwuTrn5aS7
-  J9nkODPRkipvL1cV1s1+q8i2dysdNN6qIw5XmZQXtDbvJPJSHz2zxI9xtIm7Wtnt
-  ims+knuBtphSiGOSGFNhwHTH3DzuVP1cLp/I07kCgYEAiaComo6HXhnToEv+s2Bk
-  wJxwq7rf3AwjdseVR5K+nEt49ZSW1LWHfpiZcxMwUEAccSAkpLhmhk77Dm/Ly8gh
-  5pS+c0ok/bfAOUYgoikkypfFueBUPzo8tJEVsngcqk7IZf0PuzOoI6YXXWOQESdD
-  +5kvAF5DBlbtJrevLbmWpDECgYBwpZ4MKOcoZq7pfjxAJssUYl53NvL1fitgSLVI
-  61y561HWX7xMkU9f56AF+SiBwOZSEzmW/17g4i11iTanAR6SSxj8AHvj49dAcKHL
-  9Ee/TvxTSOxVI4sv3WbinNL1aWEYsFhc0e+ElHilf5Qw7lFqPieim21PtaeZQKkD
-  ZaYDWQKBgQDnxGgmnHc1U142oWdylAnKAjqNYPqNJ07xzhZ3qJLSz43BFXxEQ5z1
-  0puO8cp5JTCe6Ra3sQLVjje/+RDRv6PFHt5lOUzcQJMk3/o2meiGgmjvqP6eYnZY
-  qq4uuDnuUN4w6z2Cei8/SePn3nl3lGNezj1BEmn9hHj87l4NaZoofA==
-  -----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-----
-  MIIDmjCCAoKgAwIBAgIUJP7NEvKDIpLSr6zuTLFOZtIbMTkwDQYJKoZIhvcNAQEL
-  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
-  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMDsxFTATBgNVBAoTDHN5c3Rl
-  bTpub2RlczEiMCAGA1UEAxMZc3lzdGVtOm5vZGU6Y2FiMjMtcjcyMC0xMTCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOPvJkcbzo46YwvQSgljh1EW80Vh
-  fvaH3xKR99gRQHC5AyfFdfqMaIYPbG3qBSgi07rO/VON7BVbDXtAqRDqycGsIIIM
-  ZKWsejBxn28peiKpTENa3jC+71cRPIRG40Tz2TFuVfr82thDnmc7p4bhid1s8lLr
-  FFcGhMIE9uDY9e+3hPuArWCiiaA2jVfribiZQlExzF2TCCr1o6bjtjFErXbWjkY7
-  69dESIbcbhpva7VFdaPHhY/oYCg0UDNX9gpmcwtSs2DtZWsgSA2MO2k2URwNVw2s
-  Adq/lopiwZ2VJuSFuS15aQWzhGqdL66lihs0ZT5XmOxo5iTpOzoUw4hFAFsCAwEA
-  AaOBpjCBozAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-  AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFDJpCFAAsToEv6qfIn2l/vOM
-  g0lgMB8GA1UdIwQYMBaAFBSCPU9mclvFIs6Pca/n2IOKIL4bMCQGA1UdEQQdMBuC
-  DWNhYjIzLXI3MjAtMTGHBAoXFQuHBAoXFgswDQYJKoZIhvcNAQELBQADggEBAMmx
-  ophenoDCi9KxLKBAN9A8kOduCJYfzPJU1e36EFYVSJ26v51SrQC6+1nCvqdAYH1y
-  2RKHJBkuJS72d5oaLTQg91Uhwijczc0uUFH1+p5BpjOnKHEv3cnjBlj1D//n0I7Z
-  EooEIXsF9fCUuTU5QPPKv0457dm6vRuimH/Lrhla05u7XeK1vl26p+CzDlx8HV0B
-  MHkr0038oxfhILKTNouEK1zVpZRJTAGeuYhkWYZT70RwoKQX44yELrU/Am0r3TKy
-  l1bSNKm/8la6vT4lOr3YlIjvF95J24vEoil+YBy+MvzfyOHnXI+SghHtiZVMymbb
-  8vG8ubdGuO0BNFp8kOE=
+  MIIDhTCCAm2gAwIBAgIUAtkINkZZyNznrKyk7wj4oVBQrgQwDQYJKoZIhvcNAQEL
+  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yNDA0MTgyMTAwMDBaFw0yNjA0
+  MDgyMTAwMDBaMDsxFTATBgNVBAoTDHN5c3RlbTpub2RlczEiMCAGA1UEAxMZc3lz
+  dGVtOm5vZGU6Y2FiMjMtcjcyMC0xMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+  AQoCggEBAL+xD5s43qQOkwITMoHwOyaMYGtsnEBI0XdMNzu7nkuvly+gAeSYbDG9
+  k8JXukxZDV0t1+V4FQf46uDdXCqIBvCjFthS5WvLvYAFKOZ3DhFOnf1G+6JtWi71
+  133rmUUmDisOiIfLA/ItLNR0kSRSiD5mOAsxKws0uw8xu4vucx/a6aKiDL03VDL2
+  mM6a7ZQLWFVaMKxLvYjve376Z04XDAyjHMM3jGrtQcfpZR51Zn/ZCMybU4HrRN71
+  EHXsIJ6mRucDMmnoGykyFCU1d5I8vwKN6ZpL1KDdsGYf+YZqPwGwS5l67S9Ut2Nk
+  oCafrWMRYz3y/AGHJ5eAznxE+fLHJfcCAwEAAaOBpjCBozAOBgNVHQ8BAf8EBAMC
+  BaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAw
+  HQYDVR0OBBYEFHdPBEzE5cHu6Q3gFSaH9jSkQfuCMB8GA1UdIwQYMBaAFIj9pnkQ
+  TF3IngXUyE4LqOC+vOzjMCQGA1UdEQQdMBuCDWNhYjIzLXI3MjAtMTGHBAoXFQuH
+  BAoXFgswDQYJKoZIhvcNAQELBQADggEBAFGwS99Yo/Q8JFyD4iLqbrnLyES2Xpdt
+  MPnyzCFvhzH42UvQRxWQaSWLmqcHYMV93t8JzSiGon7K6gsw4alnsSmRHzxegJ5l
+  lHKI39V7MNPnt7YULPdrjJEQrq2lT60of6khKBnlMv1b1WArF+TezcCH7i6SI1mH
+  TnJb98koiGw8aBaYyc2ELv4yUWZfEdOSjQCgjWAN5HNm6Ci4fMrhVptRjaIrUWcs
+  N2yaJ8/skgrKdOAPIIw/c4yn6tmlIlDRzUsy4yJ/o7pVc3/Fmi58yA2/n+9/JFDz
+  LL4HlFQ9/IX2bOTb3/OHuwdyxxU6WD2lRTeKv8aAiMGBG5a3R2VxeP4=
   -----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-----
+  MIIEpAIBAAKCAQEAv7EPmzjepA6TAhMygfA7Joxga2ycQEjRd0w3O7ueS6+XL6AB
+  5JhsMb2Twle6TFkNXS3X5XgVB/jq4N1cKogG8KMW2FLla8u9gAUo5ncOEU6d/Ub7
+  om1aLvXXfeuZRSYOKw6Ih8sD8i0s1HSRJFKIPmY4CzErCzS7DzG7i+5zH9rpoqIM
+  vTdUMvaYzprtlAtYVVowrEu9iO97fvpnThcMDKMcwzeMau1Bx+llHnVmf9kIzJtT
+  getE3vUQdewgnqZG5wMyaegbKTIUJTV3kjy/Ao3pmkvUoN2wZh/5hmo/AbBLmXrt
+  L1S3Y2SgJp+tYxFjPfL8AYcnl4DOfET58scl9wIDAQABAoIBAFZzz3sNAfRxkkGM
+  UOojYzn2c4HfYPTpIncwS3TIIBM4ZPIYsuHbEGi6fEpY8G+AdjOA+m7GYo3O6Hdz
+  vh58bMzYcPQtJsUgBR4YtaKDLTgHAd/5xIEz2kl1nLNwrxZtnFQ04MSFfgkZ8K78
+  x3zfMA0cYshBa41JQdgPcOsiJo/FjhuBGuEbI0zBq45e2LDj3EnInLYDN6oIDugw
+  ejGrE0enX5M2GGmZ7+XUfoK6A7MggsIKlGCK1tXXSUhrl/EUyr1vT4XggrdiBTCt
+  rJnvUUPIg6USKZaNZxllckq0B08olcKaSjSxann1szViSR/WacOwFW+18Xd3v48q
+  yQZOCqkCgYEA0ZLwt/OS0Qtoqn97SxC/q452kH5yIq4wkRGUJQdUOuK2e4BaLmfV
+  LzD5CxAxkcYnEP0wi/9DdMkOGMLmy9siehIYHWHYOsbsB4lLKXz2GLoukDUTZ5Nh
+  q5Yy39NKCjfxFEPymvVclBipxkO22NtJ3E93HwYCFn9UMmJ7L2Ifo9sCgYEA6igA
+  wFmDoXp3+NLOMVa/AZ3jRCyRm10DWUEaQw3+MuqxEsUtAHkyD4aKLlLA4MxDVs97
+  xOBVYXDsCr91nLcj547tK30KUcuChpIIseGWIcYOt9UXLbCIPijzQt+4Ps64KqcG
+  jTfeLb4l3ioOpj5jXQcVQt3IUdeckInp3u1ErxUCgYBxkDdi5tlC7/S6lzP/XEcQ
+  trUm3W4JvuxQX/8wBYWuFxYdXFMB3IAX/2ikhxTlUkPvH9QDuMIb8ary3gJkqw1G
+  qrFokpGyYAKcntgc1jsg8Rq0SB6IvMNrUIum3/66BNBdU+iN8bFGCwtMhXr6jfG7
+  MVByfjX5bOv6FYV9CqXsiwKBgQDJvU1oa7cNGQbkSjt8JtDKA84anouU375S19RY
+  kWXBWJLXKSpsjf6jgbbr0kB7bYFW+cwZA26MVU4ItIwQSXmVt35/SWvqrPv4FTmI
+  iGNhFdL4b49Yvg+j/oQXychj1Ja3qM/sO4YgwwK9Nl8IvBe/vqqCwbIlUS6DGU91
+  0darQQKBgQCPzso9pWTYOEf+JHN6TQmEZY7I/56/Ul0U6EjXVZNO3EzRE+eKWEfL
+  TLnuv+yu//Nsr/BxXnylja+GFh9PIGp3BukI09YApGeHn/9NCT/7nxlNpOZrVF3c
+  5e6L3jhpuRQrMU8h0ry3rGeXdfw+zJs8qZpdYYfCPa3MtVqxk03lFw==
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/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-----
-  MIIEowIBAAKCAQEAwJFn9VwFBlqa1caBwg6IpUY/MUkHRfooB8i4Kv+FF0F3BjKk
-  10H+6ap9JswOtzCBQkpXMcRhMPNvprOX+uzPW8ZYIKNxkma0kC7PomK/C7Ybs6t+
-  z3883D3kUrByxrlvSEtgCBOMkCiJZw9cvtaSRVMRQsAaG8SKpBAUDoqs07MTR8AR
-  8nLcz8NN3PnIWhJJNKuk8jWZToTifIjuep+naJA5jwDrL8lxhs/s1F7hvSQ+DZRq
-  8jwcBu9zqKCz834i3ZXkolBQOomdbTwG5CZSz4MdE2+tByzqnSSdSRH4/oGc9hFr
-  R8hgcjWX5Mu4zcIPgkvc8mLaiHm2fqIAWskAIwIDAQABAoIBAChOBtlHAlI7Io89
-  9ii8zALzugRBycDuw/QlIc72HlAoxpXIgdIAIS+dHIbDTQ0wnM1YK/nhpYoOWb8l
-  ddjyOdB2qjlinEHNN1u6QIE3c88qtY+chHU/p2hdl+1quws3AsC57gaiuNfvdBrb
-  D0luNb1GzqUO+if3siD2sIv+oH/KbXuz47wvYVoDShCC5jqBgjB2CQdPuM/tljpQ
-  XeI5ZDQtxE4Vx//jZelML05x/5d1y4mljBbH8YAJN5n4NOesTbQ9TpaYmOdpIMm7
-  li1dHyjS9VQst3aHJlVJTyRUyEGGVJEkHVMSj4Ghfbf5Dwc+699+gbHsqCQ2GrqT
-  baV3zrECgYEA3PB8yK7srg8jIFdAlrYp9fta0dWvDTyySxIVYz3kGNZvsGJBIsU1
-  aGmB0uzia6eKnh6n804u07FjiDuQ3VP27O9qAPX5QRV4SVtEIAuP6POqB+3plY01
-  m4q2amW/XAIyyBjR6ldZ6aXAVmofOacCOTD8GtvUz4gXXMM0z74z6tkCgYEA3yBZ
-  cxrRa/WsLTo7fCdpZ2YtZKhQ3sDMmQXPOzyYzGjFPweSJnvfFUnVSNRxurfeD9jO
-  dlQLCaoOyonTOS8/ccqBnJGvlkO6+JsFsgMYokvvgzyqP6c7IflfbaoVtHn9+1ao
-  GddoFtSAdzhLNOK+D93RaAM2pJ5vshavfsrzjVsCgYBuVG2L7cZlWUvKP6gSWt9z
-  ZdTBinrDGndSg7JIf8SjHpphs38hdOepv15ETWT4K49OTLLEDlvV/PReOJir3d0m
-  DpyZ5DtXY/hQcZIAiqWPx/Y1xXnq47xMcyWK1kqMEND5GWPiKULOKaZ1wMLdEGhM
-  1QhgBT0tcaFxAk4iG7JjaQKBgE8Vyz62KbZnXICnXEA0Q/LnT32W/xsFIT+3xG0N
-  nGcPV6Jwj4febgLAqb1nt2vkEexx/zQHs+XYBegaE+j36zfs/CW/qYnMNfA6Gjmv
-  SUL1QU616O4o2xe+qOlY2NqgRrqYS3rlU7qL1YDsThPPrmg3SirgwLR2h8aKred2
-  Df9zAoGBAK03pA27ioQUmlCpcZQ2VO0WeZ7UWiRTstpakRD6zhACbgCwumnkqLxg
-  1N7OI7gEiwEpRbFyXHiI+LDCzlEmf+jTB/KHNYX88oebpHWI/eLIMSeuIobuVnEe
-  +4CisuRN1zOO8d4uyOzzQiO3vMcUgZHurktaQisoKKDifARmzwCv
-  -----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-----
-  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
+  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
+  UEUSjBm3sJaz47hVoE3dkDp2vSehQg==
   -----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-----
+  MIIEpQIBAAKCAQEA2gxGFeE6u1Q5SXfEnmE4ShLG8s/3gzuypymgVzTr1c204k8f
+  jcKdCbZb/DkYeeg7YXGnuydLic06tzyv/t8HOAFJwB7wgCkk5Ayp+CT9iguGm9/C
+  6+Fq+HdkkSUd0EUJ8QH3qWgJySUEvLSqrmIqVMxKCcpZkGIlLRHeKOfbOs3ogOL7
+  YURTUy/htE6tjo7sZ4OU2UxmC5ykG0wjp7UXPNfrztK3jThq6yaj8liizovQWKsW
+  Mwe/+W3CiCCXFOYI+Q7yYiA5tR+W56y3vT9JsnPzae00XoZ49qzRzWIoYuBokG4Q
+  LvC5Q6GoHAOvdUsK8nZr2MSr7G6PIzILMliDJwIDAQABAoIBAQCKaEAUo2MkhdHX
+  UK792bhhTIn8lwYFx18fvMyKjo0kqe6nuJHO6jnEcHzzHUrsFv2aXQqbQdYxIpSi
+  u2L75ZYvdqHZ0cnXkEZae69oVBKcDbTkPKT+FZhRH3g2qdjC2w/0a8tJPUD47QaU
+  whmVl7pHGWXl0QwJGkN+2FisnoAKUn28jwO5Yq/OPCs0nS20JF2TUeDiWtX0NaRl
+  T0BjaDRBdY10reXREpFoDlre+rUBoSEZtm58L80LuZRQ6On8X1w7N6RKXUHnCBne
+  PdHZ+zJ8/hpuWoltDC3yfvP8v1JuTh2KfTAjidjX9PpUXvCaWuvGU7cDJ2IFyyEq
+  wm/1tPgBAoGBAPHi10y8lJD46X48X8oAfcxV4jAJGIyD6IyYp1YkSpSYmOk9bMV2
+  ktqluIK/HbvQ/AASsypwdgOz5/tVUJjHr8LKQddavLM5/9gidd5dN8LrupzEJOJl
+  OfPIgDBb+0jl8aXvE1LkZCvJqNpktawZiwvMdS1Yacl4MjKffapGVHtPAoGBAObF
+  Wg5L1bVy0RARFnTHEDqB+nnCcbscgYcyYAqkP9ROIWE5mWBfKUozHikxIMkUqZf8
+  LKVYC2CIb4aLDRIohtx37y0iKSkc7ucZvtLtVwG0TtsZpCMPOKlsIC9BCXAkgsYG
+  A7uDsZiwoaaq8KQWwYjKPemvCSExAQtxwy4qBCSpAoGBALO+WTcQu2WvUfMYciXt
+  j42UFGyVlcR1EQ3JMi/07+bULmzD1Fw37JDFrQKbekDi3yA+xRy4TTobKju9/hJJ
+  8PXSznJ1XtvgMZouoWAH7TPPb/CmYLJLfnEFgRxufaCCHrurmLR0O2u+gtcnF0k4
+  AfdWi4ySsqmfw82SbxNlB8pJAoGBAOXR9tyz81Hv1XqNufJ0aJoL5dmqpr70JZ7x
+  sSoH5zVU1fNQfIm4W5N0kv3s2jzHIhqlXgUQSMxLM94mzs6do6kenAgztBAoq1dl
+  kV/YU8Tzv3B9+bOcrg40C11kBLU09zOku8Tb41sv1Nz58gtISlcjKkN2OL5gYiz2
+  j62C1Ht5AoGAEs94lIz+LBsWKxF9xPk4HLTixS1XqT2Xk3huUiYylFUGpsD9DAAA
+  p2/IlelYV/41Zqo1Nntq5flj7TfSHGLnSgBEH8EJizn4iplc6Clb12kNXdNuaWwv
+  8JflGaiK8J6Rh3VoIenE58pZqxXJVbPbbVmh03BOHxt4K0F2eS1KITY=
+  -----END RSA PRIVATE KEY-----
 ...

site/seaworthy/secrets/keypairs/service_account.yaml

@@ -1,58 +1,58 @@
 ---
-schema: deckhand/PrivateKey/v1
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: service-account
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAwTqxykNPrV3UrDzbVV1dxh/PA/T3cQ6J2BeNki14Dd+1sI3I
-  kXH67AYbegYpqqFsTtI1S25PsZE2xwjNRa2y+vm7swsLAAWtTE6LHMSkDCqnFJrV
-  f7tME9Di4OK9hU5x+OPSA1qsBfwmCnmu/WRPMLp6gZZBx7rEWL8fBbdvQVDCJjPX
-  /8NgQO7stWOn7kV2y7QaVXSfiZz7l5xc9KdlLDJk2I00AomdvSdXALy5vhYobaYa
-  ExasKatEKAj6QGiAk97+Ejbv5Zf2HLP2zD8BOGC6tdAFpUYNYMP1eprzgBRMI+pU
-  B1Ax/HSMEJVnqbcDaNHOobmHDuRssysh77TnWwIDAQABAoIBAGExqd5Ib1qP+PrN
-  /bF5rkKLG3EtFg3bN0Dn0AE4N8wau+Rb3Qgz4fg4tjdxxCGc4sLe/4m6qgFyPrBs
-  3/vtfDq7xUsxAc54DIx2cYj97FpmVfaKT1vZlVHeX1CpHJViOPfteGTRhffYtjXM
-  sVWp0B99nUNzlhDmA/9z2yHf++lI2mbkPy3AnNrXUHCxBKe4NmzdPmLSzlUinTPM
-  pRgmEnU1+JnUbaptgmzdFx8r4ZRqHYJaA4qJfZKMTrWXlovr8yvgiMs+IKGxUdi0
-  wDsOVGZMailxIe2WnRKW6Bs/1muzz+l48EKfMzn8mOLKDBToS8A+STF9WcEvtPxE
-  OESHVFECgYEA8dnolZ9EIYhyeOdSJHLQHFwIElwI8wodsJIKI034Z18/zqqtVL6I
-  95nqp/m/RqmGhspgX/1QhVJXT1a7rnEGGL1Il55c97qiyg1/z69+fsJ+yM8zm6s8
-  5bwUGWCPDddQo9w7p1/iwDeFqe3OiRv6NpJwE5AIYHCwnxfpSt2MvEMCgYEAzIiZ
-  JlufKmDi74OpHXb+fRYwabrVnSNBXagQcZr6rBwb5Pr+H7cZKLWIfmFWZLAe02e+
-  TLr51RUVJvZTt6ZkgG0XWqR5SzWDBqi2slLiE+LOrKN/HlMHG3kDHpFwQdvIq1Zo
-  T3uz0cLSfBkL+nLlWxpZDY0x+9j0dMINuDgkgwkCgYAZeG+MQme0eGBF52a5O/Y6
-  5l5bQKIYpnoV/Gtg6Hc+u8NGiqcSg7Z9DRKvehfw4y2tyGZ59X2jbNaRHntJldGk
-  jVq1zRHRbTBzwxQw1TSnOOiNUXUH8fLJ5xLe0VJ/jKuLdkg6ClkhETfce5UCz5V8
-  ZdOz27lmHrgbKTOClO6bbQKBgESHR/joHc4PJDnnvRPYOLAkbRgft06s70u38bp+
-  mJpt2JLB3b82k8FmAVOGvXGC6PEgA0ymIOrZ43pocehIYcf9xSNjlBg016+1e3EI
-  ACN1jJWfOgoo+2qjAv6M8DXAs91kWBK5eahARFG7+p1xPZNmoou90Q92w4ETO5GL
-  jgAxAoGBAPBnxO8HNILxEdSbPQZUSo1Geagihu5WjGLRdynZkMBkS7S2B4/bEVn7
-  QgY7w5xfcgimx9AfcoVQ4Kp4am/jRouSa0aMjIhnlDMd+/B6Y2uqKaGqMUnCA/VC
-  xC0BtN7zpG0/7YF9CcBwZwYnh2LmO9y1uTB/qVqqp3snouKPVRkc
-  -----END RSA PRIVATE KEY-----
-...
----
 schema: deckhand/PublicKey/v1
 metadata:
+  schema: metadata/Document/v1
+  name: service-account
   layeringDefinition:
     abstract: false
     layer: site
-  name: service-account
-  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN PUBLIC KEY-----
-  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTqxykNPrV3UrDzbVV1d
-  xh/PA/T3cQ6J2BeNki14Dd+1sI3IkXH67AYbegYpqqFsTtI1S25PsZE2xwjNRa2y
-  +vm7swsLAAWtTE6LHMSkDCqnFJrVf7tME9Di4OK9hU5x+OPSA1qsBfwmCnmu/WRP
-  MLp6gZZBx7rEWL8fBbdvQVDCJjPX/8NgQO7stWOn7kV2y7QaVXSfiZz7l5xc9Kdl
-  LDJk2I00AomdvSdXALy5vhYobaYaExasKatEKAj6QGiAk97+Ejbv5Zf2HLP2zD8B
-  OGC6tdAFpUYNYMP1eprzgBRMI+pUB1Ax/HSMEJVnqbcDaNHOobmHDuRssysh77Tn
-  WwIDAQAB
+  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwQPWr7QV4zdLb0udMeEx
+  y2m1vGvS2LojLktb/Z9NPa1hA1GquwdB79L19/oxS6V9XOnqqfkPjJ6gBV020Rti
+  4hWCl91VZOdJxb46k81wI8b3XZghKQHB2E8gvgFq/Y2kNObM1ZAEbA50p7k0z/HZ
+  0gLK59+oHatqkIgpS1b6oyfGvUXs3vjZedX05snkxHccG6Qb3kqbKmbXcFwWDoRp
+  S95ioQ9toi5J+iRlGq9Lg9baxQV4pS4YYm4APPh4U1KpbDuUpe+MttLsZ62KYxDy
+  7hk0/9s5QHrno6pSc19akxW22O+wd4ctFIru23r/uj9aVBitaGMMhW+J72WShpjj
+  DwIDAQAB
   -----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-----
+  MIIEowIBAAKCAQEAwQPWr7QV4zdLb0udMeExy2m1vGvS2LojLktb/Z9NPa1hA1Gq
+  uwdB79L19/oxS6V9XOnqqfkPjJ6gBV020Rti4hWCl91VZOdJxb46k81wI8b3XZgh
+  KQHB2E8gvgFq/Y2kNObM1ZAEbA50p7k0z/HZ0gLK59+oHatqkIgpS1b6oyfGvUXs
+  3vjZedX05snkxHccG6Qb3kqbKmbXcFwWDoRpS95ioQ9toi5J+iRlGq9Lg9baxQV4
+  pS4YYm4APPh4U1KpbDuUpe+MttLsZ62KYxDy7hk0/9s5QHrno6pSc19akxW22O+w
+  d4ctFIru23r/uj9aVBitaGMMhW+J72WShpjjDwIDAQABAoIBAAJJ0lzI7M2B1VIf
+  emCiA94ehboTKS/KnSoqWI/cOKU3jgPlDvoiruRyAtqKy9TSxHa6iz6ypj2Lj+gg
+  X8sA4R4/FQpJ5H5Kw7QlejpQYDj8XehtKk97JtoyrfeyupsA9+ZsqhcKGxNQ5I8s
+  gfTJMETuJYu0OiEH7D6EbsDm6hfPFptBBVLGLxd1K3AUNafXqOff6K9vTAFTqHK1
+  IqPn6XKVmudcCwKtT+xYzcBU9FnqzGfzNLvOAVTYbHE6uegIKh7o68u3PtGn+F07
+  fXSUcaKvUwqdR3RFckQZbygA2uX45rFLcvit++dQaP60hR+dKu2wPhDPWHPfwlnc
+  3GbmJ5kCgYEA+8/iUhesEPvDdvw4P5Xv7Lz7WKQl7DkJNBjYUSHA0pz4JYVbCt6Q
+  2WRkMPAgWKB9wEdeXhUo9KqmsWeIr7JmJS2yb59u1raeL7M/GPCftcX/gk4Sm7Wz
+  aPylG0EdXqi/Y8xqjv7ooVebjJS8qvYjH9IftKQGb2rf71N6GkIsIR0CgYEAxDme
+  uCtK2b47tdg8EeP2oTDscw1XRvQczmHdmcAac+zSo5X01yj8daOtuJHHuPF3TvW1
+  YBPlIsdYLlSOtZlSmktfEbTHs2XAwZSFR5S9mwOKzBWCFfKYiFtXK4VH8mrlwVuL
+  9kSTz4LYOBDerQU/9lq1gsx2jjSE/JY/uj2m6RsCgYBZylnwXeKMN8oOPoesHMHt
+  z8FsbTPclMX0XrubyoZgU3qknnXFXXGXIxYa4TUXhTrx+kDrGW5+N++yqLFzvRBx
+  R2cuKFK0m2+yoJ7qPLsmbRDcHQzDmzn7QMN7AXAAlfmRE44XqUu4ZG3h5hOUfqot
+  qZaGqkplJl3tj/2lKV1k/QKBgQC9e3qWE1AbRYS5S45uJDkDXI/nZcmSvaWXcY+g
+  qY2hxd19lA+zOWPYYW8enL9FCv8P41r65RtN4zt2ubZ5DA5k6kVqfqycwrRI+hdd
+  kPcq2lfMTTSp5vJ+Md3SK8jXAXzNo45bB8vIBWyvbzLn1vr19I/0N2aAWZzVoGz3
+  dhNYYwKBgF0U7K50v5ELGXJMqlJMqL0UaMHSzvX7w92cuymenfRdZzLrigU9vIr1
+  f6pZRkBG+NQpiLU0UjX3qYpL0FL91AMPWhrdy59zAcXi0mMRt4F1pb3l942MJTVD
+  BWIiLVwCUG/1VAe3/rNB8U2x9zu0R7mL3FVsCKe4FEj0JCCT9Gj2
+  -----END RSA PRIVATE KEY-----
+...