mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #61085 from hzxuzhonghu/unversioned-cleanup
Automatic merge from submit-queue (batch tested with PRs 60919, 60953, 61085, 61083, 60971). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. remove unused `pkg/api/unversioned` **What this PR does / why we need it**: clean code, see #61084 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #61084 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
This commit is contained in:
commit
dbea6f6372
@ -14,7 +14,6 @@ pkg/api/ref
|
|||||||
pkg/api/testapi
|
pkg/api/testapi
|
||||||
pkg/api/testing
|
pkg/api/testing
|
||||||
pkg/api/testing/compat
|
pkg/api/testing/compat
|
||||||
pkg/api/unversioned
|
|
||||||
pkg/api/v1/endpoints
|
pkg/api/v1/endpoints
|
||||||
pkg/api/v1/pod
|
pkg/api/v1/pod
|
||||||
pkg/api/v1/resource
|
pkg/api/v1/resource
|
||||||
|
@ -275,9 +275,6 @@ kube::util::group-version-to-pkg-path() {
|
|||||||
meta/v1beta1)
|
meta/v1beta1)
|
||||||
echo "vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1"
|
echo "vendor/k8s.io/apimachinery/pkg/apis/meta/v1beta1"
|
||||||
;;
|
;;
|
||||||
unversioned)
|
|
||||||
echo "pkg/api/unversioned"
|
|
||||||
;;
|
|
||||||
*.k8s.io)
|
*.k8s.io)
|
||||||
echo "pkg/apis/${group_version%.*k8s.io}"
|
echo "pkg/apis/${group_version%.*k8s.io}"
|
||||||
;;
|
;;
|
||||||
|
@ -49,7 +49,7 @@ find_files() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if [[ $# -eq 0 ]]; then
|
if [[ $# -eq 0 ]]; then
|
||||||
versioned_api_files=$(find_files | egrep "pkg/.[^/]*/((v.[^/]*)|unversioned)/types\.go")
|
versioned_api_files=$(find_files | egrep "pkg/.[^/]*/((v.[^/]*)|unversioned)/types\.go") || true
|
||||||
else
|
else
|
||||||
versioned_api_files="${*}"
|
versioned_api_files="${*}"
|
||||||
fi
|
fi
|
||||||
|
@ -22,7 +22,6 @@ filegroup(
|
|||||||
"//pkg/api/service:all-srcs",
|
"//pkg/api/service:all-srcs",
|
||||||
"//pkg/api/testapi:all-srcs",
|
"//pkg/api/testapi:all-srcs",
|
||||||
"//pkg/api/testing:all-srcs",
|
"//pkg/api/testing:all-srcs",
|
||||||
"//pkg/api/unversioned:all-srcs",
|
|
||||||
"//pkg/api/v1/endpoints:all-srcs",
|
"//pkg/api/v1/endpoints:all-srcs",
|
||||||
"//pkg/api/v1/node:all-srcs",
|
"//pkg/api/v1/node:all-srcs",
|
||||||
"//pkg/api/v1/pod:all-srcs",
|
"//pkg/api/v1/pod:all-srcs",
|
||||||
|
@ -1,30 +0,0 @@
|
|||||||
package(default_visibility = ["//visibility:public"])
|
|
||||||
|
|
||||||
load(
|
|
||||||
"@io_bazel_rules_go//go:def.bzl",
|
|
||||||
"go_library",
|
|
||||||
)
|
|
||||||
|
|
||||||
go_library(
|
|
||||||
name = "go_default_library",
|
|
||||||
srcs = [
|
|
||||||
"duration.go",
|
|
||||||
"time.go",
|
|
||||||
"types.go",
|
|
||||||
],
|
|
||||||
importpath = "k8s.io/kubernetes/pkg/api/unversioned",
|
|
||||||
deps = ["//vendor/github.com/google/gofuzz:go_default_library"],
|
|
||||||
)
|
|
||||||
|
|
||||||
filegroup(
|
|
||||||
name = "package-srcs",
|
|
||||||
srcs = glob(["**"]),
|
|
||||||
tags = ["automanaged"],
|
|
||||||
visibility = ["//visibility:private"],
|
|
||||||
)
|
|
||||||
|
|
||||||
filegroup(
|
|
||||||
name = "all-srcs",
|
|
||||||
srcs = [":package-srcs"],
|
|
||||||
tags = ["automanaged"],
|
|
||||||
)
|
|
@ -1,47 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2016 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package unversioned
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"time"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Duration is a wrapper around time.Duration which supports correct
|
|
||||||
// marshaling to YAML and JSON. In particular, it marshals into strings, which
|
|
||||||
// can be used as map keys in json.
|
|
||||||
type Duration struct {
|
|
||||||
time.Duration `protobuf:"-"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnmarshalJSON implements the json.Unmarshaller interface.
|
|
||||||
func (d *Duration) UnmarshalJSON(b []byte) error {
|
|
||||||
var str string
|
|
||||||
json.Unmarshal(b, &str)
|
|
||||||
|
|
||||||
pd, err := time.ParseDuration(str)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
d.Duration = pd
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// MarshalJSON implements the json.Marshaler interface.
|
|
||||||
func (d Duration) MarshalJSON() ([]byte, error) {
|
|
||||||
return json.Marshal(d.Duration.String())
|
|
||||||
}
|
|
@ -1,172 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2016 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package unversioned
|
|
||||||
|
|
||||||
import (
|
|
||||||
"encoding/json"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/google/gofuzz"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Time is a wrapper around time.Time which supports correct
|
|
||||||
// marshaling to YAML and JSON. Wrappers are provided for many
|
|
||||||
// of the factory methods that the time package offers.
|
|
||||||
type Time struct {
|
|
||||||
time.Time `protobuf:"-"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// DeepCopyInto creates a deep-copy of the Time value. The underlying time.Time
|
|
||||||
// type is effectively immutable in the time API, so it is safe to
|
|
||||||
// copy-by-assign, despite the presence of (unexported) Pointer fields.
|
|
||||||
func (t *Time) DeepCopyInto(out *Time) {
|
|
||||||
*out = *t
|
|
||||||
}
|
|
||||||
|
|
||||||
// String returns the representation of the time.
|
|
||||||
func (t Time) String() string {
|
|
||||||
return t.Time.String()
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewTime returns a wrapped instance of the provided time
|
|
||||||
func NewTime(time time.Time) Time {
|
|
||||||
return Time{time}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Date returns the Time corresponding to the supplied parameters
|
|
||||||
// by wrapping time.Date.
|
|
||||||
func Date(year int, month time.Month, day, hour, min, sec, nsec int, loc *time.Location) Time {
|
|
||||||
return Time{time.Date(year, month, day, hour, min, sec, nsec, loc)}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Now returns the current local time.
|
|
||||||
func Now() Time {
|
|
||||||
return Time{time.Now()}
|
|
||||||
}
|
|
||||||
|
|
||||||
// IsZero returns true if the value is nil or time is zero.
|
|
||||||
func (t *Time) IsZero() bool {
|
|
||||||
if t == nil {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return t.Time.IsZero()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Before reports whether the time instant t is before u.
|
|
||||||
func (t Time) Before(u Time) bool {
|
|
||||||
return t.Time.Before(u.Time)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Equal reports whether the time instant t is equal to u.
|
|
||||||
func (t Time) Equal(u Time) bool {
|
|
||||||
return t.Time.Equal(u.Time)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Unix returns the local time corresponding to the given Unix time
|
|
||||||
// by wrapping time.Unix.
|
|
||||||
func Unix(sec int64, nsec int64) Time {
|
|
||||||
return Time{time.Unix(sec, nsec)}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Rfc3339Copy returns a copy of the Time at second-level precision.
|
|
||||||
func (t Time) Rfc3339Copy() Time {
|
|
||||||
copied, _ := time.Parse(time.RFC3339, t.Format(time.RFC3339))
|
|
||||||
return Time{copied}
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnmarshalJSON implements the json.Unmarshaller interface.
|
|
||||||
func (t *Time) UnmarshalJSON(b []byte) error {
|
|
||||||
if len(b) == 4 && string(b) == "null" {
|
|
||||||
t.Time = time.Time{}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var str string
|
|
||||||
json.Unmarshal(b, &str)
|
|
||||||
|
|
||||||
pt, err := time.Parse(time.RFC3339, str)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
t.Time = pt.Local()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// UnmarshalQueryParameter converts from a URL query parameter value to an object
|
|
||||||
func (t *Time) UnmarshalQueryParameter(str string) error {
|
|
||||||
if len(str) == 0 {
|
|
||||||
t.Time = time.Time{}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
// Tolerate requests from older clients that used JSON serialization to build query params
|
|
||||||
if len(str) == 4 && str == "null" {
|
|
||||||
t.Time = time.Time{}
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
pt, err := time.Parse(time.RFC3339, str)
|
|
||||||
if err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
|
|
||||||
t.Time = pt.Local()
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// MarshalJSON implements the json.Marshaler interface.
|
|
||||||
func (t Time) MarshalJSON() ([]byte, error) {
|
|
||||||
if t.IsZero() {
|
|
||||||
// Encode unset/nil objects as JSON's "null".
|
|
||||||
return []byte("null"), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return json.Marshal(t.UTC().Format(time.RFC3339))
|
|
||||||
}
|
|
||||||
|
|
||||||
// OpenAPISchemaType is used by the kube-openapi generator when constructing
|
|
||||||
// the OpenAPI spec of this type.
|
|
||||||
//
|
|
||||||
// See: https://github.com/kubernetes/kube-openapi/tree/master/pkg/generators
|
|
||||||
func (_ Time) OpenAPISchemaType() []string { return []string{"string"} }
|
|
||||||
|
|
||||||
// OpenAPISchemaFormat is used by the kube-openapi generator when constructing
|
|
||||||
// the OpenAPI spec of this type.
|
|
||||||
func (_ Time) OpenAPISchemaFormat() string { return "date-time" }
|
|
||||||
|
|
||||||
// MarshalQueryParameter converts to a URL query parameter value
|
|
||||||
func (t Time) MarshalQueryParameter() (string, error) {
|
|
||||||
if t.IsZero() {
|
|
||||||
// Encode unset/nil objects as an empty string
|
|
||||||
return "", nil
|
|
||||||
}
|
|
||||||
|
|
||||||
return t.UTC().Format(time.RFC3339), nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fuzz satisfies fuzz.Interface.
|
|
||||||
func (t *Time) Fuzz(c fuzz.Continue) {
|
|
||||||
if t == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
// Allow for about 1000 years of randomness. Leave off nanoseconds
|
|
||||||
// because JSON doesn't represent them so they can't round-trip
|
|
||||||
// properly.
|
|
||||||
t.Time = time.Unix(c.Rand.Int63n(1000*365*24*60*60), 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
var _ fuzz.Interface = &Time{}
|
|
@ -1,60 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2016 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Package unversioned is deprecated and has been replaced with pkg/apis/meta/v1
|
|
||||||
//
|
|
||||||
// DEPRECATED - Do not reference or add types to this package, it will be removed
|
|
||||||
// once Heapster is updated to use pkg/apis/meta/v1.
|
|
||||||
package unversioned
|
|
||||||
|
|
||||||
// TypeMeta describes an individual object in an API response or request
|
|
||||||
// with strings representing the type of the object and its API schema version.
|
|
||||||
// Structures that are versioned or persisted should inline TypeMeta.
|
|
||||||
type TypeMeta struct {
|
|
||||||
// Kind is a string value representing the REST resource this object represents.
|
|
||||||
// Servers may infer this from the endpoint the client submits requests to.
|
|
||||||
// Cannot be updated.
|
|
||||||
// In CamelCase.
|
|
||||||
// More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds
|
|
||||||
// +optional
|
|
||||||
Kind string `json:"kind,omitempty" protobuf:"bytes,1,opt,name=kind"`
|
|
||||||
|
|
||||||
// APIVersion defines the versioned schema of this representation of an object.
|
|
||||||
// Servers should convert recognized schemas to the latest internal value, and
|
|
||||||
// may reject unrecognized values.
|
|
||||||
// More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources
|
|
||||||
// +optional
|
|
||||||
APIVersion string `json:"apiVersion,omitempty" protobuf:"bytes,2,opt,name=apiVersion"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// ListMeta describes metadata that synthetic resources must have, including lists and
|
|
||||||
// various status objects. A resource may have only one of {ObjectMeta, ListMeta}.
|
|
||||||
type ListMeta struct {
|
|
||||||
// SelfLink is a URL representing this object.
|
|
||||||
// Populated by the system.
|
|
||||||
// Read-only.
|
|
||||||
// +optional
|
|
||||||
SelfLink string `json:"selfLink,omitempty" protobuf:"bytes,1,opt,name=selfLink"`
|
|
||||||
|
|
||||||
// String that identifies the server's internal version of this object that
|
|
||||||
// can be used by clients to determine when objects have changed.
|
|
||||||
// Value must be treated as opaque by clients and passed unmodified back to the server.
|
|
||||||
// Populated by the system.
|
|
||||||
// Read-only.
|
|
||||||
// More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#concurrency-control-and-consistency
|
|
||||||
// +optional
|
|
||||||
ResourceVersion string `json:"resourceVersion,omitempty" protobuf:"bytes,2,opt,name=resourceVersion"`
|
|
||||||
}
|
|
@ -537,7 +537,7 @@ var kindWhiteList = sets.NewString(
|
|||||||
"WatchEvent",
|
"WatchEvent",
|
||||||
// --
|
// --
|
||||||
|
|
||||||
// k8s.io/kubernetes/pkg/api/unversioned
|
// k8s.io/apimachinery/pkg/apis/meta/v1
|
||||||
"Status",
|
"Status",
|
||||||
// --
|
// --
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user