X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=site%2Fhpgen10%2Fsoftware%2Fcharts%2Fkubernetes%2Fetcd%2Fetcd.yaml;fp=site%2Fsite30%2Fsoftware%2Fcharts%2Fkubernetes%2Fetcd%2Fetcd.yaml;h=525d40c1c6ac66ccb96b202807da3f84d18c02db;hb=refs%2Fchanges%2F69%2F369%2F1;hp=b6b9f60c68d45e4f56335cfd2245cbd4db0663c8;hpb=d743ec6c91f97cc9f5b944a8d0a609883440b14e;p=yaml_builds.git diff --git a/site/site30/software/charts/kubernetes/etcd/etcd.yaml b/site/hpgen10/software/charts/kubernetes/etcd/etcd.yaml similarity index 94% rename from site/site30/software/charts/kubernetes/etcd/etcd.yaml rename to site/hpgen10/software/charts/kubernetes/etcd/etcd.yaml index b6b9f60..525d40c 100644 --- a/site/site30/software/charts/kubernetes/etcd/etcd.yaml +++ b/site/hpgen10/software/charts/kubernetes/etcd/etcd.yaml @@ -1,6 +1,6 @@ --- ############################################################################## -# Copyright © 2018 AT&T Intellectual Property. All rights reserved. # +# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # # # # Licensed under the Apache License, Version 2.0 (the "License"); you may # # not use this file except in compliance with the License. # @@ -23,10 +23,10 @@ metadata: abstract: false layer: site parentSelector: - name: kubernetes-etcd-global + name: kubernetes-etcd-global actions: - - method: merge - path: . + - method: merge + path: . storagePolicy: cleartext substitutions: @@ -47,15 +47,13 @@ metadata: path: .values.images.tags # IP addresses - - - src: + - src: schema: pegleg/CommonAddresses/v1 name: common-addresses path: .kubernetes.etcd_service_ip dest: path: .values.service.ip - - - src: + - src: schema: pegleg/CommonAddresses/v1 name: common-addresses path: .kubernetes.etcd_service_ip @@ -63,30 +61,26 @@ metadata: path: .values.anchor.etcdctl_endpoint # CAs - - - src: + - src: schema: deckhand/CertificateAuthority/v1 name: kubernetes-etcd path: . dest: path: .values.secrets.tls.client.ca - - - src: + - src: schema: deckhand/CertificateAuthority/v1 name: kubernetes-etcd-peer path: . dest: path: .values.secrets.tls.peer.ca - - - src: + - src: schema: deckhand/Certificate/v1 name: kubernetes-etcd-anchor path: . dest: path: .values.secrets.anchor.tls.cert - - - src: + - src: schema: deckhand/CertificateKey/v1 name: kubernetes-etcd-anchor path: . @@ -94,30 +88,26 @@ metadata: path: .values.secrets.anchor.tls.key # Node names - - - src: + - src: schema: pegleg/CommonAddresses/v1 name: common-addresses path: .masters[0].hostname dest: path: .values.nodes[0].name - - - src: + - src: schema: pegleg/CommonAddresses/v1 name: common-addresses path: .masters[1].hostname dest: path: .values.nodes[1].name - - - - src: + - src: schema: pegleg/CommonAddresses/v1 name: common-addresses path: .genesis.hostname dest: path: .values.nodes[2].name - # Server certs + # Server certs - src: schema: deckhand/Certificate/v1 name: kubernetes-etcd-aknode31 @@ -166,6 +156,7 @@ metadata: path: . dest: path: .values.nodes[1].tls.peer.key + # Genesis node - src: schema: deckhand/Certificate/v1 @@ -193,5 +184,4 @@ metadata: path: .values.nodes[2].tls.peer.key data: {} - ...