X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=site%2Fhpgen10%2Fsoftware%2Fcharts%2Fkubernetes%2Fcontainer-networking%2Fetcd.yaml;fp=site%2Fsite30%2Fsoftware%2Fcharts%2Fkubernetes%2Fcontainer-networking%2Fetcd.yaml;h=6ab2ec3191518d6362c9f397b6af5877969b6d8e;hb=8e1d108f64f06572790ee4db71bc1d9dd32e82da;hp=2df6132c61bf0f76b012623a4e1c08a47192d622;hpb=d743ec6c91f97cc9f5b944a8d0a609883440b14e;p=yaml_builds.git diff --git a/site/site30/software/charts/kubernetes/container-networking/etcd.yaml b/site/hpgen10/software/charts/kubernetes/container-networking/etcd.yaml similarity index 95% rename from site/site30/software/charts/kubernetes/container-networking/etcd.yaml rename to site/hpgen10/software/charts/kubernetes/container-networking/etcd.yaml index 2df6132..6ab2ec3 100644 --- a/site/site30/software/charts/kubernetes/container-networking/etcd.yaml +++ b/site/hpgen10/software/charts/kubernetes/container-networking/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. # @@ -47,15 +47,13 @@ metadata: path: .values.images.tags # IP addresses - - - src: + - src: schema: pegleg/CommonAddresses/v1 name: common-addresses path: .calico.etcd.service_ip dest: path: .values.service.ip - - - src: + - src: schema: pegleg/CommonAddresses/v1 name: common-addresses path: .calico.etcd.service_ip @@ -63,15 +61,13 @@ metadata: path: .values.anchor.etcdctl_endpoint # CAs - - - src: + - src: schema: deckhand/CertificateAuthority/v1 name: calico-etcd path: . dest: path: .values.secrets.tls.client.ca - - - src: + - src: schema: deckhand/CertificateAuthority/v1 name: calico-etcd-peer path: . @@ -79,15 +75,13 @@ metadata: path: .values.secrets.tls.peer.ca # Anchor client cert - - - src: + - src: schema: deckhand/Certificate/v1 name: calico-etcd-anchor path: . dest: path: .values.secrets.anchor.tls.cert - - - src: + - src: schema: deckhand/CertificateKey/v1 name: calico-etcd-anchor path: . @@ -95,29 +89,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: calico-etcd-aknode31 @@ -166,6 +157,7 @@ metadata: path: . dest: path: .values.nodes[1].tls.peer.key + # NOTE(mb874d): Be sure we generate these certs for genesis. - src: schema: deckhand/Certificate/v1 @@ -192,7 +184,8 @@ metadata: dest: path: .values.nodes[2].tls.peer.key - -data: {} - +data: + values: + manifests: + test_etcd_health: false ...