update some wording (#1394)

fix merge conflicts
replicatedhq · Oct 25, 2024 · 90099e4 · 90099e4
1 parent f970f04
commit 90099e4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/cmd/embedded-cluster/network.go b/cmd/embedded-cluster/network.go
@@ -25,7 +25,7 @@ func withSubnetCIDRFlags(flags []cli.Flag) []cli.Flag {
 		},
 		&cli.StringFlag{
 			Name:  "cidr",
-			Usage: "IP Address Range for Pods and Services, allocate a range of at least /16. This will be evenly divided into separate subnets",
+			Usage: "CIDR block of available private IP addresses (/16 or larger)",
 			Value: ecv1beta1.DefaultNetworkCIDR,
 			Action: func(c *cli.Context, addr string) error {
 				if c.IsSet("pod-cidr") || c.IsSet("service-cidr") {

diff --git a/cmd/embedded-cluster/proxy.go b/cmd/embedded-cluster/proxy.go
@@ -117,7 +117,7 @@ func includeLocalIPInNoProxy(c *cli.Context, proxy *ecv1beta1.ProxySpec) (*ecv1b
 			return nil, fmt.Errorf("failed to clean subnet: %w", err)
 		}
 		if proxy.ProvidedNoProxy == "" {
-			logrus.Infof("--no-proxy was not set. Adding the default interface's subnet (%q) to the no-proxy list.", cleanIPNet)
+			logrus.Infof("--no-proxy was not set. Adding the network interface's subnet (%q) to the no-proxy list.", cleanIPNet)
 			proxy.ProvidedNoProxy = cleanIPNet
 			if err := combineNoProxySuppliedValuesAndDefaults(c, proxy); err != nil {
 				return nil, fmt.Errorf("unable to combine no-proxy supplied values and defaults: %w", err)
@@ -128,7 +128,7 @@ func includeLocalIPInNoProxy(c *cli.Context, proxy *ecv1beta1.ProxySpec) (*ecv1b
 			if err != nil {
 				return nil, fmt.Errorf("failed to validate no-proxy: %w", err)
 			} else if !isValid {
-				logrus.Infof("The node IP (%q) is not included in the provided no-proxy list (%q). Adding the default interface's subnet (%q) to the no-proxy list.", ipnet.IP.String(), proxy.ProvidedNoProxy, cleanIPNet)
+				logrus.Infof("The node IP (%q) is not included in the provided no-proxy list (%q). Adding the network interface's subnet (%q) to the no-proxy list.", ipnet.IP.String(), proxy.ProvidedNoProxy, cleanIPNet)
 				proxy.ProvidedNoProxy = cleanIPNet
 				if err := combineNoProxySuppliedValuesAndDefaults(c, proxy); err != nil {
 					return nil, fmt.Errorf("unable to combine no-proxy supplied values and defaults: %w", err)

diff --git a/pkg/preflights/host-preflight.yaml b/pkg/preflights/host-preflight.yaml
@@ -175,10 +175,10 @@ spec:
         outcomes:
           - fail:
               when: 'total < 40Gi'
-              message: The filesystem at {{ .DataDir }} has less than 40 Gi of total space. Ensure sufficient space is available, or use the --data-dir flag to specify an alternative data directory.
+              message: The filesystem at {{ .DataDir }} has less than 40 Gi of total space. Ensure sufficient space is available, or use --data-dir to specify an alternative data directory.
           - fail:
               when: 'used/total > 80%'
-              message: The filesystem at {{ .DataDir }} is more than 80% full. Ensure sufficient space is available, or use the --data-dir flag to specify an alternative data directory.
+              message: The filesystem at {{ .DataDir }} is more than 80% full. Ensure sufficient space is available, or use --data-dir to specify an alternative data directory.
           - pass:
               message: The filesystem at {{ .DataDir }} has sufficient space
     - textAnalyze:
@@ -378,8 +378,8 @@ spec:
               when: error
               message: >
                 Error connecting to {{ .ReplicatedAPIURL }}.
-                Ensure your firewall is properly configured, and use the --http-proxy, --https-proxy,
-                and --no-proxy flags if there is a proxy server.
+                Ensure your firewall is properly configured, and use --http-proxy,
+                --https-proxy, and --no-proxy if there is a proxy server.
                 The static IP addresses for {{ .ReplicatedAPIURL }} are
                 162.159.133.41 and 162.159.134.41.
           - pass:
@@ -388,8 +388,8 @@ spec:
           - fail:
               message: >
                 Error connecting to {{ .ReplicatedAPIURL }}.
-                Ensure your firewall is properly configured, and use the --http-proxy, --https-proxy,
-                and --no-proxy flags if there is a proxy server.
+                Ensure your firewall is properly configured, and use --http-proxy,
+                --https-proxy, and --no-proxy if there is a proxy server.
                 The static IP addresses for {{ .ReplicatedAPIURL }} are
                 162.159.133.41 and 162.159.134.41.
     - http:
@@ -401,8 +401,8 @@ spec:
               when: error
               message: >
                 Error connecting to {{ .ProxyRegistryURL }}.
-                Ensure your firewall is properly configured, and use the --http-proxy, --https-proxy,
-                and --no-proxy flags if there is a proxy server.
+                Ensure your firewall is properly configured, and use --http-proxy,
+                --https-proxy, and --no-proxy if there is a proxy server.
                 The static IP addresses for {{ .ProxyRegistryURL }} are
                 162.159.137.43 and 162.159.138.43.
           - pass:
@@ -411,8 +411,8 @@ spec:
           - fail:
               message: >
                 Unexpected response from {{ .ProxyRegistryURL }}.
-                Ensure your firewall is properly configured, and use the --http-proxy, --https-proxy,
-                and --no-proxy flags if there is a proxy server.
+                Ensure your firewall is properly configured, and use --http-proxy,
+                --https-proxy, and --no-proxy if there is a proxy server.
                 The static IP addresses for {{ .ProxyRegistryURL }} are
                 162.159.137.43 and 162.159.138.43.
     - textAnalyze:
@@ -778,7 +778,7 @@ spec:
         outcomes:
           - fail:
               when: 'true'
-              message: "{{ .DataDir }} cannot be symlinked. Remove the symlink, or use the --data-dir flag to provide an alternate data directory."
+              message: "{{ .DataDir }} cannot be symlinked. Remove the symlink, or use --data-dir to specify an alternative data directory."
           - pass:
               when: 'false'
               message: "{{ .DataDir }} is not a symlink."