Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

Commit

Permalink
ServiceClass.Tags → AlphaTags
Browse files Browse the repository at this point in the history
  • Loading branch information
MHBauer authored and kibbles-n-bytes committed May 16, 2017
1 parent 7491fd3 commit 52cb3c6
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions pkg/apis/servicecatalog/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ type ServiceClass struct {
ExternalID string

// OSB-specific
Tags []string
Requires []string
AlphaTags []string
Requires []string
// Description is a short description of the service.
Description string
ExternalMetadata *runtime.RawExtension
Expand Down
22 changes: 11 additions & 11 deletions pkg/apis/servicecatalog/v1alpha1/types.generated.go
Original file line number Diff line number Diff line change
Expand Up @@ -2038,7 +2038,7 @@ func (x *ServiceClass) CodecEncodeSelf(e *codec1978.Encoder) {
yyq2[0] = x.Kind != ""
yyq2[1] = x.APIVersion != ""
yyq2[2] = true
yyq2[8] = len(x.Tags) != 0
yyq2[8] = len(x.AlphaTags) != 0
yyq2[9] = len(x.Requires) != 0
var yynn2 int
if yyr2 || yy2arr2 {
Expand Down Expand Up @@ -2238,14 +2238,14 @@ func (x *ServiceClass) CodecEncodeSelf(e *codec1978.Encoder) {
if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[8] {
if x.Tags == nil {
if x.AlphaTags == nil {
r.EncodeNil()
} else {
yym30 := z.EncBinary()
_ = yym30
if false {
} else {
z.F.EncSliceStringV(x.Tags, false, e)
z.F.EncSliceStringV(x.AlphaTags, false, e)
}
}
} else {
Expand All @@ -2254,16 +2254,16 @@ func (x *ServiceClass) CodecEncodeSelf(e *codec1978.Encoder) {
} else {
if yyq2[8] {
z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("tags"))
r.EncodeString(codecSelferC_UTF81234, string("alphaTags"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
if x.Tags == nil {
if x.AlphaTags == nil {
r.EncodeNil()
} else {
yym31 := z.EncBinary()
_ = yym31
if false {
} else {
z.F.EncSliceStringV(x.Tags, false, e)
z.F.EncSliceStringV(x.AlphaTags, false, e)
}
}
}
Expand Down Expand Up @@ -2511,11 +2511,11 @@ func (x *ServiceClass) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
*((*string)(yyv18)) = r.DecodeString()
}
}
case "tags":
case "alphaTags":
if r.TryDecodeAsNil() {
x.Tags = nil
x.AlphaTags = nil
} else {
yyv20 := &x.Tags
yyv20 := &x.AlphaTags
yym21 := z.DecBinary()
_ = yym21
if false {
Expand Down Expand Up @@ -2769,9 +2769,9 @@ func (x *ServiceClass) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.Tags = nil
x.AlphaTags = nil
} else {
yyv45 := &x.Tags
yyv45 := &x.AlphaTags
yym46 := z.DecBinary()
_ = yym46
if false {
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/servicecatalog/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ type ServiceClass struct {
ExternalID string `json:"externalID"`

// OSB-specific
Tags []string `json:"tags,omitempty"`
Requires []string `json:"requires,omitempty"`
AlphaTags []string `json:"alphaTags,omitempty"`
Requires []string `json:"requires,omitempty"`
// Description is a short description of the service.
Description string `json:"description"`

Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/servicecatalog/v1alpha1/zz_generated.conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ func autoConvert_v1alpha1_ServiceClass_To_servicecatalog_ServiceClass(in *Servic
}
out.PlanUpdatable = in.PlanUpdatable
out.ExternalID = in.ExternalID
out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags))
out.AlphaTags = *(*[]string)(unsafe.Pointer(&in.AlphaTags))
out.Requires = *(*[]string)(unsafe.Pointer(&in.Requires))
out.Description = in.Description
out.ExternalMetadata = (*runtime.RawExtension)(unsafe.Pointer(in.ExternalMetadata))
Expand Down Expand Up @@ -480,7 +480,7 @@ func autoConvert_servicecatalog_ServiceClass_To_v1alpha1_ServiceClass(in *servic
}
out.PlanUpdatable = in.PlanUpdatable
out.ExternalID = in.ExternalID
out.Tags = *(*[]string)(unsafe.Pointer(&in.Tags))
out.AlphaTags = *(*[]string)(unsafe.Pointer(&in.AlphaTags))
out.Requires = *(*[]string)(unsafe.Pointer(&in.Requires))
out.Description = in.Description
out.ExternalMetadata = (*runtime.RawExtension)(unsafe.Pointer(in.ExternalMetadata))
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/servicecatalog/v1alpha1/zz_generated.deepcopy.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ func DeepCopy_v1alpha1_ServiceClass(in interface{}, out interface{}, c *conversi
}
}
}
if in.Tags != nil {
in, out := &in.Tags, &out.Tags
if in.AlphaTags != nil {
in, out := &in.AlphaTags, &out.AlphaTags
*out = make([]string, len(*in))
copy(*out, *in)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/servicecatalog/zz_generated.deepcopy.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,8 @@ func DeepCopy_servicecatalog_ServiceClass(in interface{}, out interface{}, c *co
}
}
}
if in.Tags != nil {
in, out := &in.Tags, &out.Tags
if in.AlphaTags != nil {
in, out := &in.AlphaTags, &out.AlphaTags
*out = make([]string, len(*in))
copy(*out, *in)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ func (c *controller) reconcileServiceClassFromBrokerCatalog(broker *v1alpha1.Bro
toUpdate.Bindable = serviceClass.Bindable
toUpdate.Plans = serviceClass.Plans
toUpdate.PlanUpdatable = serviceClass.PlanUpdatable
toUpdate.Tags = serviceClass.Tags
toUpdate.AlphaTags = serviceClass.AlphaTags
toUpdate.Requires = serviceClass.Requires
toUpdate.Description = serviceClass.Description

Expand Down Expand Up @@ -1705,7 +1705,7 @@ func convertCatalog(in *brokerapi.Catalog) ([]*v1alpha1.ServiceClass, error) {
Plans: plans,
PlanUpdatable: svc.PlanUpdateable,
ExternalID: svc.ID,
Tags: svc.Tags,
AlphaTags: svc.Tags,
Requires: svc.Requires,
Description: svc.Description,
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/openapi/openapi_generated.go
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope
Format: "",
},
},
"tags": {
"alphaTags": {
SchemaProps: spec.SchemaProps{
Description: "OSB-specific",
Type: []string{"array"},
Expand Down

0 comments on commit 52cb3c6

Please sign in to comment.