Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DOCS-2091: D3 updates to main #1358

Merged
merged 4 commits into from
Mar 7, 2024
Merged

DOCS-2091: D3 updates to main #1358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f595e7
Removes old OSS 3.24 file
ctauchen Mar 7, 2024
6f2a434
Changes syntax for componentImagePlugin.js, adds imports for DomainNa…
ctauchen Mar 7, 2024
3b9ffe1
Updates to ComponentVersions component to clear errors
ctauchen Mar 7, 2024
edb6ecd
Updates to ComponentVersions component to clear errors
ctauchen Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion calico-cloud/_includes/content/_docker-container-service.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ExecStart=/usr/bin/docker run --net=host --privileged \
-v /run/docker/plugins:/run/docker/plugins \
-v /lib/modules:/lib/modules \
-v /etc/pki:/pki \
{{registry}}{% component_image("cnx-node") %} /bin/calico-node -felix
{{registry}}%% component_image("cnx-node") %% /bin/calico-node -felix

ExecStop=-/usr/bin/docker stop {{noderunning}}

Expand Down
2 changes: 2 additions & 0 deletions calico-cloud/_includes/content/_entityrule.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import DomainNames from '@site/calico-cloud/_includes/content/_domain-names.mdx';

Entity rules specify the attributes of the source or destination of a packet that must match for the rule as a whole
to match. Packets can be matched on combinations of:

Expand Down
4 changes: 2 additions & 2 deletions calico-cloud/_includes/content/_non-cluster-binary-install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Use the following command to download the {{nodecontainer}} image.

```bash
docker pull {{registry}}{% component_image("cnx-node") %}
docker pull {{registry}}%% component_image("cnx-node") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand All @@ -25,7 +25,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Create a temporary {{nodecontainer}} container.

```bash
docker create --name container {{registry}}{% component_image("cnx-node") %}
docker create --name container {{registry}}%% component_image("cnx-node") %%
```

1. Copy the calico-node binary from the container to the local file system.
Expand Down
2 changes: 1 addition & 1 deletion ...oud_versioned_docs/version-19-1/_includes/content/_docker-container-service.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ExecStart=/usr/bin/docker run --net=host --privileged \
-v /run/docker/plugins:/run/docker/plugins \
-v /lib/modules:/lib/modules \
-v /etc/pki:/pki \
{{registry}}{% component_image("cnx-node") %} /bin/calico-node -felix
{{registry}}%% component_image("cnx-node") %% /bin/calico-node -felix

ExecStop=-/usr/bin/docker stop {{noderunning}}

Expand Down
2 changes: 2 additions & 0 deletions calico-cloud_versioned_docs/version-19-1/_includes/content/_entityrule.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import DomainNames from '@site/calico-cloud_versioned_docs/version-19-1/_includes/content/_domain-names.mdx';

Entity rules specify the attributes of the source or destination of a packet that must match for the rule as a whole
to match. Packets can be matched on combinations of:

Expand Down
4 changes: 2 additions & 2 deletions ...d_versioned_docs/version-19-1/_includes/content/_non-cluster-binary-install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Use the following command to download the {{nodecontainer}} image.

```bash
docker pull {{registry}}{% component_image("cnx-node") %}
docker pull {{registry}}%% component_image("cnx-node") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand All @@ -25,7 +25,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Create a temporary {{nodecontainer}} container.

```bash
docker create --name container {{registry}}{% component_image("cnx-node") %}
docker create --name container {{registry}}%% component_image("cnx-node") %%
```

1. Copy the calico-node binary from the container to the local file system.
Expand Down
16 changes: 2 additions & 14 deletions calico-enterprise/_includes/components/ComponentVersions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,8 @@ export default function ComponentVersions() {
const { prodname, version, downloadsurl } = variables;

const releases = variables.releases.map((release) => {
let note = release.note;
try {
if (!note) {
note = require(`../release-notes/_${release.title}-release-notes.mdx`).default({});
}
} catch {
console.error(`Cannot find "/_includes/release-notes/_${release.title}-release-notes.mdx" file`);
}

return {
...release,
note,
};
});
return release;
}).filter(release => release);

return (
<>
Expand Down
2 changes: 1 addition & 1 deletion calico-enterprise/_includes/content/_docker-container-service.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ExecStart=/usr/bin/docker run --net=host --privileged \
-v /run/docker/plugins:/run/docker/plugins \
-v /lib/modules:/lib/modules \
-v /etc/pki:/pki \
{{registry}}{% component_image("cnx-node") %} /bin/calico-node -felix
{{registry}}%% component_image("cnx-node") %% /bin/calico-node -felix

ExecStop=-/usr/bin/docker stop {{noderunning}}

Expand Down
4 changes: 2 additions & 2 deletions calico-enterprise/_includes/content/_non-cluster-binary-install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Use the following command to download the {{nodecontainer}} image.

```bash
docker pull {{registry}}{% component_image("cnx-node") %}
docker pull {{registry}}%% component_image("cnx-node") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand All @@ -25,7 +25,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Create a temporary {{nodecontainer}} container.

```bash
docker create --name container {{registry}}{% component_image("cnx-node") %}
docker create --name container {{registry}}%% component_image("cnx-node") %%
```

1. Copy the calico-node binary from the container to the local file system.
Expand Down
2 changes: 1 addition & 1 deletion calico-enterprise/operations/clis/calicoctl/install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ If you run these commands from your local machine (instead of a host node), some
registry.

```bash
docker pull {{registry}}{% component_image("calicoctl") %}
docker pull {{registry}}%% component_image("calicoctl") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand Down
2 changes: 1 addition & 1 deletion calico-enterprise/operations/clis/calicoq/installing.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ corresponds to your desired deployment.
registry.

```bash
docker pull {{registry}}{% component_image("calicoq") %}
docker pull {{registry}}%% component_image("calicoq") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand Down
2 changes: 1 addition & 1 deletion ...ise_versioned_docs/version-3.16/_includes/content/_docker-container-service.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ExecStart=/usr/bin/docker run --net=host --privileged \
-v /run/docker/plugins:/run/docker/plugins \
-v /lib/modules:/lib/modules \
-v /etc/pki:/pki \
{{registry}}{% component_image("cnx-node") %} /bin/calico-node -felix
{{registry}}%% component_image("cnx-node") %% /bin/calico-node -felix

ExecStop=-/usr/bin/docker stop {{noderunning}}

Expand Down
4 changes: 2 additions & 2 deletions ...e_versioned_docs/version-3.16/_includes/content/_non-cluster-binary-install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Use the following command to download the {{nodecontainer}} image.

```bash
docker pull {{registry}}{% component_image("cnx-node") %}
docker pull {{registry}}%% component_image("cnx-node") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand All @@ -25,7 +25,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Create a temporary {{nodecontainer}} container.

```bash
docker create --name container {{registry}}{% component_image("cnx-node") %}
docker create --name container {{registry}}%% component_image("cnx-node") %%
```

1. Copy the calico-node binary from the container to the local file system.
Expand Down
2 changes: 1 addition & 1 deletion ...co-enterprise_versioned_docs/version-3.16/operations/clis/calicoctl/install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ If you run these commands from your local machine (instead of a host node), some
registry.

```bash
docker pull {{registry}}{% component_image("calicoctl") %}
docker pull {{registry}}%% component_image("calicoctl") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand Down
2 changes: 1 addition & 1 deletion ...o-enterprise_versioned_docs/version-3.16/operations/clis/calicoq/installing.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ corresponds to your desired deployment.
registry.

```bash
docker pull {{registry}}{% component_image("calicoq") %}
docker pull {{registry}}%% component_image("calicoq") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand Down
2 changes: 1 addition & 1 deletion ...ise_versioned_docs/version-3.17/_includes/content/_docker-container-service.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ExecStart=/usr/bin/docker run --net=host --privileged \
-v /run/docker/plugins:/run/docker/plugins \
-v /lib/modules:/lib/modules \
-v /etc/pki:/pki \
{{registry}}{% component_image("cnx-node") %} /bin/calico-node -felix
{{registry}}%% component_image("cnx-node") %% /bin/calico-node -felix

ExecStop=-/usr/bin/docker stop {{noderunning}}

Expand Down
4 changes: 2 additions & 2 deletions ...e_versioned_docs/version-3.17/_includes/content/_non-cluster-binary-install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Use the following command to download the {{nodecontainer}} image.

```bash
docker pull {{registry}}{% component_image("cnx-node") %}
docker pull {{registry}}%% component_image("cnx-node") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand All @@ -25,7 +25,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Create a temporary {{nodecontainer}} container.

```bash
docker create --name container {{registry}}{% component_image("cnx-node") %}
docker create --name container {{registry}}%% component_image("cnx-node") %%
```

1. Copy the calico-node binary from the container to the local file system.
Expand Down
2 changes: 1 addition & 1 deletion ...co-enterprise_versioned_docs/version-3.17/operations/clis/calicoctl/install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ If you run these commands from your local machine (instead of a host node), some
registry.

```bash
docker pull {{registry}}{% component_image("calicoctl") %}
docker pull {{registry}}%% component_image("calicoctl") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand Down
2 changes: 1 addition & 1 deletion ...o-enterprise_versioned_docs/version-3.17/operations/clis/calicoq/installing.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ corresponds to your desired deployment.
registry.

```bash
docker pull {{registry}}{% component_image("calicoq") %}
docker pull {{registry}}%% component_image("calicoq") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand Down
16 changes: 2 additions & 14 deletions ...erprise_versioned_docs/version-3.18-2/_includes/components-temp/ComponentVersions-temp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,8 @@ export default function ComponentVersions() {
const { prodname, version, downloadsurl } = variables;

const releases = variables.releases.map((release) => {
let note = release.note;
try {
if (!note) {
note = require(`../release-notes/_${release.title}-release-notes.mdx`).default({});
}
} catch {
console.error(`Cannot find "/_includes/release-notes/_${release.title}-release-notes.mdx" file`);
}

return {
...release,
note,
};
});
return release;
}).filter(release => release);

return (
<>
Expand Down
16 changes: 2 additions & 14 deletions calico-enterprise_versioned_docs/version-3.18-2/_includes/components/ComponentVersions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,8 @@ export default function ComponentVersions() {
const { prodname, version, downloadsurl } = variables;

const releases = variables.releases.map((release) => {
let note = release.note;
try {
if (!note) {
note = require(`../release-notes/_${release.title}-release-notes.mdx`).default({});
}
} catch {
console.error(`Cannot find "/_includes/release-notes/_${release.title}-release-notes.mdx" file`);
}

return {
...release,
note,
};
});
return release;
}).filter(release => release);

return (
<>
Expand Down
2 changes: 1 addition & 1 deletion ...e_versioned_docs/version-3.18-2/_includes/content/_docker-container-service.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ExecStart=/usr/bin/docker run --net=host --privileged \
-v /run/docker/plugins:/run/docker/plugins \
-v /lib/modules:/lib/modules \
-v /etc/pki:/pki \
{{registry}}{% component_image("cnx-node") %} /bin/calico-node -felix
{{registry}}%% component_image("cnx-node") %% /bin/calico-node -felix

ExecStop=-/usr/bin/docker stop {{noderunning}}

Expand Down
4 changes: 2 additions & 2 deletions ...versioned_docs/version-3.18-2/_includes/content/_non-cluster-binary-install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Use the following command to download the {{nodecontainer}} image.

```bash
docker pull {{registry}}{% component_image("cnx-node") %}
docker pull {{registry}}%% component_image("cnx-node") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand All @@ -25,7 +25,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Create a temporary {{nodecontainer}} container.

```bash
docker create --name container {{registry}}{% component_image("cnx-node") %}
docker create --name container {{registry}}%% component_image("cnx-node") %%
```

1. Copy the calico-node binary from the container to the local file system.
Expand Down
2 changes: 1 addition & 1 deletion ...-enterprise_versioned_docs/version-3.18-2/operations/clis/calicoctl/install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ If you run these commands from your local machine (instead of a host node), some
registry.

```bash
docker pull {{registry}}{% component_image("calicoctl") %}
docker pull {{registry}}%% component_image("calicoctl") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand Down
2 changes: 1 addition & 1 deletion ...enterprise_versioned_docs/version-3.18-2/operations/clis/calicoq/installing.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ corresponds to your desired deployment.
registry.

```bash
docker pull {{registry}}{% component_image("calicoq") %}
docker pull {{registry}}%% component_image("calicoq") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand Down
2 changes: 1 addition & 1 deletion ...ise_versioned_docs/version-3.18/_includes/content/_docker-container-service.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ ExecStart=/usr/bin/docker run --net=host --privileged \
-v /run/docker/plugins:/run/docker/plugins \
-v /lib/modules:/lib/modules \
-v /etc/pki:/pki \
{{registry}}{% component_image("cnx-node") %} /bin/calico-node -felix
{{registry}}%% component_image("cnx-node") %% /bin/calico-node -felix

ExecStop=-/usr/bin/docker stop {{noderunning}}

Expand Down
4 changes: 2 additions & 2 deletions ...e_versioned_docs/version-3.18/_includes/content/_non-cluster-binary-install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Use the following command to download the {{nodecontainer}} image.

```bash
docker pull {{registry}}{% component_image("cnx-node") %}
docker pull {{registry}}%% component_image("cnx-node") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand All @@ -25,7 +25,7 @@ This step requires Docker, but it can be run from any machine with Docker instal
1. Create a temporary {{nodecontainer}} container.

```bash
docker create --name container {{registry}}{% component_image("cnx-node") %}
docker create --name container {{registry}}%% component_image("cnx-node") %%
```

1. Copy the calico-node binary from the container to the local file system.
Expand Down
2 changes: 1 addition & 1 deletion ...co-enterprise_versioned_docs/version-3.18/operations/clis/calicoctl/install.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ If you run these commands from your local machine (instead of a host node), some
registry.

```bash
docker pull {{registry}}{% component_image("calicoctl") %}
docker pull {{registry}}%% component_image("calicoctl") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand Down
2 changes: 1 addition & 1 deletion ...o-enterprise_versioned_docs/version-3.18/operations/clis/calicoq/installing.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ corresponds to your desired deployment.
registry.

```bash
docker pull {{registry}}{% component_image("calicoq") %}
docker pull {{registry}}%% component_image("calicoq") %%
```

1. Confirm that the image has loaded by typing `docker images`.
Expand Down
16 changes: 2 additions & 14 deletions ...erprise_versioned_docs/version-3.19-1/_includes/components-temp/ComponentVersions-temp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,8 @@ export default function ComponentVersions() {
const { prodname, version, downloadsurl } = variables;

const releases = variables.releases.map((release) => {
let note = release.note;
try {
if (!note) {
note = require(`../release-notes/_${release.title}-release-notes.mdx`).default({});
}
} catch {
console.error(`Cannot find "/_includes/release-notes/_${release.title}-release-notes.mdx" file`);
}

return {
...release,
note,
};
});
return release;
}).filter(release => release);

return (
<>
Expand Down
Loading
Loading