kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix the typos

This commit is contained in:
SataQiu 2018-10-19 17:35:26 +08:00
parent c33ac16c2d
commit 0550d8d4e8
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/prometheus-operator/v0.19.0.yaml
View File

@ -824,7 +824,7 @@ spec:
command: command:
description: Command is the command line to execute description: Command is the command line to execute
inside the container, the working directory for inside the container, the working directory for
the command is root ('/') in the container's filesystem. the command is root ('/') in the container's filesystem.
The command is simply exec'd, it is not run inside The command is simply exec'd, it is not run inside
a shell, so traditional shell instructions ('|', a shell, so traditional shell instructions ('|',
etc) won't work. To use a shell, you need to explicitly etc) won't work. To use a shell, you need to explicitly
@ -891,7 +891,7 @@ spec:
command: command:
description: Command is the command line to execute description: Command is the command line to execute
inside the container, the working directory for inside the container, the working directory for
the command is root ('/') in the container's filesystem. the command is root ('/') in the container's filesystem.
The command is simply exec'd, it is not run inside The command is simply exec'd, it is not run inside
a shell, so traditional shell instructions ('|', a shell, so traditional shell instructions ('|',
etc) won't work. To use a shell, you need to explicitly etc) won't work. To use a shell, you need to explicitly
@ -957,7 +957,7 @@ spec:
properties: properties:
command: command:
description: Command is the command line to execute inside description: Command is the command line to execute inside
the container, the working directory for the command is the container, the working directory for the command is
root ('/') in the container's filesystem. The command root ('/') in the container's filesystem. The command
is simply exec'd, it is not run inside a shell, so traditional is simply exec'd, it is not run inside a shell, so traditional
shell instructions ('|', etc) won't work. To use a shell, shell instructions ('|', etc) won't work. To use a shell,
@ -1097,7 +1097,7 @@ spec:
properties: properties:
command: command:
description: Command is the command line to execute inside description: Command is the command line to execute inside
the container, the working directory for the command is the container, the working directory for the command is
root ('/') in the container's filesystem. The command root ('/') in the container's filesystem. The command
is simply exec'd, it is not run inside a shell, so traditional is simply exec'd, it is not run inside a shell, so traditional
shell instructions ('|', etc) won't work. To use a shell, shell instructions ('|', etc) won't work. To use a shell,
@ -3163,7 +3163,7 @@ spec:
command: command:
description: Command is the command line to execute description: Command is the command line to execute
inside the container, the working directory for inside the container, the working directory for
the command is root ('/') in the container's filesystem. the command is root ('/') in the container's filesystem.
The command is simply exec'd, it is not run inside The command is simply exec'd, it is not run inside
a shell, so traditional shell instructions ('|', a shell, so traditional shell instructions ('|',
etc) won't work. To use a shell, you need to explicitly etc) won't work. To use a shell, you need to explicitly
@ -3230,7 +3230,7 @@ spec:
command: command:
description: Command is the command line to execute description: Command is the command line to execute
inside the container, the working directory for inside the container, the working directory for
the command is root ('/') in the container's filesystem. the command is root ('/') in the container's filesystem.
The command is simply exec'd, it is not run inside The command is simply exec'd, it is not run inside
a shell, so traditional shell instructions ('|', a shell, so traditional shell instructions ('|',
etc) won't work. To use a shell, you need to explicitly etc) won't work. To use a shell, you need to explicitly
@ -3296,7 +3296,7 @@ spec:
properties: properties:
command: command:
description: Command is the command line to execute inside description: Command is the command line to execute inside
the container, the working directory for the command is the container, the working directory for the command is
root ('/') in the container's filesystem. The command root ('/') in the container's filesystem. The command
is simply exec'd, it is not run inside a shell, so traditional is simply exec'd, it is not run inside a shell, so traditional
shell instructions ('|', etc) won't work. To use a shell, shell instructions ('|', etc) won't work. To use a shell,
@ -3436,7 +3436,7 @@ spec:
properties: properties:
command: command:
description: Command is the command line to execute inside description: Command is the command line to execute inside
the container, the working directory for the command is the container, the working directory for the command is
root ('/') in the container's filesystem. The command root ('/') in the container's filesystem. The command
is simply exec'd, it is not run inside a shell, so traditional is simply exec'd, it is not run inside a shell, so traditional
shell instructions ('|', etc) won't work. To use a shell, shell instructions ('|', etc) won't work. To use a shell,

2
cmd/kops/validate_cluster.go
View File

@ -39,7 +39,7 @@ import (
func init() { func init() {
if runtime.GOOS == "darwin" { if runtime.GOOS == "darwin" {
// In order for net.LookupHost(apiAddr.Host) to lookup our placeholder address on darwin, we have to // In order for net.LookupHost(apiAddr.Host) to lookup our placeholder address on darwin, we have to
os.Setenv("GODEBUG", "netdns=go") os.Setenv("GODEBUG", "netdns=go")
} }
} }

2
docs/advisories/cve_2017_14491.md
View File

@ -16,7 +16,7 @@ changes, but when released 1.8.0.apha.2 will contain the required patches.
The kube-dns deployment will be automatically upgraded when `kops update The kube-dns deployment will be automatically upgraded when `kops update
cluster` is executed. Replace `my-cluster.example.com` with the name of your cluster` is executed. Replace `my-cluster.example.com` with the name of your
cluster. If you are upgrading a Kubernetes 1.4.x or 1.5.x cluster you may need cluster. If you are upgrading a Kubernetes 1.4.x or 1.5.x cluster you may need
to follow the instruction below to create a required configmap for kube-dns. to follow the instruction below to create a required configmap for kube-dns.
Upgrade command: Upgrade command:

2
docs/development/testing.md
View File

@ -148,7 +148,7 @@ rm kubernetes/kubernetes-src.tar.gz
find kubernetes/server/bin -type f -name "*.tar" | xargs -I {} /bin/bash -c "sha1sum {} | cut -f1 -d ' ' > {}.sha1" find kubernetes/server/bin -type f -name "*.tar" | xargs -I {} /bin/bash -c "sha1sum {} | cut -f1 -d ' ' > {}.sha1"
find kubernetes/server/bin -type f -name "kube???" | xargs -I {} /bin/bash -c "sha1sum {} | cut -f1 -d ' ' > {}.sha1" find kubernetes/server/bin -type f -name "kube???" | xargs -I {} /bin/bash -c "sha1sum {} | cut -f1 -d ' ' > {}.sha1"
aws s3 sync --acl public-read kubernetes/server/bin/ s3://${S3_BUCKET_NAME}/kubernetes/dev/v1.6.0-dev/bin/linux/amd64/ aws s3 sync --acl public-read kubernetes/server/bin/ s3://${S3_BUCKET_NAME}/kubernetes/dev/v1.6.0-dev/bin/linux/amd64/
``` ```
### Example e2e command ### Example e2e command

2
docs/high_availability.md
View File

@ -88,7 +88,7 @@ kops create cluster \
Notes (Best Practice) Notes (Best Practice)
---- ----
* In regions with 2 Availability Zones, deploy the 3 masters in one zone and the nodes can be distributed between the 2 * In regions with 2 Availability Zones, deploy the 3 masters in one zone and the nodes can be distributed between the 2
zones. This can be done by specifying the flags: zones. This can be done by specifying the flags:
``` ```
--master-count=3 --master-count=3
--master-zones=$MASTER_ZONE --master-zones=$MASTER_ZONE

4
docs/networking.md
View File

@ -10,8 +10,8 @@ Kubernetes Operations (kops) currently supports 4 networking modes:
### kops Default Networking ### kops Default Networking
Kubernetes Operations (kops) uses `kubenet` networking by default. This sets up networking on AWS using VPC Kubernetes Operations (kops) uses `kubenet` networking by default. This sets up networking on AWS using VPC
networking, where the master allocates a /24 CIDR to each Node, drawing from the Node network. networking, where the master allocates a /24 CIDR to each Node, drawing from the Node network.
Using `kubenet` mode routes for each node are then configured in the AWS VPC routing tables. Using `kubenet` mode routes for each node are then configured in the AWS VPC routing tables.
One important limitation when using `kubenet` networking is that an AWS routing table cannot have more than One important limitation when using `kubenet` networking is that an AWS routing table cannot have more than
50 entries, which sets a limit of 50 nodes per cluster. AWS support will sometimes raise the limit to 100, 50 entries, which sets a limit of 50 nodes per cluster. AWS support will sometimes raise the limit to 100,

2
nodeup/pkg/model/kubelet.go
View File

@ -322,7 +322,7 @@ func (b *KubeletBuilder) addContainerizedMounter(c *fi.ModelBuilderContext) erro
// So what we do here is we download a tarred container image, expand it to containerizedMounterHome, then // So what we do here is we download a tarred container image, expand it to containerizedMounterHome, then
// set up bind mounts so that the script is executable (most of containeros is noexec), // set up bind mounts so that the script is executable (most of containeros is noexec),
// and set up some bind mounts of proc and dev so that mounting can take place inside that container // and set up some bind mounts of proc and dev so that mounting can take place inside that container
// - it isn't a full docker container. // - it isn't a full docker container.
{ {