Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Commit ff20393

Browse files
author
Krish Chowdhary
committed
moves various fields into status from spec
1 parent 2cdabb1 commit ff20393

17 files changed

+115
-334
lines changed

Diff for: apis/objectstorage.k8s.io/v1alpha1/openapi_generated.go

+66-104
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: apis/objectstorage.k8s.io/v1alpha1/types.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ type BucketSpec struct {
7272

7373
Protocol Protocol `json:"protocol"`
7474

75-
// +optional
76-
BucketID string `json:"bucketID,omitempty"`
77-
7875
// +optional
7976
Parameters map[string]string `json:"parameters,omitempty"`
8077

@@ -88,6 +85,9 @@ type BucketStatus struct {
8885

8986
// +optional
9087
BucketAvailable bool `json:"bucketAvailable,omitempty"`
88+
89+
// +optional
90+
BucketID string `json:"bucketID,omitempty"`
9191
}
9292

9393
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -239,14 +239,8 @@ type BucketAccessSpec struct {
239239
// +optional
240240
ServiceAccount *corev1.ObjectReference `json:"serviceAccount,omitempty"`
241241

242-
// +optional
243-
MintedSecretName string `json:"mintedSecretName,omitempty"`
244-
245242
PolicyActionsConfigMapData string `json:"policyActionsConfigMapData,omitempty"`
246243

247-
// +optional
248-
AccountID string `json:"accountID,omitempty"`
249-
250244
// +optional
251245
Parameters map[string]string `json:"parameters,omitempty"`
252246
}
@@ -255,6 +249,12 @@ type BucketAccessStatus struct {
255249
// +optional
256250
Message string `json:"message,omitempty"`
257251

252+
// +optional
253+
MintedSecretName string `json:"mintedSecretName,omitempty"`
254+
255+
// +optional
256+
AccountID string `json:"accountID,omitempty"`
257+
258258
// +optional
259259
AccessGranted bool `json:"accessGranted,omitempty"`
260260
}

Diff for: clientset/fake/register.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: crds/objectstorage.k8s.io_bucketaccessclasses.yaml

+6-41
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
44
kind: CustomResourceDefinition
55
metadata:
66
annotations:
7-
controller-gen.kubebuilder.io/version: v0.4.1
7+
controller-gen.kubebuilder.io/version: v0.5.0
88
creationTimestamp: null
99
name: bucketaccessclasses.objectstorage.k8s.io
1010
spec:
@@ -21,14 +21,10 @@ spec:
2121
openAPIV3Schema:
2222
properties:
2323
apiVersion:
24-
description: 'APIVersion defines the versioned schema of this representation
25-
of an object. Servers should convert recognized schemas to the latest
26-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
24+
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'
2725
type: string
2826
kind:
29-
description: 'Kind is a string value representing the REST resource this
30-
object represents. Servers may infer this from the endpoint the client
31-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
27+
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'
3228
type: string
3329
metadata:
3430
type: object
@@ -37,43 +33,13 @@ spec:
3733
type: string
3834
type: object
3935
policyActionsConfigMap:
40-
description: 'ObjectReference contains enough information to let you inspect
41-
or modify the referred object. --- New uses of this type are discouraged
42-
because of difficulty describing its usage when embedded in APIs. 1.
43-
Ignored fields. It includes many fields which are not generally honored. For
44-
instance, ResourceVersion and FieldPath are both very rarely valid in
45-
actual usage. 2. Invalid usage help. It is impossible to add specific
46-
help for individual usage. In most embedded usages, there are particular restrictions
47-
like, "must refer only to types A and B" or "UID not honored" or "name
48-
must be restricted". Those cannot be well described when embedded. 3.
49-
Inconsistent validation. Because the usages are different, the validation
50-
rules are different by usage, which makes it hard for users to predict
51-
what will happen. 4. The fields are both imprecise and overly precise. Kind
52-
is not a precise mapping to a URL. This can produce ambiguity during
53-
interpretation and require a REST mapping. In most cases, the dependency
54-
is on the group,resource tuple and the version of the actual struct
55-
is irrelevant. 5. We cannot easily change it. Because this type is
56-
embedded in many locations, updates to this type will affect numerous
57-
schemas. Don''t make new APIs embed an underspecified API type they
58-
do not control. Instead of using this type, create a locally provided
59-
and used type that is well-focused on your reference. For example, ServiceReferences
60-
for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533
61-
.'
36+
description: 'ObjectReference contains enough information to let you inspect or modify the referred object. --- New uses of this type are discouraged because of difficulty describing its usage when embedded in APIs. 1. Ignored fields. It includes many fields which are not generally honored. For instance, ResourceVersion and FieldPath are both very rarely valid in actual usage. 2. Invalid usage help. It is impossible to add specific help for individual usage. In most embedded usages, there are particular restrictions like, "must refer only to types A and B" or "UID not honored" or "name must be restricted". Those cannot be well described when embedded. 3. Inconsistent validation. Because the usages are different, the validation rules are different by usage, which makes it hard for users to predict what will happen. 4. The fields are both imprecise and overly precise. Kind is not a precise mapping to a URL. This can produce ambiguity during interpretation and require a REST mapping. In most cases, the dependency is on the group,resource tuple and the version of the actual struct is irrelevant. 5. We cannot easily change it. Because this type is embedded in many locations, updates to this type will affect numerous schemas. Don''t make new APIs embed an underspecified API type they do not control. Instead of using this type, create a locally provided and used type that is well-focused on your reference. For example, ServiceReferences for admission registration: https://github.com/kubernetes/api/blob/release-1.17/admissionregistration/v1/types.go#L533 .'
6237
properties:
6338
apiVersion:
6439
description: API version of the referent.
6540
type: string
6641
fieldPath:
67-
description: 'If referring to a piece of an object instead of an entire
68-
object, this string should contain a valid JSON/Go field access
69-
statement, such as desiredState.manifest.containers[2]. For example,
70-
if the object reference is to a container within a pod, this would
71-
take on a value like: "spec.containers{name}" (where "name" refers
72-
to the name of the container that triggered the event) or if no
73-
container name is specified "spec.containers[2]" (container with
74-
index 2 in this pod). This syntax is chosen only to have some well-defined
75-
way of referencing a part of an object. TODO: this design is not
76-
final and this field is subject to change in the future.'
42+
description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.'
7743
type: string
7844
kind:
7945
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
@@ -85,8 +51,7 @@ spec:
8551
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
8652
type: string
8753
resourceVersion:
88-
description: 'Specific resourceVersion to which this reference is
89-
made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
54+
description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
9055
type: string
9156
uid:
9257
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'

0 commit comments

Comments
 (0)