github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15750 from yehuis4/master 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2015-10-19 01:06:34 -07:00
parent 3ee1c58756 2a0e1dd9e2
commit 44a9877bd4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/pillar/README.md
View File

@ -5,7 +5,7 @@ directory. The bulk of the pillars are hard to perceive from browsing
this directory, though, because they are written into this directory, though, because they are written into
[cluster-params.sls](cluster-params.sls) at cluster inception. [cluster-params.sls](cluster-params.sls) at cluster inception.
* [cluster-params.sls](cluster-params.sls) is generated entirely at cluster inception. See e.g. [configure-vm.sh](../../gce/configure-vm.sh#L226) * [cluster-params.sls](cluster-params.sls) is generated entirely at cluster inception. See e.g. [configure-vm.sh](../../gce/configure-vm.sh#L262)
* [docker-images.sls](docker-images.sls) stores the Docker tags of the current Docker-wrapped server binaries, twiddling by the Salt install script * [docker-images.sls](docker-images.sls) stores the Docker tags of the current Docker-wrapped server binaries, twiddling by the Salt install script
* [logging.sls](logging.sls) defines the cluster log level * [logging.sls](logging.sls) defines the cluster log level
* [mine.sls](mine.sls): defines the variables shared across machines in the Salt * [mine.sls](mine.sls): defines the variables shared across machines in the Salt

2
pkg/api/resource_helpers.go
View File

@ -66,7 +66,7 @@ func GetExistingContainerStatus(statuses []ContainerStatus, name string) Contain
return ContainerStatus{} return ContainerStatus{}
} }
// IsPodReady retruns true if a pod is ready; false otherwise. // IsPodReady returns true if a pod is ready; false otherwise.
func IsPodReady(pod *Pod) bool { func IsPodReady(pod *Pod) bool {
return IsPodReadyConditionTrue(pod.Status) return IsPodReadyConditionTrue(pod.Status)
} }