mirror of
https://github.com/kubernetes/sample-controller.git
synced 2025-04-01 20:42:41 +08:00
bf2edea825
Automatic merge from submit-queue (batch tested with PRs 55093, 54966, 55047, 54971, 54786). 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>. vendor update: github.com/golang/protobuf When I'm working on PR: https://github.com/kubernetes/kubernetes/pull/54782, I met a problem here: https://github.com/golang/protobuf/issues/372, which I think we need to update our vendor of protobuf and I ask Dr. Stefan for suggestion, here is our coversation shiywang [5:09 PM] hi, Dr. Stefan i'm sorry to bother, I have a simple question, I was working on a pr which need to use protobuf custom field, and I run into this problem here: https://github.com/golang/protobuf/issues/372 which I think is due to our codebase's protobuf vendor is too old `vendor/github.com/golang/protobuf`, do you think I can update that vendor to lastest one ? also I noticed there's also an extend package called `vendor/github.com/gogo/protobuf/proto` what's the releationship between those two ? which one should I update ? sttts [5:11 PM] hi [5:11] don't know much about the proto internals either, @claytonc is probably the only one [5:12] create a vendor/github.com/golang/protobuf bump PR and assign it to him shiywang [5:12 PM] sounds good, thank you sir so /assign @smarterclayton for suggestion, thanks ```release-note NONE ``` Kubernetes-commit: 5b7ce60fcebea445b7852d8dc2bce141a2bd7a3a
67 lines
2.0 KiB
Go
67 lines
2.0 KiB
Go
/*
|
|
Copyright 2015 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 v1beta1
|
|
|
|
import (
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
|
)
|
|
|
|
// GroupName is the group name use in this package
|
|
const GroupName = "extensions"
|
|
|
|
// SchemeGroupVersion is group version used to register these objects
|
|
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1beta1"}
|
|
|
|
// Resource takes an unqualified resource and returns a Group qualified GroupResource
|
|
func Resource(resource string) schema.GroupResource {
|
|
return SchemeGroupVersion.WithResource(resource).GroupResource()
|
|
}
|
|
|
|
var (
|
|
// TODO: move SchemeBuilder with zz_generated.deepcopy.go to k8s.io/api.
|
|
// localSchemeBuilder and AddToScheme will stay in k8s.io/kubernetes.
|
|
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
|
|
localSchemeBuilder = &SchemeBuilder
|
|
AddToScheme = localSchemeBuilder.AddToScheme
|
|
)
|
|
|
|
// Adds the list of known types to the given scheme.
|
|
func addKnownTypes(scheme *runtime.Scheme) error {
|
|
scheme.AddKnownTypes(SchemeGroupVersion,
|
|
&Deployment{},
|
|
&DeploymentList{},
|
|
&DeploymentRollback{},
|
|
&ReplicationControllerDummy{},
|
|
&Scale{},
|
|
&DaemonSetList{},
|
|
&DaemonSet{},
|
|
&Ingress{},
|
|
&IngressList{},
|
|
&ReplicaSet{},
|
|
&ReplicaSetList{},
|
|
&PodSecurityPolicy{},
|
|
&PodSecurityPolicyList{},
|
|
&NetworkPolicy{},
|
|
&NetworkPolicyList{},
|
|
)
|
|
// Add the watch version that applies
|
|
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
|
|
return nil
|
|
}
|