Skip to content

Commit

Permalink
Rename IPSEC->IPsec in outputs (submariner-io#369)
Browse files Browse the repository at this point in the history
While copying the output of `subctl deploy-broker -h` into the website
subctl docs, it was noted during review that this output's useage of
IPSEC over IPsec  was inconsitenat with the norms of the website. After
digging, it also became apparent the correct format is IPsec (from
Wikipedia and RFC 4301).

Signed-off-by: Daniel Farrell <[email protected]>
  • Loading branch information
dfarrell07 authored May 8, 2020
1 parent 0d4a6d9 commit 47aea6a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions pkg/subctl/cmd/deploybroker.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func init() {
panicOnError(err)

deployBroker.PersistentFlags().StringVar(&ipsecSubmFile, "ipsec-psk-from", "",
"Import IPSEC PSK from existing submariner broker file, like broker-info.subm")
"Import IPsec PSK from existing submariner broker file, like broker-info.subm")

addKubeconfigFlag(deployBroker)
addJoinFlags(deployBroker)
Expand Down Expand Up @@ -88,13 +88,13 @@ var deployBroker = &cobra.Command{

status.Start(fmt.Sprintf("Creating %s file", brokerDetailsFilename))

// If deploy-broker is retried we will attempt to re-use the existing IPSEC PSK secret
// If deploy-broker is retried we will attempt to re-use the existing IPsec PSK secret
if ipsecSubmFile == "" {
if _, err := datafile.NewFromFile(brokerDetailsFilename); err == nil {
ipsecSubmFile = brokerDetailsFilename
status.QueueSuccessMessage(fmt.Sprintf("Reusing IPSEC PSK from existing %s", brokerDetailsFilename))
status.QueueSuccessMessage(fmt.Sprintf("Reusing IPsec PSK from existing %s", brokerDetailsFilename))
} else {
status.QueueSuccessMessage(fmt.Sprintf("A new IPSEC PSK will be generated for %s", brokerDetailsFilename))
status.QueueSuccessMessage(fmt.Sprintf("A new IPsec PSK will be generated for %s", brokerDetailsFilename))
}
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/subctl/datafile/datafile.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func newFromCluster(clientSet clientset.Interface, brokerNamespace, ipsecSubmFil
if ipsecSubmFile != "" {
datafile, err := NewFromFile(ipsecSubmFile)
if err != nil {
return nil, fmt.Errorf("Error happened trying to import IPSEC PSK from subm file: %s: %s", ipsecSubmFile,
return nil, fmt.Errorf("Error happened trying to import IPsec PSK from subm file: %s: %s", ipsecSubmFile,
err.Error())
}
subctlData.IPSecPSK = datafile.IPSecPSK
Expand Down

0 comments on commit 47aea6a

Please sign in to comment.