diff --git a/docs/concepts/storage/persistent-volumes.md b/docs/concepts/storage/persistent-volumes.md index b323af5d01..00e0910485 100644 --- a/docs/concepts/storage/persistent-volumes.md +++ b/docs/concepts/storage/persistent-volumes.md @@ -261,6 +261,7 @@ parameters: allowVolumeExpansion: true ``` +<<<<<<< HEAD <<<<<<< HEAD Once both feature gate and the aforementioned admission plug-in are turned on, a user can request larger volume for their `PersistentVolumeClaim` by simply editing the claim and requesting a larger size. This in turn will trigger expansion of the volume that is backing the underlying `PersistentVolume`. @@ -269,6 +270,11 @@ Once both feature gate and aforementioned admission plug-in are turned on, an us by simply editing the claim and requesting bigger size. This in turn will trigger expansion of volume that is backing underlying `PersistentVolume`. ======= Once both feature gate and the aforementioned admission plug-in are turned on, an user can request larger volume for their `PersistentVolumeClaim` +||||||| merged common ancestors +Once both feature gate and the aforementioned admission plug-in are turned on, an user can request larger volume for their `PersistentVolumeClaim` +======= +Once both feature gate and the aforementioned admission plug-in are turned on, a user can request larger volume for their `PersistentVolumeClaim` +>>>>>>> Pvcprotection toc (#7807) by simply editing the claim and requesting a larger size. This in turn will trigger expansion of the volume that is backing the underlying `PersistentVolume`. >>>>>>> merge master to 1.10, with fixes (#7682) diff --git a/docs/getting-started-guides/ubuntu/installation.md b/docs/getting-started-guides/ubuntu/installation.md index e30174db53..bd3152a409 100644 --- a/docs/getting-started-guides/ubuntu/installation.md +++ b/docs/getting-started-guides/ubuntu/installation.md @@ -131,8 +131,14 @@ ERROR failed to bootstrap model: instance provisioning failed (Failed) ``` +<<<<<<< HEAD You will need a controller node for each cloud or region you are deploying to. See the [controller documentation](https://jujucharms.com/docs/2.2/controllers) for more information. >>>>>>> merge master to 1.10, with fixes (#7682) +||||||| merged common ancestors +You will need a controller node for each cloud or region you are deploying to. See the [controller documentation](https://jujucharms.com/docs/2.2/controllers) for more information. +======= +You will need a controller node for each cloud or region you are deploying to. See the [controller documentation](https://jujucharms.com/docs/2.3/controllers) for more information. +>>>>>>> Pvcprotection toc (#7807) Note that each controller can host multiple Kubernetes clusters in a given cloud or region. diff --git a/docs/setup/independent/high-availability.md b/docs/setup/independent/high-availability.md index c297b7c19d..1aa16715bf 100644 --- a/docs/setup/independent/high-availability.md +++ b/docs/setup/independent/high-availability.md @@ -957,7 +957,7 @@ Next provision and set up the worker nodes. To do this, you will need to provisi ``` ======= ```shell - kubectl get configmap -n kube-system kube-proxy -o yaml > kube-proxy-сm.yaml + kubectl get configmap -n kube-system kube-proxy -o yaml > kube-proxy-cm.yaml sed -i 's#server:.*#server: https://:6443#g' kube-proxy-cm.yaml kubectl apply -f kube-proxy-cm.yaml --force # restart all kube-proxy pods to ensure that they load the new configmap diff --git a/docs/setup/independent/install-kubeadm.md b/docs/setup/independent/install-kubeadm.md index a988a494eb..83049a0967 100644 --- a/docs/setup/independent/install-kubeadm.md +++ b/docs/setup/independent/install-kubeadm.md @@ -240,7 +240,13 @@ apt-get install -y kubelet kubeadm kubectl cat < /etc/yum.repos.d/kubernetes.repo [kubernetes] name=Kubernetes +<<<<<<< HEAD baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-\$basearch +||||||| merged common ancestors +baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64 +======= +baseurl=https://packages.cloud.google.com/yum/repos/kubernetes-el7-$basearch +>>>>>>> Pvcprotection toc (#7807) enabled=1 gpgcheck=1 repo_gpgcheck=1 diff --git a/docs/tasks/tools/install-kubectl.md b/docs/tasks/tools/install-kubectl.md index 9865693d3e..0861462892 100644 --- a/docs/tasks/tools/install-kubectl.md +++ b/docs/tasks/tools/install-kubectl.md @@ -16,8 +16,15 @@ Use a version of kubectl that is the same version as your server or later. Using ## Install kubectl Here are a few methods to install kubectl. +<<<<<<< HEAD +||||||| merged common ancestors +======= +Pick the one that suits your environment best. + +>>>>>>> Pvcprotection toc (#7807) {% capture steps %} +<<<<<<< HEAD ## Install kubectl binary via native package management @@ -117,6 +124,11 @@ kubectl can be installed as part of the Google Cloud SDK. 3. Run `kubectl version` to verify that the version you've installed is sufficiently up-to-date. ## Install kubectl binary via curl +||||||| merged common ancestors +## Install kubectl binary via curl +======= +### Install kubectl binary via curl +>>>>>>> Pvcprotection toc (#7807) {% capture macos %} 1. Download the latest release with the command: @@ -184,6 +196,7 @@ kubectl can be installed as part of the Google Cloud SDK. {% include tabs.md %} +<<<<<<< HEAD <<<<<<< HEAD ||||||| merged common ancestors ## Download as part of the Google Cloud SDK @@ -246,6 +259,11 @@ Edit the config file with a text editor of your choice, such as Notepad for exam ======= ## Download as part of the Google Cloud SDK +||||||| merged common ancestors +## Download as part of the Google Cloud SDK +======= +### Download as part of the Google Cloud SDK +>>>>>>> Pvcprotection toc (#7807) kubectl can be installed as part of the Google Cloud SDK. @@ -256,7 +274,7 @@ kubectl can be installed as part of the Google Cloud SDK. 3. Run `kubectl version` to verify that the version you've installed is sufficiently up-to-date. -## Install with snap on Ubuntu +### Install with snap on Ubuntu kubectl is available as a [snap](https://snapcraft.io/) application. @@ -266,7 +284,7 @@ kubectl is available as a [snap](https://snapcraft.io/) application. 2. Run `kubectl version` to verify that the version you've installed is sufficiently up-to-date. -## Install with Homebrew on macOS +### Install with Homebrew on macOS 1. If you are on macOS and using [Homebrew](https://brew.sh/) package manager, you can install with: @@ -274,7 +292,7 @@ kubectl is available as a [snap](https://snapcraft.io/) application. 2. Run `kubectl version` to verify that the version you've installed is sufficiently up-to-date. -## Install with Powershell from PSGallery +### Install with Powershell from PSGallery 1. If you are on Windows and using [Powershell Gallery](https://www.powershellgallery.com/) package manager, you can install and update with: @@ -287,7 +305,7 @@ If no Downloadlocation is specified, kubectl will be installed in users temp Dir re-run Install-Script to update the installer re-run install-kubectl.ps1 to install latest binaries -## Install with Chocolatey on Windows +### Install with Chocolatey on Windows 1. If you are on Windows and using [Chocolatey](https://chocolatey.org) package manager, you can install with: