Pvcprotection toc (#7807)

* Refreshing installation instructions (#7495) * Refreshing installation instructions Added conjure-up. Updated displays and juju versions to current versions. * Updated anchors * Fixed image value version typo (#7768) Was inconsistent with other values * Update flocker reference to the github repo (#7784) * Fix typo in federation document (#7779) * an user -> a user (#7778) * Events are namespaced (#7767) * fix 'monitoring' link lose efficacy problem' (#7764) * docs/concepts/policy/pod-security-policy.md: minor fix. (#7659) * Update downward-api-volume-expose-pod-information.md (#7771) * Update downward-api-volume-expose-pod-information.md The pod spec puts the downward api files into /etc/podinfo, not directly in /etc. Updated docs to reflect this fact. * Update downward-api-volume-expose-pod-information.md One more spot needed fixing. * Update downward-api-volume-expose-pod-information.md Yet another fix, in the container example. * Add Amadeus Case Study (#7783) * Add Amadeus Case Study * add Amadeus logo * Fixed Cyrillic с in 'kube-proxy-cm' (#7787) There was a typo (wrong character) in kube-proxy-cm.yaml - Cyrillic с (UTF-8 0x0441) was used instead of Latin c. * install-kubectl: choose one installation method (#7705) The previous text layout suggested that all installations had to be done, one after another. * Update install-kubeadm.md (#7781) Add note to kubeadm install instruction to help install in other arch i.e. aarch64, ppc64le etc. * repair failure link (#7788) * repair failure link * repair failure link * do change as required * Update k8s201.md (#7777) * Update k8s201.md Change instructions to download yams files directly from the website (as used in other pages.) Added instructions to delete labeled pod to avoid warnings in the subsequent deployment step. * Update k8s201.md Added example of using the exposed host from the a node running Kubernetes. (This works on AWS with Weave; not able to test it on other variations...) * Gramatical fix to kompose introduction (#7792) The original wording didn't through very well. As much of the original sentence has been preserved as possible, primarily to ensure the kompose web address is see both in text and as a href link. * update amadeus.html (#7800) * Fix a missing word in endpoint reconciler section (#7804) * add toc entry for pvcprotection downgrade issue doc
kubernetes · Apr 16, 2018 · d74ce9b · d74ce9b
1 parent b25cbea
commit d74ce9b
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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://<masterLoadBalancerFQDN>: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
@@ -240,7 +240,13 @@ apt-get install -y kubelet kubeadm kubectl
 cat <<EOF > /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
@@ -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,15 +284,15 @@ 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:
 
        brew install kubectl
 
 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: