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
c6212cc2
Unverified
Commit
c6212cc2
authored
Jan 15, 2017
by
Clayton Coleman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Strip k8s gen tags from client-go
Prevents client-go from being part of generation now that vendored dependencies are considered in the chain.
parent
62d1ae96
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
1 deletion
+9
-1
copy.sh
staging/copy.sh
+9
-1
No files found.
staging/copy.sh
View file @
c6212cc2
...
@@ -42,6 +42,7 @@ CLIENT_REPO="${MAIN_REPO}/staging/src/${CLIENT_REPO_FROM_SRC}"
...
@@ -42,6 +42,7 @@ CLIENT_REPO="${MAIN_REPO}/staging/src/${CLIENT_REPO_FROM_SRC}"
CLIENT_REPO_TEMP
=
"
${
MAIN_REPO
}
/staging/src/
${
CLIENT_REPO_TEMP_FROM_SRC
}
"
CLIENT_REPO_TEMP
=
"
${
MAIN_REPO
}
/staging/src/
${
CLIENT_REPO_TEMP_FROM_SRC
}
"
DIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
"
DIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
"
sedi
=
"-i"
cleanup
()
{
cleanup
()
{
rm
-rf
"
${
CLIENT_REPO_TEMP
}
"
rm
-rf
"
${
CLIENT_REPO_TEMP
}
"
...
@@ -89,7 +90,7 @@ GO15VENDOREXPERIMENT=1 godep save ./...
...
@@ -89,7 +90,7 @@ GO15VENDOREXPERIMENT=1 godep save ./...
popd
>
/dev/null
popd
>
/dev/null
echo
"moving vendor/k8s.io/kubernetes"
echo
"moving vendor/k8s.io/kubernetes"
cp
-r
n
"
${
CLIENT_REPO_TEMP
}
"
/vendor/k8s.io/kubernetes/
*
"
${
CLIENT_REPO_TEMP
}
"
/
cp
-r
"
${
CLIENT_REPO_TEMP
}
"
/vendor/k8s.io/kubernetes/
*
"
${
CLIENT_REPO_TEMP
}
"
/
rm
-rf
"
${
CLIENT_REPO_TEMP
}
"
/vendor/k8s.io/kubernetes
rm
-rf
"
${
CLIENT_REPO_TEMP
}
"
/vendor/k8s.io/kubernetes
# client-go will share the vendor of the main repo for now. When client-go
# client-go will share the vendor of the main repo for now. When client-go
# becomes a standalone repo, it will have its own vendor
# becomes a standalone repo, it will have its own vendor
...
@@ -130,6 +131,13 @@ sed -i "s/kubernetes_build_info/kubernetes_build_info_copy/g" "${CLIENT_REPO_TEM
...
@@ -130,6 +131,13 @@ sed -i "s/kubernetes_build_info/kubernetes_build_info_copy/g" "${CLIENT_REPO_TEM
echo
"rewrite proto names in proto.RegisterType"
echo
"rewrite proto names in proto.RegisterType"
find
"
${
CLIENT_REPO_TEMP
}
"
-type
f
-name
"generated.pb.go"
-print0
| xargs
-0
sed
-i
"s/k8s
\.
io
\.
kubernetes/k8s.io.client-go/g"
find
"
${
CLIENT_REPO_TEMP
}
"
-type
f
-name
"generated.pb.go"
-print0
| xargs
-0
sed
-i
"s/k8s
\.
io
\.
kubernetes/k8s.io.client-go/g"
# strip all generator tags from client-go
find
"
${
CLIENT_REPO_TEMP
}
"
-type
f
-name
"*.go"
-print0
| xargs
-0
sed
-i
'/^\/\/ +k8s:openapi-gen=true/d'
find
"
${
CLIENT_REPO_TEMP
}
"
-type
f
-name
"*.go"
-print0
| xargs
-0
sed
-i
'/^\/\/ +k8s:defaulter-gen=/d'
find
"
${
CLIENT_REPO_TEMP
}
"
-type
f
-name
"*.go"
-print0
| xargs
-0
sed
-i
'/^\/\/ +k8s:deepcopy-gen=/d'
find
"
${
CLIENT_REPO_TEMP
}
"
-type
f
-name
"*.go"
-print0
| xargs
-0
sed
-i
'/^\/\/ +k8s:conversion-gen=/d'
echo
"rearranging directory layout"
echo
"rearranging directory layout"
# $1 and $2 are relative to ${CLIENT_REPO_TEMP}
# $1 and $2 are relative to ${CLIENT_REPO_TEMP}
function
mvfolder
{
function
mvfolder
{
...
...
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