Skip to content

Commit 79efdd3

Browse files
authored
Merge pull request #127 from kahirokunn/make-generate
Run make generate
2 parents 2bb7dee + 130eae2 commit 79efdd3

File tree

4 files changed

+67
-38
lines changed

4 files changed

+67
-38
lines changed

config/crd/multicluster.x-k8s.io_serviceexports.yaml

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -84,24 +84,7 @@ spec:
8484
conditions:
8585
type: array
8686
items:
87-
description: |-
88-
Condition contains details for one aspect of the current state of this API Resource.
89-
---
90-
This struct is intended for direct use as an array at the field path .status.conditions. For example,
91-
92-
93-
type FooStatus struct{
94-
// Represents the observations of a foo's current state.
95-
// Known .status.conditions.type are: "Available", "Progressing", and "Degraded"
96-
// +patchMergeKey=type
97-
// +patchStrategy=merge
98-
// +listType=map
99-
// +listMapKey=type
100-
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
101-
102-
103-
// other fields
104-
}
87+
description: Condition contains details for one aspect of the current state of this API Resource.
10588
type: object
10689
required:
10790
- lastTransitionTime
@@ -149,12 +132,7 @@ spec:
149132
- "False"
150133
- Unknown
151134
type:
152-
description: |-
153-
type of condition in CamelCase or in foo.example.com/CamelCase.
154-
---
155-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
156-
useful (see .node.status.conditions), the ability to deconflict is important.
157-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
135+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
158136
type: string
159137
maxLength: 316
160138
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])$

config/crd/multicluster.x-k8s.io_serviceimports.yaml

Lines changed: 58 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,12 @@ spec:
9393
This field follows standard Kubernetes label syntax.
9494
Valid values are either:
9595
96-
9796
* Un-prefixed protocol names - reserved for IANA standard service names (as per
9897
RFC-6335 and https://www.iana.org/assignments/service-names).
9998
100-
10199
* Kubernetes-defined prefixed names:
102100
* 'kubernetes.io/h2c' - HTTP/2 over cleartext as described in https://www.rfc-editor.org/rfc/rfc7540
103101
104-
105102
* Other protocols should use implementation-defined prefixed names such as
106103
mycompany.com/my-custom-protocol.
107104
Field can be enabled with ServiceAppProtocol feature gate.
@@ -123,7 +120,6 @@ spec:
123120
The IP protocol for this port. Supports "TCP", "UDP", and "SCTP".
124121
Default is TCP.
125122
type: string
126-
default: TCP
127123
x-kubernetes-list-type: atomic
128124
sessionAffinity:
129125
description: |-
@@ -182,3 +178,61 @@ spec:
182178
x-kubernetes-list-map-keys:
183179
- cluster
184180
x-kubernetes-list-type: map
181+
conditions:
182+
type: array
183+
items:
184+
description: Condition contains details for one aspect of the current state of this API Resource.
185+
type: object
186+
required:
187+
- lastTransitionTime
188+
- message
189+
- reason
190+
- status
191+
- type
192+
properties:
193+
lastTransitionTime:
194+
description: |-
195+
lastTransitionTime is the last time the condition transitioned from one status to another.
196+
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
197+
type: string
198+
format: date-time
199+
message:
200+
description: |-
201+
message is a human readable message indicating details about the transition.
202+
This may be an empty string.
203+
type: string
204+
maxLength: 32768
205+
observedGeneration:
206+
description: |-
207+
observedGeneration represents the .metadata.generation that the condition was set based upon.
208+
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
209+
with respect to the current state of the instance.
210+
type: integer
211+
format: int64
212+
minimum: 0
213+
reason:
214+
description: |-
215+
reason contains a programmatic identifier indicating the reason for the condition's last transition.
216+
Producers of specific condition types may define expected values and meanings for this field,
217+
and whether the values are considered a guaranteed API.
218+
The value should be a CamelCase string.
219+
This field may not be empty.
220+
type: string
221+
maxLength: 1024
222+
minLength: 1
223+
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
224+
status:
225+
description: status of the condition, one of True, False, Unknown.
226+
type: string
227+
enum:
228+
- "True"
229+
- "False"
230+
- Unknown
231+
type:
232+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
233+
type: string
234+
maxLength: 316
235+
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])$
236+
x-kubernetes-list-map-keys:
237+
- type
238+
x-kubernetes-list-type: map

config/rbac/role.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,6 @@ rules:
88
- ""
99
resources:
1010
- services
11-
verbs:
12-
- create
13-
- get
14-
- list
15-
- patch
16-
- update
17-
- watch
18-
- apiGroups:
19-
- ""
20-
resources:
2111
- services/status
2212
verbs:
2313
- create

pkg/apis/v1alpha1/zz_generated.deepcopy.go

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)