Skip to content

Commit 52a695e

Browse files
committed
Use common includes for v24.2 orchestration pages
1 parent 7232df2 commit 52a695e

File tree

60 files changed

+775
-783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+775
-783
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{{site.data.alerts.callout_success}}
2-
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>.
2+
To deploy a free CockroachDB Cloud cluster instead of running CockroachDB yourself, see the [Quickstart]({% link cockroachcloud/quickstart.md %}).
33
{{site.data.alerts.end}}

src/current/_includes/v24.2/orchestration/kubernetes-cockroach-cert.md renamed to src/current/_includes/common/orchestration/kubernetes-cockroach-cert.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,4 @@ The below steps use [`cockroach cert` commands]({% link {{ page.version.version
8787
cockroachdb.client.root Opaque 3 41m
8888
cockroachdb.node Opaque 5 14s
8989
default-token-6qjdb kubernetes.io/service-account-token 3 4m
90-
~~~
90+
~~~

src/current/_includes/v24.2/orchestration/kubernetes-expand-disk-helm.md renamed to src/current/_includes/common/orchestration/kubernetes-expand-disk-helm.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
You can expand certain [types of persistent volumes](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#types-of-persistent-volumes
2-
) (including GCE Persistent Disk and Amazon Elastic Block Store) by editing their persistent volume claims.
2+
) (including in cloud storage) by editing their persistent volume claims.
33

44
{{site.data.alerts.callout_info}}
5-
These steps assume you followed the tutorial [Deploy CockroachDB on Kubernetes](deploy-cockroachdb-with-kubernetes.html?filters=helm).
5+
These steps assume you followed the tutorial [Deploy CockroachDB on Kubernetes]({% link {{ page.version.version }}/deploy-cockroachdb-with-kubernetes.md %}?filters=helm).
66
{{site.data.alerts.end}}
77

88
1. Get the persistent volume claims for the volumes:
@@ -63,19 +63,19 @@ These steps assume you followed the tutorial [Deploy CockroachDB on Kubernetes](
6363

6464
~~~
6565
persistentvolumeclaim/datadir-my-release-cockroachdb-0 patched
66-
~~~
66+
~~~
6767

6868
1. Check the capacity of the persistent volume claim:
6969

7070
{% include_cached copy-clipboard.html %}
7171
~~~ shell
7272
$ kubectl get pvc datadir-my-release-cockroachdb-0
73-
~~~
73+
~~~
7474

7575
~~~
7676
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
7777
datadir-my-release-cockroachdb-0 Bound pvc-75dadd4c-01a1-11ea-b065-42010a8e00cb 100Gi RWO standard 18m
78-
~~~
78+
~~~
7979

8080
If the PVC capacity has not changed, this may be because `AllowVolumeExpansion` was initially set to `false` or because the [volume has a file system](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#resizing-an-in-use-persistentvolumeclaim) that has to be expanded. You will need to start or restart a pod in order to have it reflect the new capacity.
8181

@@ -113,6 +113,6 @@ These steps assume you followed the tutorial [Deploy CockroachDB on Kubernetes](
113113
~~~
114114
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
115115
datadir-my-release-cockroachdb-0 Bound pvc-75dadd4c-01a1-11ea-b065-42010a8e00cb 200Gi RWO standard 20m
116-
~~~
116+
~~~
117117
118-
1. The CockroachDB cluster needs to be expanded one node at a time. Repeat steps 3 - 6 to increase the capacities of the remaining volumes by the same amount.
118+
1. The CockroachDB cluster needs to be expanded one node at a time. Repeat steps 3 - 6 to increase the capacities of the remaining volumes by the same amount.

src/current/_includes/v24.2/orchestration/kubernetes-expand-disk-manual.md renamed to src/current/_includes/common/orchestration/kubernetes-expand-disk-manual.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ You can expand certain [types of persistent volumes](https://kubernetes.io/docs/
22
) (including GCE Persistent Disk and Amazon Elastic Block Store) by editing their persistent volume claims.
33

44
{{site.data.alerts.callout_info}}
5-
These steps assume you followed the tutorial [Deploy CockroachDB on Kubernetes](deploy-cockroachdb-with-kubernetes.html?filters=manual).
5+
These steps assume you followed the tutorial [Deploy CockroachDB on Kubernetes]({% link {{ page.version.version }}/deploy-cockroachdb-with-kubernetes.md %}?filters=manual).
66
{{site.data.alerts.end}}
77

88
1. Get the persistent volume claims for the volumes:
@@ -70,7 +70,7 @@ These steps assume you followed the tutorial [Deploy CockroachDB on Kubernetes](
7070
{% include_cached copy-clipboard.html %}
7171
~~~ shell
7272
$ kubectl get pvc datadir-cockroachdb-0
73-
~~~
73+
~~~
7474

7575
~~~
7676
NAME STATUS VOLUME CAPACITY ACCESS MODES STORAGECLASS AGE
@@ -115,4 +115,4 @@ These steps assume you followed the tutorial [Deploy CockroachDB on Kubernetes](
115115
datadir-cockroachdb-0 Bound pvc-75dadd4c-01a1-11ea-b065-42010a8e00cb 200Gi RWO standard 20m
116116
~~~
117117
118-
1. The CockroachDB cluster needs to be expanded one node at a time. Repeat steps 3 - 6 to increase the capacities of the remaining volumes by the same amount.
118+
1. The CockroachDB cluster needs to be expanded one node at a time. Repeat steps 3 - 6 to increase the capacities of the remaining volumes by the same amount.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
To delete the Kubernetes cluster:
2+
3+
- Hosted GKE:
4+
5+
{% include_cached copy-clipboard.html %}
6+
~~~ shell
7+
$ gcloud container clusters delete cockroachdb --region {region-name}
8+
~~~
9+
- Hosted EKS:
10+
11+
{% include_cached copy-clipboard.html %}
12+
~~~ shell
13+
$ eksctl delete cluster --name cockroachdb
14+
~~~
15+
- Manual GCE:
16+
17+
{% include_cached copy-clipboard.html %}
18+
~~~ shell
19+
$ cluster/kube-down.sh
20+
~~~
21+
- Manual AWS:
22+
23+
{% include_cached copy-clipboard.html %}
24+
~~~ shell
25+
$ cluster/kube-down.sh
26+
~~~
27+
28+
{{site.data.alerts.callout_danger}}
29+
If you stop Kubernetes without first deleting the persistent volumes, they will still exist in your cloud project.
30+
{{site.data.alerts.end}}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
Feature | Description
2+
--------|------------
3+
[node](https://kubernetes.io/docs/concepts/architecture/nodes/) | A physical or virtual machine. In this tutorial, you'll create GCE or AWS instances and join them as worker nodes into a single Kubernetes cluster from your local workstation.
4+
[pod](http://kubernetes.io/docs/user-guide/pods/) | A pod is a group of one or more Docker containers. In this tutorial, each pod will run on a separate Kubernetes node and include one Docker container running a single CockroachDB node. You'll start with 3 pods and grow to 4.
5+
[StatefulSet](http://kubernetes.io/docs/concepts/abstractions/controllers/statefulsets/) | A StatefulSet is a group of pods treated as stateful units, where each pod has distinguishable network identity and always binds back to the same persistent storage on restart. StatefulSets are considered stable as of Kubernetes version 1.9 after reaching beta in version 1.5.
6+
[persistent volumes](http://kubernetes.io/docs/user-guide/persistent-volumes/) | A persistent volume is a piece of networked storage (Persistent Disk on GCE, Elastic Block Store on AWS) mounted into a pod. The lifetime of a persistent volume is decoupled from the lifetime of the pod that's using it, ensuring that each CockroachDB node binds back to the same storage on restart.<br><br>This tutorial assumes that dynamic volume provisioning is available. When that is not the case, [persistent volume claims](http://kubernetes.io/docs/user-guide/persistent-volumes/#persistentvolumeclaims) need to be created manually.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## Step 1. Start Kubernetes
2+
3+
1. Follow the Kubernetes [documentation](https://kubernetes.io/docs/tasks/tools/install-minikube/) to install the latest release of `minikube`, a tool you can use to run Kubernetes on a workstation. `minikube` includes installing a hypervisor and `kubectl`, the command-line tool used to manage Kubernetes.
4+
5+
1. Start a local Kubernetes cluster:
6+
7+
{% include_cached copy-clipboard.html %}
8+
~~~ shell
9+
$ minikube start
10+
~~~

0 commit comments

Comments
 (0)