Merge pull request #4810 from appvia/apimachinery

apimachinery run to update generated files for EtcdQuorumRead flag
This commit is contained in:
k8s-ci-robot 2018-03-27 09:46:03 -07:00 committed by GitHub
commit 06d3f4fdae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 35 additions and 2 deletions

View File

@ -1933,6 +1933,7 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.RequestheaderAllowedNames = in.RequestheaderAllowedNames
out.FeatureGates = in.FeatureGates
out.MaxRequestsInflight = in.MaxRequestsInflight
out.EtcdQuorumRead = in.EtcdQuorumRead
return nil
}
@ -1996,6 +1997,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
out.RequestheaderAllowedNames = in.RequestheaderAllowedNames
out.FeatureGates = in.FeatureGates
out.MaxRequestsInflight = in.MaxRequestsInflight
out.EtcdQuorumRead = in.EtcdQuorumRead
return nil
}

View File

@ -1897,6 +1897,15 @@ func (in *KubeAPIServerConfig) DeepCopyInto(out *KubeAPIServerConfig) {
(*out)[key] = val
}
}
if in.EtcdQuorumRead != nil {
in, out := &in.EtcdQuorumRead, &out.EtcdQuorumRead
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
return
}

View File

@ -2197,6 +2197,7 @@ func autoConvert_v1alpha2_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.RequestheaderAllowedNames = in.RequestheaderAllowedNames
out.FeatureGates = in.FeatureGates
out.MaxRequestsInflight = in.MaxRequestsInflight
out.EtcdQuorumRead = in.EtcdQuorumRead
return nil
}
@ -2260,6 +2261,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko
out.RequestheaderAllowedNames = in.RequestheaderAllowedNames
out.FeatureGates = in.FeatureGates
out.MaxRequestsInflight = in.MaxRequestsInflight
out.EtcdQuorumRead = in.EtcdQuorumRead
return nil
}

View File

@ -2005,6 +2005,15 @@ func (in *KubeAPIServerConfig) DeepCopyInto(out *KubeAPIServerConfig) {
(*out)[key] = val
}
}
if in.EtcdQuorumRead != nil {
in, out := &in.EtcdQuorumRead, &out.EtcdQuorumRead
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
return
}

View File

@ -2184,6 +2184,15 @@ func (in *KubeAPIServerConfig) DeepCopyInto(out *KubeAPIServerConfig) {
(*out)[key] = val
}
}
if in.EtcdQuorumRead != nil {
in, out := &in.EtcdQuorumRead, &out.EtcdQuorumRead
if *in == nil {
*out = nil
} else {
*out = new(bool)
**out = **in
}
}
return
}

View File

@ -17,6 +17,8 @@ limitations under the License.
package scheme
import (
os "os"
announced "k8s.io/apimachinery/pkg/apimachinery/announced"
registered "k8s.io/apimachinery/pkg/apimachinery/registered"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -24,7 +26,6 @@ import (
schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
kops "k8s.io/kops/pkg/apis/kops/install"
os "os"
)
var Scheme = runtime.NewScheme()

View File

@ -17,6 +17,8 @@ limitations under the License.
package scheme
import (
os "os"
announced "k8s.io/apimachinery/pkg/apimachinery/announced"
registered "k8s.io/apimachinery/pkg/apimachinery/registered"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -24,7 +26,6 @@ import (
schema "k8s.io/apimachinery/pkg/runtime/schema"
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
kops "k8s.io/kops/pkg/apis/kops/install"
os "os"
)
var Scheme = runtime.NewScheme()