Skip to content

Commit

Permalink
Manual fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ctauchen
ctauchen committed Mar 26, 2024
1 parent a607c9f commit 2a7bf7d
Show file tree
Hide file tree
Showing 46 changed files with 424 additions and 416 deletions.
2 changes: 1 addition & 1 deletion calico-cloud/_includes/content/_non-cluster-binary-install.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This step requires Docker, but it can be run from any machine with Docker instal

<CodeBlock language=''>
REPOSITORY TAG IMAGE ID CREATED SIZE
{variables.registry}{variables.releases[0].components.cnx-node.image} {variables.releases[0].components.cnx-node.version} e07d59b0eb8a 2 minutes ago 42MB
{variables.registry}{variables.releases[0].components['cnx-node'].image} {variables.releases[0].components['cnx-node'].version} e07d59b0eb8a 2 minutes ago 42MB
</CodeBlock>

1. Create a temporary {variables.nodecontainer} container.
Expand Down
2 changes: 1 addition & 1 deletion ...d_versioned_docs/version-19-1/_includes/content/_non-cluster-binary-install.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This step requires Docker, but it can be run from any machine with Docker instal

<CodeBlock language=''>
REPOSITORY TAG IMAGE ID CREATED SIZE
{variables.registry}{variables.releases[0].components.cnx-node.image} {variables.releases[0].components.cnx-node.version} e07d59b0eb8a 2 minutes ago 42MB
{variables.registry}{variables.releases[0].components['cnx-node'].image} {variables.releases[0].components['cnx-node'].version} e07d59b0eb8a 2 minutes ago 42MB
</CodeBlock>

1. Create a temporary {variables.nodecontainer} container.
Expand Down
2 changes: 1 addition & 1 deletion calico-enterprise/_includes/content/_non-cluster-binary-install.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This step requires Docker, but it can be run from any machine with Docker instal

<CodeBlock language=''>
REPOSITORY TAG IMAGE ID CREATED SIZE
{variables.registry}{variables.releases[0].components.cnx-node.image} {variables.releases[0].components.cnx-node.version} e07d59b0eb8a 2 minutes ago 42MB
{variables.registry}{variables.releases[0].components['cnx-node'].image} {variables.releases[0].components['cnx-node'].version} e07d59b0eb8a 2 minutes ago 42MB
</CodeBlock>

1. Create a temporary {variables.nodecontainer} container.
Expand Down
2 changes: 1 addition & 1 deletion calico-enterprise/getting-started/install-on-clusters/windows-calico/demo.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ EOF
Next, we'll create the porter server pod:

<CodeBlock language='bash'>
kubectl apply -f - <<EOF
kubectl apply -f - \<\<EOF
apiVersion: v1
kind: Pod
metadata:
Expand Down
72 changes: 36 additions & 36 deletions calico-enterprise/reference/clis/calicoctl/node/run.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,45 +19,45 @@ command.

<CodeBlock language=''>
Usage:
calicoctl node run [--ip=<IP>] [--ip6=<IP6>] [--as=<AS_NUM>]
[--name=<NAME>]
[--ip-autodetection-method=<IP_AUTODETECTION_METHOD>]
[--ip6-autodetection-method=<IP6_AUTODETECTION_METHOD>]
[--log-dir=<LOG_DIR>]
[--node-image=<DOCKER_IMAGE_NAME>]
calicoctl node run [--ip=\<IP>] [--ip6=\<IP6>] [--as=\<AS_NUM>]
[--name=\<NAME>]
[--ip-autodetection-method=\<IP_AUTODETECTION_METHOD>]
[--ip6-autodetection-method=\<IP6_AUTODETECTION_METHOD>]
[--log-dir=\<LOG_DIR>]
[--node-image=\<DOCKER_IMAGE_NAME>]
[--backend=(bird|none)]
[--config=<CONFIG>]
[--felix-config=<CONFIG>]
[--config=\<CONFIG>]
[--felix-config=\<CONFIG>]
[--no-default-ippools]
[--dryrun]
[--init-system]
[--disable-docker-networking]
[--docker-networking-ifprefix=<IFPREFIX>]
[--docker-networking-ifprefix=\<IFPREFIX>]
[--use-docker-networking-container-labels]

Options:
-h --help Show this screen.
--name=<NAME> The name of the Calico node. If this is not
--name=\<NAME> The name of the Calico node. If this is not
supplied it defaults to the host name.
--as=<AS_NUM> Set the AS number for this node. If omitted, it
--as=\<AS_NUM> Set the AS number for this node. If omitted, it
will use the value configured on the node resource.
If there is no configured value and --as option is
omitted, the node will inherit the global AS number
(see 'calicoctl config' for details).
--ip=<IP> Set the local IPv4 routing address for this node.
--ip=\<IP> Set the local IPv4 routing address for this node.
If omitted, it will use the value configured on the
node resource. If there is no configured value
and the --ip option is omitted, the node will
attempt to autodetect an IP address to use. Use a
value of 'autodetect' to always force autodetection
of the IP each time the node starts.
--ip6=<IP6> Set the local IPv6 routing address for this node.
--ip6=\<IP6> Set the local IPv6 routing address for this node.
If omitted, it will use the value configured on the
node resource. If there is no configured value
and the --ip6 option is omitted, the node will not
route IPv6. Use a value of 'autodetect' to force
autodetection of the IP each time the node starts.
--ip-autodetection-method=<IP_AUTODETECTION_METHOD>
--ip-autodetection-method=\<IP_AUTODETECTION_METHOD>
Specify the autodetection method for detecting the
local IPv4 routing address for this node. The valid
options are:
Expand All @@ -67,32 +67,32 @@ Options:
filtered out, e.g. the docker bridge). It is not
recommended to use this if you have multiple
external interfaces on your host.
> can-reach=<IP OR DOMAINNAME>
> can-reach=\<IP OR DOMAINNAME>
Use the interface determined by your host routing
tables that will be used to reach the supplied
destination IP or domain name.
> interface=<IFACE NAME REGEX LIST>
> interface=\<IFACE NAME REGEX LIST>
Use the first valid IP address found on interfaces
named as per the first matching supplied interface
name regex. Regexes are separated by commas
(e.g. eth.*,enp0s.*).
> skip-interface=<IFACE NAME REGEX LIST>
> skip-interface=\<IFACE NAME REGEX LIST>
Use the first valid IP address on the first
enumerated interface (same logic as first-found
above) that does NOT match with any of the
specified interface name regexes. Regexes are
separated by commas (e.g. eth.*,enp0s.*).
[default: first-found]
--ip6-autodetection-method=<IP6_AUTODETECTION_METHOD>
--ip6-autodetection-method=\<IP6_AUTODETECTION_METHOD>
Specify the autodetection method for detecting the
local IPv6 routing address for this node. See
ip-autodetection-method flag for valid options.
[default: first-found]
--log-dir=<LOG_DIR> The directory containing Calico logs.
--log-dir=\<LOG_DIR> The directory containing Calico logs.
[default: /var/log/calico]
--node-image=<DOCKER_IMAGE_NAME>
--node-image=\<DOCKER_IMAGE_NAME>
Docker image to use for Calico's per-node container.
[default: {variables.registry}{variables.imageNames.node}:latest]
[default: {variables.registry}{variables.imageNames['calico/node']}:latest]
--backend=(bird|none)
Specify which networking backend to use. When set
to "none", Calico node runs in policy only mode.
Expand All @@ -106,7 +106,7 @@ Options:
and there are no pre-existing Calico IP pools.
--disable-docker-networking
Disable Docker networking.
--docker-networking-ifprefix=<IFPREFIX>
--docker-networking-ifprefix=\<IFPREFIX>
Interface prefix to use for the network interface
within the Docker containers that have been networked
by the Calico driver.
Expand All @@ -118,10 +118,10 @@ Options:
This option is only valid when using Calico Docker
networking, and when enabled traffic must be
explicitly allowed by configuring Calico policies.
-c --config=<CONFIG> Path to the file containing connection
-c --config=\<CONFIG> Path to the file containing connection
configuration in YAML or JSON format.
[default: /etc/calico/calicoctl.cfg]
--felix-config=<CONFIG>
--felix-config=\<CONFIG>
Path to the file containing Felix
configuration in YAML or JSON format.

Expand Down Expand Up @@ -279,27 +279,27 @@ terminating `,` character does not need to be specified for those cases.
### Options

<CodeBlock language=''>
--name=<NAME> The name of the Calico node. If this is not
--name=\<NAME> The name of the Calico node. If this is not
supplied it defaults to the host name.
--as=<AS_NUM> Set the AS number for this node. If omitted, it
--as=\<AS_NUM> Set the AS number for this node. If omitted, it
will use the value configured on the node resource.
If there is no configured value and --as option is
omitted, the node will inherit the global AS number
(see 'calicoctl config' for details).
--ip=<IP> Set the local IPv4 routing address for this node.
--ip=\<IP> Set the local IPv4 routing address for this node.
If omitted, it will use the value configured on the
node resource. If there is no configured value
and the --ip option is omitted, the node will
attempt to autodetect an IP address to use. Use a
value of 'autodetect' to always force autodetection
of the IP each time the node starts.
--ip6=<IP6> Set the local IPv6 routing address for this node.
--ip6=\<IP6> Set the local IPv6 routing address for this node.
If omitted, it will use the value configured on the
node resource. If there is no configured value
and the --ip6 option is omitted, the node will not
route IPv6. Use a value of 'autodetect' to force
autodetection of the IP each time the node starts.
--ip-autodetection-method=<IP_AUTODETECTION_METHOD>
--ip-autodetection-method=\<IP_AUTODETECTION_METHOD>
Specify the autodetection method for detecting the
local IPv4 routing address for this node. The valid
options are:
Expand All @@ -309,30 +309,30 @@ terminating `,` character does not need to be specified for those cases.
filtered out, e.g. the docker bridge). It is not
recommended to use this if you have multiple
external interfaces on your host.
> can-reach=<IP OR DOMAINNAME>
> can-reach=\<IP OR DOMAINNAME>
Use the interface determined by your host routing
tables that will be used to reach the supplied
destination IP or domain name.
> interface=<IFACE NAME REGEX LIST>
> interface=\<IFACE NAME REGEX LIST>
Use the first valid IP address found on interfaces
named as per the first matching supplied interface
name regex. Regexes are separated by commas
(e.g. eth.*,enp0s.*).
> skip-interface=<IFACE NAME REGEX LIST>
> skip-interface=\<IFACE NAME REGEX LIST>
Use the first valid IP address on the first
enumerated interface (same logic as first-found
above) that does NOT match with any of the
specified interface name regexes. Regexes are
separated by commas (e.g. eth.*,enp0s.*).
[default: first-found]
--ip6-autodetection-method=<IP6_AUTODETECTION_METHOD>
--ip6-autodetection-method=\<IP6_AUTODETECTION_METHOD>
Specify the autodetection method for detecting the
local IPv6 routing address for this node. See
ip-autodetection-method flag for valid options.
[default: first-found]
--log-dir=<LOG_DIR> The directory containing Calico logs.
--log-dir=\<LOG_DIR> The directory containing Calico logs.
[default: /var/log/calico]
--node-image=<DOCKER_IMAGE_NAME>
--node-image=\<DOCKER_IMAGE_NAME>
Docker image to use for Calico's per-node container.
[default: {variables.registry}{variables.imageNames.node}:latest]
--backend=(bird|none)
Expand All @@ -348,7 +348,7 @@ terminating `,` character does not need to be specified for those cases.
and there are no pre-existing Calico IP pools.
--disable-docker-networking
Disable Docker networking.
--docker-networking-ifprefix=<IFPREFIX>
--docker-networking-ifprefix=\<IFPREFIX>
Interface prefix to use for the network interface
within the Docker containers that have been networked
by the Calico driver.
Expand Down
2 changes: 1 addition & 1 deletion ...e_versioned_docs/version-3.16/_includes/content/_non-cluster-binary-install.mdx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This step requires Docker, but it can be run from any machine with Docker instal

<CodeBlock language=''>
REPOSITORY TAG IMAGE ID CREATED SIZE
{variables.registry}{variables.releases[0].components.cnx-node.image} {variables.releases[0].components.cnx-node.version} e07d59b0eb8a 2 minutes ago 42MB
{variables.registry}{variables.releases[0].components['cnx-node'].image} {variables.releases[0].components['cnx-node'].version} e07d59b0eb8a 2 minutes ago 42MB
</CodeBlock>

1. Create a temporary {variables.nodecontainer} container.
Expand Down
Loading

0 comments on commit 2a7bf7d

Please sign in to comment.