kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable primary=mesh secondary=memberlist by default

This commit is contained in:
Thomas Jackson 2019-10-10 13:21:00 -07:00
parent 85db3dce27
commit 14a60a53c9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protokube/cmd/protokube/main.go
View File

@ -82,7 +82,7 @@ func run() error {
flag.StringVar(&gossipProtocol, "gossip-protocol", "mesh", "mesh/memberlist") flag.StringVar(&gossipProtocol, "gossip-protocol", "mesh", "mesh/memberlist")
flag.StringVar(&gossipListen, "gossip-listen", "0.0.0.0:3999", "address:port on which to bind for gossip") flag.StringVar(&gossipListen, "gossip-listen", "0.0.0.0:3999", "address:port on which to bind for gossip")
flags.StringVar(&gossipSecret, "gossip-secret", gossipSecret, "Secret to use to secure gossip") flags.StringVar(&gossipSecret, "gossip-secret", gossipSecret, "Secret to use to secure gossip")
flag.StringVar(&gossipProtocolSecondary, "gossip-protocol-secondary", "", "mesh/memberlist") flag.StringVar(&gossipProtocolSecondary, "gossip-protocol-secondary", "memberlist", "mesh/memberlist")
flag.StringVar(&gossipListenSecondary, "gossip-listen-secondary", "0.0.0.0:4000", "address:port on which to bind for gossip") flag.StringVar(&gossipListenSecondary, "gossip-listen-secondary", "0.0.0.0:4000", "address:port on which to bind for gossip")
flags.StringVar(&gossipSecretSecondary, "gossip-secret-secondary", gossipSecret, "Secret to use to secure gossip") flags.StringVar(&gossipSecretSecondary, "gossip-secret-secondary", gossipSecret, "Secret to use to secure gossip")
flag.StringVar(&peerCA, "peer-ca", peerCA, "Path to a file containing the peer ca in PEM format") flag.StringVar(&peerCA, "peer-ca", peerCA, "Path to a file containing the peer ca in PEM format")

5
upup/pkg/fi/cloudup/template_functions.go
View File

@ -249,7 +249,12 @@ func (tf *TemplateFunctions) DnsControllerArgv() ([]string, error) {
} }
} }
} else { } else {
// Default to primary mesh and secondary memberlist
argv = append(argv, "--gossip-seed=127.0.0.1:3999") argv = append(argv, "--gossip-seed=127.0.0.1:3999")
argv = append(argv, "--gossip-protocol-secondary=memberlist")
argv = append(argv, "--gossip-listen-secondary=0.0.0.0:3997")
argv = append(argv, "--gossip-seed-secondary=127.0.0.1:4000")
} }
} else { } else {
switch kops.CloudProviderID(tf.cluster.Spec.CloudProvider) { switch kops.CloudProviderID(tf.cluster.Spec.CloudProvider) {