github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Updating generated code

Browse Source
This commit is contained in:
nikhiljindal 2016-05-23 20:19:59 -07:00
parent 57ea89a512
commit 236eb42664
7 changed files with 130 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
federation/apis/federation/deep_copy_generated.go
View File

@ -110,7 +110,15 @@ func DeepCopy_federation_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conver
} else { } else {
out.ServerAddressByClientCIDRs = nil out.ServerAddressByClientCIDRs = nil
} }
out.Credential = in.Credential if in.SecretRef != nil {
in, out := in.SecretRef, &out.SecretRef
*out = new(api.LocalObjectReference)
if err := api.DeepCopy_api_LocalObjectReference(*in, *out, c); err != nil {
return err
}
} else {
out.SecretRef = nil
}
return nil return nil
} }

49
federation/apis/federation/types.generated.go
View File

@ -64,7 +64,7 @@ func init() {
panic(err) panic(err)
} }
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg1_api.ConditionStatus var v0 pkg1_api.LocalObjectReference
var v1 pkg3_resource.Quantity var v1 pkg3_resource.Quantity
var v2 pkg2_unversioned.Time var v2 pkg2_unversioned.Time
var v3 pkg4_types.UID var v3 pkg4_types.UID
@ -293,12 +293,11 @@ func (x *ClusterSpec) CodecEncodeSelf(e *codec1978.Encoder) {
var yyq2 [2]bool var yyq2 [2]bool
_, _, _ = yysep2, yyq2, yy2arr2 _, _, _ = yysep2, yyq2, yy2arr2
const yyr2 bool = false const yyr2 bool = false
yyq2[1] = x.Credential != ""
var yynn2 int var yynn2 int
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.EncodeArrayStart(2) r.EncodeArrayStart(2)
} else { } else {
yynn2 = 1 yynn2 = 2
for _, b := range yyq2 { for _, b := range yyq2 {
if b { if b {
yynn2++ yynn2++
@ -336,27 +335,19 @@ func (x *ClusterSpec) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[1] { if x.SecretRef == nil {
yym7 := z.EncBinary() r.EncodeNil()
_ = yym7
if false {
} else { } else {
r.EncodeString(codecSelferC_UTF81234, string(x.Credential)) x.SecretRef.CodecEncodeSelf(e)
} }
} else { } else {
r.EncodeString(codecSelferC_UTF81234, "")
}
} else {
if yyq2[1] {
z.EncSendContainerState(codecSelfer_containerMapKey1234) z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("credential")) r.EncodeString(codecSelferC_UTF81234, string("secretRef"))
z.EncSendContainerState(codecSelfer_containerMapValue1234) z.EncSendContainerState(codecSelfer_containerMapValue1234)
yym8 := z.EncBinary() if x.SecretRef == nil {
_ = yym8 r.EncodeNil()
if false {
} else { } else {
r.EncodeString(codecSelferC_UTF81234, string(x.Credential)) x.SecretRef.CodecEncodeSelf(e)
}
} }
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
@ -432,11 +423,16 @@ func (x *ClusterSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
h.decSliceServerAddressByClientCIDR((*[]ServerAddressByClientCIDR)(yyv4), d) h.decSliceServerAddressByClientCIDR((*[]ServerAddressByClientCIDR)(yyv4), d)
} }
} }
case "credential": case "secretRef":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Credential = "" if x.SecretRef != nil {
x.SecretRef = nil
}
} else { } else {
x.Credential = string(r.DecodeString()) if x.SecretRef == nil {
x.SecretRef = new(pkg1_api.LocalObjectReference)
}
x.SecretRef.CodecDecodeSelf(d)
} }
default: default:
z.DecStructFieldNotFound(-1, yys3) z.DecStructFieldNotFound(-1, yys3)
@ -486,9 +482,14 @@ func (x *ClusterSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Credential = "" if x.SecretRef != nil {
x.SecretRef = nil
}
} else { } else {
x.Credential = string(r.DecodeString()) if x.SecretRef == nil {
x.SecretRef = new(pkg1_api.LocalObjectReference)
}
x.SecretRef.CodecDecodeSelf(d)
} }
for { for {
yyj7++ yyj7++
@ -2447,7 +2448,7 @@ func (x codecSelfer1234) decSliceCluster(v *[]Cluster, d *codec1978.Decoder) {
yyrg1 := len(yyv1) > 0 yyrg1 := len(yyv1) > 0
yyv21 := yyv1 yyv21 := yyv1
yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 336) yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 328)
if yyrt1 { if yyrt1 {
if yyrl1 <= cap(yyv1) { if yyrl1 <= cap(yyv1) {
yyv1 = yyv1[:yyrl1] yyv1 = yyv1[:yyrl1]

22
federation/apis/federation/v1alpha1/conversion_generated.go
View File

@ -208,7 +208,16 @@ func autoConvert_v1alpha1_ClusterSpec_To_federation_ClusterSpec(in *ClusterSpec,
} else { } else {
out.ServerAddressByClientCIDRs = nil out.ServerAddressByClientCIDRs = nil
} }
out.Credential = in.Credential if in.SecretRef != nil {
in, out := &in.SecretRef, &out.SecretRef
*out = new(api.LocalObjectReference)
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(*in, *out, 0); err != nil {
return err
}
} else {
out.SecretRef = nil
}
return nil return nil
} }
@ -228,7 +237,16 @@ func autoConvert_federation_ClusterSpec_To_v1alpha1_ClusterSpec(in *federation.C
} else { } else {
out.ServerAddressByClientCIDRs = nil out.ServerAddressByClientCIDRs = nil
} }
out.Credential = in.Credential if in.SecretRef != nil {
in, out := &in.SecretRef, &out.SecretRef
*out = new(v1.LocalObjectReference)
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(*in, *out, 0); err != nil {
return err
}
} else {
out.SecretRef = nil
}
return nil return nil
} }

10
federation/apis/federation/v1alpha1/deep_copy_generated.go
View File

@ -111,7 +111,15 @@ func DeepCopy_v1alpha1_ClusterSpec(in ClusterSpec, out *ClusterSpec, c *conversi
} else { } else {
out.ServerAddressByClientCIDRs = nil out.ServerAddressByClientCIDRs = nil
} }
out.Credential = in.Credential if in.SecretRef != nil {
in, out := in.SecretRef, &out.SecretRef
*out = new(v1.LocalObjectReference)
if err := v1.DeepCopy_v1_LocalObjectReference(*in, *out, c); err != nil {
return err
}
} else {
out.SecretRef = nil
}
return nil return nil
} }

44
federation/apis/federation/v1alpha1/generated.pb.go
View File

@ -266,10 +266,16 @@ func (m *ClusterSpec) MarshalTo(data []byte) (int, error) {
i += n i += n
} }
} }
if m.SecretRef != nil {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64(len(m.Credential))) i = encodeVarintGenerated(data, i, uint64(m.SecretRef.Size()))
i += copy(data[i:], m.Credential) n7, err := m.SecretRef.MarshalTo(data[i:])
if err != nil {
return 0, err
}
i += n7
}
return i, nil return i, nil
} }
@ -315,11 +321,11 @@ func (m *ClusterStatus) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64((&v).Size())) i = encodeVarintGenerated(data, i, uint64((&v).Size()))
n7, err := (&v).MarshalTo(data[i:]) n8, err := (&v).MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n7 i += n8
} }
} }
if len(m.Allocatable) > 0 { if len(m.Allocatable) > 0 {
@ -337,21 +343,21 @@ func (m *ClusterStatus) MarshalTo(data []byte) (int, error) {
data[i] = 0x12 data[i] = 0x12
i++ i++
i = encodeVarintGenerated(data, i, uint64((&v).Size())) i = encodeVarintGenerated(data, i, uint64((&v).Size()))
n8, err := (&v).MarshalTo(data[i:]) n9, err := (&v).MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n8 i += n9
} }
} }
data[i] = 0x22 data[i] = 0x22
i++ i++
i = encodeVarintGenerated(data, i, uint64(m.ClusterMeta.Size())) i = encodeVarintGenerated(data, i, uint64(m.ClusterMeta.Size()))
n9, err := m.ClusterMeta.MarshalTo(data[i:]) n10, err := m.ClusterMeta.MarshalTo(data[i:])
if err != nil { if err != nil {
return 0, err return 0, err
} }
i += n9 i += n10
return i, nil return i, nil
} }
@ -469,8 +475,10 @@ func (m *ClusterSpec) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
} }
} }
l = len(m.Credential) if m.SecretRef != nil {
l = m.SecretRef.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
}
return n return n
} }
@ -1147,9 +1155,9 @@ func (m *ClusterSpec) Unmarshal(data []byte) error {
iNdEx = postIndex iNdEx = postIndex
case 2: case 2:
if wireType != 2 { if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Credential", wireType) return fmt.Errorf("proto: wrong wireType = %d for field SecretRef", wireType)
} }
var stringLen uint64 var msglen int
for shift := uint(0); ; shift += 7 { for shift := uint(0); ; shift += 7 {
if shift >= 64 { if shift >= 64 {
return ErrIntOverflowGenerated return ErrIntOverflowGenerated
@ -1159,20 +1167,24 @@ func (m *ClusterSpec) Unmarshal(data []byte) error {
} }
b := data[iNdEx] b := data[iNdEx]
iNdEx++ iNdEx++
stringLen |= (uint64(b) & 0x7F) << shift msglen |= (int(b) & 0x7F) << shift
if b < 0x80 { if b < 0x80 {
break break
} }
} }
intStringLen := int(stringLen) if msglen < 0 {
if intStringLen < 0 {
return ErrInvalidLengthGenerated return ErrInvalidLengthGenerated
} }
postIndex := iNdEx + intStringLen postIndex := iNdEx + msglen
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Credential = string(data[iNdEx:postIndex]) if m.SecretRef == nil {
m.SecretRef = &k8s_io_kubernetes_pkg_api_v1.LocalObjectReference{}
}
if err := m.SecretRef.Unmarshal(data[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex iNdEx = postIndex
default: default:
iNdEx = preIndex iNdEx = preIndex

9
federation/apis/federation/v1alpha1/generated.proto
View File

@ -87,10 +87,11 @@ message ClusterSpec {
// In case of multiple matches, clients should use the longest matching CIDR. // In case of multiple matches, clients should use the longest matching CIDR.
repeated ServerAddressByClientCIDR serverAddressByClientCIDRs = 1; repeated ServerAddressByClientCIDR serverAddressByClientCIDRs = 1;
// the type (e.g. bearer token, client certificate etc) and data of the credential used to access cluster. // Name of the secret containing kubeconfig to access this cluster.
// It’s used for system routines (not behalf of users) // The secret is read from the kubernetes cluster that is hosting federation control plane.
// TODO: string may not enough, https://github.com/kubernetes/kubernetes/pull/23847#discussion_r59301275 // Admin needs to ensure that the required secret exists. Secret should be in the same namespace where federation control plane is hosted and it should have kubeconfig in its data with key "kubeconfig".
optional string credential = 2; // This will later be changed to a reference to secret in federation control plane when the federation control plane supports secrets.
optional k8s.io.kubernetes.pkg.api.v1.LocalObjectReference secretRef = 2;
} }
// ClusterStatus is information about the current status of a cluster updated by cluster controller peridocally. // ClusterStatus is information about the current status of a cluster updated by cluster controller peridocally.

49
federation/apis/federation/v1alpha1/types.generated.go
View File

@ -66,7 +66,7 @@ func init() {
if false { // reference the types, but skip this branch at build/run time if false { // reference the types, but skip this branch at build/run time
var v0 pkg3_resource.Quantity var v0 pkg3_resource.Quantity
var v1 pkg2_unversioned.Time var v1 pkg2_unversioned.Time
var v2 pkg1_v1.ConditionStatus var v2 pkg1_v1.LocalObjectReference
var v3 pkg4_types.UID var v3 pkg4_types.UID
var v4 time.Time var v4 time.Time
_, _, _, _, _ = v0, v1, v2, v3, v4 _, _, _, _, _ = v0, v1, v2, v3, v4
@ -293,12 +293,11 @@ func (x *ClusterSpec) CodecEncodeSelf(e *codec1978.Encoder) {
var yyq2 [2]bool var yyq2 [2]bool
_, _, _ = yysep2, yyq2, yy2arr2 _, _, _ = yysep2, yyq2, yy2arr2
const yyr2 bool = false const yyr2 bool = false
yyq2[1] = x.Credential != ""
var yynn2 int var yynn2 int
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.EncodeArrayStart(2) r.EncodeArrayStart(2)
} else { } else {
yynn2 = 1 yynn2 = 2
for _, b := range yyq2 { for _, b := range yyq2 {
if b { if b {
yynn2++ yynn2++
@ -336,27 +335,19 @@ func (x *ClusterSpec) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[1] { if x.SecretRef == nil {
yym7 := z.EncBinary() r.EncodeNil()
_ = yym7
if false {
} else { } else {
r.EncodeString(codecSelferC_UTF81234, string(x.Credential)) x.SecretRef.CodecEncodeSelf(e)
} }
} else { } else {
r.EncodeString(codecSelferC_UTF81234, "")
}
} else {
if yyq2[1] {
z.EncSendContainerState(codecSelfer_containerMapKey1234) z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("credential")) r.EncodeString(codecSelferC_UTF81234, string("secretRef"))
z.EncSendContainerState(codecSelfer_containerMapValue1234) z.EncSendContainerState(codecSelfer_containerMapValue1234)
yym8 := z.EncBinary() if x.SecretRef == nil {
_ = yym8 r.EncodeNil()
if false {
} else { } else {
r.EncodeString(codecSelferC_UTF81234, string(x.Credential)) x.SecretRef.CodecEncodeSelf(e)
}
} }
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
@ -432,11 +423,16 @@ func (x *ClusterSpec) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
h.decSliceServerAddressByClientCIDR((*[]ServerAddressByClientCIDR)(yyv4), d) h.decSliceServerAddressByClientCIDR((*[]ServerAddressByClientCIDR)(yyv4), d)
} }
} }
case "credential": case "secretRef":
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Credential = "" if x.SecretRef != nil {
x.SecretRef = nil
}
} else { } else {
x.Credential = string(r.DecodeString()) if x.SecretRef == nil {
x.SecretRef = new(pkg1_v1.LocalObjectReference)
}
x.SecretRef.CodecDecodeSelf(d)
} }
default: default:
z.DecStructFieldNotFound(-1, yys3) z.DecStructFieldNotFound(-1, yys3)
@ -486,9 +482,14 @@ func (x *ClusterSpec) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
} }
z.DecSendContainerState(codecSelfer_containerArrayElem1234) z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() { if r.TryDecodeAsNil() {
x.Credential = "" if x.SecretRef != nil {
x.SecretRef = nil
}
} else { } else {
x.Credential = string(r.DecodeString()) if x.SecretRef == nil {
x.SecretRef = new(pkg1_v1.LocalObjectReference)
}
x.SecretRef.CodecDecodeSelf(d)
} }
for { for {
yyj7++ yyj7++
@ -2447,7 +2448,7 @@ func (x codecSelfer1234) decSliceCluster(v *[]Cluster, d *codec1978.Decoder) {
yyrg1 := len(yyv1) > 0 yyrg1 := len(yyv1) > 0
yyv21 := yyv1 yyv21 := yyv1
yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 336) yyrl1, yyrt1 = z.DecInferLen(yyl1, z.DecBasicHandle().MaxInitLen, 328)
if yyrt1 { if yyrt1 {
if yyrl1 <= cap(yyv1) { if yyrl1 <= cap(yyv1) {
yyv1 = yyv1[:yyrl1] yyv1 = yyv1[:yyrl1]