Skip to content

Commit 73476e2

Browse files
committed
Add missing registration for API groups
1 parent 801db92 commit 73476e2

File tree

11 files changed

+441
-569
lines changed

11 files changed

+441
-569
lines changed

cloudnetwork/v1/001-cloudprivateipconfig.crd.yaml

Lines changed: 86 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -13,136 +13,92 @@ spec:
1313
singular: cloudprivateipconfig
1414
scope: Cluster
1515
versions:
16-
- name: v1
17-
schema:
18-
openAPIV3Schema:
19-
description: "CloudPrivateIPConfig performs an assignment of a private IP
20-
address to the primary NIC associated with cloud VMs. This is done by specifying
21-
the IP and Kubernetes node which the IP should be assigned to. This CRD
22-
is intended to be used by the network plugin which manages the cluster network.
23-
The spec side represents the desired state requested by the network plugin,
24-
and the status side represents the current state that this CRD's controller
25-
has executed. No users will have permission to modify it, and if a cluster-admin
26-
decides to edit it for some reason, their changes will be overwritten the
27-
next time the network plugin reconciles the object. Note: the CR's name
28-
must specify the requested private IP address (can be IPv4 or IPv6). \n
29-
Compatibility level 1: Stable within a major release for a minimum of 12
30-
months or 3 minor releases (whichever is longer)."
31-
properties:
32-
apiVersion:
33-
description: 'APIVersion defines the versioned schema of this representation
34-
of an object. Servers should convert recognized schemas to the latest
35-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
36-
type: string
37-
kind:
38-
description: 'Kind is a string value representing the REST resource this
39-
object represents. Servers may infer this from the endpoint the client
40-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
41-
type: string
42-
metadata:
43-
properties:
44-
name:
45-
anyOf:
46-
- format: ipv4
47-
- format: ipv6
48-
type: string
49-
type: object
50-
spec:
51-
description: spec is the definition of the desired private IP request.
52-
properties:
53-
node:
54-
description: 'node is the node name, as specified by the Kubernetes
55-
field: node.metadata.name'
56-
type: string
57-
type: object
58-
status:
59-
description: status is the observed status of the desired private IP request.
60-
Read-only.
61-
properties:
62-
conditions:
63-
description: condition is the assignment condition of the private
64-
IP and its status
65-
items:
66-
description: "Condition contains details for one aspect of the current
67-
state of this API Resource. --- This struct is intended for direct
68-
use as an array at the field path .status.conditions. For example,
69-
\n type FooStatus struct{ // Represents the observations of a
70-
foo's current state. // Known .status.conditions.type are: \"Available\",
71-
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
72-
// +listType=map // +listMapKey=type Conditions []metav1.Condition
73-
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
74-
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
75-
properties:
76-
lastTransitionTime:
77-
description: lastTransitionTime is the last time the condition
78-
transitioned from one status to another. This should be when
79-
the underlying condition changed. If that is not known, then
80-
using the time when the API field changed is acceptable.
81-
format: date-time
82-
type: string
83-
message:
84-
description: message is a human readable message indicating
85-
details about the transition. This may be an empty string.
86-
maxLength: 32768
87-
type: string
88-
observedGeneration:
89-
description: observedGeneration represents the .metadata.generation
90-
that the condition was set based upon. For instance, if .metadata.generation
91-
is currently 12, but the .status.conditions[x].observedGeneration
92-
is 9, the condition is out of date with respect to the current
93-
state of the instance.
94-
format: int64
95-
minimum: 0
96-
type: integer
97-
reason:
98-
description: reason contains a programmatic identifier indicating
99-
the reason for the condition's last transition. Producers
100-
of specific condition types may define expected values and
101-
meanings for this field, and whether the values are considered
102-
a guaranteed API. The value should be a CamelCase string.
103-
This field may not be empty.
104-
maxLength: 1024
105-
minLength: 1
106-
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
107-
type: string
108-
status:
109-
description: status of the condition, one of True, False, Unknown.
110-
enum:
111-
- "True"
112-
- "False"
113-
- Unknown
114-
type: string
115-
type:
116-
description: type of condition in CamelCase or in foo.example.com/CamelCase.
117-
--- Many .condition.type values are consistent across resources
118-
like Available, but because arbitrary conditions can be useful
119-
(see .node.status.conditions), the ability to deconflict is
120-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
121-
maxLength: 316
122-
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
123-
type: string
124-
required:
125-
- lastTransitionTime
126-
- message
127-
- reason
128-
- status
129-
- type
130-
type: object
131-
type: array
132-
node:
133-
description: 'node is the node name, as specified by the Kubernetes
134-
field: node.metadata.name'
135-
type: string
136-
required:
137-
- conditions
138-
type: object
139-
required:
140-
- spec
141-
type: object
142-
served: true
143-
storage: true
144-
subresources:
145-
status: {}
16+
- name: v1
17+
schema:
18+
openAPIV3Schema:
19+
description: "CloudPrivateIPConfig performs an assignment of a private IP address to the primary NIC associated with cloud VMs. This is done by specifying the IP and Kubernetes node which the IP should be assigned to. This CRD is intended to be used by the network plugin which manages the cluster network. The spec side represents the desired state requested by the network plugin, and the status side represents the current state that this CRD's controller has executed. No users will have permission to modify it, and if a cluster-admin decides to edit it for some reason, their changes will be overwritten the next time the network plugin reconciles the object. Note: the CR's name must specify the requested private IP address (can be IPv4 or IPv6). \n Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer)."
20+
properties:
21+
apiVersion:
22+
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
23+
type: string
24+
kind:
25+
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
26+
type: string
27+
metadata:
28+
properties:
29+
name:
30+
anyOf:
31+
- format: ipv4
32+
- format: ipv6
33+
type: string
34+
type: object
35+
spec:
36+
description: spec is the definition of the desired private IP request.
37+
properties:
38+
node:
39+
description: 'node is the node name, as specified by the Kubernetes field: node.metadata.name'
40+
type: string
41+
type: object
42+
status:
43+
description: status is the observed status of the desired private IP request. Read-only.
44+
properties:
45+
conditions:
46+
description: condition is the assignment condition of the private IP and its status
47+
items:
48+
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
49+
properties:
50+
lastTransitionTime:
51+
description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
52+
format: date-time
53+
type: string
54+
message:
55+
description: message is a human readable message indicating details about the transition. This may be an empty string.
56+
maxLength: 32768
57+
type: string
58+
observedGeneration:
59+
description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
60+
format: int64
61+
minimum: 0
62+
type: integer
63+
reason:
64+
description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
65+
maxLength: 1024
66+
minLength: 1
67+
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
68+
type: string
69+
status:
70+
description: status of the condition, one of True, False, Unknown.
71+
enum:
72+
- "True"
73+
- "False"
74+
- Unknown
75+
type: string
76+
type:
77+
description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
78+
maxLength: 316
79+
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
80+
type: string
81+
required:
82+
- lastTransitionTime
83+
- message
84+
- reason
85+
- status
86+
- type
87+
type: object
88+
type: array
89+
node:
90+
description: 'node is the node name, as specified by the Kubernetes field: node.metadata.name'
91+
type: string
92+
required:
93+
- conditions
94+
type: object
95+
required:
96+
- spec
97+
type: object
98+
served: true
99+
storage: true
100+
subresources:
101+
status: {}
146102
status:
147103
acceptedNames:
148104
kind: ""

cloudnetwork/v1/register.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,15 @@ import (
77
)
88

99
var (
10-
GroupName = "cloud.network.openshift.io"
11-
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
12-
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
13-
Install = SchemeBuilder.AddToScheme
10+
GroupName = "cloud.network.openshift.io"
11+
GroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
12+
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
13+
// Install is a function which adds this version to a scheme
14+
Install = SchemeBuilder.AddToScheme
15+
16+
// SchemeGroupVersion generated code relies on this name
17+
// Deprecated
18+
SchemeGroupVersion = GroupVersion
1419
// AddToScheme exists solely to keep the old generators creating valid code
1520
// DEPRECATED
1621
AddToScheme = SchemeBuilder.AddToScheme

image/docker10/register.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,23 @@ const (
1212

1313
// SchemeGroupVersion is group version used to register these objects
1414
var (
15-
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "1.0"}
15+
GroupVersion = schema.GroupVersion{Group: GroupName, Version: "1.0"}
1616
LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "1.0"}
1717

1818
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
1919
LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes)
2020

21-
AddToScheme = SchemeBuilder.AddToScheme
2221
AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
22+
23+
// Install is a function which adds this version to a scheme
24+
Install = SchemeBuilder.AddToScheme
25+
26+
// SchemeGroupVersion generated code relies on this name
27+
// Deprecated
28+
SchemeGroupVersion = GroupVersion
29+
// AddToScheme exists solely to keep the old generators creating valid code
30+
// DEPRECATED
31+
AddToScheme = SchemeBuilder.AddToScheme
2332
)
2433

2534
// Adds the list of known types to api.Scheme.

image/dockerpre012/register.go

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,23 @@ const (
1111
)
1212

1313
var (
14-
SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "pre012"}
14+
GroupVersion = schema.GroupVersion{Group: GroupName, Version: "pre012"}
1515
LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "pre012"}
1616

1717
SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
18-
AddToScheme = SchemeBuilder.AddToScheme
1918

2019
LegacySchemeBuilder = runtime.NewSchemeBuilder(addLegacyKnownTypes)
2120
AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
21+
22+
// Install is a function which adds this version to a scheme
23+
Install = SchemeBuilder.AddToScheme
24+
25+
// SchemeGroupVersion generated code relies on this name
26+
// Deprecated
27+
SchemeGroupVersion = GroupVersion
28+
// AddToScheme exists solely to keep the old generators creating valid code
29+
// DEPRECATED
30+
AddToScheme = SchemeBuilder.AddToScheme
2231
)
2332

2433
// Adds the list of known types to api.Scheme.

legacyconfig/v1/register.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ import (
88
var (
99
// Legacy is the 'v1' apiVersion of config
1010
LegacyGroupName = ""
11-
LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
11+
GroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
12+
LegacySchemeGroupVersion = GroupVersion
1213
legacySchemeBuilder = runtime.NewSchemeBuilder(
1314
addKnownTypesToLegacy,
1415
)

0 commit comments

Comments
 (0)