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
c49cd4ed
Commit
c49cd4ed
authored
Dec 21, 2015
by
Clayton Coleman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Alter the build to generate for __internal correctly
parent
c1d932e4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
deep_copy.go
cmd/gendeepcopy/deep_copy.go
+1
-1
update-generated-deep-copies.sh
hack/after-build/update-generated-deep-copies.sh
+2
-2
util.sh
hack/lib/util.sh
+2
-2
No files found.
cmd/gendeepcopy/deep_copy.go
View file @
c49cd4ed
...
...
@@ -61,7 +61,7 @@ func pkgPath(group, version string) string {
group
=
"api"
}
gv
:=
group
if
version
!=
""
{
if
version
!=
"
__internal
"
{
gv
=
path
.
Join
(
group
,
version
)
}
switch
{
...
...
hack/after-build/update-generated-deep-copies.sh
View file @
c49cd4ed
...
...
@@ -54,7 +54,7 @@ function generate_deep_copies() {
else
apiVersions
=
"
${
ver
}
"
fi
KUBE_API_VERSIONS
=
"
${
apiVersions
}
"
generate_version
"
${
ver
}
"
KUBE_API_VERSIONS
=
"
${
apiVersions
:-
}
"
generate_version
"
${
ver
}
"
done
}
...
...
@@ -62,6 +62,6 @@ function generate_deep_copies() {
# Currently pkg/api/deep_copy_generated.go is generated by the new go2idl generator.
# All others (mentioned above) are still generated by the old reflection-based generator.
# TODO: Migrate these to the new generator.
DEFAULT_VERSIONS
=
"v1 authorization/
authorization/v1beta1 extensions/ extensions/v1beta1 componentconfig/ componentconfig/v1alpha1 metrics/
metrics/v1alpha1"
DEFAULT_VERSIONS
=
"v1 authorization/
__internal authorization/v1beta1 extensions/__internal extensions/v1beta1 componentconfig/__internal componentconfig/v1alpha1 metrics/__internal
metrics/v1alpha1"
VERSIONS
=
${
VERSIONS
:-
$DEFAULT_VERSIONS
}
generate_deep_copies
"
$VERSIONS
"
hack/lib/util.sh
View file @
c49cd4ed
...
...
@@ -282,7 +282,7 @@ kube::util::group-version-to-pkg-path() {
# moving the results to pkg/apis/api.
case
"
${
group_version
}
"
in
# both group and version are "", this occurs when we generate deep copies for internal objects of the legacy v1 API.
/
)
__internal
)
echo
"api"
;;
v1
)
...
...
@@ -292,7 +292,7 @@ kube::util::group-version-to-pkg-path() {
echo
"api/unversioned"
;;
*
)
echo
"apis/
${
group_version
}
"
echo
"apis/
${
group_version
%__internal
}
"
;;
esac
}
...
...
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