github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 02:09:56 +00:00
Code Issues Projects Releases Wiki Activity

Simplify GroupVersion.Seting()

Browse Source 
The old code had special cases that returned the same values as the regular case does.

If group is empty, the conditional
```if len(gv.Group) > 0 {```
doesn't apply, and `gv.Version` is returned.

In the empty case, the special case was returning `""`, which is exactly what `gv.Version` contains.
In the legacy v1 case, the special case was returning `"v1"`, which is exactly what `gv.Version` contains.
This commit is contained in:
Dor Kleiman 2020-05-01 02:39:38 +03:00 committed by GitHub
parent a0344973a3
commit 445044db9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/apimachinery/pkg/runtime/schema/group_version.go
View File

@ -176,15 +176,6 @@ func (gv GroupVersion) Empty() bool {
// String puts "group" and "version" into a single "group/version" string. For the legacy v1 // String puts "group" and "version" into a single "group/version" string. For the legacy v1
// it returns "v1". // it returns "v1".
func (gv GroupVersion) String() string { func (gv GroupVersion) String() string {
// special case the internal apiVersion for the legacy kube types
if gv.Empty() {
return ""
}
// special case of "v1" for backward compatibility
if len(gv.Group) == 0 && gv.Version == "v1" {
return gv.Version
}
if len(gv.Group) > 0 { if len(gv.Group) > 0 {
return gv.Group + "/" + gv.Version return gv.Group + "/" + gv.Version
} }