Browse code
Move conversions out of init() and give them names
Clayton Coleman authored on 2015/06/07 04:31:58Showing 16 changed files
- pkg/authorization/api/v1/conversion.go
- pkg/authorization/api/v1beta3/conversion.go
- pkg/build/api/v1/conversion.go
- pkg/build/api/v1beta3/conversion.go
- pkg/deploy/api/v1/conversion.go
- pkg/deploy/api/v1beta3/conversion.go
- pkg/image/api/v1/conversion.go
- pkg/image/api/v1beta3/conversion.go
- pkg/project/api/v1/conversion.go
- pkg/project/api/v1/conversion_test.go
- pkg/project/api/v1beta3/conversion.go
- pkg/project/api/v1beta3/conversion_test.go
- pkg/route/api/v1/conversion.go
- pkg/route/api/v1beta3/conversion.go
- pkg/template/api/v1/conversion.go
- pkg/template/api/v1beta3/conversion.go
| ... | ... |
@@ -10,110 +10,179 @@ import ( |
| 10 | 10 |
newer "github.com/openshift/origin/pkg/authorization/api" |
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 |
-func init() {
|
|
| 14 |
- err := api.Scheme.AddConversionFuncs( |
|
| 15 |
- func(in *SubjectAccessReview, out *newer.SubjectAccessReview, s conversion.Scope) error {
|
|
| 16 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 17 |
- return err |
|
| 18 |
- } |
|
| 13 |
+func convert_v1_SubjectAccessReview_To_api_SubjectAccessReview(in *SubjectAccessReview, out *newer.SubjectAccessReview, s conversion.Scope) error {
|
|
| 14 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 15 |
+ return err |
|
| 16 |
+ } |
|
| 19 | 17 |
|
| 20 |
- out.Groups = util.NewStringSet(in.GroupsSlice...) |
|
| 18 |
+ out.Groups = util.NewStringSet(in.GroupsSlice...) |
|
| 21 | 19 |
|
| 22 |
- return nil |
|
| 23 |
- }, |
|
| 24 |
- func(in *newer.SubjectAccessReview, out *SubjectAccessReview, s conversion.Scope) error {
|
|
| 25 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 26 |
- return err |
|
| 27 |
- } |
|
| 20 |
+ return nil |
|
| 21 |
+} |
|
| 28 | 22 |
|
| 29 |
- out.GroupsSlice = in.Groups.List() |
|
| 23 |
+func convert_api_SubjectAccessReview_To_v1_SubjectAccessReview(in *newer.SubjectAccessReview, out *SubjectAccessReview, s conversion.Scope) error {
|
|
| 24 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 25 |
+ return err |
|
| 26 |
+ } |
|
| 30 | 27 |
|
| 31 |
- return nil |
|
| 32 |
- }, |
|
| 33 |
- func(in *ResourceAccessReviewResponse, out *newer.ResourceAccessReviewResponse, s conversion.Scope) error {
|
|
| 34 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 35 |
- return err |
|
| 36 |
- } |
|
| 28 |
+ out.GroupsSlice = in.Groups.List() |
|
| 37 | 29 |
|
| 38 |
- out.Users = util.NewStringSet(in.UsersSlice...) |
|
| 39 |
- out.Groups = util.NewStringSet(in.GroupsSlice...) |
|
| 30 |
+ return nil |
|
| 31 |
+} |
|
| 40 | 32 |
|
| 41 |
- return nil |
|
| 42 |
- }, |
|
| 43 |
- func(in *newer.ResourceAccessReviewResponse, out *ResourceAccessReviewResponse, s conversion.Scope) error {
|
|
| 44 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 45 |
- return err |
|
| 46 |
- } |
|
| 33 |
+func convert_v1_ResourceAccessReviewResponse_To_api_ResourceAccessReviewResponse(in *ResourceAccessReviewResponse, out *newer.ResourceAccessReviewResponse, s conversion.Scope) error {
|
|
| 34 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 35 |
+ return err |
|
| 36 |
+ } |
|
| 47 | 37 |
|
| 48 |
- out.UsersSlice = in.Users.List() |
|
| 49 |
- out.GroupsSlice = in.Groups.List() |
|
| 38 |
+ out.Users = util.NewStringSet(in.UsersSlice...) |
|
| 39 |
+ out.Groups = util.NewStringSet(in.GroupsSlice...) |
|
| 50 | 40 |
|
| 51 |
- return nil |
|
| 52 |
- }, |
|
| 53 |
- func(in *PolicyRule, out *newer.PolicyRule, s conversion.Scope) error {
|
|
| 54 |
- if err := s.Convert(&in.AttributeRestrictions, &out.AttributeRestrictions, 0); err != nil {
|
|
| 55 |
- return err |
|
| 56 |
- } |
|
| 41 |
+ return nil |
|
| 42 |
+} |
|
| 57 | 43 |
|
| 58 |
- out.Resources = util.StringSet{}
|
|
| 59 |
- out.Resources.Insert(in.Resources...) |
|
| 44 |
+func convert_api_ResourceAccessReviewResponse_To_v1_ResourceAccessReviewResponse(in *newer.ResourceAccessReviewResponse, out *ResourceAccessReviewResponse, s conversion.Scope) error {
|
|
| 45 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 46 |
+ return err |
|
| 47 |
+ } |
|
| 60 | 48 |
|
| 61 |
- out.Verbs = util.StringSet{}
|
|
| 62 |
- out.Verbs.Insert(in.Verbs...) |
|
| 49 |
+ out.UsersSlice = in.Users.List() |
|
| 50 |
+ out.GroupsSlice = in.Groups.List() |
|
| 63 | 51 |
|
| 64 |
- out.ResourceNames = util.NewStringSet(in.ResourceNames...) |
|
| 52 |
+ return nil |
|
| 53 |
+} |
|
| 65 | 54 |
|
| 66 |
- out.NonResourceURLs = util.NewStringSet(in.NonResourceURLsSlice...) |
|
| 55 |
+func convert_v1_PolicyRule_To_api_PolicyRule(in *PolicyRule, out *newer.PolicyRule, s conversion.Scope) error {
|
|
| 56 |
+ if err := s.Convert(&in.AttributeRestrictions, &out.AttributeRestrictions, 0); err != nil {
|
|
| 57 |
+ return err |
|
| 58 |
+ } |
|
| 67 | 59 |
|
| 68 |
- return nil |
|
| 69 |
- }, |
|
| 70 |
- func(in *newer.PolicyRule, out *PolicyRule, s conversion.Scope) error {
|
|
| 71 |
- if err := s.Convert(&in.AttributeRestrictions, &out.AttributeRestrictions, 0); err != nil {
|
|
| 72 |
- return err |
|
| 73 |
- } |
|
| 60 |
+ out.Resources = util.StringSet{}
|
|
| 61 |
+ out.Resources.Insert(in.Resources...) |
|
| 74 | 62 |
|
| 75 |
- out.Resources = []string{}
|
|
| 76 |
- out.Resources = append(out.Resources, in.Resources.List()...) |
|
| 63 |
+ out.Verbs = util.StringSet{}
|
|
| 64 |
+ out.Verbs.Insert(in.Verbs...) |
|
| 77 | 65 |
|
| 78 |
- out.Verbs = []string{}
|
|
| 79 |
- out.Verbs = append(out.Verbs, in.Verbs.List()...) |
|
| 66 |
+ out.ResourceNames = util.NewStringSet(in.ResourceNames...) |
|
| 80 | 67 |
|
| 81 |
- out.ResourceNames = in.ResourceNames.List() |
|
| 68 |
+ out.NonResourceURLs = util.NewStringSet(in.NonResourceURLsSlice...) |
|
| 82 | 69 |
|
| 83 |
- out.NonResourceURLsSlice = in.NonResourceURLs.List() |
|
| 70 |
+ return nil |
|
| 71 |
+} |
|
| 84 | 72 |
|
| 85 |
- return nil |
|
| 86 |
- }, |
|
| 87 |
- func(in *Policy, out *newer.Policy, s conversion.Scope) error {
|
|
| 88 |
- out.LastModified = in.LastModified |
|
| 89 |
- out.Roles = make(map[string]newer.Role) |
|
| 90 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 91 |
- }, |
|
| 92 |
- func(in *newer.Policy, out *Policy, s conversion.Scope) error {
|
|
| 93 |
- out.LastModified = in.LastModified |
|
| 94 |
- out.Roles = make([]NamedRole, 0, 0) |
|
| 95 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 96 |
- }, |
|
| 97 |
- func(in *RoleBinding, out *newer.RoleBinding, s conversion.Scope) error {
|
|
| 98 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 99 |
- return err |
|
| 100 |
- } |
|
| 73 |
+func convert_api_PolicyRule_To_v1_PolicyRule(in *newer.PolicyRule, out *PolicyRule, s conversion.Scope) error {
|
|
| 74 |
+ if err := s.Convert(&in.AttributeRestrictions, &out.AttributeRestrictions, 0); err != nil {
|
|
| 75 |
+ return err |
|
| 76 |
+ } |
|
| 101 | 77 |
|
| 102 |
- out.Users = util.NewStringSet(in.UserNames...) |
|
| 103 |
- out.Groups = util.NewStringSet(in.GroupNames...) |
|
| 78 |
+ out.Resources = []string{}
|
|
| 79 |
+ out.Resources = append(out.Resources, in.Resources.List()...) |
|
| 104 | 80 |
|
| 105 |
- return nil |
|
| 106 |
- }, |
|
| 107 |
- func(in *newer.RoleBinding, out *RoleBinding, s conversion.Scope) error {
|
|
| 108 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 109 |
- return err |
|
| 110 |
- } |
|
| 81 |
+ out.Verbs = []string{}
|
|
| 82 |
+ out.Verbs = append(out.Verbs, in.Verbs.List()...) |
|
| 111 | 83 |
|
| 112 |
- out.UserNames = in.Users.List() |
|
| 113 |
- out.GroupNames = in.Groups.List() |
|
| 84 |
+ out.ResourceNames = in.ResourceNames.List() |
|
| 114 | 85 |
|
| 115 |
- return nil |
|
| 116 |
- }, |
|
| 86 |
+ out.NonResourceURLsSlice = in.NonResourceURLs.List() |
|
| 87 |
+ |
|
| 88 |
+ return nil |
|
| 89 |
+} |
|
| 90 |
+ |
|
| 91 |
+func convert_v1_Policy_To_api_Policy(in *Policy, out *newer.Policy, s conversion.Scope) error {
|
|
| 92 |
+ out.LastModified = in.LastModified |
|
| 93 |
+ out.Roles = make(map[string]newer.Role) |
|
| 94 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 95 |
+} |
|
| 96 |
+ |
|
| 97 |
+func convert_api_Policy_To_v1_Policy(in *newer.Policy, out *Policy, s conversion.Scope) error {
|
|
| 98 |
+ out.LastModified = in.LastModified |
|
| 99 |
+ out.Roles = make([]NamedRole, 0, 0) |
|
| 100 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 101 |
+} |
|
| 102 |
+ |
|
| 103 |
+func convert_v1_RoleBinding_To_api_RoleBinding(in *RoleBinding, out *newer.RoleBinding, s conversion.Scope) error {
|
|
| 104 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 105 |
+ return err |
|
| 106 |
+ } |
|
| 107 |
+ |
|
| 108 |
+ out.Users = util.NewStringSet(in.UserNames...) |
|
| 109 |
+ out.Groups = util.NewStringSet(in.GroupNames...) |
|
| 110 |
+ |
|
| 111 |
+ return nil |
|
| 112 |
+} |
|
| 113 |
+ |
|
| 114 |
+func convert_api_RoleBinding_To_v1_RoleBinding(in *newer.RoleBinding, out *RoleBinding, s conversion.Scope) error {
|
|
| 115 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 116 |
+ return err |
|
| 117 |
+ } |
|
| 118 |
+ |
|
| 119 |
+ out.UserNames = in.Users.List() |
|
| 120 |
+ out.GroupNames = in.Groups.List() |
|
| 121 |
+ |
|
| 122 |
+ return nil |
|
| 123 |
+} |
|
| 124 |
+ |
|
| 125 |
+func convert_v1_PolicyBinding_To_api_PolicyBinding(in *PolicyBinding, out *newer.PolicyBinding, s conversion.Scope) error {
|
|
| 126 |
+ out.LastModified = in.LastModified |
|
| 127 |
+ out.RoleBindings = make(map[string]newer.RoleBinding) |
|
| 128 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 129 |
+} |
|
| 130 |
+ |
|
| 131 |
+func convert_api_PolicyBinding_To_v1_PolicyBinding(in *newer.PolicyBinding, out *PolicyBinding, s conversion.Scope) error {
|
|
| 132 |
+ out.LastModified = in.LastModified |
|
| 133 |
+ out.RoleBindings = make([]NamedRoleBinding, 0, 0) |
|
| 134 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 135 |
+} |
|
| 136 |
+ |
|
| 137 |
+// and now the globals |
|
| 138 |
+func convert_v1_ClusterPolicy_To_api_ClusterPolicy(in *ClusterPolicy, out *newer.ClusterPolicy, s conversion.Scope) error {
|
|
| 139 |
+ out.LastModified = in.LastModified |
|
| 140 |
+ out.Roles = make(map[string]newer.ClusterRole) |
|
| 141 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 142 |
+} |
|
| 143 |
+ |
|
| 144 |
+func convert_api_ClusterPolicy_To_v1_ClusterPolicy(in *newer.ClusterPolicy, out *ClusterPolicy, s conversion.Scope) error {
|
|
| 145 |
+ out.LastModified = in.LastModified |
|
| 146 |
+ out.Roles = make([]NamedClusterRole, 0, 0) |
|
| 147 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 148 |
+} |
|
| 149 |
+ |
|
| 150 |
+func convert_v1_ClusterRoleBinding_To_api_ClusterRoleBinding(in *ClusterRoleBinding, out *newer.ClusterRoleBinding, s conversion.Scope) error {
|
|
| 151 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 152 |
+ return err |
|
| 153 |
+ } |
|
| 154 |
+ |
|
| 155 |
+ out.Users = util.NewStringSet(in.UserNames...) |
|
| 156 |
+ out.Groups = util.NewStringSet(in.GroupNames...) |
|
| 157 |
+ |
|
| 158 |
+ return nil |
|
| 159 |
+} |
|
| 160 |
+ |
|
| 161 |
+func convert_api_ClusterRoleBinding_To_v1_ClusterRoleBinding(in *newer.ClusterRoleBinding, out *ClusterRoleBinding, s conversion.Scope) error {
|
|
| 162 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 163 |
+ return err |
|
| 164 |
+ } |
|
| 165 |
+ |
|
| 166 |
+ out.UserNames = in.Users.List() |
|
| 167 |
+ out.GroupNames = in.Groups.List() |
|
| 168 |
+ |
|
| 169 |
+ return nil |
|
| 170 |
+} |
|
| 171 |
+ |
|
| 172 |
+func convert_v1_ClusterPolicyBinding_To_api_ClusterPolicyBinding(in *ClusterPolicyBinding, out *newer.ClusterPolicyBinding, s conversion.Scope) error {
|
|
| 173 |
+ out.LastModified = in.LastModified |
|
| 174 |
+ out.RoleBindings = make(map[string]newer.ClusterRoleBinding) |
|
| 175 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 176 |
+} |
|
| 177 |
+ |
|
| 178 |
+func convert_api_ClusterPolicyBinding_To_v1_ClusterPolicyBinding(in *newer.ClusterPolicyBinding, out *ClusterPolicyBinding, s conversion.Scope) error {
|
|
| 179 |
+ out.LastModified = in.LastModified |
|
| 180 |
+ out.RoleBindings = make([]NamedClusterRoleBinding, 0, 0) |
|
| 181 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 182 |
+} |
|
| 183 |
+ |
|
| 184 |
+func init() {
|
|
| 185 |
+ err := api.Scheme.AddConversionFuncs( |
|
| 117 | 186 |
func(in *[]NamedRole, out *map[string]newer.Role, s conversion.Scope) error {
|
| 118 | 187 |
for _, curr := range *in {
|
| 119 | 188 |
newRole := &newer.Role{}
|
| ... | ... |
@@ -145,16 +214,7 @@ func init() {
|
| 145 | 145 |
|
| 146 | 146 |
return nil |
| 147 | 147 |
}, |
| 148 |
- func(in *PolicyBinding, out *newer.PolicyBinding, s conversion.Scope) error {
|
|
| 149 |
- out.LastModified = in.LastModified |
|
| 150 |
- out.RoleBindings = make(map[string]newer.RoleBinding) |
|
| 151 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 152 |
- }, |
|
| 153 |
- func(in *newer.PolicyBinding, out *PolicyBinding, s conversion.Scope) error {
|
|
| 154 |
- out.LastModified = in.LastModified |
|
| 155 |
- out.RoleBindings = make([]NamedRoleBinding, 0, 0) |
|
| 156 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 157 |
- }, |
|
| 148 |
+ |
|
| 158 | 149 |
func(in *[]NamedRoleBinding, out *map[string]newer.RoleBinding, s conversion.Scope) error {
|
| 159 | 150 |
for _, curr := range *in {
|
| 160 | 151 |
newRoleBinding := &newer.RoleBinding{}
|
| ... | ... |
@@ -187,37 +247,6 @@ func init() {
|
| 187 | 187 |
return nil |
| 188 | 188 |
}, |
| 189 | 189 |
|
| 190 |
- // and now the globals |
|
| 191 |
- func(in *ClusterPolicy, out *newer.ClusterPolicy, s conversion.Scope) error {
|
|
| 192 |
- out.LastModified = in.LastModified |
|
| 193 |
- out.Roles = make(map[string]newer.ClusterRole) |
|
| 194 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 195 |
- }, |
|
| 196 |
- func(in *newer.ClusterPolicy, out *ClusterPolicy, s conversion.Scope) error {
|
|
| 197 |
- out.LastModified = in.LastModified |
|
| 198 |
- out.Roles = make([]NamedClusterRole, 0, 0) |
|
| 199 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 200 |
- }, |
|
| 201 |
- func(in *ClusterRoleBinding, out *newer.ClusterRoleBinding, s conversion.Scope) error {
|
|
| 202 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 203 |
- return err |
|
| 204 |
- } |
|
| 205 |
- |
|
| 206 |
- out.Users = util.NewStringSet(in.UserNames...) |
|
| 207 |
- out.Groups = util.NewStringSet(in.GroupNames...) |
|
| 208 |
- |
|
| 209 |
- return nil |
|
| 210 |
- }, |
|
| 211 |
- func(in *newer.ClusterRoleBinding, out *ClusterRoleBinding, s conversion.Scope) error {
|
|
| 212 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 213 |
- return err |
|
| 214 |
- } |
|
| 215 |
- |
|
| 216 |
- out.UserNames = in.Users.List() |
|
| 217 |
- out.GroupNames = in.Groups.List() |
|
| 218 |
- |
|
| 219 |
- return nil |
|
| 220 |
- }, |
|
| 221 | 190 |
func(in *[]NamedClusterRole, out *map[string]newer.ClusterRole, s conversion.Scope) error {
|
| 222 | 191 |
for _, curr := range *in {
|
| 223 | 192 |
newRole := &newer.ClusterRole{}
|
| ... | ... |
@@ -249,16 +278,6 @@ func init() {
|
| 249 | 249 |
|
| 250 | 250 |
return nil |
| 251 | 251 |
}, |
| 252 |
- func(in *ClusterPolicyBinding, out *newer.ClusterPolicyBinding, s conversion.Scope) error {
|
|
| 253 |
- out.LastModified = in.LastModified |
|
| 254 |
- out.RoleBindings = make(map[string]newer.ClusterRoleBinding) |
|
| 255 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 256 |
- }, |
|
| 257 |
- func(in *newer.ClusterPolicyBinding, out *ClusterPolicyBinding, s conversion.Scope) error {
|
|
| 258 |
- out.LastModified = in.LastModified |
|
| 259 |
- out.RoleBindings = make([]NamedClusterRoleBinding, 0, 0) |
|
| 260 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 261 |
- }, |
|
| 262 | 252 |
func(in *[]NamedClusterRoleBinding, out *map[string]newer.ClusterRoleBinding, s conversion.Scope) error {
|
| 263 | 253 |
for _, curr := range *in {
|
| 264 | 254 |
newRoleBinding := &newer.ClusterRoleBinding{}
|
| ... | ... |
@@ -290,6 +309,25 @@ func init() {
|
| 290 | 290 |
|
| 291 | 291 |
return nil |
| 292 | 292 |
}, |
| 293 |
+ |
|
| 294 |
+ convert_v1_SubjectAccessReview_To_api_SubjectAccessReview, |
|
| 295 |
+ convert_api_SubjectAccessReview_To_v1_SubjectAccessReview, |
|
| 296 |
+ convert_v1_ResourceAccessReviewResponse_To_api_ResourceAccessReviewResponse, |
|
| 297 |
+ convert_api_ResourceAccessReviewResponse_To_v1_ResourceAccessReviewResponse, |
|
| 298 |
+ convert_v1_PolicyRule_To_api_PolicyRule, |
|
| 299 |
+ convert_api_PolicyRule_To_v1_PolicyRule, |
|
| 300 |
+ convert_v1_Policy_To_api_Policy, |
|
| 301 |
+ convert_api_Policy_To_v1_Policy, |
|
| 302 |
+ convert_v1_RoleBinding_To_api_RoleBinding, |
|
| 303 |
+ convert_api_RoleBinding_To_v1_RoleBinding, |
|
| 304 |
+ convert_v1_PolicyBinding_To_api_PolicyBinding, |
|
| 305 |
+ convert_api_PolicyBinding_To_v1_PolicyBinding, |
|
| 306 |
+ convert_v1_ClusterPolicy_To_api_ClusterPolicy, |
|
| 307 |
+ convert_api_ClusterPolicy_To_v1_ClusterPolicy, |
|
| 308 |
+ convert_v1_ClusterRoleBinding_To_api_ClusterRoleBinding, |
|
| 309 |
+ convert_api_ClusterRoleBinding_To_v1_ClusterRoleBinding, |
|
| 310 |
+ convert_v1_ClusterPolicyBinding_To_api_ClusterPolicyBinding, |
|
| 311 |
+ convert_api_ClusterPolicyBinding_To_v1_ClusterPolicyBinding, |
|
| 293 | 312 |
) |
| 294 | 313 |
if err != nil {
|
| 295 | 314 |
// If one of the conversion functions is malformed, detect it immediately. |
| ... | ... |
@@ -10,152 +10,198 @@ import ( |
| 10 | 10 |
newer "github.com/openshift/origin/pkg/authorization/api" |
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 |
-func init() {
|
|
| 14 |
- err := api.Scheme.AddConversionFuncs( |
|
| 15 |
- func(in *SubjectAccessReview, out *newer.SubjectAccessReview, s conversion.Scope) error {
|
|
| 16 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 17 |
- return err |
|
| 18 |
- } |
|
| 13 |
+func convert_v1beta3_SubjectAccessReview_To_api_SubjectAccessReview(in *SubjectAccessReview, out *newer.SubjectAccessReview, s conversion.Scope) error {
|
|
| 14 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 15 |
+ return err |
|
| 16 |
+ } |
|
| 19 | 17 |
|
| 20 |
- out.Groups = util.NewStringSet(in.GroupsSlice...) |
|
| 18 |
+ out.Groups = util.NewStringSet(in.GroupsSlice...) |
|
| 21 | 19 |
|
| 22 |
- return nil |
|
| 23 |
- }, |
|
| 24 |
- func(in *newer.SubjectAccessReview, out *SubjectAccessReview, s conversion.Scope) error {
|
|
| 25 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 26 |
- return err |
|
| 27 |
- } |
|
| 20 |
+ return nil |
|
| 21 |
+} |
|
| 28 | 22 |
|
| 29 |
- out.GroupsSlice = in.Groups.List() |
|
| 23 |
+func convert_api_SubjectAccessReview_To_v1beta3_SubjectAccessReview(in *newer.SubjectAccessReview, out *SubjectAccessReview, s conversion.Scope) error {
|
|
| 24 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 25 |
+ return err |
|
| 26 |
+ } |
|
| 30 | 27 |
|
| 31 |
- return nil |
|
| 32 |
- }, |
|
| 33 |
- func(in *ResourceAccessReviewResponse, out *newer.ResourceAccessReviewResponse, s conversion.Scope) error {
|
|
| 34 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 35 |
- return err |
|
| 36 |
- } |
|
| 28 |
+ out.GroupsSlice = in.Groups.List() |
|
| 37 | 29 |
|
| 38 |
- out.Users = util.NewStringSet(in.UsersSlice...) |
|
| 39 |
- out.Groups = util.NewStringSet(in.GroupsSlice...) |
|
| 30 |
+ return nil |
|
| 31 |
+} |
|
| 40 | 32 |
|
| 41 |
- return nil |
|
| 42 |
- }, |
|
| 43 |
- func(in *newer.ResourceAccessReviewResponse, out *ResourceAccessReviewResponse, s conversion.Scope) error {
|
|
| 44 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 45 |
- return err |
|
| 46 |
- } |
|
| 33 |
+func convert_v1beta3_ResourceAccessReviewResponse_To_api_ResourceAccessReviewResponse(in *ResourceAccessReviewResponse, out *newer.ResourceAccessReviewResponse, s conversion.Scope) error {
|
|
| 34 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 35 |
+ return err |
|
| 36 |
+ } |
|
| 47 | 37 |
|
| 48 |
- out.UsersSlice = in.Users.List() |
|
| 49 |
- out.GroupsSlice = in.Groups.List() |
|
| 38 |
+ out.Users = util.NewStringSet(in.UsersSlice...) |
|
| 39 |
+ out.Groups = util.NewStringSet(in.GroupsSlice...) |
|
| 50 | 40 |
|
| 51 |
- return nil |
|
| 52 |
- }, |
|
| 53 |
- func(in *PolicyRule, out *newer.PolicyRule, s conversion.Scope) error {
|
|
| 54 |
- if err := s.Convert(&in.AttributeRestrictions, &out.AttributeRestrictions, 0); err != nil {
|
|
| 55 |
- return err |
|
| 56 |
- } |
|
| 41 |
+ return nil |
|
| 42 |
+} |
|
| 57 | 43 |
|
| 58 |
- out.Resources = util.StringSet{}
|
|
| 59 |
- out.Resources.Insert(in.Resources...) |
|
| 60 |
- out.Resources.Insert(in.ResourceKinds...) |
|
| 44 |
+func convert_api_ResourceAccessReviewResponse_To_v1beta3_ResourceAccessReviewResponse(in *newer.ResourceAccessReviewResponse, out *ResourceAccessReviewResponse, s conversion.Scope) error {
|
|
| 45 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 46 |
+ return err |
|
| 47 |
+ } |
|
| 61 | 48 |
|
| 62 |
- out.Verbs = util.StringSet{}
|
|
| 63 |
- out.Verbs.Insert(in.Verbs...) |
|
| 49 |
+ out.UsersSlice = in.Users.List() |
|
| 50 |
+ out.GroupsSlice = in.Groups.List() |
|
| 64 | 51 |
|
| 65 |
- out.ResourceNames = util.NewStringSet(in.ResourceNames...) |
|
| 52 |
+ return nil |
|
| 53 |
+} |
|
| 66 | 54 |
|
| 67 |
- out.NonResourceURLs = util.NewStringSet(in.NonResourceURLsSlice...) |
|
| 55 |
+func convert_v1beta3_PolicyRule_To_api_PolicyRule(in *PolicyRule, out *newer.PolicyRule, s conversion.Scope) error {
|
|
| 56 |
+ if err := s.Convert(&in.AttributeRestrictions, &out.AttributeRestrictions, 0); err != nil {
|
|
| 57 |
+ return err |
|
| 58 |
+ } |
|
| 68 | 59 |
|
| 69 |
- return nil |
|
| 70 |
- }, |
|
| 71 |
- func(in *newer.PolicyRule, out *PolicyRule, s conversion.Scope) error {
|
|
| 72 |
- if err := s.Convert(&in.AttributeRestrictions, &out.AttributeRestrictions, 0); err != nil {
|
|
| 73 |
- return err |
|
| 74 |
- } |
|
| 60 |
+ out.Resources = util.StringSet{}
|
|
| 61 |
+ out.Resources.Insert(in.Resources...) |
|
| 62 |
+ out.Resources.Insert(in.ResourceKinds...) |
|
| 75 | 63 |
|
| 76 |
- out.Resources = []string{}
|
|
| 77 |
- out.Resources = append(out.Resources, in.Resources.List()...) |
|
| 64 |
+ out.Verbs = util.StringSet{}
|
|
| 65 |
+ out.Verbs.Insert(in.Verbs...) |
|
| 78 | 66 |
|
| 79 |
- out.Verbs = []string{}
|
|
| 80 |
- out.Verbs = append(out.Verbs, in.Verbs.List()...) |
|
| 67 |
+ out.ResourceNames = util.NewStringSet(in.ResourceNames...) |
|
| 81 | 68 |
|
| 82 |
- out.ResourceNames = in.ResourceNames.List() |
|
| 69 |
+ out.NonResourceURLs = util.NewStringSet(in.NonResourceURLsSlice...) |
|
| 83 | 70 |
|
| 84 |
- out.NonResourceURLsSlice = in.NonResourceURLs.List() |
|
| 71 |
+ return nil |
|
| 72 |
+} |
|
| 85 | 73 |
|
| 86 |
- return nil |
|
| 87 |
- }, |
|
| 88 |
- func(in *Policy, out *newer.Policy, s conversion.Scope) error {
|
|
| 89 |
- out.LastModified = in.LastModified |
|
| 90 |
- out.Roles = make(map[string]newer.Role) |
|
| 91 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 92 |
- }, |
|
| 93 |
- func(in *newer.Policy, out *Policy, s conversion.Scope) error {
|
|
| 94 |
- out.LastModified = in.LastModified |
|
| 95 |
- out.Roles = make([]NamedRole, 0, 0) |
|
| 96 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 97 |
- }, |
|
| 98 |
- func(in *RoleBinding, out *newer.RoleBinding, s conversion.Scope) error {
|
|
| 99 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 100 |
- return err |
|
| 101 |
- } |
|
| 74 |
+func convert_api_PolicyRule_To_v1beta3_PolicyRule(in *newer.PolicyRule, out *PolicyRule, s conversion.Scope) error {
|
|
| 75 |
+ if err := s.Convert(&in.AttributeRestrictions, &out.AttributeRestrictions, 0); err != nil {
|
|
| 76 |
+ return err |
|
| 77 |
+ } |
|
| 102 | 78 |
|
| 103 |
- out.Users = util.NewStringSet(in.UserNames...) |
|
| 104 |
- out.Groups = util.NewStringSet(in.GroupNames...) |
|
| 79 |
+ out.Resources = []string{}
|
|
| 80 |
+ out.Resources = append(out.Resources, in.Resources.List()...) |
|
| 105 | 81 |
|
| 106 |
- return nil |
|
| 107 |
- }, |
|
| 108 |
- func(in *newer.RoleBinding, out *RoleBinding, s conversion.Scope) error {
|
|
| 109 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 110 |
- return err |
|
| 111 |
- } |
|
| 82 |
+ out.Verbs = []string{}
|
|
| 83 |
+ out.Verbs = append(out.Verbs, in.Verbs.List()...) |
|
| 112 | 84 |
|
| 113 |
- out.UserNames = in.Users.List() |
|
| 114 |
- out.GroupNames = in.Groups.List() |
|
| 85 |
+ out.ResourceNames = in.ResourceNames.List() |
|
| 115 | 86 |
|
| 116 |
- return nil |
|
| 117 |
- }, |
|
| 118 |
- func(in *[]NamedRole, out *map[string]newer.Role, s conversion.Scope) error {
|
|
| 119 |
- for _, curr := range *in {
|
|
| 120 |
- newRole := &newer.Role{}
|
|
| 121 |
- if err := s.Convert(&curr.Role, newRole, 0); err != nil {
|
|
| 122 |
- return err |
|
| 123 |
- } |
|
| 124 |
- (*out)[curr.Name] = *newRole |
|
| 125 |
- } |
|
| 87 |
+ out.NonResourceURLsSlice = in.NonResourceURLs.List() |
|
| 126 | 88 |
|
| 127 |
- return nil |
|
| 128 |
- }, |
|
| 129 |
- func(in *map[string]newer.Role, out *[]NamedRole, s conversion.Scope) error {
|
|
| 130 |
- allKeys := make([]string, 0, len(*in)) |
|
| 131 |
- for key := range *in {
|
|
| 132 |
- allKeys = append(allKeys, key) |
|
| 133 |
- } |
|
| 134 |
- sort.Strings(allKeys) |
|
| 89 |
+ return nil |
|
| 90 |
+} |
|
| 135 | 91 |
|
| 136 |
- for _, key := range allKeys {
|
|
| 137 |
- newRole := (*in)[key] |
|
| 138 |
- oldRole := &Role{}
|
|
| 139 |
- if err := s.Convert(&newRole, oldRole, 0); err != nil {
|
|
| 140 |
- return err |
|
| 141 |
- } |
|
| 92 |
+func convert_v1beta3_Policy_To_api_Policy(in *Policy, out *newer.Policy, s conversion.Scope) error {
|
|
| 93 |
+ out.LastModified = in.LastModified |
|
| 94 |
+ out.Roles = make(map[string]newer.Role) |
|
| 95 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 96 |
+} |
|
| 142 | 97 |
|
| 143 |
- namedRole := NamedRole{key, *oldRole}
|
|
| 144 |
- *out = append(*out, namedRole) |
|
| 145 |
- } |
|
| 98 |
+func convert_api_Policy_To_v1beta3_Policy(in *newer.Policy, out *Policy, s conversion.Scope) error {
|
|
| 99 |
+ out.LastModified = in.LastModified |
|
| 100 |
+ out.Roles = make([]NamedRole, 0, 0) |
|
| 101 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 102 |
+} |
|
| 103 |
+ |
|
| 104 |
+func convert_v1beta3_RoleBinding_To_api_RoleBinding(in *RoleBinding, out *newer.RoleBinding, s conversion.Scope) error {
|
|
| 105 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 106 |
+ return err |
|
| 107 |
+ } |
|
| 108 |
+ |
|
| 109 |
+ out.Users = util.NewStringSet(in.UserNames...) |
|
| 110 |
+ out.Groups = util.NewStringSet(in.GroupNames...) |
|
| 111 |
+ |
|
| 112 |
+ return nil |
|
| 113 |
+} |
|
| 114 |
+ |
|
| 115 |
+func convert_api_RoleBinding_To_v1beta3_RoleBinding(in *newer.RoleBinding, out *RoleBinding, s conversion.Scope) error {
|
|
| 116 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 117 |
+ return err |
|
| 118 |
+ } |
|
| 119 |
+ |
|
| 120 |
+ out.UserNames = in.Users.List() |
|
| 121 |
+ out.GroupNames = in.Groups.List() |
|
| 122 |
+ |
|
| 123 |
+ return nil |
|
| 124 |
+} |
|
| 125 |
+ |
|
| 126 |
+func convert_v1beta3_PolicyBinding_To_api_PolicyBinding(in *PolicyBinding, out *newer.PolicyBinding, s conversion.Scope) error {
|
|
| 127 |
+ out.LastModified = in.LastModified |
|
| 128 |
+ out.RoleBindings = make(map[string]newer.RoleBinding) |
|
| 129 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 130 |
+} |
|
| 131 |
+ |
|
| 132 |
+func convert_api_PolicyBinding_To_v1beta3_PolicyBinding(in *newer.PolicyBinding, out *PolicyBinding, s conversion.Scope) error {
|
|
| 133 |
+ out.LastModified = in.LastModified |
|
| 134 |
+ out.RoleBindings = make([]NamedRoleBinding, 0, 0) |
|
| 135 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 136 |
+} |
|
| 137 |
+ |
|
| 138 |
+// and now the globals |
|
| 139 |
+func convert_v1beta3_ClusterPolicy_To_api_ClusterPolicy(in *ClusterPolicy, out *newer.ClusterPolicy, s conversion.Scope) error {
|
|
| 140 |
+ out.LastModified = in.LastModified |
|
| 141 |
+ out.Roles = make(map[string]newer.ClusterRole) |
|
| 142 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 143 |
+} |
|
| 144 |
+ |
|
| 145 |
+func convert_api_ClusterPolicy_To_v1beta3_ClusterPolicy(in *newer.ClusterPolicy, out *ClusterPolicy, s conversion.Scope) error {
|
|
| 146 |
+ out.LastModified = in.LastModified |
|
| 147 |
+ out.Roles = make([]NamedClusterRole, 0, 0) |
|
| 148 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 149 |
+} |
|
| 150 |
+ |
|
| 151 |
+func convert_v1beta3_ClusterRoleBinding_To_api_ClusterRoleBinding(in *ClusterRoleBinding, out *newer.ClusterRoleBinding, s conversion.Scope) error {
|
|
| 152 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 153 |
+ return err |
|
| 154 |
+ } |
|
| 155 |
+ |
|
| 156 |
+ out.Users = util.NewStringSet(in.UserNames...) |
|
| 157 |
+ out.Groups = util.NewStringSet(in.GroupNames...) |
|
| 158 |
+ |
|
| 159 |
+ return nil |
|
| 160 |
+} |
|
| 161 |
+ |
|
| 162 |
+func convert_api_ClusterRoleBinding_To_v1beta3_ClusterRoleBinding(in *newer.ClusterRoleBinding, out *ClusterRoleBinding, s conversion.Scope) error {
|
|
| 163 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 164 |
+ return err |
|
| 165 |
+ } |
|
| 166 |
+ |
|
| 167 |
+ out.UserNames = in.Users.List() |
|
| 168 |
+ out.GroupNames = in.Groups.List() |
|
| 169 |
+ |
|
| 170 |
+ return nil |
|
| 171 |
+} |
|
| 172 |
+ |
|
| 173 |
+func convert_v1beta3_ClusterPolicyBinding_To_api_ClusterPolicyBinding(in *ClusterPolicyBinding, out *newer.ClusterPolicyBinding, s conversion.Scope) error {
|
|
| 174 |
+ out.LastModified = in.LastModified |
|
| 175 |
+ out.RoleBindings = make(map[string]newer.ClusterRoleBinding) |
|
| 176 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 177 |
+} |
|
| 178 |
+ |
|
| 179 |
+func convert_api_ClusterPolicyBinding_To_v1beta3_ClusterPolicyBinding(in *newer.ClusterPolicyBinding, out *ClusterPolicyBinding, s conversion.Scope) error {
|
|
| 180 |
+ out.LastModified = in.LastModified |
|
| 181 |
+ out.RoleBindings = make([]NamedClusterRoleBinding, 0, 0) |
|
| 182 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 183 |
+} |
|
| 184 |
+ |
|
| 185 |
+func init() {
|
|
| 186 |
+ err := api.Scheme.AddConversionFuncs( |
|
| 187 |
+ convert_v1beta3_SubjectAccessReview_To_api_SubjectAccessReview, |
|
| 188 |
+ convert_api_SubjectAccessReview_To_v1beta3_SubjectAccessReview, |
|
| 189 |
+ convert_v1beta3_ResourceAccessReviewResponse_To_api_ResourceAccessReviewResponse, |
|
| 190 |
+ convert_api_ResourceAccessReviewResponse_To_v1beta3_ResourceAccessReviewResponse, |
|
| 191 |
+ convert_v1beta3_PolicyRule_To_api_PolicyRule, |
|
| 192 |
+ convert_api_PolicyRule_To_v1beta3_PolicyRule, |
|
| 193 |
+ convert_v1beta3_Policy_To_api_Policy, |
|
| 194 |
+ convert_api_Policy_To_v1beta3_Policy, |
|
| 195 |
+ convert_v1beta3_RoleBinding_To_api_RoleBinding, |
|
| 196 |
+ convert_api_RoleBinding_To_v1beta3_RoleBinding, |
|
| 197 |
+ convert_v1beta3_PolicyBinding_To_api_PolicyBinding, |
|
| 198 |
+ convert_api_PolicyBinding_To_v1beta3_PolicyBinding, |
|
| 199 |
+ convert_api_ClusterPolicy_To_v1beta3_ClusterPolicy, |
|
| 200 |
+ convert_v1beta3_ClusterRoleBinding_To_api_ClusterRoleBinding, |
|
| 201 |
+ convert_api_ClusterRoleBinding_To_v1beta3_ClusterRoleBinding, |
|
| 202 |
+ convert_v1beta3_ClusterPolicyBinding_To_api_ClusterPolicyBinding, |
|
| 203 |
+ convert_api_ClusterPolicyBinding_To_v1beta3_ClusterPolicyBinding, |
|
| 146 | 204 |
|
| 147 |
- return nil |
|
| 148 |
- }, |
|
| 149 |
- func(in *PolicyBinding, out *newer.PolicyBinding, s conversion.Scope) error {
|
|
| 150 |
- out.LastModified = in.LastModified |
|
| 151 |
- out.RoleBindings = make(map[string]newer.RoleBinding) |
|
| 152 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 153 |
- }, |
|
| 154 |
- func(in *newer.PolicyBinding, out *PolicyBinding, s conversion.Scope) error {
|
|
| 155 |
- out.LastModified = in.LastModified |
|
| 156 |
- out.RoleBindings = make([]NamedRoleBinding, 0, 0) |
|
| 157 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 158 |
- }, |
|
| 159 | 205 |
func(in *[]NamedRoleBinding, out *map[string]newer.RoleBinding, s conversion.Scope) error {
|
| 160 | 206 |
for _, curr := range *in {
|
| 161 | 207 |
newRoleBinding := &newer.RoleBinding{}
|
| ... | ... |
@@ -167,6 +213,7 @@ func init() {
|
| 167 | 167 |
|
| 168 | 168 |
return nil |
| 169 | 169 |
}, |
| 170 |
+ |
|
| 170 | 171 |
func(in *map[string]newer.RoleBinding, out *[]NamedRoleBinding, s conversion.Scope) error {
|
| 171 | 172 |
allKeys := make([]string, 0, len(*in)) |
| 172 | 173 |
for key := range *in {
|
| ... | ... |
@@ -188,40 +235,46 @@ func init() {
|
| 188 | 188 |
return nil |
| 189 | 189 |
}, |
| 190 | 190 |
|
| 191 |
- // and now the globals |
|
| 192 |
- func(in *ClusterPolicy, out *newer.ClusterPolicy, s conversion.Scope) error {
|
|
| 193 |
- out.LastModified = in.LastModified |
|
| 194 |
- out.Roles = make(map[string]newer.ClusterRole) |
|
| 195 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 196 |
- }, |
|
| 197 |
- func(in *newer.ClusterPolicy, out *ClusterPolicy, s conversion.Scope) error {
|
|
| 198 |
- out.LastModified = in.LastModified |
|
| 199 |
- out.Roles = make([]NamedClusterRole, 0, 0) |
|
| 200 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 201 |
- }, |
|
| 202 |
- func(in *ClusterRoleBinding, out *newer.ClusterRoleBinding, s conversion.Scope) error {
|
|
| 203 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 204 |
- return err |
|
| 191 |
+ func(in *[]NamedClusterRole, out *map[string]newer.ClusterRole, s conversion.Scope) error {
|
|
| 192 |
+ for _, curr := range *in {
|
|
| 193 |
+ newRole := &newer.ClusterRole{}
|
|
| 194 |
+ if err := s.Convert(&curr.Role, newRole, 0); err != nil {
|
|
| 195 |
+ return err |
|
| 196 |
+ } |
|
| 197 |
+ if *out == nil {
|
|
| 198 |
+ m := make(map[string]newer.ClusterRole) |
|
| 199 |
+ *out = m |
|
| 200 |
+ } |
|
| 201 |
+ (*out)[curr.Name] = *newRole |
|
| 205 | 202 |
} |
| 206 | 203 |
|
| 207 |
- out.Users = util.NewStringSet(in.UserNames...) |
|
| 208 |
- out.Groups = util.NewStringSet(in.GroupNames...) |
|
| 209 |
- |
|
| 210 | 204 |
return nil |
| 211 | 205 |
}, |
| 212 |
- func(in *newer.ClusterRoleBinding, out *ClusterRoleBinding, s conversion.Scope) error {
|
|
| 213 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields|conversion.AllowDifferentFieldTypeNames); err != nil {
|
|
| 214 |
- return err |
|
| 206 |
+ |
|
| 207 |
+ func(in *map[string]newer.ClusterRole, out *[]NamedClusterRole, s conversion.Scope) error {
|
|
| 208 |
+ allKeys := make([]string, 0, len(*in)) |
|
| 209 |
+ for key := range *in {
|
|
| 210 |
+ allKeys = append(allKeys, key) |
|
| 215 | 211 |
} |
| 212 |
+ sort.Strings(allKeys) |
|
| 216 | 213 |
|
| 217 |
- out.UserNames = in.Users.List() |
|
| 218 |
- out.GroupNames = in.Groups.List() |
|
| 214 |
+ for _, key := range allKeys {
|
|
| 215 |
+ newRole := (*in)[key] |
|
| 216 |
+ oldRole := &ClusterRole{}
|
|
| 217 |
+ if err := s.Convert(&newRole, oldRole, 0); err != nil {
|
|
| 218 |
+ return err |
|
| 219 |
+ } |
|
| 220 |
+ |
|
| 221 |
+ namedRole := NamedClusterRole{key, *oldRole}
|
|
| 222 |
+ *out = append(*out, namedRole) |
|
| 223 |
+ } |
|
| 219 | 224 |
|
| 220 | 225 |
return nil |
| 221 | 226 |
}, |
| 222 |
- func(in *[]NamedClusterRole, out *map[string]newer.ClusterRole, s conversion.Scope) error {
|
|
| 227 |
+ |
|
| 228 |
+ func(in *[]NamedRole, out *map[string]newer.Role, s conversion.Scope) error {
|
|
| 223 | 229 |
for _, curr := range *in {
|
| 224 |
- newRole := &newer.ClusterRole{}
|
|
| 230 |
+ newRole := &newer.Role{}
|
|
| 225 | 231 |
if err := s.Convert(&curr.Role, newRole, 0); err != nil {
|
| 226 | 232 |
return err |
| 227 | 233 |
} |
| ... | ... |
@@ -230,7 +283,8 @@ func init() {
|
| 230 | 230 |
|
| 231 | 231 |
return nil |
| 232 | 232 |
}, |
| 233 |
- func(in *map[string]newer.ClusterRole, out *[]NamedClusterRole, s conversion.Scope) error {
|
|
| 233 |
+ |
|
| 234 |
+ func(in *map[string]newer.Role, out *[]NamedRole, s conversion.Scope) error {
|
|
| 234 | 235 |
allKeys := make([]string, 0, len(*in)) |
| 235 | 236 |
for key := range *in {
|
| 236 | 237 |
allKeys = append(allKeys, key) |
| ... | ... |
@@ -239,27 +293,18 @@ func init() {
|
| 239 | 239 |
|
| 240 | 240 |
for _, key := range allKeys {
|
| 241 | 241 |
newRole := (*in)[key] |
| 242 |
- oldRole := &ClusterRole{}
|
|
| 242 |
+ oldRole := &Role{}
|
|
| 243 | 243 |
if err := s.Convert(&newRole, oldRole, 0); err != nil {
|
| 244 | 244 |
return err |
| 245 | 245 |
} |
| 246 | 246 |
|
| 247 |
- namedRole := NamedClusterRole{key, *oldRole}
|
|
| 247 |
+ namedRole := NamedRole{key, *oldRole}
|
|
| 248 | 248 |
*out = append(*out, namedRole) |
| 249 | 249 |
} |
| 250 | 250 |
|
| 251 | 251 |
return nil |
| 252 | 252 |
}, |
| 253 |
- func(in *ClusterPolicyBinding, out *newer.ClusterPolicyBinding, s conversion.Scope) error {
|
|
| 254 |
- out.LastModified = in.LastModified |
|
| 255 |
- out.RoleBindings = make(map[string]newer.ClusterRoleBinding) |
|
| 256 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 257 |
- }, |
|
| 258 |
- func(in *newer.ClusterPolicyBinding, out *ClusterPolicyBinding, s conversion.Scope) error {
|
|
| 259 |
- out.LastModified = in.LastModified |
|
| 260 |
- out.RoleBindings = make([]NamedClusterRoleBinding, 0, 0) |
|
| 261 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 262 |
- }, |
|
| 253 |
+ |
|
| 263 | 254 |
func(in *[]NamedClusterRoleBinding, out *map[string]newer.ClusterRoleBinding, s conversion.Scope) error {
|
| 264 | 255 |
for _, curr := range *in {
|
| 265 | 256 |
newRoleBinding := &newer.ClusterRoleBinding{}
|
| ... | ... |
@@ -11,6 +11,333 @@ import ( |
| 11 | 11 |
imageapi "github.com/openshift/origin/pkg/image/api" |
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 |
+func convert_api_Build_To_v1_Build(in *newer.Build, out *Build, s conversion.Scope) error {
|
|
| 15 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 16 |
+ return err |
|
| 17 |
+ } |
|
| 18 |
+ if err := s.Convert(&in.Parameters, &out.Spec, 0); err != nil {
|
|
| 19 |
+ return err |
|
| 20 |
+ } |
|
| 21 |
+ if err := s.Convert(in, &out.Status, 0); err != nil {
|
|
| 22 |
+ return err |
|
| 23 |
+ } |
|
| 24 |
+ return s.Convert(&in.Status, &out.Status.Phase, 0) |
|
| 25 |
+} |
|
| 26 |
+ |
|
| 27 |
+func convert_v1_Build_To_api_Build(in *Build, out *newer.Build, s conversion.Scope) error {
|
|
| 28 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 29 |
+ return err |
|
| 30 |
+ } |
|
| 31 |
+ if err := s.Convert(&in.Status, out, 0); err != nil {
|
|
| 32 |
+ return err |
|
| 33 |
+ } |
|
| 34 |
+ if err := s.Convert(&in.Spec, &out.Parameters, 0); err != nil {
|
|
| 35 |
+ return err |
|
| 36 |
+ } |
|
| 37 |
+ return s.Convert(&in.Status.Phase, &out.Status, 0) |
|
| 38 |
+} |
|
| 39 |
+ |
|
| 40 |
+func convert_api_Build_To_v1_BuildStatus(in *newer.Build, out *BuildStatus, s conversion.Scope) error {
|
|
| 41 |
+ out.Cancelled = in.Cancelled |
|
| 42 |
+ out.CompletionTimestamp = in.CompletionTimestamp |
|
| 43 |
+ if err := s.Convert(&in.Config, &out.Config, 0); err != nil {
|
|
| 44 |
+ return err |
|
| 45 |
+ } |
|
| 46 |
+ out.Duration = in.Duration |
|
| 47 |
+ out.Message = in.Message |
|
| 48 |
+ out.StartTimestamp = in.StartTimestamp |
|
| 49 |
+ return nil |
|
| 50 |
+} |
|
| 51 |
+ |
|
| 52 |
+func convert_v1_BuildStatus_To_api_Build(in *BuildStatus, out *newer.Build, s conversion.Scope) error {
|
|
| 53 |
+ out.Cancelled = in.Cancelled |
|
| 54 |
+ out.CompletionTimestamp = in.CompletionTimestamp |
|
| 55 |
+ if err := s.Convert(&in.Config, &out.Config, 0); err != nil {
|
|
| 56 |
+ return err |
|
| 57 |
+ } |
|
| 58 |
+ out.Duration = in.Duration |
|
| 59 |
+ out.Message = in.Message |
|
| 60 |
+ out.StartTimestamp = in.StartTimestamp |
|
| 61 |
+ return nil |
|
| 62 |
+} |
|
| 63 |
+ |
|
| 64 |
+func convert_api_BuildStatus_To_v1_BuildPhase(in *newer.BuildStatus, out *BuildPhase, s conversion.Scope) error {
|
|
| 65 |
+ str := string(*in) |
|
| 66 |
+ *out = BuildPhase(str) |
|
| 67 |
+ return nil |
|
| 68 |
+} |
|
| 69 |
+ |
|
| 70 |
+func convert_v1_BuildPhase_To_api_BuildStatus(in *BuildPhase, out *newer.BuildStatus, s conversion.Scope) error {
|
|
| 71 |
+ str := string(*in) |
|
| 72 |
+ *out = newer.BuildStatus(str) |
|
| 73 |
+ return nil |
|
| 74 |
+} |
|
| 75 |
+ |
|
| 76 |
+func convert_api_BuildConfig_To_v1_BuildConfig(in *newer.BuildConfig, out *BuildConfig, s conversion.Scope) error {
|
|
| 77 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 78 |
+ return err |
|
| 79 |
+ } |
|
| 80 |
+ if err := s.Convert(&in.Parameters, &out.Spec, 0); err != nil {
|
|
| 81 |
+ return err |
|
| 82 |
+ } |
|
| 83 |
+ if err := s.Convert(&in.Triggers, &out.Spec.Triggers, 0); err != nil {
|
|
| 84 |
+ return err |
|
| 85 |
+ } |
|
| 86 |
+ out.Status.LastVersion = in.LastVersion |
|
| 87 |
+ return nil |
|
| 88 |
+} |
|
| 89 |
+ |
|
| 90 |
+func convert_v1_BuildConfig_To_api_BuildConfig(in *BuildConfig, out *newer.BuildConfig, s conversion.Scope) error {
|
|
| 91 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 92 |
+ return err |
|
| 93 |
+ } |
|
| 94 |
+ if err := s.Convert(&in.Spec, &out.Parameters, 0); err != nil {
|
|
| 95 |
+ return err |
|
| 96 |
+ } |
|
| 97 |
+ if err := s.Convert(&in.Spec.Triggers, &out.Triggers, 0); err != nil {
|
|
| 98 |
+ return err |
|
| 99 |
+ } |
|
| 100 |
+ out.LastVersion = in.Status.LastVersion |
|
| 101 |
+ return nil |
|
| 102 |
+} |
|
| 103 |
+ |
|
| 104 |
+func convert_api_BuildParameters_To_v1_BuildSpec(in *newer.BuildParameters, out *BuildSpec, s conversion.Scope) error {
|
|
| 105 |
+ out.ServiceAccount = in.ServiceAccount |
|
| 106 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 107 |
+ return err |
|
| 108 |
+ } |
|
| 109 |
+ if in.Strategy.Type == newer.SourceBuildStrategyType {
|
|
| 110 |
+ out.Strategy.Type = SourceBuildStrategyType |
|
| 111 |
+ } |
|
| 112 |
+ if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 113 |
+ return err |
|
| 114 |
+ } |
|
| 115 |
+ if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 116 |
+ return err |
|
| 117 |
+ } |
|
| 118 |
+ if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 119 |
+ return err |
|
| 120 |
+ } |
|
| 121 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 122 |
+ return err |
|
| 123 |
+ } |
|
| 124 |
+ return nil |
|
| 125 |
+} |
|
| 126 |
+ |
|
| 127 |
+func convert_v1_BuildSpec_To_api_BuildParameters(in *BuildSpec, out *newer.BuildParameters, s conversion.Scope) error {
|
|
| 128 |
+ out.ServiceAccount = in.ServiceAccount |
|
| 129 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 130 |
+ return err |
|
| 131 |
+ } |
|
| 132 |
+ if in.Strategy.Type == SourceBuildStrategyType {
|
|
| 133 |
+ out.Strategy.Type = newer.SourceBuildStrategyType |
|
| 134 |
+ } |
|
| 135 |
+ if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 136 |
+ return err |
|
| 137 |
+ } |
|
| 138 |
+ if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 139 |
+ return err |
|
| 140 |
+ } |
|
| 141 |
+ if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 142 |
+ return err |
|
| 143 |
+ } |
|
| 144 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 145 |
+ return err |
|
| 146 |
+ } |
|
| 147 |
+ return nil |
|
| 148 |
+} |
|
| 149 |
+ |
|
| 150 |
+func convert_api_BuildParameters_To_v1_BuildConfigSpec(in *newer.BuildParameters, out *BuildConfigSpec, s conversion.Scope) error {
|
|
| 151 |
+ out.ServiceAccount = in.ServiceAccount |
|
| 152 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 153 |
+ return err |
|
| 154 |
+ } |
|
| 155 |
+ if in.Strategy.Type == newer.SourceBuildStrategyType {
|
|
| 156 |
+ out.Strategy.Type = SourceBuildStrategyType |
|
| 157 |
+ } |
|
| 158 |
+ if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 159 |
+ return err |
|
| 160 |
+ } |
|
| 161 |
+ if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 162 |
+ return err |
|
| 163 |
+ } |
|
| 164 |
+ if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 165 |
+ return err |
|
| 166 |
+ } |
|
| 167 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 168 |
+ return err |
|
| 169 |
+ } |
|
| 170 |
+ return nil |
|
| 171 |
+} |
|
| 172 |
+ |
|
| 173 |
+func convert_v1_BuildConfigSpec_To_api_BuildParameters(in *BuildConfigSpec, out *newer.BuildParameters, s conversion.Scope) error {
|
|
| 174 |
+ out.ServiceAccount = in.ServiceAccount |
|
| 175 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 176 |
+ return err |
|
| 177 |
+ } |
|
| 178 |
+ if in.Strategy.Type == SourceBuildStrategyType {
|
|
| 179 |
+ out.Strategy.Type = newer.SourceBuildStrategyType |
|
| 180 |
+ } |
|
| 181 |
+ if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 182 |
+ return err |
|
| 183 |
+ } |
|
| 184 |
+ if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 185 |
+ return err |
|
| 186 |
+ } |
|
| 187 |
+ if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 188 |
+ return err |
|
| 189 |
+ } |
|
| 190 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 191 |
+ return err |
|
| 192 |
+ } |
|
| 193 |
+ return nil |
|
| 194 |
+} |
|
| 195 |
+ |
|
| 196 |
+func convert_api_SourceBuildStrategy_To_v1_SourceBuildStrategy(in *newer.SourceBuildStrategy, out *SourceBuildStrategy, s conversion.Scope) error {
|
|
| 197 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 198 |
+ return err |
|
| 199 |
+ } |
|
| 200 |
+ if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 201 |
+ out.From.Kind = "ImageStreamTag" |
|
| 202 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 203 |
+ } |
|
| 204 |
+ return nil |
|
| 205 |
+} |
|
| 206 |
+ |
|
| 207 |
+func convert_v1_SourceBuildStrategy_To_api_SourceBuildStrategy(in *SourceBuildStrategy, out *newer.SourceBuildStrategy, s conversion.Scope) error {
|
|
| 208 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 209 |
+ return err |
|
| 210 |
+ } |
|
| 211 |
+ if in.From != nil {
|
|
| 212 |
+ switch in.From.Kind {
|
|
| 213 |
+ case "ImageStream": |
|
| 214 |
+ out.From.Kind = "ImageStreamTag" |
|
| 215 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 216 |
+ case "ImageStreamTag": |
|
| 217 |
+ _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 218 |
+ if !ok {
|
|
| 219 |
+ return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 220 |
+ } |
|
| 221 |
+ } |
|
| 222 |
+ } |
|
| 223 |
+ return nil |
|
| 224 |
+} |
|
| 225 |
+ |
|
| 226 |
+func convert_api_DockerBuildStrategy_To_v1_DockerBuildStrategy(in *newer.DockerBuildStrategy, out *DockerBuildStrategy, s conversion.Scope) error {
|
|
| 227 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 228 |
+ return err |
|
| 229 |
+ } |
|
| 230 |
+ if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 231 |
+ out.From.Kind = "ImageStreamTag" |
|
| 232 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 233 |
+ } |
|
| 234 |
+ return nil |
|
| 235 |
+} |
|
| 236 |
+ |
|
| 237 |
+func convert_v1_DockerBuildStrategy_To_api_DockerBuildStrategy(in *DockerBuildStrategy, out *newer.DockerBuildStrategy, s conversion.Scope) error {
|
|
| 238 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 239 |
+ return err |
|
| 240 |
+ } |
|
| 241 |
+ if in.From != nil {
|
|
| 242 |
+ switch in.From.Kind {
|
|
| 243 |
+ case "ImageStream": |
|
| 244 |
+ out.From.Kind = "ImageStreamTag" |
|
| 245 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 246 |
+ case "ImageStreamTag": |
|
| 247 |
+ _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 248 |
+ if !ok {
|
|
| 249 |
+ return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 250 |
+ } |
|
| 251 |
+ } |
|
| 252 |
+ } |
|
| 253 |
+ return nil |
|
| 254 |
+} |
|
| 255 |
+ |
|
| 256 |
+func convert_api_CustomBuildStrategy_To_v1_CustomBuildStrategy(in *newer.CustomBuildStrategy, out *CustomBuildStrategy, s conversion.Scope) error {
|
|
| 257 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 258 |
+ return err |
|
| 259 |
+ } |
|
| 260 |
+ if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 261 |
+ out.From.Kind = "ImageStreamTag" |
|
| 262 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 263 |
+ } |
|
| 264 |
+ return nil |
|
| 265 |
+} |
|
| 266 |
+ |
|
| 267 |
+func convert_v1_CustomBuildStrategy_To_api_CustomBuildStrategy(in *CustomBuildStrategy, out *newer.CustomBuildStrategy, s conversion.Scope) error {
|
|
| 268 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 269 |
+ return err |
|
| 270 |
+ } |
|
| 271 |
+ if in.From != nil {
|
|
| 272 |
+ switch in.From.Kind {
|
|
| 273 |
+ case "ImageStream": |
|
| 274 |
+ out.From.Kind = "ImageStreamTag" |
|
| 275 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 276 |
+ case "ImageStreamTag": |
|
| 277 |
+ _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 278 |
+ if !ok {
|
|
| 279 |
+ return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 280 |
+ } |
|
| 281 |
+ } |
|
| 282 |
+ } |
|
| 283 |
+ return nil |
|
| 284 |
+} |
|
| 285 |
+ |
|
| 286 |
+func convert_api_BuildOutput_To_v1_BuildOutput(in *newer.BuildOutput, out *BuildOutput, s conversion.Scope) error {
|
|
| 287 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 288 |
+ return err |
|
| 289 |
+ } |
|
| 290 |
+ if in.To != nil && (len(in.To.Kind) == 0 || in.To.Kind == "ImageStream") {
|
|
| 291 |
+ out.To.Kind = "ImageStreamTag" |
|
| 292 |
+ out.To.Name = imageapi.JoinImageStreamTag(in.To.Name, in.Tag) |
|
| 293 |
+ return nil |
|
| 294 |
+ } |
|
| 295 |
+ if len(in.DockerImageReference) != 0 {
|
|
| 296 |
+ out.To = &kapi_v1.ObjectReference{
|
|
| 297 |
+ Kind: "DockerImage", |
|
| 298 |
+ Name: imageapi.JoinImageStreamTag(in.DockerImageReference, in.Tag), |
|
| 299 |
+ } |
|
| 300 |
+ } |
|
| 301 |
+ return nil |
|
| 302 |
+} |
|
| 303 |
+ |
|
| 304 |
+func convert_v1_BuildOutput_To_api_BuildOutput(in *BuildOutput, out *newer.BuildOutput, s conversion.Scope) error {
|
|
| 305 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 306 |
+ return err |
|
| 307 |
+ } |
|
| 308 |
+ if in.To != nil && in.To.Kind == "ImageStreamTag" {
|
|
| 309 |
+ name, tag, ok := imageapi.SplitImageStreamTag(in.To.Name) |
|
| 310 |
+ if !ok {
|
|
| 311 |
+ return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.To.Name)
|
|
| 312 |
+ } |
|
| 313 |
+ out.To.Kind = "ImageStream" |
|
| 314 |
+ out.To.Name = name |
|
| 315 |
+ out.Tag = tag |
|
| 316 |
+ return nil |
|
| 317 |
+ } |
|
| 318 |
+ if in.To != nil && in.To.Kind == "DockerImage" {
|
|
| 319 |
+ out.To = nil |
|
| 320 |
+ if ref, err := imageapi.ParseDockerImageReference(in.To.Name); err == nil {
|
|
| 321 |
+ out.Tag = ref.Tag |
|
| 322 |
+ ref.Tag = "" |
|
| 323 |
+ out.DockerImageReference = ref.String() |
|
| 324 |
+ } else {
|
|
| 325 |
+ out.DockerImageReference = in.To.Name |
|
| 326 |
+ } |
|
| 327 |
+ } |
|
| 328 |
+ return nil |
|
| 329 |
+} |
|
| 330 |
+ |
|
| 331 |
+func convert_api_ImageChangeTrigger_To_v1_ImageChangeTrigger(in *newer.ImageChangeTrigger, out *ImageChangeTrigger, s conversion.Scope) error {
|
|
| 332 |
+ out.LastTriggeredImageID = in.LastTriggeredImageID |
|
| 333 |
+ return nil |
|
| 334 |
+} |
|
| 335 |
+ |
|
| 336 |
+func convert_v1_ImageChangeTrigger_To_api_ImageChangeTrigger(in *ImageChangeTrigger, out *newer.ImageChangeTrigger, s conversion.Scope) error {
|
|
| 337 |
+ out.LastTriggeredImageID = in.LastTriggeredImageID |
|
| 338 |
+ return nil |
|
| 339 |
+} |
|
| 340 |
+ |
|
| 14 | 341 |
func init() {
|
| 15 | 342 |
err := kapi.Scheme.AddDefaultingFuncs( |
| 16 | 343 |
func(obj *SourceBuildStrategy) {
|
| ... | ... |
@@ -39,317 +366,29 @@ func init() {
|
| 39 | 39 |
} |
| 40 | 40 |
|
| 41 | 41 |
kapi.Scheme.AddConversionFuncs( |
| 42 |
- func(in *newer.Build, out *Build, s conversion.Scope) error {
|
|
| 43 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 44 |
- return err |
|
| 45 |
- } |
|
| 46 |
- if err := s.Convert(&in.Parameters, &out.Spec, 0); err != nil {
|
|
| 47 |
- return err |
|
| 48 |
- } |
|
| 49 |
- if err := s.Convert(in, &out.Status, 0); err != nil {
|
|
| 50 |
- return err |
|
| 51 |
- } |
|
| 52 |
- return s.Convert(&in.Status, &out.Status.Phase, 0) |
|
| 53 |
- }, |
|
| 54 |
- func(in *Build, out *newer.Build, s conversion.Scope) error {
|
|
| 55 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 56 |
- return err |
|
| 57 |
- } |
|
| 58 |
- if err := s.Convert(&in.Status, out, 0); err != nil {
|
|
| 59 |
- return err |
|
| 60 |
- } |
|
| 61 |
- if err := s.Convert(&in.Spec, &out.Parameters, 0); err != nil {
|
|
| 62 |
- return err |
|
| 63 |
- } |
|
| 64 |
- return s.Convert(&in.Status.Phase, &out.Status, 0) |
|
| 65 |
- }, |
|
| 66 |
- |
|
| 67 |
- func(in *newer.Build, out *BuildStatus, s conversion.Scope) error {
|
|
| 68 |
- out.Cancelled = in.Cancelled |
|
| 69 |
- out.CompletionTimestamp = in.CompletionTimestamp |
|
| 70 |
- if err := s.Convert(&in.Config, &out.Config, 0); err != nil {
|
|
| 71 |
- return err |
|
| 72 |
- } |
|
| 73 |
- out.Duration = in.Duration |
|
| 74 |
- out.Message = in.Message |
|
| 75 |
- out.StartTimestamp = in.StartTimestamp |
|
| 76 |
- return nil |
|
| 77 |
- }, |
|
| 78 |
- func(in *BuildStatus, out *newer.Build, s conversion.Scope) error {
|
|
| 79 |
- out.Cancelled = in.Cancelled |
|
| 80 |
- out.CompletionTimestamp = in.CompletionTimestamp |
|
| 81 |
- if err := s.Convert(&in.Config, &out.Config, 0); err != nil {
|
|
| 82 |
- return err |
|
| 83 |
- } |
|
| 84 |
- out.Duration = in.Duration |
|
| 85 |
- out.Message = in.Message |
|
| 86 |
- out.StartTimestamp = in.StartTimestamp |
|
| 87 |
- return nil |
|
| 88 |
- }, |
|
| 89 |
- |
|
| 90 |
- func(in *newer.BuildStatus, out *BuildPhase, s conversion.Scope) error {
|
|
| 91 |
- str := string(*in) |
|
| 92 |
- *out = BuildPhase(str) |
|
| 93 |
- return nil |
|
| 94 |
- }, |
|
| 95 |
- func(in *BuildPhase, out *newer.BuildStatus, s conversion.Scope) error {
|
|
| 96 |
- str := string(*in) |
|
| 97 |
- *out = newer.BuildStatus(str) |
|
| 98 |
- return nil |
|
| 99 |
- }, |
|
| 100 |
- |
|
| 101 |
- func(in *newer.BuildConfig, out *BuildConfig, s conversion.Scope) error {
|
|
| 102 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 103 |
- return err |
|
| 104 |
- } |
|
| 105 |
- if err := s.Convert(&in.Parameters, &out.Spec, 0); err != nil {
|
|
| 106 |
- return err |
|
| 107 |
- } |
|
| 108 |
- if err := s.Convert(&in.Triggers, &out.Spec.Triggers, 0); err != nil {
|
|
| 109 |
- return err |
|
| 110 |
- } |
|
| 111 |
- out.Status.LastVersion = in.LastVersion |
|
| 112 |
- return nil |
|
| 113 |
- }, |
|
| 114 |
- func(in *BuildConfig, out *newer.BuildConfig, s conversion.Scope) error {
|
|
| 115 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 116 |
- return err |
|
| 117 |
- } |
|
| 118 |
- if err := s.Convert(&in.Spec, &out.Parameters, 0); err != nil {
|
|
| 119 |
- return err |
|
| 120 |
- } |
|
| 121 |
- if err := s.Convert(&in.Spec.Triggers, &out.Triggers, 0); err != nil {
|
|
| 122 |
- return err |
|
| 123 |
- } |
|
| 124 |
- out.LastVersion = in.Status.LastVersion |
|
| 125 |
- return nil |
|
| 126 |
- }, |
|
| 127 |
- |
|
| 128 |
- func(in *newer.BuildParameters, out *BuildSpec, s conversion.Scope) error {
|
|
| 129 |
- out.ServiceAccount = in.ServiceAccount |
|
| 130 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 131 |
- return err |
|
| 132 |
- } |
|
| 133 |
- if in.Strategy.Type == newer.SourceBuildStrategyType {
|
|
| 134 |
- out.Strategy.Type = SourceBuildStrategyType |
|
| 135 |
- } |
|
| 136 |
- if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 137 |
- return err |
|
| 138 |
- } |
|
| 139 |
- if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 140 |
- return err |
|
| 141 |
- } |
|
| 142 |
- if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 143 |
- return err |
|
| 144 |
- } |
|
| 145 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 146 |
- return err |
|
| 147 |
- } |
|
| 148 |
- return nil |
|
| 149 |
- }, |
|
| 150 |
- func(in *BuildSpec, out *newer.BuildParameters, s conversion.Scope) error {
|
|
| 151 |
- out.ServiceAccount = in.ServiceAccount |
|
| 152 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 153 |
- return err |
|
| 154 |
- } |
|
| 155 |
- if in.Strategy.Type == SourceBuildStrategyType {
|
|
| 156 |
- out.Strategy.Type = newer.SourceBuildStrategyType |
|
| 157 |
- } |
|
| 158 |
- if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 159 |
- return err |
|
| 160 |
- } |
|
| 161 |
- if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 162 |
- return err |
|
| 163 |
- } |
|
| 164 |
- if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 165 |
- return err |
|
| 166 |
- } |
|
| 167 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 168 |
- return err |
|
| 169 |
- } |
|
| 170 |
- return nil |
|
| 171 |
- }, |
|
| 172 |
- |
|
| 173 |
- func(in *newer.BuildParameters, out *BuildConfigSpec, s conversion.Scope) error {
|
|
| 174 |
- out.ServiceAccount = in.ServiceAccount |
|
| 175 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 176 |
- return err |
|
| 177 |
- } |
|
| 178 |
- if in.Strategy.Type == newer.SourceBuildStrategyType {
|
|
| 179 |
- out.Strategy.Type = SourceBuildStrategyType |
|
| 180 |
- } |
|
| 181 |
- if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 182 |
- return err |
|
| 183 |
- } |
|
| 184 |
- if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 185 |
- return err |
|
| 186 |
- } |
|
| 187 |
- if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 188 |
- return err |
|
| 189 |
- } |
|
| 190 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 191 |
- return err |
|
| 192 |
- } |
|
| 193 |
- return nil |
|
| 194 |
- }, |
|
| 195 |
- func(in *BuildConfigSpec, out *newer.BuildParameters, s conversion.Scope) error {
|
|
| 196 |
- out.ServiceAccount = in.ServiceAccount |
|
| 197 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 198 |
- return err |
|
| 199 |
- } |
|
| 200 |
- if in.Strategy.Type == SourceBuildStrategyType {
|
|
| 201 |
- out.Strategy.Type = newer.SourceBuildStrategyType |
|
| 202 |
- } |
|
| 203 |
- if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 204 |
- return err |
|
| 205 |
- } |
|
| 206 |
- if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 207 |
- return err |
|
| 208 |
- } |
|
| 209 |
- if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 210 |
- return err |
|
| 211 |
- } |
|
| 212 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 213 |
- return err |
|
| 214 |
- } |
|
| 215 |
- return nil |
|
| 216 |
- }, |
|
| 217 |
- |
|
| 218 |
- func(in *newer.SourceBuildStrategy, out *SourceBuildStrategy, s conversion.Scope) error {
|
|
| 219 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 220 |
- return err |
|
| 221 |
- } |
|
| 222 |
- if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 223 |
- out.From.Kind = "ImageStreamTag" |
|
| 224 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 225 |
- } |
|
| 226 |
- return nil |
|
| 227 |
- }, |
|
| 228 |
- func(in *SourceBuildStrategy, out *newer.SourceBuildStrategy, s conversion.Scope) error {
|
|
| 229 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 230 |
- return err |
|
| 231 |
- } |
|
| 232 |
- if in.From != nil {
|
|
| 233 |
- switch in.From.Kind {
|
|
| 234 |
- case "ImageStream": |
|
| 235 |
- out.From.Kind = "ImageStreamTag" |
|
| 236 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 237 |
- case "ImageStreamTag": |
|
| 238 |
- _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 239 |
- if !ok {
|
|
| 240 |
- return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 241 |
- } |
|
| 242 |
- } |
|
| 243 |
- } |
|
| 244 |
- return nil |
|
| 245 |
- }, |
|
| 246 |
- func(in *newer.DockerBuildStrategy, out *DockerBuildStrategy, s conversion.Scope) error {
|
|
| 247 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 248 |
- return err |
|
| 249 |
- } |
|
| 250 |
- if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 251 |
- out.From.Kind = "ImageStreamTag" |
|
| 252 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 253 |
- } |
|
| 254 |
- return nil |
|
| 255 |
- }, |
|
| 256 |
- func(in *DockerBuildStrategy, out *newer.DockerBuildStrategy, s conversion.Scope) error {
|
|
| 257 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 258 |
- return err |
|
| 259 |
- } |
|
| 260 |
- if in.From != nil {
|
|
| 261 |
- switch in.From.Kind {
|
|
| 262 |
- case "ImageStream": |
|
| 263 |
- out.From.Kind = "ImageStreamTag" |
|
| 264 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 265 |
- case "ImageStreamTag": |
|
| 266 |
- _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 267 |
- if !ok {
|
|
| 268 |
- return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 269 |
- } |
|
| 270 |
- } |
|
| 271 |
- } |
|
| 272 |
- return nil |
|
| 273 |
- }, |
|
| 274 |
- func(in *newer.CustomBuildStrategy, out *CustomBuildStrategy, s conversion.Scope) error {
|
|
| 275 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 276 |
- return err |
|
| 277 |
- } |
|
| 278 |
- if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 279 |
- out.From.Kind = "ImageStreamTag" |
|
| 280 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 281 |
- } |
|
| 282 |
- return nil |
|
| 283 |
- }, |
|
| 284 |
- func(in *CustomBuildStrategy, out *newer.CustomBuildStrategy, s conversion.Scope) error {
|
|
| 285 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 286 |
- return err |
|
| 287 |
- } |
|
| 288 |
- if in.From != nil {
|
|
| 289 |
- switch in.From.Kind {
|
|
| 290 |
- case "ImageStream": |
|
| 291 |
- out.From.Kind = "ImageStreamTag" |
|
| 292 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 293 |
- case "ImageStreamTag": |
|
| 294 |
- _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 295 |
- if !ok {
|
|
| 296 |
- return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 297 |
- } |
|
| 298 |
- } |
|
| 299 |
- } |
|
| 300 |
- return nil |
|
| 301 |
- }, |
|
| 302 |
- func(in *newer.BuildOutput, out *BuildOutput, s conversion.Scope) error {
|
|
| 303 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 304 |
- return err |
|
| 305 |
- } |
|
| 306 |
- if in.To != nil && (len(in.To.Kind) == 0 || in.To.Kind == "ImageStream") {
|
|
| 307 |
- out.To.Kind = "ImageStreamTag" |
|
| 308 |
- out.To.Name = imageapi.JoinImageStreamTag(in.To.Name, in.Tag) |
|
| 309 |
- return nil |
|
| 310 |
- } |
|
| 311 |
- if len(in.DockerImageReference) != 0 {
|
|
| 312 |
- out.To = &kapi_v1.ObjectReference{
|
|
| 313 |
- Kind: "DockerImage", |
|
| 314 |
- Name: imageapi.JoinImageStreamTag(in.DockerImageReference, in.Tag), |
|
| 315 |
- } |
|
| 316 |
- } |
|
| 317 |
- return nil |
|
| 318 |
- }, |
|
| 319 |
- func(in *BuildOutput, out *newer.BuildOutput, s conversion.Scope) error {
|
|
| 320 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 321 |
- return err |
|
| 322 |
- } |
|
| 323 |
- if in.To != nil && in.To.Kind == "ImageStreamTag" {
|
|
| 324 |
- name, tag, ok := imageapi.SplitImageStreamTag(in.To.Name) |
|
| 325 |
- if !ok {
|
|
| 326 |
- return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.To.Name)
|
|
| 327 |
- } |
|
| 328 |
- out.To.Kind = "ImageStream" |
|
| 329 |
- out.To.Name = name |
|
| 330 |
- out.Tag = tag |
|
| 331 |
- return nil |
|
| 332 |
- } |
|
| 333 |
- if in.To != nil && in.To.Kind == "DockerImage" {
|
|
| 334 |
- out.To = nil |
|
| 335 |
- if ref, err := imageapi.ParseDockerImageReference(in.To.Name); err == nil {
|
|
| 336 |
- out.Tag = ref.Tag |
|
| 337 |
- ref.Tag = "" |
|
| 338 |
- out.DockerImageReference = ref.String() |
|
| 339 |
- } else {
|
|
| 340 |
- out.DockerImageReference = in.To.Name |
|
| 341 |
- } |
|
| 342 |
- } |
|
| 343 |
- return nil |
|
| 344 |
- }, |
|
| 345 |
- func(in *newer.ImageChangeTrigger, out *ImageChangeTrigger, s conversion.Scope) error {
|
|
| 346 |
- out.LastTriggeredImageID = in.LastTriggeredImageID |
|
| 347 |
- return nil |
|
| 348 |
- }, |
|
| 349 |
- func(in *ImageChangeTrigger, out *newer.ImageChangeTrigger, s conversion.Scope) error {
|
|
| 350 |
- out.LastTriggeredImageID = in.LastTriggeredImageID |
|
| 351 |
- return nil |
|
| 352 |
- }) |
|
| 42 |
+ convert_api_Build_To_v1_Build, |
|
| 43 |
+ convert_v1_Build_To_api_Build, |
|
| 44 |
+ convert_api_Build_To_v1_BuildStatus, |
|
| 45 |
+ convert_v1_BuildStatus_To_api_Build, |
|
| 46 |
+ convert_api_BuildStatus_To_v1_BuildPhase, |
|
| 47 |
+ convert_v1_BuildPhase_To_api_BuildStatus, |
|
| 48 |
+ convert_api_BuildConfig_To_v1_BuildConfig, |
|
| 49 |
+ convert_v1_BuildConfig_To_api_BuildConfig, |
|
| 50 |
+ convert_api_BuildParameters_To_v1_BuildSpec, |
|
| 51 |
+ convert_v1_BuildSpec_To_api_BuildParameters, |
|
| 52 |
+ convert_api_BuildParameters_To_v1_BuildConfigSpec, |
|
| 53 |
+ convert_v1_BuildConfigSpec_To_api_BuildParameters, |
|
| 54 |
+ convert_api_SourceBuildStrategy_To_v1_SourceBuildStrategy, |
|
| 55 |
+ convert_v1_SourceBuildStrategy_To_api_SourceBuildStrategy, |
|
| 56 |
+ convert_api_DockerBuildStrategy_To_v1_DockerBuildStrategy, |
|
| 57 |
+ convert_v1_DockerBuildStrategy_To_api_DockerBuildStrategy, |
|
| 58 |
+ convert_api_CustomBuildStrategy_To_v1_CustomBuildStrategy, |
|
| 59 |
+ convert_v1_CustomBuildStrategy_To_api_CustomBuildStrategy, |
|
| 60 |
+ convert_api_BuildOutput_To_v1_BuildOutput, |
|
| 61 |
+ convert_v1_BuildOutput_To_api_BuildOutput, |
|
| 62 |
+ convert_api_ImageChangeTrigger_To_v1_ImageChangeTrigger, |
|
| 63 |
+ convert_v1_ImageChangeTrigger_To_api_ImageChangeTrigger, |
|
| 64 |
+ ) |
|
| 353 | 65 |
|
| 354 | 66 |
// Add field conversion funcs. |
| 355 | 67 |
err = kapi.Scheme.AddFieldLabelConversionFunc("v1", "Build",
|
| ... | ... |
@@ -11,6 +11,333 @@ import ( |
| 11 | 11 |
imageapi "github.com/openshift/origin/pkg/image/api" |
| 12 | 12 |
) |
| 13 | 13 |
|
| 14 |
+func convert_api_Build_To_v1beta3_Build(in *newer.Build, out *Build, s conversion.Scope) error {
|
|
| 15 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 16 |
+ return err |
|
| 17 |
+ } |
|
| 18 |
+ if err := s.Convert(&in.Parameters, &out.Spec, 0); err != nil {
|
|
| 19 |
+ return err |
|
| 20 |
+ } |
|
| 21 |
+ if err := s.Convert(in, &out.Status, 0); err != nil {
|
|
| 22 |
+ return err |
|
| 23 |
+ } |
|
| 24 |
+ return s.Convert(&in.Status, &out.Status.Phase, 0) |
|
| 25 |
+} |
|
| 26 |
+ |
|
| 27 |
+func convert_v1beta3_Build_To_api_Build(in *Build, out *newer.Build, s conversion.Scope) error {
|
|
| 28 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 29 |
+ return err |
|
| 30 |
+ } |
|
| 31 |
+ if err := s.Convert(&in.Status, out, 0); err != nil {
|
|
| 32 |
+ return err |
|
| 33 |
+ } |
|
| 34 |
+ if err := s.Convert(&in.Spec, &out.Parameters, 0); err != nil {
|
|
| 35 |
+ return err |
|
| 36 |
+ } |
|
| 37 |
+ return s.Convert(&in.Status.Phase, &out.Status, 0) |
|
| 38 |
+} |
|
| 39 |
+ |
|
| 40 |
+func convert_api_Build_To_v1beta3_BuildStatus(in *newer.Build, out *BuildStatus, s conversion.Scope) error {
|
|
| 41 |
+ out.Cancelled = in.Cancelled |
|
| 42 |
+ out.CompletionTimestamp = in.CompletionTimestamp |
|
| 43 |
+ if err := s.Convert(&in.Config, &out.Config, 0); err != nil {
|
|
| 44 |
+ return err |
|
| 45 |
+ } |
|
| 46 |
+ out.Duration = in.Duration |
|
| 47 |
+ out.Message = in.Message |
|
| 48 |
+ out.StartTimestamp = in.StartTimestamp |
|
| 49 |
+ return nil |
|
| 50 |
+} |
|
| 51 |
+ |
|
| 52 |
+func convert_v1beta3_BuildStatus_To_api_Build(in *BuildStatus, out *newer.Build, s conversion.Scope) error {
|
|
| 53 |
+ out.Cancelled = in.Cancelled |
|
| 54 |
+ out.CompletionTimestamp = in.CompletionTimestamp |
|
| 55 |
+ if err := s.Convert(&in.Config, &out.Config, 0); err != nil {
|
|
| 56 |
+ return err |
|
| 57 |
+ } |
|
| 58 |
+ out.Duration = in.Duration |
|
| 59 |
+ out.Message = in.Message |
|
| 60 |
+ out.StartTimestamp = in.StartTimestamp |
|
| 61 |
+ return nil |
|
| 62 |
+} |
|
| 63 |
+ |
|
| 64 |
+func convert_api_BuildStatus_To_v1beta3_BuildPhase(in *newer.BuildStatus, out *BuildPhase, s conversion.Scope) error {
|
|
| 65 |
+ str := string(*in) |
|
| 66 |
+ *out = BuildPhase(str) |
|
| 67 |
+ return nil |
|
| 68 |
+} |
|
| 69 |
+ |
|
| 70 |
+func convert_v1beta3_BuildPhase_To_api_BuildStatus(in *BuildPhase, out *newer.BuildStatus, s conversion.Scope) error {
|
|
| 71 |
+ str := string(*in) |
|
| 72 |
+ *out = newer.BuildStatus(str) |
|
| 73 |
+ return nil |
|
| 74 |
+} |
|
| 75 |
+ |
|
| 76 |
+func convert_api_BuildConfig_To_v1beta3_BuildConfig(in *newer.BuildConfig, out *BuildConfig, s conversion.Scope) error {
|
|
| 77 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 78 |
+ return err |
|
| 79 |
+ } |
|
| 80 |
+ if err := s.Convert(&in.Parameters, &out.Spec, 0); err != nil {
|
|
| 81 |
+ return err |
|
| 82 |
+ } |
|
| 83 |
+ if err := s.Convert(&in.Triggers, &out.Spec.Triggers, 0); err != nil {
|
|
| 84 |
+ return err |
|
| 85 |
+ } |
|
| 86 |
+ out.Status.LastVersion = in.LastVersion |
|
| 87 |
+ return nil |
|
| 88 |
+} |
|
| 89 |
+ |
|
| 90 |
+func convert_v1beta3_BuildConfig_To_api_BuildConfig(in *BuildConfig, out *newer.BuildConfig, s conversion.Scope) error {
|
|
| 91 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 92 |
+ return err |
|
| 93 |
+ } |
|
| 94 |
+ if err := s.Convert(&in.Spec, &out.Parameters, 0); err != nil {
|
|
| 95 |
+ return err |
|
| 96 |
+ } |
|
| 97 |
+ if err := s.Convert(&in.Spec.Triggers, &out.Triggers, 0); err != nil {
|
|
| 98 |
+ return err |
|
| 99 |
+ } |
|
| 100 |
+ out.LastVersion = in.Status.LastVersion |
|
| 101 |
+ return nil |
|
| 102 |
+} |
|
| 103 |
+ |
|
| 104 |
+func convert_api_BuildParameters_To_v1beta3_BuildSpec(in *newer.BuildParameters, out *BuildSpec, s conversion.Scope) error {
|
|
| 105 |
+ out.ServiceAccount = in.ServiceAccount |
|
| 106 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 107 |
+ return err |
|
| 108 |
+ } |
|
| 109 |
+ if in.Strategy.Type == newer.SourceBuildStrategyType {
|
|
| 110 |
+ out.Strategy.Type = SourceBuildStrategyType |
|
| 111 |
+ } |
|
| 112 |
+ if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 113 |
+ return err |
|
| 114 |
+ } |
|
| 115 |
+ if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 116 |
+ return err |
|
| 117 |
+ } |
|
| 118 |
+ if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 119 |
+ return err |
|
| 120 |
+ } |
|
| 121 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 122 |
+ return err |
|
| 123 |
+ } |
|
| 124 |
+ return nil |
|
| 125 |
+} |
|
| 126 |
+ |
|
| 127 |
+func convert_v1beta3_BuildSpec_To_api_BuildParameters(in *BuildSpec, out *newer.BuildParameters, s conversion.Scope) error {
|
|
| 128 |
+ out.ServiceAccount = in.ServiceAccount |
|
| 129 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 130 |
+ return err |
|
| 131 |
+ } |
|
| 132 |
+ if in.Strategy.Type == SourceBuildStrategyType {
|
|
| 133 |
+ out.Strategy.Type = newer.SourceBuildStrategyType |
|
| 134 |
+ } |
|
| 135 |
+ if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 136 |
+ return err |
|
| 137 |
+ } |
|
| 138 |
+ if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 139 |
+ return err |
|
| 140 |
+ } |
|
| 141 |
+ if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 142 |
+ return err |
|
| 143 |
+ } |
|
| 144 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 145 |
+ return err |
|
| 146 |
+ } |
|
| 147 |
+ return nil |
|
| 148 |
+} |
|
| 149 |
+ |
|
| 150 |
+func convert_api_BuildParameters_To_v1beta3_BuildConfigSpec(in *newer.BuildParameters, out *BuildConfigSpec, s conversion.Scope) error {
|
|
| 151 |
+ out.ServiceAccount = in.ServiceAccount |
|
| 152 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 153 |
+ return err |
|
| 154 |
+ } |
|
| 155 |
+ if in.Strategy.Type == newer.SourceBuildStrategyType {
|
|
| 156 |
+ out.Strategy.Type = SourceBuildStrategyType |
|
| 157 |
+ } |
|
| 158 |
+ if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 159 |
+ return err |
|
| 160 |
+ } |
|
| 161 |
+ if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 162 |
+ return err |
|
| 163 |
+ } |
|
| 164 |
+ if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 165 |
+ return err |
|
| 166 |
+ } |
|
| 167 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 168 |
+ return err |
|
| 169 |
+ } |
|
| 170 |
+ return nil |
|
| 171 |
+} |
|
| 172 |
+ |
|
| 173 |
+func convert_v1beta3_BuildConfigSpec_To_api_BuildParameters(in *BuildConfigSpec, out *newer.BuildParameters, s conversion.Scope) error {
|
|
| 174 |
+ out.ServiceAccount = in.ServiceAccount |
|
| 175 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 176 |
+ return err |
|
| 177 |
+ } |
|
| 178 |
+ if in.Strategy.Type == SourceBuildStrategyType {
|
|
| 179 |
+ out.Strategy.Type = newer.SourceBuildStrategyType |
|
| 180 |
+ } |
|
| 181 |
+ if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 182 |
+ return err |
|
| 183 |
+ } |
|
| 184 |
+ if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 185 |
+ return err |
|
| 186 |
+ } |
|
| 187 |
+ if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 188 |
+ return err |
|
| 189 |
+ } |
|
| 190 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 191 |
+ return err |
|
| 192 |
+ } |
|
| 193 |
+ return nil |
|
| 194 |
+} |
|
| 195 |
+ |
|
| 196 |
+func convert_api_SourceBuildStrategy_To_v1beta3_SourceBuildStrategy(in *newer.SourceBuildStrategy, out *SourceBuildStrategy, s conversion.Scope) error {
|
|
| 197 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 198 |
+ return err |
|
| 199 |
+ } |
|
| 200 |
+ if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 201 |
+ out.From.Kind = "ImageStreamTag" |
|
| 202 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 203 |
+ } |
|
| 204 |
+ return nil |
|
| 205 |
+} |
|
| 206 |
+ |
|
| 207 |
+func convert_v1beta3_SourceBuildStrategy_To_api_SourceBuildStrategy(in *SourceBuildStrategy, out *newer.SourceBuildStrategy, s conversion.Scope) error {
|
|
| 208 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 209 |
+ return err |
|
| 210 |
+ } |
|
| 211 |
+ if in.From != nil {
|
|
| 212 |
+ switch in.From.Kind {
|
|
| 213 |
+ case "ImageStream": |
|
| 214 |
+ out.From.Kind = "ImageStreamTag" |
|
| 215 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 216 |
+ case "ImageStreamTag": |
|
| 217 |
+ _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 218 |
+ if !ok {
|
|
| 219 |
+ return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 220 |
+ } |
|
| 221 |
+ } |
|
| 222 |
+ } |
|
| 223 |
+ return nil |
|
| 224 |
+} |
|
| 225 |
+ |
|
| 226 |
+func convert_api_DockerBuildStrategy_To_v1beta3_DockerBuildStrategy(in *newer.DockerBuildStrategy, out *DockerBuildStrategy, s conversion.Scope) error {
|
|
| 227 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 228 |
+ return err |
|
| 229 |
+ } |
|
| 230 |
+ if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 231 |
+ out.From.Kind = "ImageStreamTag" |
|
| 232 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 233 |
+ } |
|
| 234 |
+ return nil |
|
| 235 |
+} |
|
| 236 |
+ |
|
| 237 |
+func convert_v1beta3_DockerBuildStrategy_To_api_DockerBuildStrategy(in *DockerBuildStrategy, out *newer.DockerBuildStrategy, s conversion.Scope) error {
|
|
| 238 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 239 |
+ return err |
|
| 240 |
+ } |
|
| 241 |
+ if in.From != nil {
|
|
| 242 |
+ switch in.From.Kind {
|
|
| 243 |
+ case "ImageStream": |
|
| 244 |
+ out.From.Kind = "ImageStreamTag" |
|
| 245 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 246 |
+ case "ImageStreamTag": |
|
| 247 |
+ _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 248 |
+ if !ok {
|
|
| 249 |
+ return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 250 |
+ } |
|
| 251 |
+ } |
|
| 252 |
+ } |
|
| 253 |
+ return nil |
|
| 254 |
+} |
|
| 255 |
+ |
|
| 256 |
+func convert_api_CustomBuildStrategy_To_v1beta3_CustomBuildStrategy(in *newer.CustomBuildStrategy, out *CustomBuildStrategy, s conversion.Scope) error {
|
|
| 257 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 258 |
+ return err |
|
| 259 |
+ } |
|
| 260 |
+ if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 261 |
+ out.From.Kind = "ImageStreamTag" |
|
| 262 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 263 |
+ } |
|
| 264 |
+ return nil |
|
| 265 |
+} |
|
| 266 |
+ |
|
| 267 |
+func convert_v1beta3_CustomBuildStrategy_To_api_CustomBuildStrategy(in *CustomBuildStrategy, out *newer.CustomBuildStrategy, s conversion.Scope) error {
|
|
| 268 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 269 |
+ return err |
|
| 270 |
+ } |
|
| 271 |
+ if in.From != nil {
|
|
| 272 |
+ switch in.From.Kind {
|
|
| 273 |
+ case "ImageStream": |
|
| 274 |
+ out.From.Kind = "ImageStreamTag" |
|
| 275 |
+ out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 276 |
+ case "ImageStreamTag": |
|
| 277 |
+ _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 278 |
+ if !ok {
|
|
| 279 |
+ return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 280 |
+ } |
|
| 281 |
+ } |
|
| 282 |
+ } |
|
| 283 |
+ return nil |
|
| 284 |
+} |
|
| 285 |
+ |
|
| 286 |
+func convert_api_BuildOutput_To_v1beta3_BuildOutput(in *newer.BuildOutput, out *BuildOutput, s conversion.Scope) error {
|
|
| 287 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 288 |
+ return err |
|
| 289 |
+ } |
|
| 290 |
+ if in.To != nil && (len(in.To.Kind) == 0 || in.To.Kind == "ImageStream") {
|
|
| 291 |
+ out.To.Kind = "ImageStreamTag" |
|
| 292 |
+ out.To.Name = imageapi.JoinImageStreamTag(in.To.Name, in.Tag) |
|
| 293 |
+ return nil |
|
| 294 |
+ } |
|
| 295 |
+ if len(in.DockerImageReference) != 0 {
|
|
| 296 |
+ out.To = &kapi_v1beta3.ObjectReference{
|
|
| 297 |
+ Kind: "DockerImage", |
|
| 298 |
+ Name: imageapi.JoinImageStreamTag(in.DockerImageReference, in.Tag), |
|
| 299 |
+ } |
|
| 300 |
+ } |
|
| 301 |
+ return nil |
|
| 302 |
+} |
|
| 303 |
+ |
|
| 304 |
+func convert_v1beta3_BuildOutput_To_api_BuildOutput(in *BuildOutput, out *newer.BuildOutput, s conversion.Scope) error {
|
|
| 305 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 306 |
+ return err |
|
| 307 |
+ } |
|
| 308 |
+ if in.To != nil && in.To.Kind == "ImageStreamTag" {
|
|
| 309 |
+ name, tag, ok := imageapi.SplitImageStreamTag(in.To.Name) |
|
| 310 |
+ if !ok {
|
|
| 311 |
+ return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.To.Name)
|
|
| 312 |
+ } |
|
| 313 |
+ out.To.Kind = "ImageStream" |
|
| 314 |
+ out.To.Name = name |
|
| 315 |
+ out.Tag = tag |
|
| 316 |
+ return nil |
|
| 317 |
+ } |
|
| 318 |
+ if in.To != nil && in.To.Kind == "DockerImage" {
|
|
| 319 |
+ out.To = nil |
|
| 320 |
+ if ref, err := imageapi.ParseDockerImageReference(in.To.Name); err == nil {
|
|
| 321 |
+ out.Tag = ref.Tag |
|
| 322 |
+ ref.Tag = "" |
|
| 323 |
+ out.DockerImageReference = ref.String() |
|
| 324 |
+ } else {
|
|
| 325 |
+ out.DockerImageReference = in.To.Name |
|
| 326 |
+ } |
|
| 327 |
+ } |
|
| 328 |
+ return nil |
|
| 329 |
+} |
|
| 330 |
+ |
|
| 331 |
+func convert_api_ImageChangeTrigger_To_v1beta3_ImageChangeTrigger(in *newer.ImageChangeTrigger, out *ImageChangeTrigger, s conversion.Scope) error {
|
|
| 332 |
+ out.LastTriggeredImageID = in.LastTriggeredImageID |
|
| 333 |
+ return nil |
|
| 334 |
+} |
|
| 335 |
+ |
|
| 336 |
+func convert_v1beta3_ImageChangeTrigger_To_api_ImageChangeTrigger(in *ImageChangeTrigger, out *newer.ImageChangeTrigger, s conversion.Scope) error {
|
|
| 337 |
+ out.LastTriggeredImageID = in.LastTriggeredImageID |
|
| 338 |
+ return nil |
|
| 339 |
+} |
|
| 340 |
+ |
|
| 14 | 341 |
func init() {
|
| 15 | 342 |
err := kapi.Scheme.AddDefaultingFuncs( |
| 16 | 343 |
func(obj *SourceBuildStrategy) {
|
| ... | ... |
@@ -34,317 +361,29 @@ func init() {
|
| 34 | 34 |
} |
| 35 | 35 |
|
| 36 | 36 |
kapi.Scheme.AddConversionFuncs( |
| 37 |
- func(in *newer.Build, out *Build, s conversion.Scope) error {
|
|
| 38 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 39 |
- return err |
|
| 40 |
- } |
|
| 41 |
- if err := s.Convert(&in.Parameters, &out.Spec, 0); err != nil {
|
|
| 42 |
- return err |
|
| 43 |
- } |
|
| 44 |
- if err := s.Convert(in, &out.Status, 0); err != nil {
|
|
| 45 |
- return err |
|
| 46 |
- } |
|
| 47 |
- return s.Convert(&in.Status, &out.Status.Phase, 0) |
|
| 48 |
- }, |
|
| 49 |
- func(in *Build, out *newer.Build, s conversion.Scope) error {
|
|
| 50 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 51 |
- return err |
|
| 52 |
- } |
|
| 53 |
- if err := s.Convert(&in.Status, out, 0); err != nil {
|
|
| 54 |
- return err |
|
| 55 |
- } |
|
| 56 |
- if err := s.Convert(&in.Spec, &out.Parameters, 0); err != nil {
|
|
| 57 |
- return err |
|
| 58 |
- } |
|
| 59 |
- return s.Convert(&in.Status.Phase, &out.Status, 0) |
|
| 60 |
- }, |
|
| 61 |
- |
|
| 62 |
- func(in *newer.Build, out *BuildStatus, s conversion.Scope) error {
|
|
| 63 |
- out.Cancelled = in.Cancelled |
|
| 64 |
- out.CompletionTimestamp = in.CompletionTimestamp |
|
| 65 |
- if err := s.Convert(&in.Config, &out.Config, 0); err != nil {
|
|
| 66 |
- return err |
|
| 67 |
- } |
|
| 68 |
- out.Duration = in.Duration |
|
| 69 |
- out.Message = in.Message |
|
| 70 |
- out.StartTimestamp = in.StartTimestamp |
|
| 71 |
- return nil |
|
| 72 |
- }, |
|
| 73 |
- func(in *BuildStatus, out *newer.Build, s conversion.Scope) error {
|
|
| 74 |
- out.Cancelled = in.Cancelled |
|
| 75 |
- out.CompletionTimestamp = in.CompletionTimestamp |
|
| 76 |
- if err := s.Convert(&in.Config, &out.Config, 0); err != nil {
|
|
| 77 |
- return err |
|
| 78 |
- } |
|
| 79 |
- out.Duration = in.Duration |
|
| 80 |
- out.Message = in.Message |
|
| 81 |
- out.StartTimestamp = in.StartTimestamp |
|
| 82 |
- return nil |
|
| 83 |
- }, |
|
| 84 |
- |
|
| 85 |
- func(in *newer.BuildStatus, out *BuildPhase, s conversion.Scope) error {
|
|
| 86 |
- str := string(*in) |
|
| 87 |
- *out = BuildPhase(str) |
|
| 88 |
- return nil |
|
| 89 |
- }, |
|
| 90 |
- func(in *BuildPhase, out *newer.BuildStatus, s conversion.Scope) error {
|
|
| 91 |
- str := string(*in) |
|
| 92 |
- *out = newer.BuildStatus(str) |
|
| 93 |
- return nil |
|
| 94 |
- }, |
|
| 95 |
- |
|
| 96 |
- func(in *newer.BuildConfig, out *BuildConfig, s conversion.Scope) error {
|
|
| 97 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 98 |
- return err |
|
| 99 |
- } |
|
| 100 |
- if err := s.Convert(&in.Parameters, &out.Spec, 0); err != nil {
|
|
| 101 |
- return err |
|
| 102 |
- } |
|
| 103 |
- if err := s.Convert(&in.Triggers, &out.Spec.Triggers, 0); err != nil {
|
|
| 104 |
- return err |
|
| 105 |
- } |
|
| 106 |
- out.Status.LastVersion = in.LastVersion |
|
| 107 |
- return nil |
|
| 108 |
- }, |
|
| 109 |
- func(in *BuildConfig, out *newer.BuildConfig, s conversion.Scope) error {
|
|
| 110 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 111 |
- return err |
|
| 112 |
- } |
|
| 113 |
- if err := s.Convert(&in.Spec, &out.Parameters, 0); err != nil {
|
|
| 114 |
- return err |
|
| 115 |
- } |
|
| 116 |
- if err := s.Convert(&in.Spec.Triggers, &out.Triggers, 0); err != nil {
|
|
| 117 |
- return err |
|
| 118 |
- } |
|
| 119 |
- out.LastVersion = in.Status.LastVersion |
|
| 120 |
- return nil |
|
| 121 |
- }, |
|
| 122 |
- |
|
| 123 |
- func(in *newer.BuildParameters, out *BuildSpec, s conversion.Scope) error {
|
|
| 124 |
- out.ServiceAccount = in.ServiceAccount |
|
| 125 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 126 |
- return err |
|
| 127 |
- } |
|
| 128 |
- if in.Strategy.Type == newer.SourceBuildStrategyType {
|
|
| 129 |
- out.Strategy.Type = SourceBuildStrategyType |
|
| 130 |
- } |
|
| 131 |
- if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 132 |
- return err |
|
| 133 |
- } |
|
| 134 |
- if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 135 |
- return err |
|
| 136 |
- } |
|
| 137 |
- if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 138 |
- return err |
|
| 139 |
- } |
|
| 140 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 141 |
- return err |
|
| 142 |
- } |
|
| 143 |
- return nil |
|
| 144 |
- }, |
|
| 145 |
- func(in *BuildSpec, out *newer.BuildParameters, s conversion.Scope) error {
|
|
| 146 |
- out.ServiceAccount = in.ServiceAccount |
|
| 147 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 148 |
- return err |
|
| 149 |
- } |
|
| 150 |
- if in.Strategy.Type == SourceBuildStrategyType {
|
|
| 151 |
- out.Strategy.Type = newer.SourceBuildStrategyType |
|
| 152 |
- } |
|
| 153 |
- if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 154 |
- return err |
|
| 155 |
- } |
|
| 156 |
- if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 157 |
- return err |
|
| 158 |
- } |
|
| 159 |
- if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 160 |
- return err |
|
| 161 |
- } |
|
| 162 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 163 |
- return err |
|
| 164 |
- } |
|
| 165 |
- return nil |
|
| 166 |
- }, |
|
| 167 |
- |
|
| 168 |
- func(in *newer.BuildParameters, out *BuildConfigSpec, s conversion.Scope) error {
|
|
| 169 |
- out.ServiceAccount = in.ServiceAccount |
|
| 170 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 171 |
- return err |
|
| 172 |
- } |
|
| 173 |
- if in.Strategy.Type == newer.SourceBuildStrategyType {
|
|
| 174 |
- out.Strategy.Type = SourceBuildStrategyType |
|
| 175 |
- } |
|
| 176 |
- if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 177 |
- return err |
|
| 178 |
- } |
|
| 179 |
- if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 180 |
- return err |
|
| 181 |
- } |
|
| 182 |
- if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 183 |
- return err |
|
| 184 |
- } |
|
| 185 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 186 |
- return err |
|
| 187 |
- } |
|
| 188 |
- return nil |
|
| 189 |
- }, |
|
| 190 |
- func(in *BuildConfigSpec, out *newer.BuildParameters, s conversion.Scope) error {
|
|
| 191 |
- out.ServiceAccount = in.ServiceAccount |
|
| 192 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 193 |
- return err |
|
| 194 |
- } |
|
| 195 |
- if in.Strategy.Type == SourceBuildStrategyType {
|
|
| 196 |
- out.Strategy.Type = newer.SourceBuildStrategyType |
|
| 197 |
- } |
|
| 198 |
- if err := s.Convert(&in.Source, &out.Source, 0); err != nil {
|
|
| 199 |
- return err |
|
| 200 |
- } |
|
| 201 |
- if err := s.Convert(&in.Output, &out.Output, 0); err != nil {
|
|
| 202 |
- return err |
|
| 203 |
- } |
|
| 204 |
- if err := s.Convert(&in.Revision, &out.Revision, 0); err != nil {
|
|
| 205 |
- return err |
|
| 206 |
- } |
|
| 207 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 208 |
- return err |
|
| 209 |
- } |
|
| 210 |
- return nil |
|
| 211 |
- }, |
|
| 212 |
- |
|
| 213 |
- func(in *newer.SourceBuildStrategy, out *SourceBuildStrategy, s conversion.Scope) error {
|
|
| 214 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 215 |
- return err |
|
| 216 |
- } |
|
| 217 |
- if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 218 |
- out.From.Kind = "ImageStreamTag" |
|
| 219 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 220 |
- } |
|
| 221 |
- return nil |
|
| 222 |
- }, |
|
| 223 |
- func(in *SourceBuildStrategy, out *newer.SourceBuildStrategy, s conversion.Scope) error {
|
|
| 224 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 225 |
- return err |
|
| 226 |
- } |
|
| 227 |
- if in.From != nil {
|
|
| 228 |
- switch in.From.Kind {
|
|
| 229 |
- case "ImageStream": |
|
| 230 |
- out.From.Kind = "ImageStreamTag" |
|
| 231 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 232 |
- case "ImageStreamTag": |
|
| 233 |
- _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 234 |
- if !ok {
|
|
| 235 |
- return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 236 |
- } |
|
| 237 |
- } |
|
| 238 |
- } |
|
| 239 |
- return nil |
|
| 240 |
- }, |
|
| 241 |
- func(in *newer.DockerBuildStrategy, out *DockerBuildStrategy, s conversion.Scope) error {
|
|
| 242 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 243 |
- return err |
|
| 244 |
- } |
|
| 245 |
- if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 246 |
- out.From.Kind = "ImageStreamTag" |
|
| 247 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 248 |
- } |
|
| 249 |
- return nil |
|
| 250 |
- }, |
|
| 251 |
- func(in *DockerBuildStrategy, out *newer.DockerBuildStrategy, s conversion.Scope) error {
|
|
| 252 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 253 |
- return err |
|
| 254 |
- } |
|
| 255 |
- if in.From != nil {
|
|
| 256 |
- switch in.From.Kind {
|
|
| 257 |
- case "ImageStream": |
|
| 258 |
- out.From.Kind = "ImageStreamTag" |
|
| 259 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 260 |
- case "ImageStreamTag": |
|
| 261 |
- _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 262 |
- if !ok {
|
|
| 263 |
- return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 264 |
- } |
|
| 265 |
- } |
|
| 266 |
- } |
|
| 267 |
- return nil |
|
| 268 |
- }, |
|
| 269 |
- func(in *newer.CustomBuildStrategy, out *CustomBuildStrategy, s conversion.Scope) error {
|
|
| 270 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 271 |
- return err |
|
| 272 |
- } |
|
| 273 |
- if in.From != nil && in.From.Kind == "ImageStream" {
|
|
| 274 |
- out.From.Kind = "ImageStreamTag" |
|
| 275 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 276 |
- } |
|
| 277 |
- return nil |
|
| 278 |
- }, |
|
| 279 |
- func(in *CustomBuildStrategy, out *newer.CustomBuildStrategy, s conversion.Scope) error {
|
|
| 280 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 281 |
- return err |
|
| 282 |
- } |
|
| 283 |
- if in.From != nil {
|
|
| 284 |
- switch in.From.Kind {
|
|
| 285 |
- case "ImageStream": |
|
| 286 |
- out.From.Kind = "ImageStreamTag" |
|
| 287 |
- out.From.Name = imageapi.JoinImageStreamTag(in.From.Name, "") |
|
| 288 |
- case "ImageStreamTag": |
|
| 289 |
- _, _, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 290 |
- if !ok {
|
|
| 291 |
- return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 292 |
- } |
|
| 293 |
- } |
|
| 294 |
- } |
|
| 295 |
- return nil |
|
| 296 |
- }, |
|
| 297 |
- func(in *newer.BuildOutput, out *BuildOutput, s conversion.Scope) error {
|
|
| 298 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 299 |
- return err |
|
| 300 |
- } |
|
| 301 |
- if in.To != nil && (len(in.To.Kind) == 0 || in.To.Kind == "ImageStream") {
|
|
| 302 |
- out.To.Kind = "ImageStreamTag" |
|
| 303 |
- out.To.Name = imageapi.JoinImageStreamTag(in.To.Name, in.Tag) |
|
| 304 |
- return nil |
|
| 305 |
- } |
|
| 306 |
- if len(in.DockerImageReference) != 0 {
|
|
| 307 |
- out.To = &kapi_v1beta3.ObjectReference{
|
|
| 308 |
- Kind: "DockerImage", |
|
| 309 |
- Name: imageapi.JoinImageStreamTag(in.DockerImageReference, in.Tag), |
|
| 310 |
- } |
|
| 311 |
- } |
|
| 312 |
- return nil |
|
| 313 |
- }, |
|
| 314 |
- func(in *BuildOutput, out *newer.BuildOutput, s conversion.Scope) error {
|
|
| 315 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 316 |
- return err |
|
| 317 |
- } |
|
| 318 |
- if in.To != nil && in.To.Kind == "ImageStreamTag" {
|
|
| 319 |
- name, tag, ok := imageapi.SplitImageStreamTag(in.To.Name) |
|
| 320 |
- if !ok {
|
|
| 321 |
- return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.To.Name)
|
|
| 322 |
- } |
|
| 323 |
- out.To.Kind = "ImageStream" |
|
| 324 |
- out.To.Name = name |
|
| 325 |
- out.Tag = tag |
|
| 326 |
- return nil |
|
| 327 |
- } |
|
| 328 |
- if in.To != nil && in.To.Kind == "DockerImage" {
|
|
| 329 |
- out.To = nil |
|
| 330 |
- if ref, err := imageapi.ParseDockerImageReference(in.To.Name); err == nil {
|
|
| 331 |
- out.Tag = ref.Tag |
|
| 332 |
- ref.Tag = "" |
|
| 333 |
- out.DockerImageReference = ref.String() |
|
| 334 |
- } else {
|
|
| 335 |
- out.DockerImageReference = in.To.Name |
|
| 336 |
- } |
|
| 337 |
- } |
|
| 338 |
- return nil |
|
| 339 |
- }, |
|
| 340 |
- func(in *newer.ImageChangeTrigger, out *ImageChangeTrigger, s conversion.Scope) error {
|
|
| 341 |
- out.LastTriggeredImageID = in.LastTriggeredImageID |
|
| 342 |
- return nil |
|
| 343 |
- }, |
|
| 344 |
- func(in *ImageChangeTrigger, out *newer.ImageChangeTrigger, s conversion.Scope) error {
|
|
| 345 |
- out.LastTriggeredImageID = in.LastTriggeredImageID |
|
| 346 |
- return nil |
|
| 347 |
- }) |
|
| 37 |
+ convert_api_Build_To_v1beta3_Build, |
|
| 38 |
+ convert_v1beta3_Build_To_api_Build, |
|
| 39 |
+ convert_api_Build_To_v1beta3_BuildStatus, |
|
| 40 |
+ convert_v1beta3_BuildStatus_To_api_Build, |
|
| 41 |
+ convert_api_BuildStatus_To_v1beta3_BuildPhase, |
|
| 42 |
+ convert_v1beta3_BuildPhase_To_api_BuildStatus, |
|
| 43 |
+ convert_api_BuildConfig_To_v1beta3_BuildConfig, |
|
| 44 |
+ convert_v1beta3_BuildConfig_To_api_BuildConfig, |
|
| 45 |
+ convert_api_BuildParameters_To_v1beta3_BuildSpec, |
|
| 46 |
+ convert_v1beta3_BuildSpec_To_api_BuildParameters, |
|
| 47 |
+ convert_api_BuildParameters_To_v1beta3_BuildConfigSpec, |
|
| 48 |
+ convert_v1beta3_BuildConfigSpec_To_api_BuildParameters, |
|
| 49 |
+ convert_api_SourceBuildStrategy_To_v1beta3_SourceBuildStrategy, |
|
| 50 |
+ convert_v1beta3_SourceBuildStrategy_To_api_SourceBuildStrategy, |
|
| 51 |
+ convert_api_DockerBuildStrategy_To_v1beta3_DockerBuildStrategy, |
|
| 52 |
+ convert_v1beta3_DockerBuildStrategy_To_api_DockerBuildStrategy, |
|
| 53 |
+ convert_api_CustomBuildStrategy_To_v1beta3_CustomBuildStrategy, |
|
| 54 |
+ convert_v1beta3_CustomBuildStrategy_To_api_CustomBuildStrategy, |
|
| 55 |
+ convert_api_BuildOutput_To_v1beta3_BuildOutput, |
|
| 56 |
+ convert_v1beta3_BuildOutput_To_api_BuildOutput, |
|
| 57 |
+ convert_api_ImageChangeTrigger_To_v1beta3_ImageChangeTrigger, |
|
| 58 |
+ convert_v1beta3_ImageChangeTrigger_To_api_ImageChangeTrigger, |
|
| 59 |
+ ) |
|
| 348 | 60 |
|
| 349 | 61 |
// Add field conversion funcs. |
| 350 | 62 |
err = kapi.Scheme.AddFieldLabelConversionFunc("v1beta3", "Build",
|
| ... | ... |
@@ -10,6 +10,202 @@ import ( |
| 10 | 10 |
imageapi "github.com/openshift/origin/pkg/image/api" |
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 |
+func convert_v1_DeploymentConfig_To_api_DeploymentConfig(in *DeploymentConfig, out *newer.DeploymentConfig, s conversion.Scope) error {
|
|
| 14 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 15 |
+ return err |
|
| 16 |
+ } |
|
| 17 |
+ if err := s.Convert(&in.Spec, &out.Template, 0); err != nil {
|
|
| 18 |
+ return err |
|
| 19 |
+ } |
|
| 20 |
+ if err := s.Convert(&in.Spec.Triggers, &out.Triggers, 0); err != nil {
|
|
| 21 |
+ return err |
|
| 22 |
+ } |
|
| 23 |
+ out.LatestVersion = in.Status.LatestVersion |
|
| 24 |
+ if err := s.Convert(&in.Status.Details, &out.Details, 0); err != nil {
|
|
| 25 |
+ return err |
|
| 26 |
+ } |
|
| 27 |
+ return nil |
|
| 28 |
+} |
|
| 29 |
+ |
|
| 30 |
+func convert_api_DeploymentConfig_To_v1_DeploymentConfig(in *newer.DeploymentConfig, out *DeploymentConfig, s conversion.Scope) error {
|
|
| 31 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 32 |
+ return err |
|
| 33 |
+ } |
|
| 34 |
+ if err := s.Convert(&in.Template, &out.Spec, 0); err != nil {
|
|
| 35 |
+ return err |
|
| 36 |
+ } |
|
| 37 |
+ if err := s.Convert(&in.Triggers, &out.Spec.Triggers, 0); err != nil {
|
|
| 38 |
+ return err |
|
| 39 |
+ } |
|
| 40 |
+ out.Status.LatestVersion = in.LatestVersion |
|
| 41 |
+ if err := s.Convert(&in.Details, &out.Status.Details, 0); err != nil {
|
|
| 42 |
+ return err |
|
| 43 |
+ } |
|
| 44 |
+ return nil |
|
| 45 |
+} |
|
| 46 |
+ |
|
| 47 |
+func convert_v1_DeploymentConfigSpec_To_api_DeploymentTemplate(in *DeploymentConfigSpec, out *newer.DeploymentTemplate, s conversion.Scope) error {
|
|
| 48 |
+ out.ControllerTemplate.Replicas = in.Replicas |
|
| 49 |
+ if in.Selector != nil {
|
|
| 50 |
+ out.ControllerTemplate.Selector = make(map[string]string) |
|
| 51 |
+ for k, v := range in.Selector {
|
|
| 52 |
+ out.ControllerTemplate.Selector[k] = v |
|
| 53 |
+ } |
|
| 54 |
+ } |
|
| 55 |
+ if in.Template != nil {
|
|
| 56 |
+ if err := s.Convert(&in.Template, &out.ControllerTemplate.Template, 0); err != nil {
|
|
| 57 |
+ return err |
|
| 58 |
+ } |
|
| 59 |
+ } |
|
| 60 |
+ if in.TemplateRef != nil {
|
|
| 61 |
+ if err := s.Convert(&in.TemplateRef, &out.ControllerTemplate.TemplateRef, 0); err != nil {
|
|
| 62 |
+ return err |
|
| 63 |
+ } |
|
| 64 |
+ } |
|
| 65 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 66 |
+ return err |
|
| 67 |
+ } |
|
| 68 |
+ return nil |
|
| 69 |
+} |
|
| 70 |
+ |
|
| 71 |
+func convert_v1_DeploymentStrategy_To_api_DeploymentStrategy(in *DeploymentStrategy, out *newer.DeploymentStrategy, s conversion.Scope) error {
|
|
| 72 |
+ if err := s.Convert(&in.Type, &out.Type, 0); err != nil {
|
|
| 73 |
+ return err |
|
| 74 |
+ } |
|
| 75 |
+ if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil {
|
|
| 76 |
+ return err |
|
| 77 |
+ } |
|
| 78 |
+ if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil {
|
|
| 79 |
+ return err |
|
| 80 |
+ } |
|
| 81 |
+ if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil {
|
|
| 82 |
+ return err |
|
| 83 |
+ } |
|
| 84 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 85 |
+ return err |
|
| 86 |
+ } |
|
| 87 |
+ return nil |
|
| 88 |
+} |
|
| 89 |
+ |
|
| 90 |
+func convert_api_DeploymentStrategy_To_v1_DeploymentStrategy(in *newer.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error {
|
|
| 91 |
+ if err := s.Convert(&in.Type, &out.Type, 0); err != nil {
|
|
| 92 |
+ return err |
|
| 93 |
+ } |
|
| 94 |
+ if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil {
|
|
| 95 |
+ return err |
|
| 96 |
+ } |
|
| 97 |
+ if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil {
|
|
| 98 |
+ return err |
|
| 99 |
+ } |
|
| 100 |
+ if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil {
|
|
| 101 |
+ return err |
|
| 102 |
+ } |
|
| 103 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 104 |
+ return err |
|
| 105 |
+ } |
|
| 106 |
+ return nil |
|
| 107 |
+} |
|
| 108 |
+ |
|
| 109 |
+func convert_api_DeploymentTemplate_To_v1_DeploymentConfigSpec(in *newer.DeploymentTemplate, out *DeploymentConfigSpec, s conversion.Scope) error {
|
|
| 110 |
+ out.Replicas = in.ControllerTemplate.Replicas |
|
| 111 |
+ if in.ControllerTemplate.Selector != nil {
|
|
| 112 |
+ out.Selector = make(map[string]string) |
|
| 113 |
+ for k, v := range in.ControllerTemplate.Selector {
|
|
| 114 |
+ out.Selector[k] = v |
|
| 115 |
+ } |
|
| 116 |
+ } |
|
| 117 |
+ if in.ControllerTemplate.Template != nil {
|
|
| 118 |
+ if err := s.Convert(&in.ControllerTemplate.Template, &out.Template, 0); err != nil {
|
|
| 119 |
+ return err |
|
| 120 |
+ } |
|
| 121 |
+ } |
|
| 122 |
+ if in.ControllerTemplate.TemplateRef != nil {
|
|
| 123 |
+ if err := s.Convert(&in.ControllerTemplate.TemplateRef, &out.TemplateRef, 0); err != nil {
|
|
| 124 |
+ return err |
|
| 125 |
+ } |
|
| 126 |
+ } |
|
| 127 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 128 |
+ return err |
|
| 129 |
+ } |
|
| 130 |
+ return nil |
|
| 131 |
+} |
|
| 132 |
+ |
|
| 133 |
+func convert_v1_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams(in *DeploymentTriggerImageChangeParams, out *newer.DeploymentTriggerImageChangeParams, s conversion.Scope) error {
|
|
| 134 |
+ out.Automatic = in.Automatic |
|
| 135 |
+ out.ContainerNames = make([]string, len(in.ContainerNames)) |
|
| 136 |
+ copy(out.ContainerNames, in.ContainerNames) |
|
| 137 |
+ out.LastTriggeredImage = in.LastTriggeredImage |
|
| 138 |
+ if err := s.Convert(&in.From, &out.From, 0); err != nil {
|
|
| 139 |
+ return err |
|
| 140 |
+ } |
|
| 141 |
+ switch in.From.Kind {
|
|
| 142 |
+ case "DockerImage": |
|
| 143 |
+ ref, err := imageapi.ParseDockerImageReference(in.From.Name) |
|
| 144 |
+ if err != nil {
|
|
| 145 |
+ return err |
|
| 146 |
+ } |
|
| 147 |
+ out.Tag = ref.Tag |
|
| 148 |
+ ref.Tag, ref.ID = "", "" |
|
| 149 |
+ out.RepositoryName = ref.String() |
|
| 150 |
+ case "ImageStreamTag": |
|
| 151 |
+ name, tag, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 152 |
+ if !ok {
|
|
| 153 |
+ return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 154 |
+ } |
|
| 155 |
+ out.From.Kind = "ImageStream" |
|
| 156 |
+ out.From.Name = name |
|
| 157 |
+ out.Tag = tag |
|
| 158 |
+ } |
|
| 159 |
+ return nil |
|
| 160 |
+} |
|
| 161 |
+ |
|
| 162 |
+func convert_api_DeploymentTriggerImageChangeParams_To_v1_DeploymentTriggerImageChangeParams(in *newer.DeploymentTriggerImageChangeParams, out *DeploymentTriggerImageChangeParams, s conversion.Scope) error {
|
|
| 163 |
+ out.Automatic = in.Automatic |
|
| 164 |
+ out.ContainerNames = make([]string, len(in.ContainerNames)) |
|
| 165 |
+ copy(out.ContainerNames, in.ContainerNames) |
|
| 166 |
+ out.LastTriggeredImage = in.LastTriggeredImage |
|
| 167 |
+ if err := s.Convert(&in.From, &out.From, 0); err != nil {
|
|
| 168 |
+ return err |
|
| 169 |
+ } |
|
| 170 |
+ switch in.From.Kind {
|
|
| 171 |
+ case "ImageStream": |
|
| 172 |
+ out.From.Kind = "ImageStreamTag" |
|
| 173 |
+ tag := in.Tag |
|
| 174 |
+ if len(tag) == 0 {
|
|
| 175 |
+ tag = imageapi.DefaultImageTag |
|
| 176 |
+ } |
|
| 177 |
+ out.From.Name = fmt.Sprintf("%s:%s", in.From.Name, tag)
|
|
| 178 |
+ } |
|
| 179 |
+ return nil |
|
| 180 |
+} |
|
| 181 |
+ |
|
| 182 |
+func convert_v1_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in *DeploymentCauseImageTrigger, out *newer.DeploymentCauseImageTrigger, s conversion.Scope) error {
|
|
| 183 |
+ switch in.From.Kind {
|
|
| 184 |
+ case "DockerImage": |
|
| 185 |
+ ref, err := imageapi.ParseDockerImageReference(in.From.Name) |
|
| 186 |
+ if err != nil {
|
|
| 187 |
+ return err |
|
| 188 |
+ } |
|
| 189 |
+ out.Tag = ref.Tag |
|
| 190 |
+ ref.Tag, ref.ID = "", "" |
|
| 191 |
+ out.RepositoryName = ref.Minimal().String() |
|
| 192 |
+ } |
|
| 193 |
+ return nil |
|
| 194 |
+} |
|
| 195 |
+ |
|
| 196 |
+func convert_api_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger(in *newer.DeploymentCauseImageTrigger, out *DeploymentCauseImageTrigger, s conversion.Scope) error {
|
|
| 197 |
+ if len(in.RepositoryName) != 0 {
|
|
| 198 |
+ ref, err := imageapi.ParseDockerImageReference(in.RepositoryName) |
|
| 199 |
+ if err != nil {
|
|
| 200 |
+ return err |
|
| 201 |
+ } |
|
| 202 |
+ ref.Tag = in.Tag |
|
| 203 |
+ out.From.Kind = "DockerImage" |
|
| 204 |
+ out.From.Name = ref.String() |
|
| 205 |
+ } |
|
| 206 |
+ return nil |
|
| 207 |
+} |
|
| 208 |
+ |
|
| 13 | 209 |
func init() {
|
| 14 | 210 |
err := api.Scheme.AddDefaultingFuncs( |
| 15 | 211 |
func(obj *DeploymentTriggerImageChangeParams) {
|
| ... | ... |
@@ -23,195 +219,19 @@ func init() {
|
| 23 | 23 |
} |
| 24 | 24 |
|
| 25 | 25 |
err = api.Scheme.AddConversionFuncs( |
| 26 |
- func(in *DeploymentConfig, out *newer.DeploymentConfig, s conversion.Scope) error {
|
|
| 27 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 28 |
- return err |
|
| 29 |
- } |
|
| 30 |
- if err := s.Convert(&in.Spec, &out.Template, 0); err != nil {
|
|
| 31 |
- return err |
|
| 32 |
- } |
|
| 33 |
- if err := s.Convert(&in.Spec.Triggers, &out.Triggers, 0); err != nil {
|
|
| 34 |
- return err |
|
| 35 |
- } |
|
| 36 |
- out.LatestVersion = in.Status.LatestVersion |
|
| 37 |
- if err := s.Convert(&in.Status.Details, &out.Details, 0); err != nil {
|
|
| 38 |
- return err |
|
| 39 |
- } |
|
| 40 |
- return nil |
|
| 41 |
- }, |
|
| 42 |
- func(in *newer.DeploymentConfig, out *DeploymentConfig, s conversion.Scope) error {
|
|
| 43 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 44 |
- return err |
|
| 45 |
- } |
|
| 46 |
- if err := s.Convert(&in.Template, &out.Spec, 0); err != nil {
|
|
| 47 |
- return err |
|
| 48 |
- } |
|
| 49 |
- if err := s.Convert(&in.Triggers, &out.Spec.Triggers, 0); err != nil {
|
|
| 50 |
- return err |
|
| 51 |
- } |
|
| 52 |
- out.Status.LatestVersion = in.LatestVersion |
|
| 53 |
- if err := s.Convert(&in.Details, &out.Status.Details, 0); err != nil {
|
|
| 54 |
- return err |
|
| 55 |
- } |
|
| 56 |
- return nil |
|
| 57 |
- }, |
|
| 26 |
+ convert_v1_DeploymentConfig_To_api_DeploymentConfig, |
|
| 27 |
+ convert_api_DeploymentConfig_To_v1_DeploymentConfig, |
|
| 58 | 28 |
|
| 59 |
- func(in *DeploymentConfigSpec, out *newer.DeploymentTemplate, s conversion.Scope) error {
|
|
| 60 |
- out.ControllerTemplate.Replicas = in.Replicas |
|
| 61 |
- if in.Selector != nil {
|
|
| 62 |
- out.ControllerTemplate.Selector = make(map[string]string) |
|
| 63 |
- for k, v := range in.Selector {
|
|
| 64 |
- out.ControllerTemplate.Selector[k] = v |
|
| 65 |
- } |
|
| 66 |
- } |
|
| 67 |
- if in.Template != nil {
|
|
| 68 |
- if err := s.Convert(&in.Template, &out.ControllerTemplate.Template, 0); err != nil {
|
|
| 69 |
- return err |
|
| 70 |
- } |
|
| 71 |
- } |
|
| 72 |
- if in.TemplateRef != nil {
|
|
| 73 |
- if err := s.Convert(&in.TemplateRef, &out.ControllerTemplate.TemplateRef, 0); err != nil {
|
|
| 74 |
- return err |
|
| 75 |
- } |
|
| 76 |
- } |
|
| 77 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 78 |
- return err |
|
| 79 |
- } |
|
| 80 |
- return nil |
|
| 81 |
- }, |
|
| 82 |
- func(in *DeploymentStrategy, out *newer.DeploymentStrategy, s conversion.Scope) error {
|
|
| 83 |
- if err := s.Convert(&in.Type, &out.Type, 0); err != nil {
|
|
| 84 |
- return err |
|
| 85 |
- } |
|
| 86 |
- if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil {
|
|
| 87 |
- return err |
|
| 88 |
- } |
|
| 89 |
- if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil {
|
|
| 90 |
- return err |
|
| 91 |
- } |
|
| 92 |
- if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil {
|
|
| 93 |
- return err |
|
| 94 |
- } |
|
| 95 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 96 |
- return err |
|
| 97 |
- } |
|
| 98 |
- return nil |
|
| 99 |
- }, |
|
| 100 |
- func(in *newer.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error {
|
|
| 101 |
- if err := s.Convert(&in.Type, &out.Type, 0); err != nil {
|
|
| 102 |
- return err |
|
| 103 |
- } |
|
| 104 |
- if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil {
|
|
| 105 |
- return err |
|
| 106 |
- } |
|
| 107 |
- if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil {
|
|
| 108 |
- return err |
|
| 109 |
- } |
|
| 110 |
- if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil {
|
|
| 111 |
- return err |
|
| 112 |
- } |
|
| 113 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 114 |
- return err |
|
| 115 |
- } |
|
| 116 |
- return nil |
|
| 117 |
- }, |
|
| 118 |
- func(in *newer.DeploymentTemplate, out *DeploymentConfigSpec, s conversion.Scope) error {
|
|
| 119 |
- out.Replicas = in.ControllerTemplate.Replicas |
|
| 120 |
- if in.ControllerTemplate.Selector != nil {
|
|
| 121 |
- out.Selector = make(map[string]string) |
|
| 122 |
- for k, v := range in.ControllerTemplate.Selector {
|
|
| 123 |
- out.Selector[k] = v |
|
| 124 |
- } |
|
| 125 |
- } |
|
| 126 |
- if in.ControllerTemplate.Template != nil {
|
|
| 127 |
- if err := s.Convert(&in.ControllerTemplate.Template, &out.Template, 0); err != nil {
|
|
| 128 |
- return err |
|
| 129 |
- } |
|
| 130 |
- } |
|
| 131 |
- if in.ControllerTemplate.TemplateRef != nil {
|
|
| 132 |
- if err := s.Convert(&in.ControllerTemplate.TemplateRef, &out.TemplateRef, 0); err != nil {
|
|
| 133 |
- return err |
|
| 134 |
- } |
|
| 135 |
- } |
|
| 136 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 137 |
- return err |
|
| 138 |
- } |
|
| 139 |
- return nil |
|
| 140 |
- }, |
|
| 29 |
+ convert_v1_DeploymentConfigSpec_To_api_DeploymentTemplate, |
|
| 30 |
+ convert_v1_DeploymentStrategy_To_api_DeploymentStrategy, |
|
| 31 |
+ convert_api_DeploymentStrategy_To_v1_DeploymentStrategy, |
|
| 32 |
+ convert_api_DeploymentTemplate_To_v1_DeploymentConfigSpec, |
|
| 141 | 33 |
|
| 142 |
- func(in *DeploymentTriggerImageChangeParams, out *newer.DeploymentTriggerImageChangeParams, s conversion.Scope) error {
|
|
| 143 |
- out.Automatic = in.Automatic |
|
| 144 |
- out.ContainerNames = make([]string, len(in.ContainerNames)) |
|
| 145 |
- copy(out.ContainerNames, in.ContainerNames) |
|
| 146 |
- out.LastTriggeredImage = in.LastTriggeredImage |
|
| 147 |
- if err := s.Convert(&in.From, &out.From, 0); err != nil {
|
|
| 148 |
- return err |
|
| 149 |
- } |
|
| 150 |
- switch in.From.Kind {
|
|
| 151 |
- case "DockerImage": |
|
| 152 |
- ref, err := imageapi.ParseDockerImageReference(in.From.Name) |
|
| 153 |
- if err != nil {
|
|
| 154 |
- return err |
|
| 155 |
- } |
|
| 156 |
- out.Tag = ref.Tag |
|
| 157 |
- ref.Tag, ref.ID = "", "" |
|
| 158 |
- out.RepositoryName = ref.String() |
|
| 159 |
- case "ImageStreamTag": |
|
| 160 |
- name, tag, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 161 |
- if !ok {
|
|
| 162 |
- return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 163 |
- } |
|
| 164 |
- out.From.Kind = "ImageStream" |
|
| 165 |
- out.From.Name = name |
|
| 166 |
- out.Tag = tag |
|
| 167 |
- } |
|
| 168 |
- return nil |
|
| 169 |
- }, |
|
| 170 |
- func(in *newer.DeploymentTriggerImageChangeParams, out *DeploymentTriggerImageChangeParams, s conversion.Scope) error {
|
|
| 171 |
- out.Automatic = in.Automatic |
|
| 172 |
- out.ContainerNames = make([]string, len(in.ContainerNames)) |
|
| 173 |
- copy(out.ContainerNames, in.ContainerNames) |
|
| 174 |
- out.LastTriggeredImage = in.LastTriggeredImage |
|
| 175 |
- if err := s.Convert(&in.From, &out.From, 0); err != nil {
|
|
| 176 |
- return err |
|
| 177 |
- } |
|
| 178 |
- switch in.From.Kind {
|
|
| 179 |
- case "ImageStream": |
|
| 180 |
- out.From.Kind = "ImageStreamTag" |
|
| 181 |
- tag := in.Tag |
|
| 182 |
- if len(tag) == 0 {
|
|
| 183 |
- tag = imageapi.DefaultImageTag |
|
| 184 |
- } |
|
| 185 |
- out.From.Name = fmt.Sprintf("%s:%s", in.From.Name, tag)
|
|
| 186 |
- } |
|
| 187 |
- return nil |
|
| 188 |
- }, |
|
| 34 |
+ convert_v1_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams, |
|
| 35 |
+ convert_api_DeploymentTriggerImageChangeParams_To_v1_DeploymentTriggerImageChangeParams, |
|
| 189 | 36 |
|
| 190 |
- func(in *DeploymentCauseImageTrigger, out *newer.DeploymentCauseImageTrigger, s conversion.Scope) error {
|
|
| 191 |
- switch in.From.Kind {
|
|
| 192 |
- case "DockerImage": |
|
| 193 |
- ref, err := imageapi.ParseDockerImageReference(in.From.Name) |
|
| 194 |
- if err != nil {
|
|
| 195 |
- return err |
|
| 196 |
- } |
|
| 197 |
- out.Tag = ref.Tag |
|
| 198 |
- ref.Tag, ref.ID = "", "" |
|
| 199 |
- out.RepositoryName = ref.Minimal().String() |
|
| 200 |
- } |
|
| 201 |
- return nil |
|
| 202 |
- }, |
|
| 203 |
- func(in *newer.DeploymentCauseImageTrigger, out *DeploymentCauseImageTrigger, s conversion.Scope) error {
|
|
| 204 |
- if len(in.RepositoryName) != 0 {
|
|
| 205 |
- ref, err := imageapi.ParseDockerImageReference(in.RepositoryName) |
|
| 206 |
- if err != nil {
|
|
| 207 |
- return err |
|
| 208 |
- } |
|
| 209 |
- ref.Tag = in.Tag |
|
| 210 |
- out.From.Kind = "DockerImage" |
|
| 211 |
- out.From.Name = ref.String() |
|
| 212 |
- } |
|
| 213 |
- return nil |
|
| 214 |
- }, |
|
| 37 |
+ convert_v1_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger, |
|
| 38 |
+ convert_api_DeploymentCauseImageTrigger_To_v1_DeploymentCauseImageTrigger, |
|
| 215 | 39 |
) |
| 216 | 40 |
if err != nil {
|
| 217 | 41 |
panic(err) |
| ... | ... |
@@ -10,6 +10,201 @@ import ( |
| 10 | 10 |
imageapi "github.com/openshift/origin/pkg/image/api" |
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 |
+func convert_v1beta3_DeploymentConfig_To_api_DeploymentConfig(in *DeploymentConfig, out *newer.DeploymentConfig, s conversion.Scope) error {
|
|
| 14 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 15 |
+ return err |
|
| 16 |
+ } |
|
| 17 |
+ if err := s.Convert(&in.Spec, &out.Template, 0); err != nil {
|
|
| 18 |
+ return err |
|
| 19 |
+ } |
|
| 20 |
+ if err := s.Convert(&in.Spec.Triggers, &out.Triggers, 0); err != nil {
|
|
| 21 |
+ return err |
|
| 22 |
+ } |
|
| 23 |
+ out.LatestVersion = in.Status.LatestVersion |
|
| 24 |
+ if err := s.Convert(&in.Status.Details, &out.Details, 0); err != nil {
|
|
| 25 |
+ return err |
|
| 26 |
+ } |
|
| 27 |
+ return nil |
|
| 28 |
+} |
|
| 29 |
+ |
|
| 30 |
+func convert_api_DeploymentConfig_To_v1beta3_DeploymentConfig(in *newer.DeploymentConfig, out *DeploymentConfig, s conversion.Scope) error {
|
|
| 31 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 32 |
+ return err |
|
| 33 |
+ } |
|
| 34 |
+ if err := s.Convert(&in.Template, &out.Spec, 0); err != nil {
|
|
| 35 |
+ return err |
|
| 36 |
+ } |
|
| 37 |
+ if err := s.Convert(&in.Triggers, &out.Spec.Triggers, 0); err != nil {
|
|
| 38 |
+ return err |
|
| 39 |
+ } |
|
| 40 |
+ out.Status.LatestVersion = in.LatestVersion |
|
| 41 |
+ if err := s.Convert(&in.Details, &out.Status.Details, 0); err != nil {
|
|
| 42 |
+ return err |
|
| 43 |
+ } |
|
| 44 |
+ return nil |
|
| 45 |
+} |
|
| 46 |
+ |
|
| 47 |
+func convert_v1beta3_DeploymentConfigSpec_To_api_DeploymentTemplate(in *DeploymentConfigSpec, out *newer.DeploymentTemplate, s conversion.Scope) error {
|
|
| 48 |
+ out.ControllerTemplate.Replicas = in.Replicas |
|
| 49 |
+ if in.Selector != nil {
|
|
| 50 |
+ out.ControllerTemplate.Selector = make(map[string]string) |
|
| 51 |
+ for k, v := range in.Selector {
|
|
| 52 |
+ out.ControllerTemplate.Selector[k] = v |
|
| 53 |
+ } |
|
| 54 |
+ } |
|
| 55 |
+ if in.Template != nil {
|
|
| 56 |
+ if err := s.Convert(&in.Template, &out.ControllerTemplate.Template, 0); err != nil {
|
|
| 57 |
+ return err |
|
| 58 |
+ } |
|
| 59 |
+ } |
|
| 60 |
+ if in.TemplateRef != nil {
|
|
| 61 |
+ if err := s.Convert(&in.TemplateRef, &out.ControllerTemplate.TemplateRef, 0); err != nil {
|
|
| 62 |
+ return err |
|
| 63 |
+ } |
|
| 64 |
+ } |
|
| 65 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 66 |
+ return err |
|
| 67 |
+ } |
|
| 68 |
+ return nil |
|
| 69 |
+} |
|
| 70 |
+ |
|
| 71 |
+func convert_v1beta3_DeploymentStrategy_To_api_DeploymentStrategy(in *DeploymentStrategy, out *newer.DeploymentStrategy, s conversion.Scope) error {
|
|
| 72 |
+ if err := s.Convert(&in.Type, &out.Type, 0); err != nil {
|
|
| 73 |
+ return err |
|
| 74 |
+ } |
|
| 75 |
+ if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil {
|
|
| 76 |
+ return err |
|
| 77 |
+ } |
|
| 78 |
+ if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil {
|
|
| 79 |
+ return err |
|
| 80 |
+ } |
|
| 81 |
+ if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil {
|
|
| 82 |
+ return err |
|
| 83 |
+ } |
|
| 84 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 85 |
+ return err |
|
| 86 |
+ } |
|
| 87 |
+ return nil |
|
| 88 |
+} |
|
| 89 |
+ |
|
| 90 |
+func convert_api_DeploymentStrategy_To_v1beta3_DeploymentStrategy(in *newer.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error {
|
|
| 91 |
+ if err := s.Convert(&in.Type, &out.Type, 0); err != nil {
|
|
| 92 |
+ return err |
|
| 93 |
+ } |
|
| 94 |
+ if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil {
|
|
| 95 |
+ return err |
|
| 96 |
+ } |
|
| 97 |
+ if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil {
|
|
| 98 |
+ return err |
|
| 99 |
+ } |
|
| 100 |
+ if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil {
|
|
| 101 |
+ return err |
|
| 102 |
+ } |
|
| 103 |
+ if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 104 |
+ return err |
|
| 105 |
+ } |
|
| 106 |
+ return nil |
|
| 107 |
+} |
|
| 108 |
+ |
|
| 109 |
+func convert_api_DeploymentTemplate_To_v1beta3_DeploymentConfigSpec(in *newer.DeploymentTemplate, out *DeploymentConfigSpec, s conversion.Scope) error {
|
|
| 110 |
+ out.Replicas = in.ControllerTemplate.Replicas |
|
| 111 |
+ if in.ControllerTemplate.Selector != nil {
|
|
| 112 |
+ out.Selector = make(map[string]string) |
|
| 113 |
+ for k, v := range in.ControllerTemplate.Selector {
|
|
| 114 |
+ out.Selector[k] = v |
|
| 115 |
+ } |
|
| 116 |
+ } |
|
| 117 |
+ if in.ControllerTemplate.Template != nil {
|
|
| 118 |
+ if err := s.Convert(&in.ControllerTemplate.Template, &out.Template, 0); err != nil {
|
|
| 119 |
+ return err |
|
| 120 |
+ } |
|
| 121 |
+ } |
|
| 122 |
+ if in.ControllerTemplate.TemplateRef != nil {
|
|
| 123 |
+ if err := s.Convert(&in.ControllerTemplate.TemplateRef, &out.TemplateRef, 0); err != nil {
|
|
| 124 |
+ return err |
|
| 125 |
+ } |
|
| 126 |
+ } |
|
| 127 |
+ if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 128 |
+ return err |
|
| 129 |
+ } |
|
| 130 |
+ return nil |
|
| 131 |
+} |
|
| 132 |
+ |
|
| 133 |
+func convert_v1beta3_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams(in *DeploymentTriggerImageChangeParams, out *newer.DeploymentTriggerImageChangeParams, s conversion.Scope) error {
|
|
| 134 |
+ out.Automatic = in.Automatic |
|
| 135 |
+ out.ContainerNames = make([]string, len(in.ContainerNames)) |
|
| 136 |
+ copy(out.ContainerNames, in.ContainerNames) |
|
| 137 |
+ out.LastTriggeredImage = in.LastTriggeredImage |
|
| 138 |
+ if err := s.Convert(&in.From, &out.From, 0); err != nil {
|
|
| 139 |
+ return err |
|
| 140 |
+ } |
|
| 141 |
+ switch in.From.Kind {
|
|
| 142 |
+ case "DockerImage": |
|
| 143 |
+ ref, err := imageapi.ParseDockerImageReference(in.From.Name) |
|
| 144 |
+ if err != nil {
|
|
| 145 |
+ return err |
|
| 146 |
+ } |
|
| 147 |
+ out.Tag = ref.Tag |
|
| 148 |
+ ref.Tag, ref.ID = "", "" |
|
| 149 |
+ out.RepositoryName = ref.String() |
|
| 150 |
+ case "ImageStreamTag": |
|
| 151 |
+ name, tag, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 152 |
+ if !ok {
|
|
| 153 |
+ return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 154 |
+ } |
|
| 155 |
+ out.From.Kind = "ImageStream" |
|
| 156 |
+ out.From.Name = name |
|
| 157 |
+ out.Tag = tag |
|
| 158 |
+ } |
|
| 159 |
+ return nil |
|
| 160 |
+} |
|
| 161 |
+ |
|
| 162 |
+func convert_api_DeploymentTriggerImageChangeParams_To_v1beta3_DeploymentTriggerImageChangeParams(in *newer.DeploymentTriggerImageChangeParams, out *DeploymentTriggerImageChangeParams, s conversion.Scope) error {
|
|
| 163 |
+ out.Automatic = in.Automatic |
|
| 164 |
+ out.ContainerNames = make([]string, len(in.ContainerNames)) |
|
| 165 |
+ copy(out.ContainerNames, in.ContainerNames) |
|
| 166 |
+ out.LastTriggeredImage = in.LastTriggeredImage |
|
| 167 |
+ if err := s.Convert(&in.From, &out.From, 0); err != nil {
|
|
| 168 |
+ return err |
|
| 169 |
+ } |
|
| 170 |
+ switch in.From.Kind {
|
|
| 171 |
+ case "ImageStream": |
|
| 172 |
+ out.From.Kind = "ImageStreamTag" |
|
| 173 |
+ tag := in.Tag |
|
| 174 |
+ if len(tag) == 0 {
|
|
| 175 |
+ tag = imageapi.DefaultImageTag |
|
| 176 |
+ } |
|
| 177 |
+ out.From.Name = fmt.Sprintf("%s:%s", in.From.Name, tag)
|
|
| 178 |
+ } |
|
| 179 |
+ return nil |
|
| 180 |
+} |
|
| 181 |
+ |
|
| 182 |
+func convert_v1beta3_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger(in *DeploymentCauseImageTrigger, out *newer.DeploymentCauseImageTrigger, s conversion.Scope) error {
|
|
| 183 |
+ switch in.From.Kind {
|
|
| 184 |
+ case "DockerImage": |
|
| 185 |
+ ref, err := imageapi.ParseDockerImageReference(in.From.Name) |
|
| 186 |
+ if err != nil {
|
|
| 187 |
+ return err |
|
| 188 |
+ } |
|
| 189 |
+ out.Tag = ref.Tag |
|
| 190 |
+ ref.Tag, ref.ID = "", "" |
|
| 191 |
+ out.RepositoryName = ref.Minimal().String() |
|
| 192 |
+ } |
|
| 193 |
+ return nil |
|
| 194 |
+} |
|
| 195 |
+ |
|
| 196 |
+func convert_api_DeploymentCauseImageTrigger_To_v1beta3_DeploymentCauseImageTrigger(in *newer.DeploymentCauseImageTrigger, out *DeploymentCauseImageTrigger, s conversion.Scope) error {
|
|
| 197 |
+ if len(in.RepositoryName) != 0 {
|
|
| 198 |
+ ref, err := imageapi.ParseDockerImageReference(in.RepositoryName) |
|
| 199 |
+ if err != nil {
|
|
| 200 |
+ return err |
|
| 201 |
+ } |
|
| 202 |
+ ref.Tag = in.Tag |
|
| 203 |
+ out.From.Kind = "DockerImage" |
|
| 204 |
+ out.From.Name = ref.String() |
|
| 205 |
+ } |
|
| 206 |
+ return nil |
|
| 207 |
+} |
|
| 13 | 208 |
func init() {
|
| 14 | 209 |
err := api.Scheme.AddDefaultingFuncs( |
| 15 | 210 |
func(obj *DeploymentTriggerImageChangeParams) {
|
| ... | ... |
@@ -23,195 +218,16 @@ func init() {
|
| 23 | 23 |
} |
| 24 | 24 |
|
| 25 | 25 |
err = api.Scheme.AddConversionFuncs( |
| 26 |
- func(in *DeploymentConfig, out *newer.DeploymentConfig, s conversion.Scope) error {
|
|
| 27 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 28 |
- return err |
|
| 29 |
- } |
|
| 30 |
- if err := s.Convert(&in.Spec, &out.Template, 0); err != nil {
|
|
| 31 |
- return err |
|
| 32 |
- } |
|
| 33 |
- if err := s.Convert(&in.Spec.Triggers, &out.Triggers, 0); err != nil {
|
|
| 34 |
- return err |
|
| 35 |
- } |
|
| 36 |
- out.LatestVersion = in.Status.LatestVersion |
|
| 37 |
- if err := s.Convert(&in.Status.Details, &out.Details, 0); err != nil {
|
|
| 38 |
- return err |
|
| 39 |
- } |
|
| 40 |
- return nil |
|
| 41 |
- }, |
|
| 42 |
- func(in *newer.DeploymentConfig, out *DeploymentConfig, s conversion.Scope) error {
|
|
| 43 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 44 |
- return err |
|
| 45 |
- } |
|
| 46 |
- if err := s.Convert(&in.Template, &out.Spec, 0); err != nil {
|
|
| 47 |
- return err |
|
| 48 |
- } |
|
| 49 |
- if err := s.Convert(&in.Triggers, &out.Spec.Triggers, 0); err != nil {
|
|
| 50 |
- return err |
|
| 51 |
- } |
|
| 52 |
- out.Status.LatestVersion = in.LatestVersion |
|
| 53 |
- if err := s.Convert(&in.Details, &out.Status.Details, 0); err != nil {
|
|
| 54 |
- return err |
|
| 55 |
- } |
|
| 56 |
- return nil |
|
| 57 |
- }, |
|
| 58 |
- |
|
| 59 |
- func(in *DeploymentConfigSpec, out *newer.DeploymentTemplate, s conversion.Scope) error {
|
|
| 60 |
- out.ControllerTemplate.Replicas = in.Replicas |
|
| 61 |
- if in.Selector != nil {
|
|
| 62 |
- out.ControllerTemplate.Selector = make(map[string]string) |
|
| 63 |
- for k, v := range in.Selector {
|
|
| 64 |
- out.ControllerTemplate.Selector[k] = v |
|
| 65 |
- } |
|
| 66 |
- } |
|
| 67 |
- if in.Template != nil {
|
|
| 68 |
- if err := s.Convert(&in.Template, &out.ControllerTemplate.Template, 0); err != nil {
|
|
| 69 |
- return err |
|
| 70 |
- } |
|
| 71 |
- } |
|
| 72 |
- if in.TemplateRef != nil {
|
|
| 73 |
- if err := s.Convert(&in.TemplateRef, &out.ControllerTemplate.TemplateRef, 0); err != nil {
|
|
| 74 |
- return err |
|
| 75 |
- } |
|
| 76 |
- } |
|
| 77 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 78 |
- return err |
|
| 79 |
- } |
|
| 80 |
- return nil |
|
| 81 |
- }, |
|
| 82 |
- func(in *DeploymentStrategy, out *newer.DeploymentStrategy, s conversion.Scope) error {
|
|
| 83 |
- if err := s.Convert(&in.Type, &out.Type, 0); err != nil {
|
|
| 84 |
- return err |
|
| 85 |
- } |
|
| 86 |
- if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil {
|
|
| 87 |
- return err |
|
| 88 |
- } |
|
| 89 |
- if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil {
|
|
| 90 |
- return err |
|
| 91 |
- } |
|
| 92 |
- if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil {
|
|
| 93 |
- return err |
|
| 94 |
- } |
|
| 95 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 96 |
- return err |
|
| 97 |
- } |
|
| 98 |
- return nil |
|
| 99 |
- }, |
|
| 100 |
- func(in *newer.DeploymentStrategy, out *DeploymentStrategy, s conversion.Scope) error {
|
|
| 101 |
- if err := s.Convert(&in.Type, &out.Type, 0); err != nil {
|
|
| 102 |
- return err |
|
| 103 |
- } |
|
| 104 |
- if err := s.Convert(&in.CustomParams, &out.CustomParams, 0); err != nil {
|
|
| 105 |
- return err |
|
| 106 |
- } |
|
| 107 |
- if err := s.Convert(&in.RecreateParams, &out.RecreateParams, 0); err != nil {
|
|
| 108 |
- return err |
|
| 109 |
- } |
|
| 110 |
- if err := s.Convert(&in.RollingParams, &out.RollingParams, 0); err != nil {
|
|
| 111 |
- return err |
|
| 112 |
- } |
|
| 113 |
- if err := s.Convert(&in.Resources, &out.Resources, 0); err != nil {
|
|
| 114 |
- return err |
|
| 115 |
- } |
|
| 116 |
- return nil |
|
| 117 |
- }, |
|
| 118 |
- func(in *newer.DeploymentTemplate, out *DeploymentConfigSpec, s conversion.Scope) error {
|
|
| 119 |
- out.Replicas = in.ControllerTemplate.Replicas |
|
| 120 |
- if in.ControllerTemplate.Selector != nil {
|
|
| 121 |
- out.Selector = make(map[string]string) |
|
| 122 |
- for k, v := range in.ControllerTemplate.Selector {
|
|
| 123 |
- out.Selector[k] = v |
|
| 124 |
- } |
|
| 125 |
- } |
|
| 126 |
- if in.ControllerTemplate.Template != nil {
|
|
| 127 |
- if err := s.Convert(&in.ControllerTemplate.Template, &out.Template, 0); err != nil {
|
|
| 128 |
- return err |
|
| 129 |
- } |
|
| 130 |
- } |
|
| 131 |
- if in.ControllerTemplate.TemplateRef != nil {
|
|
| 132 |
- if err := s.Convert(&in.ControllerTemplate.TemplateRef, &out.TemplateRef, 0); err != nil {
|
|
| 133 |
- return err |
|
| 134 |
- } |
|
| 135 |
- } |
|
| 136 |
- if err := s.Convert(&in.Strategy, &out.Strategy, 0); err != nil {
|
|
| 137 |
- return err |
|
| 138 |
- } |
|
| 139 |
- return nil |
|
| 140 |
- }, |
|
| 141 |
- |
|
| 142 |
- func(in *DeploymentTriggerImageChangeParams, out *newer.DeploymentTriggerImageChangeParams, s conversion.Scope) error {
|
|
| 143 |
- out.Automatic = in.Automatic |
|
| 144 |
- out.ContainerNames = make([]string, len(in.ContainerNames)) |
|
| 145 |
- copy(out.ContainerNames, in.ContainerNames) |
|
| 146 |
- out.LastTriggeredImage = in.LastTriggeredImage |
|
| 147 |
- if err := s.Convert(&in.From, &out.From, 0); err != nil {
|
|
| 148 |
- return err |
|
| 149 |
- } |
|
| 150 |
- switch in.From.Kind {
|
|
| 151 |
- case "DockerImage": |
|
| 152 |
- ref, err := imageapi.ParseDockerImageReference(in.From.Name) |
|
| 153 |
- if err != nil {
|
|
| 154 |
- return err |
|
| 155 |
- } |
|
| 156 |
- out.Tag = ref.Tag |
|
| 157 |
- ref.Tag, ref.ID = "", "" |
|
| 158 |
- out.RepositoryName = ref.String() |
|
| 159 |
- case "ImageStreamTag": |
|
| 160 |
- name, tag, ok := imageapi.SplitImageStreamTag(in.From.Name) |
|
| 161 |
- if !ok {
|
|
| 162 |
- return fmt.Errorf("ImageStreamTag object references must be in the form <name>:<tag>: %s", in.From.Name)
|
|
| 163 |
- } |
|
| 164 |
- out.From.Kind = "ImageStream" |
|
| 165 |
- out.From.Name = name |
|
| 166 |
- out.Tag = tag |
|
| 167 |
- } |
|
| 168 |
- return nil |
|
| 169 |
- }, |
|
| 170 |
- func(in *newer.DeploymentTriggerImageChangeParams, out *DeploymentTriggerImageChangeParams, s conversion.Scope) error {
|
|
| 171 |
- out.Automatic = in.Automatic |
|
| 172 |
- out.ContainerNames = make([]string, len(in.ContainerNames)) |
|
| 173 |
- copy(out.ContainerNames, in.ContainerNames) |
|
| 174 |
- out.LastTriggeredImage = in.LastTriggeredImage |
|
| 175 |
- if err := s.Convert(&in.From, &out.From, 0); err != nil {
|
|
| 176 |
- return err |
|
| 177 |
- } |
|
| 178 |
- switch in.From.Kind {
|
|
| 179 |
- case "ImageStream": |
|
| 180 |
- out.From.Kind = "ImageStreamTag" |
|
| 181 |
- tag := in.Tag |
|
| 182 |
- if len(tag) == 0 {
|
|
| 183 |
- tag = imageapi.DefaultImageTag |
|
| 184 |
- } |
|
| 185 |
- out.From.Name = fmt.Sprintf("%s:%s", in.From.Name, tag)
|
|
| 186 |
- } |
|
| 187 |
- return nil |
|
| 188 |
- }, |
|
| 189 |
- |
|
| 190 |
- func(in *DeploymentCauseImageTrigger, out *newer.DeploymentCauseImageTrigger, s conversion.Scope) error {
|
|
| 191 |
- switch in.From.Kind {
|
|
| 192 |
- case "DockerImage": |
|
| 193 |
- ref, err := imageapi.ParseDockerImageReference(in.From.Name) |
|
| 194 |
- if err != nil {
|
|
| 195 |
- return err |
|
| 196 |
- } |
|
| 197 |
- out.Tag = ref.Tag |
|
| 198 |
- ref.Tag, ref.ID = "", "" |
|
| 199 |
- out.RepositoryName = ref.Minimal().String() |
|
| 200 |
- } |
|
| 201 |
- return nil |
|
| 202 |
- }, |
|
| 203 |
- func(in *newer.DeploymentCauseImageTrigger, out *DeploymentCauseImageTrigger, s conversion.Scope) error {
|
|
| 204 |
- if len(in.RepositoryName) != 0 {
|
|
| 205 |
- ref, err := imageapi.ParseDockerImageReference(in.RepositoryName) |
|
| 206 |
- if err != nil {
|
|
| 207 |
- return err |
|
| 208 |
- } |
|
| 209 |
- ref.Tag = in.Tag |
|
| 210 |
- out.From.Kind = "DockerImage" |
|
| 211 |
- out.From.Name = ref.String() |
|
| 212 |
- } |
|
| 213 |
- return nil |
|
| 214 |
- }, |
|
| 26 |
+ convert_v1beta3_DeploymentConfig_To_api_DeploymentConfig, |
|
| 27 |
+ convert_api_DeploymentConfig_To_v1beta3_DeploymentConfig, |
|
| 28 |
+ convert_v1beta3_DeploymentConfigSpec_To_api_DeploymentTemplate, |
|
| 29 |
+ convert_v1beta3_DeploymentStrategy_To_api_DeploymentStrategy, |
|
| 30 |
+ convert_api_DeploymentStrategy_To_v1beta3_DeploymentStrategy, |
|
| 31 |
+ convert_api_DeploymentTemplate_To_v1beta3_DeploymentConfigSpec, |
|
| 32 |
+ convert_v1beta3_DeploymentTriggerImageChangeParams_To_api_DeploymentTriggerImageChangeParams, |
|
| 33 |
+ convert_api_DeploymentTriggerImageChangeParams_To_v1beta3_DeploymentTriggerImageChangeParams, |
|
| 34 |
+ convert_v1beta3_DeploymentCauseImageTrigger_To_api_DeploymentCauseImageTrigger, |
|
| 35 |
+ convert_api_DeploymentCauseImageTrigger_To_v1beta3_DeploymentCauseImageTrigger, |
|
| 215 | 36 |
) |
| 216 | 37 |
if err != nil {
|
| 217 | 38 |
panic(err) |
| ... | ... |
@@ -10,60 +10,93 @@ import ( |
| 10 | 10 |
newer "github.com/openshift/origin/pkg/image/api" |
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 |
-func init() {
|
|
| 14 |
- err := kapi.Scheme.AddConversionFuncs( |
|
| 15 |
- // The docker metadata must be cast to a version |
|
| 16 |
- func(in *newer.Image, out *Image, s conversion.Scope) error {
|
|
| 17 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 18 |
- return err |
|
| 19 |
- } |
|
| 13 |
+// The docker metadata must be cast to a version |
|
| 14 |
+func convert_api_Image_To_v1_Image(in *newer.Image, out *Image, s conversion.Scope) error {
|
|
| 15 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 16 |
+ return err |
|
| 17 |
+ } |
|
| 20 | 18 |
|
| 21 |
- out.DockerImageReference = in.DockerImageReference |
|
| 22 |
- out.DockerImageManifest = in.DockerImageManifest |
|
| 19 |
+ out.DockerImageReference = in.DockerImageReference |
|
| 20 |
+ out.DockerImageManifest = in.DockerImageManifest |
|
| 23 | 21 |
|
| 24 |
- version := in.DockerImageMetadataVersion |
|
| 25 |
- if len(version) == 0 {
|
|
| 26 |
- version = "1.0" |
|
| 27 |
- } |
|
| 28 |
- data, err := kapi.Scheme.EncodeToVersion(&in.DockerImageMetadata, version) |
|
| 29 |
- if err != nil {
|
|
| 30 |
- return err |
|
| 31 |
- } |
|
| 32 |
- out.DockerImageMetadata.RawJSON = data |
|
| 33 |
- out.DockerImageMetadataVersion = version |
|
| 22 |
+ version := in.DockerImageMetadataVersion |
|
| 23 |
+ if len(version) == 0 {
|
|
| 24 |
+ version = "1.0" |
|
| 25 |
+ } |
|
| 26 |
+ data, err := kapi.Scheme.EncodeToVersion(&in.DockerImageMetadata, version) |
|
| 27 |
+ if err != nil {
|
|
| 28 |
+ return err |
|
| 29 |
+ } |
|
| 30 |
+ out.DockerImageMetadata.RawJSON = data |
|
| 31 |
+ out.DockerImageMetadataVersion = version |
|
| 34 | 32 |
|
| 35 |
- return nil |
|
| 36 |
- }, |
|
| 37 |
- func(in *Image, out *newer.Image, s conversion.Scope) error {
|
|
| 38 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 39 |
- return err |
|
| 40 |
- } |
|
| 33 |
+ return nil |
|
| 34 |
+} |
|
| 41 | 35 |
|
| 42 |
- out.DockerImageReference = in.DockerImageReference |
|
| 43 |
- out.DockerImageManifest = in.DockerImageManifest |
|
| 36 |
+func convert_v1_Image_To_api_Image(in *Image, out *newer.Image, s conversion.Scope) error {
|
|
| 37 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 38 |
+ return err |
|
| 39 |
+ } |
|
| 44 | 40 |
|
| 45 |
- version := in.DockerImageMetadataVersion |
|
| 46 |
- if len(version) == 0 {
|
|
| 47 |
- version = "1.0" |
|
| 48 |
- } |
|
| 49 |
- if len(in.DockerImageMetadata.RawJSON) > 0 {
|
|
| 50 |
- // TODO: add a way to default the expected kind and version of an object if not set |
|
| 51 |
- obj, err := kapi.Scheme.New(version, "DockerImage") |
|
| 52 |
- if err != nil {
|
|
| 53 |
- return err |
|
| 54 |
- } |
|
| 55 |
- if err := kapi.Scheme.DecodeInto(in.DockerImageMetadata.RawJSON, obj); err != nil {
|
|
| 56 |
- return err |
|
| 57 |
- } |
|
| 58 |
- if err := s.Convert(obj, &out.DockerImageMetadata, 0); err != nil {
|
|
| 59 |
- return err |
|
| 60 |
- } |
|
| 61 |
- } |
|
| 62 |
- out.DockerImageMetadataVersion = version |
|
| 41 |
+ out.DockerImageReference = in.DockerImageReference |
|
| 42 |
+ out.DockerImageManifest = in.DockerImageManifest |
|
| 63 | 43 |
|
| 64 |
- return nil |
|
| 65 |
- }, |
|
| 44 |
+ version := in.DockerImageMetadataVersion |
|
| 45 |
+ if len(version) == 0 {
|
|
| 46 |
+ version = "1.0" |
|
| 47 |
+ } |
|
| 48 |
+ if len(in.DockerImageMetadata.RawJSON) > 0 {
|
|
| 49 |
+ // TODO: add a way to default the expected kind and version of an object if not set |
|
| 50 |
+ obj, err := kapi.Scheme.New(version, "DockerImage") |
|
| 51 |
+ if err != nil {
|
|
| 52 |
+ return err |
|
| 53 |
+ } |
|
| 54 |
+ if err := kapi.Scheme.DecodeInto(in.DockerImageMetadata.RawJSON, obj); err != nil {
|
|
| 55 |
+ return err |
|
| 56 |
+ } |
|
| 57 |
+ if err := s.Convert(obj, &out.DockerImageMetadata, 0); err != nil {
|
|
| 58 |
+ return err |
|
| 59 |
+ } |
|
| 60 |
+ } |
|
| 61 |
+ out.DockerImageMetadataVersion = version |
|
| 62 |
+ |
|
| 63 |
+ return nil |
|
| 64 |
+} |
|
| 65 |
+ |
|
| 66 |
+func convert_v1_ImageStreamSpec_To_api_ImageStreamSpec(in *ImageStreamSpec, out *newer.ImageStreamSpec, s conversion.Scope) error {
|
|
| 67 |
+ out.DockerImageRepository = in.DockerImageRepository |
|
| 68 |
+ out.Tags = make(map[string]newer.TagReference) |
|
| 69 |
+ return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 70 |
+} |
|
| 71 |
+ |
|
| 72 |
+func convert_api_ImageStreamSpec_To_v1_ImageStreamSpec(in *newer.ImageStreamSpec, out *ImageStreamSpec, s conversion.Scope) error {
|
|
| 73 |
+ out.DockerImageRepository = in.DockerImageRepository |
|
| 74 |
+ out.Tags = make([]NamedTagReference, 0, 0) |
|
| 75 |
+ return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 76 |
+} |
|
| 77 |
+ |
|
| 78 |
+func convert_v1_ImageStreamStatus_To_api_ImageStreamStatus(in *ImageStreamStatus, out *newer.ImageStreamStatus, s conversion.Scope) error {
|
|
| 79 |
+ out.DockerImageRepository = in.DockerImageRepository |
|
| 80 |
+ out.Tags = make(map[string]newer.TagEventList) |
|
| 81 |
+ return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 82 |
+} |
|
| 83 |
+ |
|
| 84 |
+func convert_api_ImageStreamStatus_To_v1_ImageStreamStatus(in *newer.ImageStreamStatus, out *ImageStreamStatus, s conversion.Scope) error {
|
|
| 85 |
+ out.DockerImageRepository = in.DockerImageRepository |
|
| 86 |
+ out.Tags = make([]NamedTagEventList, 0, 0) |
|
| 87 |
+ return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 88 |
+} |
|
| 66 | 89 |
|
| 90 |
+func convert_api_ImageStreamMapping_To_v1_ImageStreamMapping(in *newer.ImageStreamMapping, out *ImageStreamMapping, s conversion.Scope) error {
|
|
| 91 |
+ return s.DefaultConvert(in, out, conversion.DestFromSource) |
|
| 92 |
+} |
|
| 93 |
+ |
|
| 94 |
+func convert_v1_ImageStreamMapping_To_api_ImageStreamMapping(in *ImageStreamMapping, out *newer.ImageStreamMapping, s conversion.Scope) error {
|
|
| 95 |
+ return s.DefaultConvert(in, out, conversion.SourceToDest) |
|
| 96 |
+} |
|
| 97 |
+ |
|
| 98 |
+func init() {
|
|
| 99 |
+ err := kapi.Scheme.AddConversionFuncs( |
|
| 67 | 100 |
func(in *[]NamedTagEventList, out *map[string]newer.TagEventList, s conversion.Scope) error {
|
| 68 | 101 |
for _, curr := range *in {
|
| 69 | 102 |
newTagEventList := newer.TagEventList{}
|
| ... | ... |
@@ -127,32 +160,14 @@ func init() {
|
| 127 | 127 |
return nil |
| 128 | 128 |
}, |
| 129 | 129 |
|
| 130 |
- func(in *ImageStreamSpec, out *newer.ImageStreamSpec, s conversion.Scope) error {
|
|
| 131 |
- out.DockerImageRepository = in.DockerImageRepository |
|
| 132 |
- out.Tags = make(map[string]newer.TagReference) |
|
| 133 |
- return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 134 |
- }, |
|
| 135 |
- func(in *newer.ImageStreamSpec, out *ImageStreamSpec, s conversion.Scope) error {
|
|
| 136 |
- out.DockerImageRepository = in.DockerImageRepository |
|
| 137 |
- out.Tags = make([]NamedTagReference, 0, 0) |
|
| 138 |
- return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 139 |
- }, |
|
| 140 |
- func(in *ImageStreamStatus, out *newer.ImageStreamStatus, s conversion.Scope) error {
|
|
| 141 |
- out.DockerImageRepository = in.DockerImageRepository |
|
| 142 |
- out.Tags = make(map[string]newer.TagEventList) |
|
| 143 |
- return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 144 |
- }, |
|
| 145 |
- func(in *newer.ImageStreamStatus, out *ImageStreamStatus, s conversion.Scope) error {
|
|
| 146 |
- out.DockerImageRepository = in.DockerImageRepository |
|
| 147 |
- out.Tags = make([]NamedTagEventList, 0, 0) |
|
| 148 |
- return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 149 |
- }, |
|
| 150 |
- func(in *newer.ImageStreamMapping, out *ImageStreamMapping, s conversion.Scope) error {
|
|
| 151 |
- return s.DefaultConvert(in, out, conversion.DestFromSource) |
|
| 152 |
- }, |
|
| 153 |
- func(in *ImageStreamMapping, out *newer.ImageStreamMapping, s conversion.Scope) error {
|
|
| 154 |
- return s.DefaultConvert(in, out, conversion.SourceToDest) |
|
| 155 |
- }, |
|
| 130 |
+ convert_api_Image_To_v1_Image, |
|
| 131 |
+ convert_v1_Image_To_api_Image, |
|
| 132 |
+ convert_v1_ImageStreamSpec_To_api_ImageStreamSpec, |
|
| 133 |
+ convert_api_ImageStreamSpec_To_v1_ImageStreamSpec, |
|
| 134 |
+ convert_v1_ImageStreamStatus_To_api_ImageStreamStatus, |
|
| 135 |
+ convert_api_ImageStreamStatus_To_v1_ImageStreamStatus, |
|
| 136 |
+ convert_api_ImageStreamMapping_To_v1_ImageStreamMapping, |
|
| 137 |
+ convert_v1_ImageStreamMapping_To_api_ImageStreamMapping, |
|
| 156 | 138 |
) |
| 157 | 139 |
if err != nil {
|
| 158 | 140 |
// If one of the conversion functions is malformed, detect it immediately. |
| ... | ... |
@@ -10,60 +10,178 @@ import ( |
| 10 | 10 |
newer "github.com/openshift/origin/pkg/image/api" |
| 11 | 11 |
) |
| 12 | 12 |
|
| 13 |
-func init() {
|
|
| 14 |
- err := kapi.Scheme.AddConversionFuncs( |
|
| 15 |
- // The docker metadata must be cast to a version |
|
| 16 |
- func(in *newer.Image, out *Image, s conversion.Scope) error {
|
|
| 17 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 18 |
- return err |
|
| 19 |
- } |
|
| 13 |
+// The docker metadata must be cast to a version |
|
| 14 |
+func convert_api_Image_To_v1beta3_Image(in *newer.Image, out *Image, s conversion.Scope) error {
|
|
| 15 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 16 |
+ return err |
|
| 17 |
+ } |
|
| 20 | 18 |
|
| 21 |
- out.DockerImageReference = in.DockerImageReference |
|
| 22 |
- out.DockerImageManifest = in.DockerImageManifest |
|
| 19 |
+ out.DockerImageReference = in.DockerImageReference |
|
| 20 |
+ out.DockerImageManifest = in.DockerImageManifest |
|
| 23 | 21 |
|
| 24 |
- version := in.DockerImageMetadataVersion |
|
| 25 |
- if len(version) == 0 {
|
|
| 26 |
- version = "1.0" |
|
| 27 |
- } |
|
| 28 |
- data, err := kapi.Scheme.EncodeToVersion(&in.DockerImageMetadata, version) |
|
| 29 |
- if err != nil {
|
|
| 30 |
- return err |
|
| 31 |
- } |
|
| 32 |
- out.DockerImageMetadata.RawJSON = data |
|
| 33 |
- out.DockerImageMetadataVersion = version |
|
| 22 |
+ version := in.DockerImageMetadataVersion |
|
| 23 |
+ if len(version) == 0 {
|
|
| 24 |
+ version = "1.0" |
|
| 25 |
+ } |
|
| 26 |
+ data, err := kapi.Scheme.EncodeToVersion(&in.DockerImageMetadata, version) |
|
| 27 |
+ if err != nil {
|
|
| 28 |
+ return err |
|
| 29 |
+ } |
|
| 30 |
+ out.DockerImageMetadata.RawJSON = data |
|
| 31 |
+ out.DockerImageMetadataVersion = version |
|
| 34 | 32 |
|
| 35 |
- return nil |
|
| 36 |
- }, |
|
| 37 |
- func(in *Image, out *newer.Image, s conversion.Scope) error {
|
|
| 38 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 39 |
- return err |
|
| 40 |
- } |
|
| 33 |
+ return nil |
|
| 34 |
+} |
|
| 41 | 35 |
|
| 42 |
- out.DockerImageReference = in.DockerImageReference |
|
| 43 |
- out.DockerImageManifest = in.DockerImageManifest |
|
| 36 |
+func convert_v1beta3_Image_To_api_Image(in *Image, out *newer.Image, s conversion.Scope) error {
|
|
| 37 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 38 |
+ return err |
|
| 39 |
+ } |
|
| 44 | 40 |
|
| 45 |
- version := in.DockerImageMetadataVersion |
|
| 46 |
- if len(version) == 0 {
|
|
| 47 |
- version = "1.0" |
|
| 48 |
- } |
|
| 49 |
- if len(in.DockerImageMetadata.RawJSON) > 0 {
|
|
| 50 |
- // TODO: add a way to default the expected kind and version of an object if not set |
|
| 51 |
- obj, err := kapi.Scheme.New(version, "DockerImage") |
|
| 52 |
- if err != nil {
|
|
| 53 |
- return err |
|
| 54 |
- } |
|
| 55 |
- if err := kapi.Scheme.DecodeInto(in.DockerImageMetadata.RawJSON, obj); err != nil {
|
|
| 56 |
- return err |
|
| 57 |
- } |
|
| 58 |
- if err := s.Convert(obj, &out.DockerImageMetadata, 0); err != nil {
|
|
| 59 |
- return err |
|
| 60 |
- } |
|
| 61 |
- } |
|
| 62 |
- out.DockerImageMetadataVersion = version |
|
| 41 |
+ out.DockerImageReference = in.DockerImageReference |
|
| 42 |
+ out.DockerImageManifest = in.DockerImageManifest |
|
| 63 | 43 |
|
| 64 |
- return nil |
|
| 65 |
- }, |
|
| 44 |
+ version := in.DockerImageMetadataVersion |
|
| 45 |
+ if len(version) == 0 {
|
|
| 46 |
+ version = "1.0" |
|
| 47 |
+ } |
|
| 48 |
+ if len(in.DockerImageMetadata.RawJSON) > 0 {
|
|
| 49 |
+ // TODO: add a way to default the expected kind and version of an object if not set |
|
| 50 |
+ obj, err := kapi.Scheme.New(version, "DockerImage") |
|
| 51 |
+ if err != nil {
|
|
| 52 |
+ return err |
|
| 53 |
+ } |
|
| 54 |
+ if err := kapi.Scheme.DecodeInto(in.DockerImageMetadata.RawJSON, obj); err != nil {
|
|
| 55 |
+ return err |
|
| 56 |
+ } |
|
| 57 |
+ if err := s.Convert(obj, &out.DockerImageMetadata, 0); err != nil {
|
|
| 58 |
+ return err |
|
| 59 |
+ } |
|
| 60 |
+ } |
|
| 61 |
+ out.DockerImageMetadataVersion = version |
|
| 62 |
+ |
|
| 63 |
+ return nil |
|
| 64 |
+} |
|
| 65 |
+ |
|
| 66 |
+func convert_v1beta3_ImageStreamSpec_To_api_ImageStreamSpec(in *ImageStreamSpec, out *newer.ImageStreamSpec, s conversion.Scope) error {
|
|
| 67 |
+ out.DockerImageRepository = in.DockerImageRepository |
|
| 68 |
+ out.Tags = make(map[string]newer.TagReference) |
|
| 69 |
+ return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 70 |
+} |
|
| 71 |
+ |
|
| 72 |
+func convert_api_ImageStreamSpec_To_v1beta3_ImageStreamSpec(in *newer.ImageStreamSpec, out *ImageStreamSpec, s conversion.Scope) error {
|
|
| 73 |
+ out.DockerImageRepository = in.DockerImageRepository |
|
| 74 |
+ out.Tags = make([]NamedTagReference, 0, 0) |
|
| 75 |
+ return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 76 |
+} |
|
| 77 |
+ |
|
| 78 |
+func convert_v1beta3_ImageStreamStatus_To_api_ImageStreamStatus(in *ImageStreamStatus, out *newer.ImageStreamStatus, s conversion.Scope) error {
|
|
| 79 |
+ out.DockerImageRepository = in.DockerImageRepository |
|
| 80 |
+ out.Tags = make(map[string]newer.TagEventList) |
|
| 81 |
+ return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 82 |
+} |
|
| 83 |
+ |
|
| 84 |
+func convert_api_ImageStreamStatus_To_v1beta3_ImageStreamStatus(in *newer.ImageStreamStatus, out *ImageStreamStatus, s conversion.Scope) error {
|
|
| 85 |
+ out.DockerImageRepository = in.DockerImageRepository |
|
| 86 |
+ out.Tags = make([]NamedTagEventList, 0, 0) |
|
| 87 |
+ return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 88 |
+} |
|
| 89 |
+ |
|
| 90 |
+func convert_api_ImageStreamMapping_To_v1beta3_ImageStreamMapping(in *newer.ImageStreamMapping, out *ImageStreamMapping, s conversion.Scope) error {
|
|
| 91 |
+ return s.DefaultConvert(in, out, conversion.DestFromSource) |
|
| 92 |
+} |
|
| 93 |
+ |
|
| 94 |
+func convert_v1beta3_ImageStreamMapping_To_api_ImageStreamMapping(in *ImageStreamMapping, out *newer.ImageStreamMapping, s conversion.Scope) error {
|
|
| 95 |
+ return s.DefaultConvert(in, out, conversion.SourceToDest) |
|
| 96 |
+} |
|
| 97 |
+ |
|
| 98 |
+func convert_api_ImageStream_To_v1beta3_ImageStream(in *newer.ImageStream, out *ImageStream, s conversion.Scope) error {
|
|
| 99 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 100 |
+ return err |
|
| 101 |
+ } |
|
| 102 |
+ if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil {
|
|
| 103 |
+ return err |
|
| 104 |
+ } |
|
| 105 |
+ return s.Convert(&in.Status, &out.Status, 0) |
|
| 106 |
+} |
|
| 107 |
+ |
|
| 108 |
+func convert_v1beta3_ImageStream_To_api_ImageStream(in *ImageStream, out *newer.ImageStream, s conversion.Scope) error {
|
|
| 109 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 110 |
+ return err |
|
| 111 |
+ } |
|
| 112 |
+ if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil {
|
|
| 113 |
+ return err |
|
| 114 |
+ } |
|
| 115 |
+ return s.Convert(&in.Status, &out.Status, 0) |
|
| 116 |
+} |
|
| 117 |
+ |
|
| 118 |
+func convert_api_ImageStreamImage_To_v1beta3_ImageStreamImage(in *newer.ImageStreamImage, out *ImageStreamImage, s conversion.Scope) error {
|
|
| 119 |
+ if err := s.Convert(&in.Image, &out.Image, 0); err != nil {
|
|
| 120 |
+ return err |
|
| 121 |
+ } |
|
| 122 |
+ |
|
| 123 |
+ if err := s.Convert(&in.Image.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 124 |
+ return err |
|
| 125 |
+ } |
|
| 126 |
+ |
|
| 127 |
+ out.ImageName = in.Image.Name |
|
| 128 |
+ out.Name = in.Name |
|
| 129 |
+ |
|
| 130 |
+ return nil |
|
| 131 |
+} |
|
| 132 |
+ |
|
| 133 |
+func convert_v1beta3_ImageStreamImage_To_api_ImageStreamImage(in *ImageStreamImage, out *newer.ImageStreamImage, s conversion.Scope) error {
|
|
| 134 |
+ imageName := in.ImageName |
|
| 135 |
+ isiName := in.Name |
|
| 136 |
+ |
|
| 137 |
+ if err := s.Convert(&in.Image, &out.Image, 0); err != nil {
|
|
| 138 |
+ return err |
|
| 139 |
+ } |
|
| 140 |
+ |
|
| 141 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 142 |
+ return err |
|
| 143 |
+ } |
|
| 144 |
+ |
|
| 145 |
+ out.Image.Name = imageName |
|
| 146 |
+ out.Name = isiName |
|
| 66 | 147 |
|
| 148 |
+ return nil |
|
| 149 |
+} |
|
| 150 |
+ |
|
| 151 |
+func convert_api_ImageStreamTag_To_v1beta3_ImageStreamTag(in *newer.ImageStreamTag, out *ImageStreamTag, s conversion.Scope) error {
|
|
| 152 |
+ if err := s.Convert(&in.Image, &out.Image, 0); err != nil {
|
|
| 153 |
+ return err |
|
| 154 |
+ } |
|
| 155 |
+ |
|
| 156 |
+ if err := s.Convert(&in.Image.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 157 |
+ return err |
|
| 158 |
+ } |
|
| 159 |
+ |
|
| 160 |
+ out.ImageName = in.Image.Name |
|
| 161 |
+ out.Name = in.Name |
|
| 162 |
+ |
|
| 163 |
+ return nil |
|
| 164 |
+} |
|
| 165 |
+ |
|
| 166 |
+func convert_v1beta3_ImageStreamTag_To_api_ImageStreamTag(in *ImageStreamTag, out *newer.ImageStreamTag, s conversion.Scope) error {
|
|
| 167 |
+ imageName := in.ImageName |
|
| 168 |
+ istName := in.Name |
|
| 169 |
+ |
|
| 170 |
+ if err := s.Convert(&in.Image, &out.Image, 0); err != nil {
|
|
| 171 |
+ return err |
|
| 172 |
+ } |
|
| 173 |
+ |
|
| 174 |
+ if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 175 |
+ return err |
|
| 176 |
+ } |
|
| 177 |
+ |
|
| 178 |
+ out.Image.Name = imageName |
|
| 179 |
+ out.Name = istName |
|
| 180 |
+ |
|
| 181 |
+ return nil |
|
| 182 |
+} |
|
| 183 |
+func init() {
|
|
| 184 |
+ err := kapi.Scheme.AddConversionFuncs( |
|
| 67 | 185 |
func(in *[]NamedTagEventList, out *map[string]newer.TagEventList, s conversion.Scope) error {
|
| 68 | 186 |
for _, curr := range *in {
|
| 69 | 187 |
newTagEventList := newer.TagEventList{}
|
| ... | ... |
@@ -127,113 +245,20 @@ func init() {
|
| 127 | 127 |
return nil |
| 128 | 128 |
}, |
| 129 | 129 |
|
| 130 |
- func(in *ImageStreamSpec, out *newer.ImageStreamSpec, s conversion.Scope) error {
|
|
| 131 |
- out.DockerImageRepository = in.DockerImageRepository |
|
| 132 |
- out.Tags = make(map[string]newer.TagReference) |
|
| 133 |
- return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 134 |
- }, |
|
| 135 |
- func(in *newer.ImageStreamSpec, out *ImageStreamSpec, s conversion.Scope) error {
|
|
| 136 |
- out.DockerImageRepository = in.DockerImageRepository |
|
| 137 |
- out.Tags = make([]NamedTagReference, 0, 0) |
|
| 138 |
- return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 139 |
- }, |
|
| 140 |
- func(in *ImageStreamStatus, out *newer.ImageStreamStatus, s conversion.Scope) error {
|
|
| 141 |
- out.DockerImageRepository = in.DockerImageRepository |
|
| 142 |
- out.Tags = make(map[string]newer.TagEventList) |
|
| 143 |
- return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 144 |
- }, |
|
| 145 |
- func(in *newer.ImageStreamStatus, out *ImageStreamStatus, s conversion.Scope) error {
|
|
| 146 |
- out.DockerImageRepository = in.DockerImageRepository |
|
| 147 |
- out.Tags = make([]NamedTagEventList, 0, 0) |
|
| 148 |
- return s.Convert(&in.Tags, &out.Tags, 0) |
|
| 149 |
- }, |
|
| 150 |
- func(in *newer.ImageStreamMapping, out *ImageStreamMapping, s conversion.Scope) error {
|
|
| 151 |
- return s.DefaultConvert(in, out, conversion.DestFromSource) |
|
| 152 |
- }, |
|
| 153 |
- func(in *ImageStreamMapping, out *newer.ImageStreamMapping, s conversion.Scope) error {
|
|
| 154 |
- return s.DefaultConvert(in, out, conversion.SourceToDest) |
|
| 155 |
- }, |
|
| 156 |
- |
|
| 157 |
- func(in *newer.ImageStream, out *ImageStream, s conversion.Scope) error {
|
|
| 158 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 159 |
- return err |
|
| 160 |
- } |
|
| 161 |
- if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil {
|
|
| 162 |
- return err |
|
| 163 |
- } |
|
| 164 |
- return s.Convert(&in.Status, &out.Status, 0) |
|
| 165 |
- }, |
|
| 166 |
- func(in *ImageStream, out *newer.ImageStream, s conversion.Scope) error {
|
|
| 167 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 168 |
- return err |
|
| 169 |
- } |
|
| 170 |
- if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil {
|
|
| 171 |
- return err |
|
| 172 |
- } |
|
| 173 |
- return s.Convert(&in.Status, &out.Status, 0) |
|
| 174 |
- }, |
|
| 175 |
- func(in *newer.ImageStreamImage, out *ImageStreamImage, s conversion.Scope) error {
|
|
| 176 |
- if err := s.Convert(&in.Image, &out.Image, 0); err != nil {
|
|
| 177 |
- return err |
|
| 178 |
- } |
|
| 179 |
- |
|
| 180 |
- if err := s.Convert(&in.Image.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 181 |
- return err |
|
| 182 |
- } |
|
| 183 |
- |
|
| 184 |
- out.ImageName = in.Image.Name |
|
| 185 |
- out.Name = in.Name |
|
| 186 |
- |
|
| 187 |
- return nil |
|
| 188 |
- }, |
|
| 189 |
- func(in *ImageStreamImage, out *newer.ImageStreamImage, s conversion.Scope) error {
|
|
| 190 |
- imageName := in.ImageName |
|
| 191 |
- isiName := in.Name |
|
| 192 |
- |
|
| 193 |
- if err := s.Convert(&in.Image, &out.Image, 0); err != nil {
|
|
| 194 |
- return err |
|
| 195 |
- } |
|
| 196 |
- |
|
| 197 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 198 |
- return err |
|
| 199 |
- } |
|
| 200 |
- |
|
| 201 |
- out.Image.Name = imageName |
|
| 202 |
- out.Name = isiName |
|
| 203 |
- |
|
| 204 |
- return nil |
|
| 205 |
- }, |
|
| 206 |
- func(in *newer.ImageStreamTag, out *ImageStreamTag, s conversion.Scope) error {
|
|
| 207 |
- if err := s.Convert(&in.Image, &out.Image, 0); err != nil {
|
|
| 208 |
- return err |
|
| 209 |
- } |
|
| 210 |
- |
|
| 211 |
- if err := s.Convert(&in.Image.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 212 |
- return err |
|
| 213 |
- } |
|
| 214 |
- |
|
| 215 |
- out.ImageName = in.Image.Name |
|
| 216 |
- out.Name = in.Name |
|
| 217 |
- |
|
| 218 |
- return nil |
|
| 219 |
- }, |
|
| 220 |
- func(in *ImageStreamTag, out *newer.ImageStreamTag, s conversion.Scope) error {
|
|
| 221 |
- imageName := in.ImageName |
|
| 222 |
- istName := in.Name |
|
| 223 |
- |
|
| 224 |
- if err := s.Convert(&in.Image, &out.Image, 0); err != nil {
|
|
| 225 |
- return err |
|
| 226 |
- } |
|
| 227 |
- |
|
| 228 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 229 |
- return err |
|
| 230 |
- } |
|
| 231 |
- |
|
| 232 |
- out.Image.Name = imageName |
|
| 233 |
- out.Name = istName |
|
| 234 |
- |
|
| 235 |
- return nil |
|
| 236 |
- }, |
|
| 130 |
+ convert_api_Image_To_v1beta3_Image, |
|
| 131 |
+ convert_v1beta3_Image_To_api_Image, |
|
| 132 |
+ convert_v1beta3_ImageStreamSpec_To_api_ImageStreamSpec, |
|
| 133 |
+ convert_api_ImageStreamSpec_To_v1beta3_ImageStreamSpec, |
|
| 134 |
+ convert_v1beta3_ImageStreamStatus_To_api_ImageStreamStatus, |
|
| 135 |
+ convert_api_ImageStreamStatus_To_v1beta3_ImageStreamStatus, |
|
| 136 |
+ convert_api_ImageStreamMapping_To_v1beta3_ImageStreamMapping, |
|
| 137 |
+ convert_v1beta3_ImageStreamMapping_To_api_ImageStreamMapping, |
|
| 138 |
+ convert_api_ImageStream_To_v1beta3_ImageStream, |
|
| 139 |
+ convert_v1beta3_ImageStream_To_api_ImageStream, |
|
| 140 |
+ convert_api_ImageStreamImage_To_v1beta3_ImageStreamImage, |
|
| 141 |
+ convert_v1beta3_ImageStreamImage_To_api_ImageStreamImage, |
|
| 142 |
+ convert_api_ImageStreamTag_To_v1beta3_ImageStreamTag, |
|
| 143 |
+ convert_v1beta3_ImageStreamTag_To_api_ImageStreamTag, |
|
| 237 | 144 |
) |
| 238 | 145 |
if err != nil {
|
| 239 | 146 |
// If one of the conversion functions is malformed, detect it immediately. |
| 240 | 147 |
deleted file mode 100644 |
| ... | ... |
@@ -1,41 +0,0 @@ |
| 1 |
-package v1 |
|
| 2 |
- |
|
| 3 |
-import ( |
|
| 4 |
- kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api" |
|
| 5 |
- "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" |
|
| 6 |
- |
|
| 7 |
- newer "github.com/openshift/origin/pkg/project/api" |
|
| 8 |
-) |
|
| 9 |
- |
|
| 10 |
-func init() {
|
|
| 11 |
- |
|
| 12 |
- err := kapi.Scheme.AddConversionFuncs( |
|
| 13 |
- func(in *newer.Project, out *Project, s conversion.Scope) error {
|
|
| 14 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 15 |
- return err |
|
| 16 |
- } |
|
| 17 |
- if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil {
|
|
| 18 |
- return err |
|
| 19 |
- } |
|
| 20 |
- if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
|
|
| 21 |
- return err |
|
| 22 |
- } |
|
| 23 |
- return nil |
|
| 24 |
- }, |
|
| 25 |
- func(in *Project, out *newer.Project, s conversion.Scope) error {
|
|
| 26 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 27 |
- return err |
|
| 28 |
- } |
|
| 29 |
- if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil {
|
|
| 30 |
- return err |
|
| 31 |
- } |
|
| 32 |
- if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
|
|
| 33 |
- return err |
|
| 34 |
- } |
|
| 35 |
- return nil |
|
| 36 |
- }, |
|
| 37 |
- ) |
|
| 38 |
- if err != nil {
|
|
| 39 |
- panic(err) |
|
| 40 |
- } |
|
| 41 |
-} |
| 42 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,53 +0,0 @@ |
| 1 |
-package v1_test |
|
| 2 |
- |
|
| 3 |
-import ( |
|
| 4 |
- "reflect" |
|
| 5 |
- "testing" |
|
| 6 |
- |
|
| 7 |
- kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api" |
|
| 8 |
- "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" |
|
| 9 |
- "github.com/GoogleCloudPlatform/kubernetes/pkg/util" |
|
| 10 |
- |
|
| 11 |
- newer "github.com/openshift/origin/pkg/project/api" |
|
| 12 |
- current "github.com/openshift/origin/pkg/project/api/v1" |
|
| 13 |
-) |
|
| 14 |
- |
|
| 15 |
-func TestProjectConversion(t *testing.T) {
|
|
| 16 |
- newProj := newer.Project{
|
|
| 17 |
- ObjectMeta: kapi.ObjectMeta{
|
|
| 18 |
- Name: "foo", |
|
| 19 |
- Annotations: map[string]string{
|
|
| 20 |
- "description": "This is a description", |
|
| 21 |
- "displayName": "hi", |
|
| 22 |
- }, |
|
| 23 |
- }, |
|
| 24 |
- } |
|
| 25 |
- |
|
| 26 |
- v1Proj := current.Project{
|
|
| 27 |
- ObjectMeta: v1.ObjectMeta{
|
|
| 28 |
- Name: "foo", |
|
| 29 |
- Annotations: map[string]string{
|
|
| 30 |
- "description": "This is a description", |
|
| 31 |
- "displayName": "hi", |
|
| 32 |
- }, |
|
| 33 |
- }, |
|
| 34 |
- } |
|
| 35 |
- |
|
| 36 |
- newProject := newer.Project{}
|
|
| 37 |
- if err := kapi.Scheme.Convert(&v1Proj, &newProject); err != nil {
|
|
| 38 |
- t.Fatalf("unexpected error: %v", err)
|
|
| 39 |
- } |
|
| 40 |
- |
|
| 41 |
- if !reflect.DeepEqual(newProject, newProj) {
|
|
| 42 |
- t.Errorf("conversion error: %s", util.ObjectDiff(newProject, newProj))
|
|
| 43 |
- } |
|
| 44 |
- |
|
| 45 |
- backProject := current.Project{}
|
|
| 46 |
- if err := kapi.Scheme.Convert(&newProj, &backProject); err != nil {
|
|
| 47 |
- t.Fatalf("unexpected error: %v", err)
|
|
| 48 |
- } |
|
| 49 |
- |
|
| 50 |
- if !reflect.DeepEqual(backProject, v1Proj) {
|
|
| 51 |
- t.Errorf("conversion error: %s", util.ObjectDiff(backProject, v1Proj))
|
|
| 52 |
- } |
|
| 53 |
-} |
| 54 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,41 +0,0 @@ |
| 1 |
-package v1beta3 |
|
| 2 |
- |
|
| 3 |
-import ( |
|
| 4 |
- kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api" |
|
| 5 |
- "github.com/GoogleCloudPlatform/kubernetes/pkg/conversion" |
|
| 6 |
- |
|
| 7 |
- newer "github.com/openshift/origin/pkg/project/api" |
|
| 8 |
-) |
|
| 9 |
- |
|
| 10 |
-func init() {
|
|
| 11 |
- |
|
| 12 |
- err := kapi.Scheme.AddConversionFuncs( |
|
| 13 |
- func(in *newer.Project, out *Project, s conversion.Scope) error {
|
|
| 14 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 15 |
- return err |
|
| 16 |
- } |
|
| 17 |
- if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil {
|
|
| 18 |
- return err |
|
| 19 |
- } |
|
| 20 |
- if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
|
|
| 21 |
- return err |
|
| 22 |
- } |
|
| 23 |
- return nil |
|
| 24 |
- }, |
|
| 25 |
- func(in *Project, out *newer.Project, s conversion.Scope) error {
|
|
| 26 |
- if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
|
|
| 27 |
- return err |
|
| 28 |
- } |
|
| 29 |
- if err := s.Convert(&in.Spec, &out.Spec, 0); err != nil {
|
|
| 30 |
- return err |
|
| 31 |
- } |
|
| 32 |
- if err := s.Convert(&in.Status, &out.Status, 0); err != nil {
|
|
| 33 |
- return err |
|
| 34 |
- } |
|
| 35 |
- return nil |
|
| 36 |
- }, |
|
| 37 |
- ) |
|
| 38 |
- if err != nil {
|
|
| 39 |
- panic(err) |
|
| 40 |
- } |
|
| 41 |
-} |
| 42 | 1 |
deleted file mode 100644 |
| ... | ... |
@@ -1,53 +0,0 @@ |
| 1 |
-package v1beta3_test |
|
| 2 |
- |
|
| 3 |
-import ( |
|
| 4 |
- "reflect" |
|
| 5 |
- "testing" |
|
| 6 |
- |
|
| 7 |
- kapi "github.com/GoogleCloudPlatform/kubernetes/pkg/api" |
|
| 8 |
- "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1beta3" |
|
| 9 |
- "github.com/GoogleCloudPlatform/kubernetes/pkg/util" |
|
| 10 |
- |
|
| 11 |
- newer "github.com/openshift/origin/pkg/project/api" |
|
| 12 |
- current "github.com/openshift/origin/pkg/project/api/v1beta3" |
|
| 13 |
-) |
|
| 14 |
- |
|
| 15 |
-func TestProjectConversion(t *testing.T) {
|
|
| 16 |
- newProj := newer.Project{
|
|
| 17 |
- ObjectMeta: kapi.ObjectMeta{
|
|
| 18 |
- Name: "foo", |
|
| 19 |
- Annotations: map[string]string{
|
|
| 20 |
- "openshift.io/description": "This is a description", |
|
| 21 |
- "openshift.io/display-name": "hi", |
|
| 22 |
- }, |
|
| 23 |
- }, |
|
| 24 |
- } |
|
| 25 |
- |
|
| 26 |
- v1beta3Proj := current.Project{
|
|
| 27 |
- ObjectMeta: v1beta3.ObjectMeta{
|
|
| 28 |
- Name: "foo", |
|
| 29 |
- Annotations: map[string]string{
|
|
| 30 |
- "openshift.io/description": "This is a description", |
|
| 31 |
- "openshift.io/display-name": "hi", |
|
| 32 |
- }, |
|
| 33 |
- }, |
|
| 34 |
- } |
|
| 35 |
- |
|
| 36 |
- newProject := newer.Project{}
|
|
| 37 |
- if err := kapi.Scheme.Convert(&v1beta3Proj, &newProject); err != nil {
|
|
| 38 |
- t.Fatalf("unexpected error: %v", err)
|
|
| 39 |
- } |
|
| 40 |
- |
|
| 41 |
- if !reflect.DeepEqual(newProject, newProj) {
|
|
| 42 |
- t.Errorf("conversion error: %s", util.ObjectDiff(newProject, newProj))
|
|
| 43 |
- } |
|
| 44 |
- |
|
| 45 |
- backProject := current.Project{}
|
|
| 46 |
- if err := kapi.Scheme.Convert(&newProj, &backProject); err != nil {
|
|
| 47 |
- t.Fatalf("unexpected error: %v", err)
|
|
| 48 |
- } |
|
| 49 |
- |
|
| 50 |
- if !reflect.DeepEqual(backProject, v1beta3Proj) {
|
|
| 51 |
- t.Errorf("conversion error: %s", util.ObjectDiff(backProject, v1beta3Proj))
|
|
| 52 |
- } |
|
| 53 |
-} |
| ... | ... |
@@ -7,6 +7,31 @@ import ( |
| 7 | 7 |
newer "github.com/openshift/origin/pkg/route/api" |
| 8 | 8 |
) |
| 9 | 9 |
|
| 10 |
+func convert_v1_Route_To_api_Route(in *Route, out *newer.Route, s conversion.Scope) error {
|
|
| 11 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 12 |
+ return err |
|
| 13 |
+ } |
|
| 14 |
+ |
|
| 15 |
+ out.Path = in.Spec.Path |
|
| 16 |
+ out.Host = in.Spec.Host |
|
| 17 |
+ if in.Spec.To.Kind == "Service" || len(in.Spec.To.Kind) == 0 {
|
|
| 18 |
+ out.ServiceName = in.Spec.To.Name |
|
| 19 |
+ } |
|
| 20 |
+ return s.Convert(&in.Spec.TLS, &out.TLS, 0) |
|
| 21 |
+} |
|
| 22 |
+ |
|
| 23 |
+func convert_api_Route_To_v1_Route(in *newer.Route, out *Route, s conversion.Scope) error {
|
|
| 24 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 25 |
+ return err |
|
| 26 |
+ } |
|
| 27 |
+ |
|
| 28 |
+ out.Spec.Path = in.Path |
|
| 29 |
+ out.Spec.Host = in.Host |
|
| 30 |
+ out.Spec.To.Kind = "Service" |
|
| 31 |
+ out.Spec.To.Name = in.ServiceName |
|
| 32 |
+ return s.Convert(&in.TLS, &out.Spec.TLS, 0) |
|
| 33 |
+} |
|
| 34 |
+ |
|
| 10 | 35 |
func init() {
|
| 11 | 36 |
err := api.Scheme.AddDefaultingFuncs( |
| 12 | 37 |
func(obj *RouteSpec) {
|
| ... | ... |
@@ -18,29 +43,8 @@ func init() {
|
| 18 | 18 |
} |
| 19 | 19 |
|
| 20 | 20 |
err = api.Scheme.AddConversionFuncs( |
| 21 |
- func(in *Route, out *newer.Route, s conversion.Scope) error {
|
|
| 22 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 23 |
- return err |
|
| 24 |
- } |
|
| 25 |
- |
|
| 26 |
- out.Path = in.Spec.Path |
|
| 27 |
- out.Host = in.Spec.Host |
|
| 28 |
- if in.Spec.To.Kind == "Service" || len(in.Spec.To.Kind) == 0 {
|
|
| 29 |
- out.ServiceName = in.Spec.To.Name |
|
| 30 |
- } |
|
| 31 |
- return s.Convert(&in.Spec.TLS, &out.TLS, 0) |
|
| 32 |
- }, |
|
| 33 |
- func(in *newer.Route, out *Route, s conversion.Scope) error {
|
|
| 34 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 35 |
- return err |
|
| 36 |
- } |
|
| 37 |
- |
|
| 38 |
- out.Spec.Path = in.Path |
|
| 39 |
- out.Spec.Host = in.Host |
|
| 40 |
- out.Spec.To.Kind = "Service" |
|
| 41 |
- out.Spec.To.Name = in.ServiceName |
|
| 42 |
- return s.Convert(&in.TLS, &out.Spec.TLS, 0) |
|
| 43 |
- }, |
|
| 21 |
+ convert_v1_Route_To_api_Route, |
|
| 22 |
+ convert_api_Route_To_v1_Route, |
|
| 44 | 23 |
) |
| 45 | 24 |
if err != nil {
|
| 46 | 25 |
panic(err) |
| ... | ... |
@@ -7,6 +7,31 @@ import ( |
| 7 | 7 |
newer "github.com/openshift/origin/pkg/route/api" |
| 8 | 8 |
) |
| 9 | 9 |
|
| 10 |
+func convert_v1beta3_Route_To_api_Route(in *Route, out *newer.Route, s conversion.Scope) error {
|
|
| 11 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 12 |
+ return err |
|
| 13 |
+ } |
|
| 14 |
+ |
|
| 15 |
+ out.Path = in.Spec.Path |
|
| 16 |
+ out.Host = in.Spec.Host |
|
| 17 |
+ if in.Spec.To.Kind == "Service" || len(in.Spec.To.Kind) == 0 {
|
|
| 18 |
+ out.ServiceName = in.Spec.To.Name |
|
| 19 |
+ } |
|
| 20 |
+ return s.Convert(&in.Spec.TLS, &out.TLS, 0) |
|
| 21 |
+} |
|
| 22 |
+ |
|
| 23 |
+func convert_api_Route_To_v1beta3_Route(in *newer.Route, out *Route, s conversion.Scope) error {
|
|
| 24 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 25 |
+ return err |
|
| 26 |
+ } |
|
| 27 |
+ |
|
| 28 |
+ out.Spec.Path = in.Path |
|
| 29 |
+ out.Spec.Host = in.Host |
|
| 30 |
+ out.Spec.To.Kind = "Service" |
|
| 31 |
+ out.Spec.To.Name = in.ServiceName |
|
| 32 |
+ return s.Convert(&in.TLS, &out.Spec.TLS, 0) |
|
| 33 |
+} |
|
| 34 |
+ |
|
| 10 | 35 |
func init() {
|
| 11 | 36 |
err := api.Scheme.AddDefaultingFuncs( |
| 12 | 37 |
func(obj *RouteSpec) {
|
| ... | ... |
@@ -18,29 +43,8 @@ func init() {
|
| 18 | 18 |
} |
| 19 | 19 |
|
| 20 | 20 |
err = api.Scheme.AddConversionFuncs( |
| 21 |
- func(in *Route, out *newer.Route, s conversion.Scope) error {
|
|
| 22 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 23 |
- return err |
|
| 24 |
- } |
|
| 25 |
- |
|
| 26 |
- out.Path = in.Spec.Path |
|
| 27 |
- out.Host = in.Spec.Host |
|
| 28 |
- if in.Spec.To.Kind == "Service" || len(in.Spec.To.Kind) == 0 {
|
|
| 29 |
- out.ServiceName = in.Spec.To.Name |
|
| 30 |
- } |
|
| 31 |
- return s.Convert(&in.Spec.TLS, &out.TLS, 0) |
|
| 32 |
- }, |
|
| 33 |
- func(in *newer.Route, out *Route, s conversion.Scope) error {
|
|
| 34 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 35 |
- return err |
|
| 36 |
- } |
|
| 37 |
- |
|
| 38 |
- out.Spec.Path = in.Path |
|
| 39 |
- out.Spec.Host = in.Host |
|
| 40 |
- out.Spec.To.Kind = "Service" |
|
| 41 |
- out.Spec.To.Name = in.ServiceName |
|
| 42 |
- return s.Convert(&in.TLS, &out.Spec.TLS, 0) |
|
| 43 |
- }, |
|
| 21 |
+ convert_v1beta3_Route_To_api_Route, |
|
| 22 |
+ convert_api_Route_To_v1beta3_Route, |
|
| 44 | 23 |
) |
| 45 | 24 |
if err != nil {
|
| 46 | 25 |
panic(err) |
| ... | ... |
@@ -7,23 +7,27 @@ import ( |
| 7 | 7 |
newer "github.com/openshift/origin/pkg/template/api" |
| 8 | 8 |
) |
| 9 | 9 |
|
| 10 |
+func convert_api_Template_To_v1_Template(in *newer.Template, out *Template, s conversion.Scope) error {
|
|
| 11 |
+ //FIXME: DefaultConvert should not overwrite the Labels field on the |
|
| 12 |
+ // the base object. This is likely a bug in the DefaultConvert |
|
| 13 |
+ // code. For now, it is called before converting the labels. |
|
| 14 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 15 |
+ return err |
|
| 16 |
+ } |
|
| 17 |
+ return s.Convert(&in.ObjectLabels, &out.Labels, 0) |
|
| 18 |
+} |
|
| 19 |
+ |
|
| 20 |
+func convert_v1_Template_To_api_Template(in *Template, out *newer.Template, s conversion.Scope) error {
|
|
| 21 |
+ if err := s.Convert(&in.Labels, &out.ObjectLabels, 0); err != nil {
|
|
| 22 |
+ return err |
|
| 23 |
+ } |
|
| 24 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 25 |
+} |
|
| 26 |
+ |
|
| 10 | 27 |
func init() {
|
| 11 | 28 |
err := api.Scheme.AddConversionFuncs( |
| 12 |
- func(in *newer.Template, out *Template, s conversion.Scope) error {
|
|
| 13 |
- //FIXME: DefaultConvert should not overwrite the Labels field on the |
|
| 14 |
- // the base object. This is likely a bug in the DefaultConvert |
|
| 15 |
- // code. For now, it is called before converting the labels. |
|
| 16 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 17 |
- return err |
|
| 18 |
- } |
|
| 19 |
- return s.Convert(&in.ObjectLabels, &out.Labels, 0) |
|
| 20 |
- }, |
|
| 21 |
- func(in *Template, out *newer.Template, s conversion.Scope) error {
|
|
| 22 |
- if err := s.Convert(&in.Labels, &out.ObjectLabels, 0); err != nil {
|
|
| 23 |
- return err |
|
| 24 |
- } |
|
| 25 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 26 |
- }, |
|
| 29 |
+ convert_api_Template_To_v1_Template, |
|
| 30 |
+ convert_v1_Template_To_api_Template, |
|
| 27 | 31 |
) |
| 28 | 32 |
if err != nil {
|
| 29 | 33 |
panic(err) |
| ... | ... |
@@ -7,23 +7,27 @@ import ( |
| 7 | 7 |
newer "github.com/openshift/origin/pkg/template/api" |
| 8 | 8 |
) |
| 9 | 9 |
|
| 10 |
+func convert_api_Template_To_v1beta3_Template(in *newer.Template, out *Template, s conversion.Scope) error {
|
|
| 11 |
+ //FIXME: DefaultConvert should not overwrite the Labels field on the |
|
| 12 |
+ // the base object. This is likely a bug in the DefaultConvert |
|
| 13 |
+ // code. For now, it is called before converting the labels. |
|
| 14 |
+ if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 15 |
+ return err |
|
| 16 |
+ } |
|
| 17 |
+ return s.Convert(&in.ObjectLabels, &out.Labels, 0) |
|
| 18 |
+} |
|
| 19 |
+ |
|
| 20 |
+func convert_v1beta3_Template_To_api_Template(in *Template, out *newer.Template, s conversion.Scope) error {
|
|
| 21 |
+ if err := s.Convert(&in.Labels, &out.ObjectLabels, 0); err != nil {
|
|
| 22 |
+ return err |
|
| 23 |
+ } |
|
| 24 |
+ return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 25 |
+} |
|
| 26 |
+ |
|
| 10 | 27 |
func init() {
|
| 11 | 28 |
err := api.Scheme.AddConversionFuncs( |
| 12 |
- func(in *newer.Template, out *Template, s conversion.Scope) error {
|
|
| 13 |
- //FIXME: DefaultConvert should not overwrite the Labels field on the |
|
| 14 |
- // the base object. This is likely a bug in the DefaultConvert |
|
| 15 |
- // code. For now, it is called before converting the labels. |
|
| 16 |
- if err := s.DefaultConvert(in, out, conversion.IgnoreMissingFields); err != nil {
|
|
| 17 |
- return err |
|
| 18 |
- } |
|
| 19 |
- return s.Convert(&in.ObjectLabels, &out.Labels, 0) |
|
| 20 |
- }, |
|
| 21 |
- func(in *Template, out *newer.Template, s conversion.Scope) error {
|
|
| 22 |
- if err := s.Convert(&in.Labels, &out.ObjectLabels, 0); err != nil {
|
|
| 23 |
- return err |
|
| 24 |
- } |
|
| 25 |
- return s.DefaultConvert(in, out, conversion.IgnoreMissingFields) |
|
| 26 |
- }, |
|
| 29 |
+ convert_api_Template_To_v1beta3_Template, |
|
| 30 |
+ convert_v1beta3_Template_To_api_Template, |
|
| 27 | 31 |
) |
| 28 | 32 |
if err != nil {
|
| 29 | 33 |
panic(err) |