diff --git a/content/cn/docs/concepts/configuration/secret.md b/content/cn/docs/concepts/configuration/secret.md index fd1a9d03779fd..5d59573aa739a 100644 --- a/content/cn/docs/concepts/configuration/secret.md +++ b/content/cn/docs/concepts/configuration/secret.md @@ -104,7 +104,7 @@ $ kubectl create -f ./secret.yaml secret "mysecret" created ``` -**编码注意：** secret 数据的序列化 JSON 和 YAML 值使用 base64 编码成字符串。换行符在这些字符串中无效，必须省略。当在 Darwin/OS X 上使用 `base64` 实用程序时，用户应避免使用 `-b` 选项来拆分长行。另外，对于 Linux 用户如果 `-w` 选项不可用的话，应该添加选项 `-w 0` 到 `base64` 命令或管道 `base64 | tr -d '\n' ` 。 +**编码注意：** secret 数据的序列化 JSON 和 YAML 值使用 base64 编码成字符串。换行符在这些字符串中无效，必须省略。当在 Darwin/macOS 上使用 `base64` 实用程序时，用户应避免使用 `-b` 选项来拆分长行。另外，对于 Linux 用户如果 `-w` 选项不可用的话，应该添加选项 `-w 0` 到 `base64` 命令或管道 `base64 | tr -d '\n' ` 。 #### 解码 Secret diff --git a/content/en/blog/_posts/2016-07-00-Minikube-Easily-Run-Kubernetes-Locally.md b/content/en/blog/_posts/2016-07-00-Minikube-Easily-Run-Kubernetes-Locally.md index c6a8c8331fa9f..bfaad42a19c04 100644 --- a/content/en/blog/_posts/2016-07-00-Minikube-Easily-Run-Kubernetes-Locally.md +++ b/content/en/blog/_posts/2016-07-00-Minikube-Easily-Run-Kubernetes-Locally.md @@ -10,7 +10,7 @@ While Kubernetes is one of the best tools for managing containerized application For the past several months, several of us from the Kubernetes community have been working to fix this in the [Minikube](http://github.com/kubernetes/minikube) repository on GitHub. Our goal is to build an easy-to-use, high-fidelity Kubernetes distribution that can be run locally on Mac, Linux and Windows workstations and laptops with a single command. -Thanks to lots of help from members of the community, we're proud to announce the official release of Minikube. This release comes with support for [Kubernetes 1.3](https://kubernetes.io/blog/2016/07/kubernetes-1.3-bridging-cloud-native-and-enterprise-workloads), new commands to make interacting with your local cluster easier and experimental drivers for xhyve (on Mac OSX) and KVM (on Linux). +Thanks to lots of help from members of the community, we're proud to announce the official release of Minikube. This release comes with support for [Kubernetes 1.3](https://kubernetes.io/blog/2016/07/kubernetes-1.3-bridging-cloud-native-and-enterprise-workloads), new commands to make interacting with your local cluster easier and experimental drivers for xhyve (on macOS) and KVM (on Linux). **Using Minikube** @@ -107,8 +107,8 @@ Here's a list of some of the things we're hoping to add to Minikube soon: -- Native hypervisor support for OSX and Windows -- We're planning to remove the dependency on Virtualbox, and integrate with the native hypervisors included in OSX and Windows (Hypervisor.framework and Hyper-v, respectively). +- Native hypervisor support for macOS and Windows +- We're planning to remove the dependency on Virtualbox, and integrate with the native hypervisors included in macOS and Windows (Hypervisor.framework and Hyper-v, respectively). - Improved support for Kubernetes features - We're planning to increase the range of supported Kubernetes features, to include things like Ingress. - Configurable versions of Kubernetes diff --git a/content/en/blog/_posts/2018-04-24-kubernetes-application-survey-results-2018.md b/content/en/blog/_posts/2018-04-24-kubernetes-application-survey-results-2018.md index a0218a8d095be..e145f9635e0e1 100644 --- a/content/en/blog/_posts/2018-04-24-kubernetes-application-survey-results-2018.md +++ b/content/en/blog/_posts/2018-04-24-kubernetes-application-survey-results-2018.md @@ -26,7 +26,7 @@ The number of respondents in the past year and 10 months increased at a rate of ![Minikube operating system usage](/images/blog/survey-results/2018-application-survey/minikube-os-usage.png) -Minikube is used primarily be people on MacOS and Linux. Yet, according to the 2018 Stack Overflow survey, [almost half of developers use Windows as their primary operating system](https://insights.stackoverflow.com/survey/2018/#technology-developers-primary-operating-systems). This is where Minikube would run. +Minikube is used primarily by people on macOS and Linux. Yet, according to the 2018 Stack Overflow survey, [almost half of developers use Windows as their primary operating system](https://insights.stackoverflow.com/survey/2018/#technology-developers-primary-operating-systems). This is where Minikube would run. Seeing differences from other data sets is worth looking more deeply at to better understand our audience, where Kubernetes is at, and where it is on the journey it's headed. diff --git a/content/en/docs/concepts/configuration/secret.md b/content/en/docs/concepts/configuration/secret.md index df5b80129ea3d..e2469c1c83fc6 100644 --- a/content/en/docs/concepts/configuration/secret.md +++ b/content/en/docs/concepts/configuration/secret.md @@ -135,7 +135,7 @@ secret "mysecret" created **Encoding Note:** The serialized JSON and YAML values of secret data are encoded as base64 strings. Newlines are not valid within these strings and must -be omitted. When using the `base64` utility on Darwin/OS X users should avoid +be omitted. When using the `base64` utility on Darwin/macOS users should avoid using the `-b` option to split long lines. Conversely Linux users *should* add the option `-w 0` to `base64` commands or the pipeline `base64 | tr -d '\n'` if `-w` option is not available. diff --git a/content/en/docs/getting-started-guides/ubuntu/installation.md b/content/en/docs/getting-started-guides/ubuntu/installation.md index 811850c3264b2..ab5b42a76dccf 100644 --- a/content/en/docs/getting-started-guides/ubuntu/installation.md +++ b/content/en/docs/getting-started-guides/ubuntu/installation.md @@ -11,7 +11,7 @@ Ubuntu 16.04 introduced the [Canonical Distribution of Kubernetes](https://www.u {{% /capture %}} {{% capture prerequisites %}} -- A working [Juju client](https://jujucharms.com/docs/2.3/reference-install); this does not have to be a Linux machine, it can also be Windows or OSX. +- A working [Juju client](https://jujucharms.com/docs/2.3/reference-install); this does not have to be a Linux machine, it can also be Windows or macOS. - A [supported cloud](#cloud-compatibility). - Bare Metal deployments are supported via [MAAS](http://maas.io). Refer to the [MAAS documentation](http://maas.io/docs/) for configuration instructions. - OpenStack deployments are currently only tested on Icehouse and newer. diff --git a/content/en/docs/home/contribute/generated-reference/kubernetes-components.md b/content/en/docs/home/contribute/generated-reference/kubernetes-components.md index c2b0617bbd8de..db6182341a25d 100644 --- a/content/en/docs/home/contribute/generated-reference/kubernetes-components.md +++ b/content/en/docs/home/contribute/generated-reference/kubernetes-components.md @@ -15,7 +15,7 @@ reference documentation for tools and components in the {{% capture prerequisites %}} -* You need a machine that is running Linux or MacOS. +* You need a machine that is running Linux or macOS. * You need to have this software installed: diff --git a/content/en/docs/imported/release/notes.md b/content/en/docs/imported/release/notes.md index 8dce51dcef36a..fee5d6aa607ec 100644 --- a/content/en/docs/imported/release/notes.md +++ b/content/en/docs/imported/release/notes.md @@ -700,7 +700,7 @@ You can now bind tokens to service requests. ([ref](https://github.com/kubernete * Updated admission controller settings for Juju deployed Kubernetes clusters ([#61427](https://github.com/kubernetes/kubernetes/pull/61427), [@hyperbolic2346](https://github.com/hyperbolic2346)) * Performance test framework and basic tests for the IPAM controller, to simulate behavior of the four supported modes under lightly loaded and loaded conditions, where load is defined as the number of operations to perform as against the configured kubernetes. ([#61143](https://github.com/kubernetes/kubernetes/pull/61143), [@satyasm](https://github.com/satyasm)) * Removed always pull policy from the template for ingress on CDK. ([#61598](https://github.com/kubernetes/kubernetes/pull/61598), [@hyperbolic2346](https://github.com/hyperbolic2346)) -* `make test-cmd` now works on OSX. ([#61393](https://github.com/kubernetes/kubernetes/pull/61393), [@totherme](https://github.com/totherme)) +* `make test-cmd` now works on macOS. ([#61393](https://github.com/kubernetes/kubernetes/pull/61393), [@totherme](https://github.com/totherme)) * Conformance: ReplicaSet must be supported in the `apps/v1` version. ([#61367](https://github.com/kubernetes/kubernetes/pull/61367), [@enisoc](https://github.com/enisoc)) * Remove 'system' prefix from Metadata Agent rbac configuration ([#61394](https://github.com/kubernetes/kubernetes/pull/61394), [@kawych](https://github.com/kawych)) * Support new NODE_OS_DISTRIBUTION 'custom' on GCE on a new add event. ([#61235](https://github.com/kubernetes/kubernetes/pull/61235), [@yguo0905](https://github.com/yguo0905)) diff --git a/content/en/docs/setup/custom-cloud/coreos.md b/content/en/docs/setup/custom-cloud/coreos.md index 10ce259f2d662..cbd2e5e576877 100644 --- a/content/en/docs/setup/custom-cloud/coreos.md +++ b/content/en/docs/setup/custom-cloud/coreos.md @@ -60,15 +60,15 @@ Configure a single master, multi-worker cluster locally, running on your choice
-[**Single-node cluster using a small OS X App**](https://github.com/rimusz/kube-solo-osx/blob/master/README.md) +[**Single-node cluster using a small macOS App**](https://github.com/rimusz/kube-solo-osx/blob/master/README.md) -Guide to running a solo cluster (master + worker) controlled by an OS X menubar application. Uses xhyve + CoreOS under the hood. +Guide to running a solo cluster (master + worker) controlled by an macOS menubar application. Uses xhyve + CoreOS under the hood.
-[**Multi-node cluster with Vagrant and fleet units using a small OS X App**](https://github.com/rimusz/coreos-osx-gui-kubernetes-cluster/blob/master/README.md) +[**Multi-node cluster with Vagrant and fleet units using a small macOS App**](https://github.com/rimusz/coreos-osx-gui-kubernetes-cluster/blob/master/README.md) -Guide to running a single master, multi-worker cluster controlled by an OS X menubar application. Uses Vagrant under the hood. +Guide to running a single master, multi-worker cluster controlled by an macOS menubar application. Uses Vagrant under the hood.
diff --git a/content/en/docs/setup/custom-cloud/kops.md b/content/en/docs/setup/custom-cloud/kops.md index f3e489df41b6c..324ad80dc2d01 100644 --- a/content/en/docs/setup/custom-cloud/kops.md +++ b/content/en/docs/setup/custom-cloud/kops.md @@ -31,7 +31,7 @@ You must have [kubectl](/docs/tasks/tools/install-kubectl/) installed in order f Download kops from the [releases page](https://github.com/kubernetes/kops/releases) (it is also easy to build from source): -On MacOS: +On macOS: ``` curl -OL https://github.com/kubernetes/kops/releases/download/1.8.0/kops-darwin-amd64 diff --git a/content/en/docs/setup/minikube.md b/content/en/docs/setup/minikube.md index 5c4dce1bde755..e9d9ca02b0508 100644 --- a/content/en/docs/setup/minikube.md +++ b/content/en/docs/setup/minikube.md @@ -298,10 +298,10 @@ Some drivers will mount a host folder within the VM so that you can easily share | Driver | OS | HostFolder | VM | | --- | --- | --- | --- | | VirtualBox | Linux | /home | /hosthome | -| VirtualBox | OSX | /Users | /Users | +| VirtualBox | macOS | /Users | /Users | | VirtualBox | Windows | C://Users | /c/Users | -| VMware Fusion | OSX | /Users | /Users | -| Xhyve | OSX | /Users | /Users | +| VMware Fusion | macOS | /Users | /Users | +| Xhyve | macOS | /Users | /Users | ## Private Container Registries diff --git a/content/en/docs/setup/turnkey/aws.md b/content/en/docs/setup/turnkey/aws.md index 0a854624216fa..128209fb78e49 100644 --- a/content/en/docs/setup/turnkey/aws.md +++ b/content/en/docs/setup/turnkey/aws.md @@ -30,7 +30,7 @@ Alternately, you can download the latest Kubernetes release from [this page](htt Next, add the appropriate binary folder to your `PATH` to access kubectl: ```shell -# OS X +# macOS export PATH=/platforms/darwin/amd64:$PATH # Linux diff --git a/content/en/docs/setup/turnkey/clc.md b/content/en/docs/setup/turnkey/clc.md index 69488fadc5842..e21e5dc052f24 100644 --- a/content/en/docs/setup/turnkey/clc.md +++ b/content/en/docs/setup/turnkey/clc.md @@ -27,7 +27,7 @@ If you run into any problems or want help with anything, we are here to help. Re The requirements to run this script are: -- A linux administrative host (tested on ubuntu and OSX) +- A linux administrative host (tested on ubuntu and macOS) - python 2 (tested on 2.7.11) - pip (installed with python as of 2.7.9) - git @@ -264,7 +264,7 @@ curl \ ``` But please note, this *does not* work out of the box with the ```curl``` binary -distributed with OSX. +distributed with macOS. ### Accessing the cluster with a browser diff --git a/content/en/docs/tasks/administer-cluster/encrypt-data.md b/content/en/docs/tasks/administer-cluster/encrypt-data.md index ff291a33f8260..75f5e19e28488 100644 --- a/content/en/docs/tasks/administer-cluster/encrypt-data.md +++ b/content/en/docs/tasks/administer-cluster/encrypt-data.md @@ -113,7 +113,7 @@ resources: To create a new secret perform the following steps: -1. Generate a 32 byte random key and base64 encode it. If you're on Linux or Mac OS X, run the following command: +1. Generate a 32 byte random key and base64 encode it. If you're on Linux or macOS, run the following command: ``` head -c 32 /dev/urandom | base64 diff --git a/content/en/docs/tasks/tools/install-kubectl.md b/content/en/docs/tasks/tools/install-kubectl.md index cb4c1d40e0748..aa42394468ea4 100644 --- a/content/en/docs/tasks/tools/install-kubectl.md +++ b/content/en/docs/tasks/tools/install-kubectl.md @@ -117,7 +117,7 @@ kubectl can be installed as part of the Google Cloud SDK. To download a specific version, replace the `$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)` portion of the command with the specific version. - For example, to download version {{< param "fullversion" >}} on MacOS, type: + For example, to download version {{< param "fullversion" >}} on macOS, type: ``` curl -LO https://storage.googleapis.com/kubernetes-release/release/{{< param "fullversion" >}}/bin/darwin/amd64/kubectl diff --git a/content/en/docs/tasks/tools/install-minikube.md b/content/en/docs/tasks/tools/install-minikube.md index a825d09dd05d4..5a0393517b15f 100644 --- a/content/en/docs/tasks/tools/install-minikube.md +++ b/content/en/docs/tasks/tools/install-minikube.md @@ -22,7 +22,7 @@ VT-x or AMD-v virtualization must be enabled in your computer's BIOS. If you do not already have a hypervisor installed, install one now. -* For OS X, install +* For macOS, install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) or [VMware Fusion](https://www.vmware.com/products/fusion), or [HyperKit](https://github.com/moby/hyperkit). diff --git a/content/en/docs/tutorials/hello-minikube.md b/content/en/docs/tutorials/hello-minikube.md index 0c5cd7a635652..7f02a333adb8e 100644 --- a/content/en/docs/tutorials/hello-minikube.md +++ b/content/en/docs/tutorials/hello-minikube.md @@ -26,10 +26,10 @@ Minikube provides a simple way of running Kubernetes on your local machine for f {{% capture prerequisites %}} -* For OS X, you can use [Homebrew](https://brew.sh) to install Minikube. +* For macOS, you can use [Homebrew](https://brew.sh) to install Minikube. {{< note >}} - **Note:** If you see the following Homebrew error when you run `brew update` after you update your computer to MacOS 10.13: + **Note:** If you see the following Homebrew error when you run `brew update` after you update your computer to macOS 10.13: ``` Error: /usr/local is not writable. You should change the ownership @@ -44,7 +44,7 @@ Minikube provides a simple way of running Kubernetes on your local machine for f * [NodeJS](https://nodejs.org/en/) is required to run the sample application. -* Install Docker. On OS X, we recommend +* Install Docker. On macOS, we recommend [Docker for Mac](https://docs.docker.com/engine/installation/mac/). @@ -57,7 +57,7 @@ Minikube provides a simple way of running Kubernetes on your local machine for f This tutorial uses [Minikube](https://github.com/kubernetes/minikube) to create a local cluster. This tutorial also assumes you are using [Docker for Mac](https://docs.docker.com/engine/installation/mac/) -on OS X. If you are on a different platform like Linux, or using VirtualBox +on macOS. If you are on a different platform like Linux, or using VirtualBox instead of Docker for Mac, the instructions to install Minikube may be slightly different. For general Minikube installation instructions, see the [Minikube installation guide](/docs/getting-started-guides/minikube/).