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.

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

Use common includes for orchestration pages #18894

Open
wants to merge 12 commits into
base: main
Choose a base branch
from

Conversation

mdlinville
Copy link
Contributor

@mdlinville mdlinville commented Sep 11, 2024

Within each major version, a series of pages about Kubernetes is driven by a series of includes about Kubernetes. Kubernetes itself is CRDB-version-agnostic. Rather than moving the content pages around, this PR shares the common includes related to Kubernetes among major version docs. This will ease maintenance of this content, and may also improve site build times by reducing the # of files being built.

This PR:

  • Moves images/v24.2/kubernetes*.png to images/common/
  • Moves _includes/v24.2/orchesteration/ to _includes/common/orchestration
  • Updates includes within _includes/common/orchestration to point to the common content for their own includes and to use the common images.
    • No includes other than orchestration includes are called within _includes/v24.2 and no other v24.2 pages use the common images.
  • Updates pages within v24.2/ to point to the common content for orchestration includes and images.
  • Tweak the cockroachcloud/use-cloud-instead.md include to use a Markdown link.
  • Where an include I review or modify contains no Liquid, update related include statements to include_cached.
  • Backports the above to v24.1, v23.2, v23.1, v22.2

Tests:

  • Local build
  • Local linkcheck

Copy link

github-actions bot commented Sep 11, 2024

Files changed:

Copy link

netlify bot commented Sep 11, 2024

Deploy Preview for cockroachdb-api-docs canceled.

Name Link
🔨 Latest commit a92c9d8
🔍 Latest deploy log https://app.netlify.com/sites/cockroachdb-api-docs/deploys/670d9401b5687f00083a6b3d

Copy link

netlify bot commented Sep 11, 2024

Deploy Preview for cockroachdb-interactivetutorials-docs canceled.

Name Link
🔨 Latest commit a92c9d8
🔍 Latest deploy log https://app.netlify.com/sites/cockroachdb-interactivetutorials-docs/deploys/670d9401621dc80008e78de0

Copy link

netlify bot commented Sep 11, 2024

Netlify Preview

Name Link
🔨 Latest commit a92c9d8
🔍 Latest deploy log https://app.netlify.com/sites/cockroachdb-docs/deploys/670d9401385f070008246391
😎 Deploy Preview https://deploy-preview-18894--cockroachdb-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@mdlinville mdlinville changed the title [POC] Use common includes for v24.2 orchestration pages [POC] Use common includes for v24.2 and v24.1 orchestration pages Sep 27, 2024
@mdlinville mdlinville force-pushed the k8s_common_includes branch 4 times, most recently from 428b2ee to 60327b5 Compare September 30, 2024 18:16
@mdlinville mdlinville changed the title [POC] Use common includes for v24.2 and v24.1 orchestration pages Use common includes for orchestration pages Sep 30, 2024
Copy link
Contributor

@taroface taroface left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blocking because a few files/filenames got mixed up here, causing the wrong content to be shown.

@@ -1,3 +1,3 @@
{{site.data.alerts.callout_success}}
To deploy a free CockroachDB {{ site.data.products.cloud }} cluster instead of running CockroachDB yourself, see the <a href="{% link cockroachcloud/quickstart.md %}">Quickstart</a>.
To deploy a free CockroachDB Cloud cluster instead of running CockroachDB yourself, see the [Quickstart]({% link cockroachcloud/quickstart.md %}).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason the product variable was removed for Cloud?

~~~
1. Create a `my-values.yaml` file to override the defaults in `values.yaml`, substituting your own values in this example based on the guidelines below.

{% include_cached copy-clipboard.html %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


1. Use the file to create the StatefulSet and start the cluster:
Modify the file wherever there is a `TODO` comment, then use the file to create the StatefulSet and start the cluster:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<section class="filter-content" markdown="1" data-scope="operator">

{% capture latest_operator_version %}{% include_cached latest_operator_version.md %}{% endcapture %}

1. To use the CockroachDB SQL client, first launch a secure pod running the `cockroach` binary.
1. From your local workstation, use the [Kubernetes Operator](https://github.com/cockroachdb/cockroach-operator/) file to launch a pod and keep it running indefinitely.

{% include_cached copy-clipboard.html %}
~~~ shell
$ kubectl create \
-f https://raw.githubusercontent.com/cockroachdb/cockroach-operator/v{{ latest_operator_version }}/examples/client-secure-operator.yaml
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is pointing to a secure yaml, though. Do we have an insecure one for the Operator? Maybe this is why we never added an Operator option for the local insecure doc.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was incorrectly renamed to test-cluster-insecure rather than test-cluster-secure. So it's being included on the wrong doc.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like the wrong content? Should be Cluster Upgrades.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment as earlier; this is the wrong file content.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants