Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
2a0e1dd9
Commit
2a0e1dd9
authored
Oct 16, 2015
by
y00278980
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some problems:
1. cluster/saltbase/pillar/README.md L8 quoted the wrong line number of cluster/gce/configure-vm.sh 2. spelling mistake of 'retruns'
parent
282b5abf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
README.md
cluster/saltbase/pillar/README.md
+1
-1
resource_helpers.go
pkg/api/resource_helpers.go
+1
-1
No files found.
cluster/saltbase/pillar/README.md
View file @
2a0e1dd9
...
@@ -5,7 +5,7 @@ directory. The bulk of the pillars are hard to perceive from browsing
...
@@ -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#L2
26
)
*
[
cluster-params.sls
](
cluster-params.sls
)
is generated entirely at cluster inception. See e.g.
[
configure-vm.sh
](
../../gce/configure-vm.sh#L2
62
)
*
[
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
...
...
pkg/api/resource_helpers.go
View file @
2a0e1dd9
...
@@ -66,7 +66,7 @@ func GetExistingContainerStatus(statuses []ContainerStatus, name string) Contain
...
@@ -66,7 +66,7 @@ func GetExistingContainerStatus(statuses []ContainerStatus, name string) Contain
return
ContainerStatus
{}
return
ContainerStatus
{}
}
}
// IsPodReady ret
ru
ns true if a pod is ready; false otherwise.
// IsPodReady ret
ur
ns 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
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment