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
93ea0166
Commit
93ea0166
authored
Feb 16, 2017
by
Phillip Wittrock
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move .generated_docs to docs/ so docs OWNERS can review / approve
parent
30e8953f
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
15 deletions
+17
-15
.generated_files
.generated_files
+1
-1
.generated_docs
docs/.generated_docs
+1
-1
OWNERS
docs/OWNERS
+2
-0
generate-docs.sh
hack/generate-docs.sh
+1
-1
util.sh
hack/lib/util.sh
+7
-7
update-generated-docs.sh
hack/update-generated-docs.sh
+1
-1
verify-generated-docs.sh
hack/verify-generated-docs.sh
+4
-4
No files found.
.generated_files
View file @
93ea0166
...
@@ -27,4 +27,4 @@ path-prefix vendor/
...
@@ -27,4 +27,4 @@ path-prefix vendor/
path-prefix api/swagger-spec/
path-prefix api/swagger-spec/
path-prefix pkg/generated/
path-prefix pkg/generated/
paths-from-repo .generated_docs
paths-from-repo
docs/
.generated_docs
.generated_docs
→
docs/
.generated_docs
View file @
93ea0166
.generated_docs
docs/
.generated_docs
docs/admin/federation-apiserver.md
docs/admin/federation-apiserver.md
docs/admin/federation-controller-manager.md
docs/admin/federation-controller-manager.md
docs/admin/kube-apiserver.md
docs/admin/kube-apiserver.md
...
...
docs/OWNERS
View file @
93ea0166
...
@@ -6,3 +6,4 @@ approvers:
...
@@ -6,3 +6,4 @@ approvers:
- brendandburns
- brendandburns
- smarterclayton
- smarterclayton
- thockin
- thockin
- pwittrock
\ No newline at end of file
hack/generate-docs.sh
View file @
93ea0166
...
@@ -44,7 +44,7 @@ kube::util::gen-docs "${KUBE_TEMP}"
...
@@ -44,7 +44,7 @@ kube::util::gen-docs "${KUBE_TEMP}"
kube::util::remove-gen-docs
kube::util::remove-gen-docs
# copy fresh docs into the repo.
# copy fresh docs into the repo.
# the shopt is so that we get .generated_docs from the glob.
# the shopt is so that we get
docs/
.generated_docs from the glob.
shopt
-s
dotglob
shopt
-s
dotglob
cp
-af
"
${
KUBE_TEMP
}
"
/
*
"
${
KUBE_ROOT
}
"
cp
-af
"
${
KUBE_TEMP
}
"
/
*
"
${
KUBE_ROOT
}
"
shopt
-u
dotglob
shopt
-u
dotglob
hack/lib/util.sh
View file @
93ea0166
...
@@ -228,14 +228,14 @@ kube::util::gen-docs() {
...
@@ -228,14 +228,14 @@ kube::util::gen-docs() {
# create the list of generated files
# create the list of generated files
pushd
"
${
dest
}
"
>
/dev/null
pushd
"
${
dest
}
"
>
/dev/null
touch
.generated_docs
touch
docs/
.generated_docs
find
.
-type
f |
cut
-sd
/
-f
2- |
LC_ALL
=
C
sort
>
.generated_docs
find
.
-type
f |
cut
-sd
/
-f
2- |
LC_ALL
=
C
sort
>
docs/
.generated_docs
popd
>
/dev/null
popd
>
/dev/null
}
}
# Puts a placeholder for every generated doc. This makes the link checker work.
# Puts a placeholder for every generated doc. This makes the link checker work.
kube::util::set-placeholder-gen-docs
()
{
kube::util::set-placeholder-gen-docs
()
{
local
list_file
=
"
${
KUBE_ROOT
}
/.generated_docs"
local
list_file
=
"
${
KUBE_ROOT
}
/
docs/
.generated_docs"
if
[
-e
${
list_file
}
]
;
then
if
[
-e
${
list_file
}
]
;
then
# remove all of the old docs; we don't want to check them in.
# remove all of the old docs; we don't want to check them in.
while
read
file
;
do
while
read
file
;
do
...
@@ -243,7 +243,7 @@ kube::util::set-placeholder-gen-docs() {
...
@@ -243,7 +243,7 @@ kube::util::set-placeholder-gen-docs() {
cp
"
${
KUBE_ROOT
}
/hack/autogenerated_placeholder.txt"
"
${
KUBE_ROOT
}
/
${
file
}
"
cp
"
${
KUBE_ROOT
}
/hack/autogenerated_placeholder.txt"
"
${
KUBE_ROOT
}
/
${
file
}
"
fi
fi
done
<
"
${
list_file
}
"
done
<
"
${
list_file
}
"
# The .generated_docs file lists itself, so we don't need to explicitly
# The
docs/
.generated_docs file lists itself, so we don't need to explicitly
# delete it.
# delete it.
fi
fi
}
}
...
@@ -251,12 +251,12 @@ kube::util::set-placeholder-gen-docs() {
...
@@ -251,12 +251,12 @@ kube::util::set-placeholder-gen-docs() {
# Removes previously generated docs-- we don't want to check them in. $KUBE_ROOT
# Removes previously generated docs-- we don't want to check them in. $KUBE_ROOT
# must be set.
# must be set.
kube::util::remove-gen-docs
()
{
kube::util::remove-gen-docs
()
{
if
[
-e
"
${
KUBE_ROOT
}
/.generated_docs"
]
;
then
if
[
-e
"
${
KUBE_ROOT
}
/
docs/
.generated_docs"
]
;
then
# remove all of the old docs; we don't want to check them in.
# remove all of the old docs; we don't want to check them in.
while
read
file
;
do
while
read
file
;
do
rm
"
${
KUBE_ROOT
}
/
${
file
}
"
2>/dev/null
||
true
rm
"
${
KUBE_ROOT
}
/
${
file
}
"
2>/dev/null
||
true
done
<
"
${
KUBE_ROOT
}
/.generated_docs"
done
<
"
${
KUBE_ROOT
}
/
docs/
.generated_docs"
# The .generated_docs file lists itself, so we don't need to explicitly
# The
docs/
.generated_docs file lists itself, so we don't need to explicitly
# delete it.
# delete it.
fi
fi
}
}
...
...
hack/update-generated-docs.sh
View file @
93ea0166
...
@@ -44,7 +44,7 @@ kube::util::gen-docs "${KUBE_TEMP}"
...
@@ -44,7 +44,7 @@ kube::util::gen-docs "${KUBE_TEMP}"
kube::util::remove-gen-docs
kube::util::remove-gen-docs
# Copy fresh docs into the repo.
# Copy fresh docs into the repo.
# the shopt is so that we get .generated_docs from the glob.
# the shopt is so that we get
docs/
.generated_docs from the glob.
shopt
-s
dotglob
shopt
-s
dotglob
cp
-af
"
${
KUBE_TEMP
}
"
/
*
"
${
KUBE_ROOT
}
"
cp
-af
"
${
KUBE_TEMP
}
"
/
*
"
${
KUBE_ROOT
}
"
shopt
-u
dotglob
shopt
-u
dotglob
...
...
hack/verify-generated-docs.sh
View file @
93ea0166
...
@@ -37,7 +37,7 @@ kube::util::ensure-temp-dir
...
@@ -37,7 +37,7 @@ kube::util::ensure-temp-dir
kube::util::gen-docs
"
${
KUBE_TEMP
}
"
kube::util::gen-docs
"
${
KUBE_TEMP
}
"
# Verify the list matches the expected list (diff should be empty)
# Verify the list matches the expected list (diff should be empty)
if
[[
"
$(
diff
${
KUBE_ROOT
}
/
.generated_docs
${
KUBE_TEMP
}
/.generated_docs
)
"
!=
""
]]
;
then
if
[[
"
$(
diff
${
KUBE_ROOT
}
/
docs/.generated_docs
${
KUBE_TEMP
}
/docs
/.generated_docs
)
"
!=
""
]]
;
then
echo
"List of generated docs doesn't match a freshly built list. Please run hack/update-generated-docs.sh"
echo
"List of generated docs doesn't match a freshly built list. Please run hack/update-generated-docs.sh"
exit
1
exit
1
fi
fi
...
@@ -45,8 +45,8 @@ fi
...
@@ -45,8 +45,8 @@ fi
# Verify the files in the repo all contain the boilerplate instead of the actual
# Verify the files in the repo all contain the boilerplate instead of the actual
# content.
# content.
while
read
file
;
do
while
read
file
;
do
# Ignore .generated_docs-- it should not have the boilerplate!
# Ignore
docs/
.generated_docs-- it should not have the boilerplate!
[[
"
${
file
}
"
==
".generated_docs"
]]
&&
continue
[[
"
${
file
}
"
==
"
docs/
.generated_docs"
]]
&&
continue
# Search for "hack/generate-docs.sh" as a proxy for the boilerplate content,
# Search for "hack/generate-docs.sh" as a proxy for the boilerplate content,
# since the munger adds a bunch of other stuff.
# since the munger adds a bunch of other stuff.
...
@@ -55,4 +55,4 @@ while read file; do
...
@@ -55,4 +55,4 @@ while read file; do
echo
"Please run hack/update-generated-docs.sh"
echo
"Please run hack/update-generated-docs.sh"
exit
1
exit
1
fi
fi
done
<
"
${
KUBE_ROOT
}
/.generated_docs"
done
<
"
${
KUBE_ROOT
}
/
docs/
.generated_docs"
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