github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DS: Api Machinery Fixes

Browse Source
This commit is contained in:
Anirudh 2017-07-18 15:03:57 -07:00
parent ef7203563b
commit c7a25a3786
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/defaulting_test.go
View File

@ -108,6 +108,8 @@ func TestDefaulting(t *testing.T) {
// {Group: "kubeadm.k8s.io", Version: "v1alpha1", Kind: "NodeConfiguration"}: {}, // {Group: "kubeadm.k8s.io", Version: "v1alpha1", Kind: "NodeConfiguration"}: {},
{Group: "extensions", Version: "v1beta1", Kind: "DaemonSet"}: {}, {Group: "extensions", Version: "v1beta1", Kind: "DaemonSet"}: {},
{Group: "extensions", Version: "v1beta1", Kind: "DaemonSetList"}: {}, {Group: "extensions", Version: "v1beta1", Kind: "DaemonSetList"}: {},
{Group: "apps", Version: "v1beta2", Kind: "DaemonSet"}: {},
{Group: "apps", Version: "v1beta2", Kind: "DaemonSetList"}: {},
{Group: "extensions", Version: "v1beta1", Kind: "Deployment"}: {}, {Group: "extensions", Version: "v1beta1", Kind: "Deployment"}: {},
{Group: "extensions", Version: "v1beta1", Kind: "DeploymentList"}: {}, {Group: "extensions", Version: "v1beta1", Kind: "DeploymentList"}: {},
{Group: "apps", Version: "v1beta1", Kind: "Deployment"}: {}, {Group: "apps", Version: "v1beta1", Kind: "Deployment"}: {},

4
pkg/apis/apps/v1beta2/conversion.go
View File

@ -88,7 +88,7 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
return nil return nil
} }
func Convert_apps_RollingUpdateDaemonSet_To_v1beta2_RollingUpdateDaemonSet(in *apps.RollingUpdateDaemonSet, out *appsv1beta2.RollingUpdateDaemonSet, s conversion.Scope) error { func Convert_extensions_RollingUpdateDaemonSet_To_v1beta2_RollingUpdateDaemonSet(in *extensions.RollingUpdateDaemonSet, out *appsv1beta2.RollingUpdateDaemonSet, s conversion.Scope) error {
if out.MaxUnavailable == nil { if out.MaxUnavailable == nil {
out.MaxUnavailable = &intstr.IntOrString{} out.MaxUnavailable = &intstr.IntOrString{}
} }
@ -98,7 +98,7 @@ func Convert_apps_RollingUpdateDaemonSet_To_v1beta2_RollingUpdateDaemonSet(in *a
return nil return nil
} }
func Convert_v1beta2_RollingUpdateDaemonSet_To_apps_RollingUpdateDaemonSet(in *appsv1beta2.RollingUpdateDaemonSet, out *apps.RollingUpdateDaemonSet, s conversion.Scope) error { func Convert_v1beta2_RollingUpdateDaemonSet_To_extensions_RollingUpdateDaemonSet(in *appsv1beta2.RollingUpdateDaemonSet, out *extensions.RollingUpdateDaemonSet, s conversion.Scope) error {
if err := s.Convert(in.MaxUnavailable, &out.MaxUnavailable, 0); err != nil { if err := s.Convert(in.MaxUnavailable, &out.MaxUnavailable, 0); err != nil {
return err return err
} }

2
plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml vendored
View File

@ -150,6 +150,7 @@ items:
name: system:controller:daemon-set-controller name: system:controller:daemon-set-controller
rules: rules:
- apiGroups: - apiGroups:
- apps
- extensions - extensions
resources: resources:
- daemonsets - daemonsets
@ -158,6 +159,7 @@ items:
- list - list
- watch - watch
- apiGroups: - apiGroups:
- apps
- extensions - extensions
resources: resources:
- daemonsets/status - daemonsets/status

2
staging/src/k8s.io/api/apps/v1beta2/types.go
View File

@ -641,7 +641,7 @@ type DaemonSetStatus struct {
CollisionCount *int64 `json:"collisionCount,omitempty" protobuf:"varint,9,opt,name=collisionCount"` CollisionCount *int64 `json:"collisionCount,omitempty" protobuf:"varint,9,opt,name=collisionCount"`
} }
// +genclient=true // +genclient
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// WIP: This is not ready to be used and we plan to make breaking changes to it. // WIP: This is not ready to be used and we plan to make breaking changes to it.