Skip to content

Commit d214cf8

Browse files
jlarribajlarriba
committed
Fix pre-commit
1 parent 13ef450 commit d214cf8

16 files changed

+46
-105
lines changed

‎api/bases/telemetry.openstack.org_cloudkitties.yaml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,14 @@ spec:
6565
items:
6666
type: string
6767
type: array
68+
x-kubernetes-list-type: atomic
6869
networkAttachments:
6970
description: NetworkAttachments is a list of NetworkAttachment
7071
resource names to expose the services to the given network
7172
items:
7273
type: string
7374
type: array
75+
x-kubernetes-list-type: atomic
7476
nodeSelector:
7577
additionalProperties:
7678
type: string
@@ -348,8 +350,6 @@ spec:
348350
current project
349351
type: string
350352
type: object
351-
required:
352-
- containerImage
353353
type: object
354354
cloudKittyProc:
355355
description: CloudKittyProc - Spec definition for the Scheduler service
@@ -373,12 +373,14 @@ spec:
373373
items:
374374
type: string
375375
type: array
376+
x-kubernetes-list-type: atomic
376377
networkAttachments:
377378
description: NetworkAttachments is a list of NetworkAttachment
378379
resource names to expose the services to the given network
379380
items:
380381
type: string
381382
type: array
383+
x-kubernetes-list-type: atomic
382384
nodeSelector:
383385
additionalProperties:
384386
type: string
@@ -478,8 +480,6 @@ spec:
478480
current project
479481
type: string
480482
type: object
481-
required:
482-
- containerImage
483483
type: object
484484
customServiceConfig:
485485
description: |-
@@ -600,13 +600,6 @@ spec:
600600
current project
601601
type: string
602602
type: object
603-
required:
604-
- cloudKittyAPI
605-
- cloudKittyProc
606-
- databaseInstance
607-
- memcachedInstance
608-
- rabbitMqClusterName
609-
- secret
610603
type: object
611604
status:
612605
description: CloudKittyStatus defines the observed state of CloudKitty

‎api/bases/telemetry.openstack.org_cloudkittyapis.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ spec:
5757
items:
5858
type: string
5959
type: array
60+
x-kubernetes-list-type: atomic
6061
databaseAccount:
6162
default: cloudkitty
6263
description: DatabaseAccount - optional MariaDBAccount used for cloudkitty
@@ -71,6 +72,7 @@ spec:
7172
items:
7273
type: string
7374
type: array
75+
x-kubernetes-list-type: atomic
7476
nodeSelector:
7577
additionalProperties:
7678
type: string
@@ -384,12 +386,6 @@ spec:
384386
transportURLSecret:
385387
description: Secret containing RabbitMq transport URL
386388
type: string
387-
required:
388-
- containerImage
389-
- databaseHostname
390-
- secret
391-
- serviceAccount
392-
- transportURLSecret
393389
type: object
394390
status:
395391
description: CloudKittyAPIStatus defines the observed state of CloudKittyAPI

‎api/bases/telemetry.openstack.org_cloudkittyprocs.yaml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ spec:
7171
items:
7272
type: string
7373
type: array
74+
x-kubernetes-list-type: atomic
7475
databaseAccount:
7576
default: cloudkitty
7677
description: DatabaseAccount - optional MariaDBAccount used for cloudkitty
@@ -85,6 +86,7 @@ spec:
8586
items:
8687
type: string
8788
type: array
89+
x-kubernetes-list-type: atomic
8890
nodeSelector:
8991
additionalProperties:
9092
type: string
@@ -220,12 +222,6 @@ spec:
220222
transportURLSecret:
221223
description: Secret containing RabbitMq transport URL
222224
type: string
223-
required:
224-
- containerImage
225-
- databaseHostname
226-
- secret
227-
- serviceAccount
228-
- transportURLSecret
229225
type: object
230226
status:
231227
description: CloudKittyProcStatus defines the observed state of CloudKitty

‎api/bases/telemetry.openstack.org_telemetries.yaml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -623,12 +623,14 @@ spec:
623623
items:
624624
type: string
625625
type: array
626+
x-kubernetes-list-type: atomic
626627
networkAttachments:
627628
description: NetworkAttachments is a list of NetworkAttachment
628629
resource names to expose the services to the given network
629630
items:
630631
type: string
631632
type: array
633+
x-kubernetes-list-type: atomic
632634
nodeSelector:
633635
additionalProperties:
634636
type: string
@@ -906,8 +908,6 @@ spec:
906908
current project
907909
type: string
908910
type: object
909-
required:
910-
- containerImage
911911
type: object
912912
cloudKittyProc:
913913
description: CloudKittyProc - Spec definition for the Scheduler
@@ -931,12 +931,14 @@ spec:
931931
items:
932932
type: string
933933
type: array
934+
x-kubernetes-list-type: atomic
934935
networkAttachments:
935936
description: NetworkAttachments is a list of NetworkAttachment
936937
resource names to expose the services to the given network
937938
items:
938939
type: string
939940
type: array
941+
x-kubernetes-list-type: atomic
940942
nodeSelector:
941943
additionalProperties:
942944
type: string
@@ -1037,8 +1039,6 @@ spec:
10371039
current project
10381040
type: string
10391041
type: object
1040-
required:
1041-
- containerImage
10421042
type: object
10431043
customServiceConfig:
10441044
description: |-
@@ -1166,13 +1166,6 @@ spec:
11661166
current project
11671167
type: string
11681168
type: object
1169-
required:
1170-
- cloudKittyAPI
1171-
- cloudKittyProc
1172-
- databaseInstance
1173-
- memcachedInstance
1174-
- rabbitMqClusterName
1175-
- secret
11761169
type: object
11771170
logging:
11781171
description: Logging - Parameters related to the logging

‎api/v1beta1/cloudkitty_types.go‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,20 @@ const (
4646
type CloudKittySpecBase struct {
4747
CloudKittyTemplate `json:",inline"`
4848

49-
// +kubebuilder:validation:Required
49+
// +kubebuilder:validation:Optional
5050
// +kubebuilder:default=openstack
5151
// MariaDB instance name
5252
// Right now required by the maridb-operator to get the credentials from the instance to create the DB
5353
// Might not be required in future
5454
DatabaseInstance string `json:"databaseInstance"`
5555

56-
// +kubebuilder:validation:Required
56+
// +kubebuilder:validation:Optional
5757
// +kubebuilder:default=rabbitmq
5858
// RabbitMQ instance name
5959
// Needed to request a transportURL that is created and used in CloudKitty
6060
RabbitMqClusterName string `json:"rabbitMqClusterName"`
6161

62-
// +kubebuilder:validation:Required
62+
// +kubebuilder:validation:Optional
6363
// +kubebuilder:default=memcached
6464
// Memcached instance name.
6565
MemcachedInstance string `json:"memcachedInstance"`
@@ -111,11 +111,11 @@ type CloudKittySpecBase struct {
111111
type CloudKittySpecCore struct {
112112
CloudKittySpecBase `json:",inline"`
113113

114-
// +kubebuilder:validation:Required
114+
// +kubebuilder:validation:Optional
115115
// CloudKittyAPI - Spec definition for the API service of this CloudKitty deployment
116116
CloudKittyAPI CloudKittyAPITemplateCore `json:"cloudKittyAPI"`
117117

118-
// +kubebuilder:validation:Required
118+
// +kubebuilder:validation:Optional
119119
// CloudKittyProc - Spec definition for the Scheduler service of this CloudKitty deployment
120120
CloudKittyProc CloudKittyProcTemplateCore `json:"cloudKittyProc"`
121121
}
@@ -124,11 +124,11 @@ type CloudKittySpecCore struct {
124124
type CloudKittySpec struct {
125125
CloudKittySpecBase `json:",inline"`
126126

127-
// +kubebuilder:validation:Required
127+
// +kubebuilder:validation:Optional
128128
// CloudKittyAPI - Spec definition for the API service of this CloudKitty deployment
129129
CloudKittyAPI CloudKittyAPITemplate `json:"cloudKittyAPI"`
130130

131-
// +kubebuilder:validation:Required
131+
// +kubebuilder:validation:Optional
132132
// CloudKittyProc - Spec definition for the Scheduler service of this CloudKitty deployment
133133
CloudKittyProc CloudKittyProcTemplate `json:"cloudKittyProc"`
134134
}
@@ -145,7 +145,7 @@ type CloudKittyTemplate struct {
145145
// DatabaseAccount - optional MariaDBAccount used for cloudkitty DB, defaults to cloudkitty
146146
DatabaseAccount string `json:"databaseAccount"`
147147

148-
// +kubebuilder:validation:Required
148+
// +kubebuilder:validation:Optional
149149
// Secret containing OpenStack password information
150150
Secret string `json:"secret"`
151151

@@ -171,6 +171,7 @@ type CloudKittyServiceTemplate struct {
171171
CustomServiceConfig string `json:"customServiceConfig,omitempty"`
172172

173173
// +kubebuilder:validation:Optional
174+
// +listType=atomic
174175
// CustomServiceConfigSecrets - customize the service config using this parameter to specify Secrets
175176
// that contain sensitive service config data. The content of each Secret gets added to the
176177
// /etc/<service>/<service>.conf.d directory as a custom config file.
@@ -182,6 +183,7 @@ type CloudKittyServiceTemplate struct {
182183
Resources corev1.ResourceRequirements `json:"resources,omitempty"`
183184

184185
// +kubebuilder:validation:Optional
186+
// +listType=atomic
185187
// NetworkAttachments is a list of NetworkAttachment resource names to expose the services to the given network
186188
NetworkAttachments []string `json:"networkAttachments,omitempty"`
187189

‎api/v1beta1/cloudkittyapi_types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type CloudKittyAPITemplateCore struct {
4646

4747
// CloudKittyAPITemplate defines the input parameters for the CloudKitty API service
4848
type CloudKittyAPITemplate struct {
49-
// +kubebuilder:validation:Required
49+
// +kubebuilder:validation:Optional
5050
// ContainerImage - CloudKitty Container Image URL (will be set to environmental default if empty)
5151
ContainerImage string `json:"containerImage"`
5252

@@ -61,15 +61,15 @@ type CloudKittyAPISpec struct {
6161
// Input parameters for the CloudKitty API service
6262
CloudKittyAPITemplate `json:",inline"`
6363

64-
// +kubebuilder:validation:Required
64+
// +kubebuilder:validation:Optional
6565
// DatabaseHostname - CloudKitty Database Hostname
6666
DatabaseHostname string `json:"databaseHostname"`
6767

68-
// +kubebuilder:validation:Required
68+
// +kubebuilder:validation:Optional
6969
// Secret containing RabbitMq transport URL
7070
TransportURLSecret string `json:"transportURLSecret"`
7171

72-
// +kubebuilder:validation:Required
72+
// +kubebuilder:validation:Optional
7373
// ServiceAccount - service account name used internally to provide CloudKitty services the default SA name
7474
ServiceAccount string `json:"serviceAccount"`
7575
}

‎api/v1beta1/cloudkittyproc_types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ type CloudKittyProcTemplateCore struct {
4242

4343
// CloudKittyProcTemplate defines the input parameters for the CloudKitty Processor service
4444
type CloudKittyProcTemplate struct {
45-
// +kubebuilder:validation:Required
45+
// +kubebuilder:validation:Optional
4646
// ContainerImage - CloudKitty Container Image URL (will be set to environmental default if empty)
4747
ContainerImage string `json:"containerImage"`
4848

@@ -57,15 +57,15 @@ type CloudKittyProcSpec struct {
5757
// Input parameters for the CloudKitty Processor service
5858
CloudKittyProcTemplate `json:",inline"`
5959

60-
// +kubebuilder:validation:Required
60+
// +kubebuilder:validation:Optional
6161
// DatabaseHostname - CloudKitty Database Hostname
6262
DatabaseHostname string `json:"databaseHostname"`
6363

64-
// +kubebuilder:validation:Required
64+
// +kubebuilder:validation:Optional
6565
// Secret containing RabbitMq transport URL
6666
TransportURLSecret string `json:"transportURLSecret"`
6767

68-
// +kubebuilder:validation:Required
68+
// +kubebuilder:validation:Optional
6969
// ServiceAccount - service account name used internally to provide CloudKitty services the default SA name
7070
ServiceAccount string `json:"serviceAccount"`
7171
}

‎config/crd/bases/telemetry.openstack.org_cloudkitties.yaml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,14 @@ spec:
6565
items:
6666
type: string
6767
type: array
68+
x-kubernetes-list-type: atomic
6869
networkAttachments:
6970
description: NetworkAttachments is a list of NetworkAttachment
7071
resource names to expose the services to the given network
7172
items:
7273
type: string
7374
type: array
75+
x-kubernetes-list-type: atomic
7476
nodeSelector:
7577
additionalProperties:
7678
type: string
@@ -348,8 +350,6 @@ spec:
348350
current project
349351
type: string
350352
type: object
351-
required:
352-
- containerImage
353353
type: object
354354
cloudKittyProc:
355355
description: CloudKittyProc - Spec definition for the Scheduler service
@@ -373,12 +373,14 @@ spec:
373373
items:
374374
type: string
375375
type: array
376+
x-kubernetes-list-type: atomic
376377
networkAttachments:
377378
description: NetworkAttachments is a list of NetworkAttachment
378379
resource names to expose the services to the given network
379380
items:
380381
type: string
381382
type: array
383+
x-kubernetes-list-type: atomic
382384
nodeSelector:
383385
additionalProperties:
384386
type: string
@@ -478,8 +480,6 @@ spec:
478480
current project
479481
type: string
480482
type: object
481-
required:
482-
- containerImage
483483
type: object
484484
customServiceConfig:
485485
description: |-
@@ -600,13 +600,6 @@ spec:
600600
current project
601601
type: string
602602
type: object
603-
required:
604-
- cloudKittyAPI
605-
- cloudKittyProc
606-
- databaseInstance
607-
- memcachedInstance
608-
- rabbitMqClusterName
609-
- secret
610603
type: object
611604
status:
612605
description: CloudKittyStatus defines the observed state of CloudKitty

0 commit comments

Comments
 (0)