Skip to content

Commit

Permalink
Remove space before ellipsis (...)
Browse files Browse the repository at this point in the history
This makes the user-visible strings more consistent.

This fixes #2039
  • Loading branch information
cfergeau authored and guillaumerose committed May 5, 2021
1 parent 31f06c0 commit 1ee974f
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions pkg/crc/cluster/cluster.go
Expand Up @@ -109,7 +109,7 @@ func EnsurePullSecretPresentInTheCluster(ocConfig oc.Config, pullSec PullSecretL
return nil
}

logging.Info("Adding user's pull secret to the cluster ...")
logging.Info("Adding user's pull secret to the cluster...")
content, err := pullSec.Value()
if err != nil {
return err
Expand Down Expand Up @@ -168,7 +168,7 @@ func EnsureClusterIDIsNotEmpty(ocConfig oc.Config) error {
return nil
}

logging.Info("Updating cluster ID ...")
logging.Info("Updating cluster ID...")
clusterID := uuid.New()
cmdArgs := []string{"patch", "clusterversion", "version", "-p",
fmt.Sprintf(`'{"spec":{"clusterID":"%s"}}'`, clusterID), "--type", "merge"}
Expand Down
4 changes: 2 additions & 2 deletions pkg/crc/cluster/status.go
Expand Up @@ -30,9 +30,9 @@ func WaitForClusterStable(ctx context.Context, ocConfig oc.Config, monitoringEna
if status.IsReady() {
count++
if count == 1 {
logging.Info("All operators are available. Ensuring stability ...")
logging.Info("All operators are available. Ensuring stability...")
} else {
logging.Infof("Operators are stable (%d/%d) ...", count, numConsecutive)
logging.Infof("Operators are stable (%d/%d)...", count, numConsecutive)
}
} else {
logging.Info(status.String())
Expand Down
26 changes: 13 additions & 13 deletions pkg/crc/machine/start.go
Expand Up @@ -45,11 +45,11 @@ func getCrcBundleInfo(bundlePath string) (*bundle.CrcBundleInfo, error) {
bundleName := filepath.Base(bundlePath)
bundleInfo, err := bundle.Use(bundleName)
if err == nil {
logging.Infof("Loading bundle: %s ...", bundleName)
logging.Infof("Loading bundle: %s...", bundleName)
return bundleInfo, nil
}
logging.Debugf("Failed to load bundle %s: %v", bundleName, err)
logging.Infof("Extracting bundle: %s ...", bundleName)
logging.Infof("Extracting bundle: %s...", bundleName)
if _, err := bundle.Extract(bundlePath); err != nil {
return nil, err
}
Expand Down Expand Up @@ -351,14 +351,14 @@ func (client *client) Start(ctx context.Context, startConfig types.StartConfig)
return nil, errors.Wrapf(err, "Failed internal DNS query: %s", queryOutput)
}
}
logging.Info("Check internal and public DNS query ...")
logging.Info("Check internal and public DNS query...")

if queryOutput, err := dns.CheckCRCPublicDNSReachable(servicePostStartConfig); err != nil {
logging.Warnf("Failed public DNS query from the cluster: %v : %s", err, queryOutput)
}

// Check DNS lookup from host to VM
logging.Info("Check DNS query from host ...")
logging.Info("Check DNS query from host...")
if err := network.CheckCRCLocalDNSReachableFromHost(crcBundleMetadata, instanceIP); err != nil {
if !client.useVSock() {
return nil, errors.Wrap(err, "Failed to query DNS from host")
Expand All @@ -375,7 +375,7 @@ func (client *client) Start(ctx context.Context, startConfig types.StartConfig)
}

// Check the certs validity inside the vm
logging.Info("Verifying validity of the kubelet certificates ...")
logging.Info("Verifying validity of the kubelet certificates...")
certsExpired, err := cluster.CheckCertsValidity(sshRunner)
if err != nil {
return nil, errors.Wrap(err, "Failed to check certificate validity")
Expand Down Expand Up @@ -454,7 +454,7 @@ func (client *client) Start(ctx context.Context, startConfig types.StartConfig)
}
}

logging.Info("Starting OpenShift cluster ... [waiting for the cluster to stabilize]")
logging.Info("Starting OpenShift cluster... [waiting for the cluster to stabilize]")

if err := cluster.WaitForClusterStable(ctx, ocConfig, client.monitoringEnabled()); err != nil {
logging.Errorf("Cluster is not ready: %v", err)
Expand Down Expand Up @@ -540,7 +540,7 @@ func addNameServerToInstance(sshRunner *crcssh.Runner, ns string) error {
return err
}
if !exist {
logging.Infof("Adding %s as nameserver to the instance ...", nameserver.IPAddress)
logging.Infof("Adding %s as nameserver to the instance...", nameserver.IPAddress)
return network.AddNameserversToInstance(sshRunner, nameservers)
}
return nil
Expand All @@ -553,7 +553,7 @@ func updateSSHKeyPair(sshRunner *crcssh.Runner) error {
}

// Generate ssh key pair
logging.Info("Generating new SSH Key pair ...")
logging.Info("Generating new SSH Key pair...")
if err := crcssh.GenerateSSHKey(constants.GetPrivateKeyPath()); err != nil {
return fmt.Errorf("Error generating ssh key pair: %v", err)
}
Expand All @@ -570,7 +570,7 @@ func updateSSHKeyPair(sshRunner *crcssh.Runner) error {
return nil
}

logging.Info("Updating authorized keys ...")
logging.Info("Updating authorized keys...")
cmd := fmt.Sprintf("echo '%s' > /home/core/.ssh/authorized_keys; chmod 644 /home/core/.ssh/authorized_keys", publicKey)
_, _, err = sshRunner.Run(cmd)
if err != nil {
Expand All @@ -587,7 +587,7 @@ func copyKubeconfig(name string, crcBundleMetadata *bundle.CrcBundleInfo) error

// Copy Kubeconfig file from bundle extract path to machine directory.
// In our case it would be ~/.crc/machines/crc/
logging.Info("Copying kubeconfig file to instance dir ...")
logging.Info("Copying kubeconfig file to instance dir...")
err := crcos.CopyFileContents(crcBundleMetadata.GetKubeConfigPath(),
kubeConfigFilePath,
0644)
Expand All @@ -601,23 +601,23 @@ func ensureKubeletAndCRIOAreConfiguredForProxy(sshRunner *crcssh.Runner, proxy *
if !proxy.IsEnabled() {
return nil
}
logging.Info("Adding proxy configuration to kubelet and crio service ...")
logging.Info("Adding proxy configuration to kubelet and crio service...")
return cluster.AddProxyToKubeletAndCriO(sshRunner, proxy)
}

func ensureProxyIsConfiguredInOpenShift(ocConfig oc.Config, sshRunner *crcssh.Runner, proxy *network.ProxyConfig, instanceIP string) (err error) {
if !proxy.IsEnabled() {
return nil
}
logging.Info("Adding proxy configuration to the cluster ...")
logging.Info("Adding proxy configuration to the cluster...")
return cluster.AddProxyConfigToCluster(sshRunner, ocConfig, proxy)
}

func waitForProxyPropagation(ctx context.Context, ocConfig oc.Config, proxyConfig *network.ProxyConfig) {
if !proxyConfig.IsEnabled() {
return
}
logging.Info("Waiting for the proxy configuration to be applied ...")
logging.Info("Waiting for the proxy configuration to be applied...")
checkProxySettingsForOperator := func() error {
proxySet, err := cluster.CheckProxySettingsForOperator(ocConfig, proxyConfig, "marketplace-operator", "openshift-marketplace")
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/crc/preflight/preflight.go
Expand Up @@ -55,7 +55,7 @@ func (check *Check) doCheck(config config.Storage) error {
logging.Infof("%s", check.checkDescription)
}
if check.shouldSkip(config) {
logging.Warn("Skipping above check ...")
logging.Warn("Skipping above check...")
return nil
}

Expand Down
4 changes: 2 additions & 2 deletions test/e2e/features/config.feature
Expand Up @@ -62,11 +62,11 @@ Feature: Test configuration settings
When setting config property "<property>" to value "<value1>" succeeds
And "JSON" config file "crc.json" in CRC home folder contains key "<property>" with value matching "<value1>"
When executing "crc setup" succeeds
Then stderr should contain "Skipping above check ..."
Then stderr should contain "Skipping above check..."
When setting config property "<property>" to value "<value2>" succeeds
Then "JSON" config file "crc.json" in CRC home folder contains key "<property>" with value matching "<value2>"
When executing "crc setup" succeeds
Then stderr should not contain "Skipping above check ..."
Then stderr should not contain "Skipping above check..."
When unsetting config property "<property>" succeeds
Then "JSON" config file "crc.json" in CRC home folder does not contain key "<property>"

Expand Down

0 comments on commit 1ee974f

Please sign in to comment.