Skip to content

Commit 294361a

Browse files
jlarribajlarriba
committed
CloudKitty TLS
1 parent c223c8b commit 294361a

20 files changed

+335
-86
lines changed

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,17 @@ spec:
450450
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
451451
type: object
452452
type: object
453+
tls:
454+
description: TLS - Parameters related to the TLS
455+
properties:
456+
caBundleSecretName:
457+
description: CaBundleSecretName - holding the CA certs in
458+
a pre-created bundle file
459+
type: string
460+
secretName:
461+
description: SecretName - holding the cert, key for the service
462+
type: string
463+
type: object
453464
topologyRef:
454465
description: |-
455466
TopologyRef to apply the Topology defined by the associated CR referenced

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,9 @@ spec:
196196
description: CaBundleSecretName - holding the CA certs in a pre-created
197197
bundle file
198198
type: string
199+
secretName:
200+
description: SecretName - holding the cert, key for the service
201+
type: string
199202
type: object
200203
topologyRef:
201204
description: |-

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,18 @@ spec:
10081008
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
10091009
type: object
10101010
type: object
1011+
tls:
1012+
description: TLS - Parameters related to the TLS
1013+
properties:
1014+
caBundleSecretName:
1015+
description: CaBundleSecretName - holding the CA certs
1016+
in a pre-created bundle file
1017+
type: string
1018+
secretName:
1019+
description: SecretName - holding the cert, key for the
1020+
service
1021+
type: string
1022+
type: object
10111023
topologyRef:
10121024
description: |-
10131025
TopologyRef to apply the Topology defined by the associated CR referenced

‎api/v1beta1/cloudkitty_types.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ const (
3232
CloudKittyGroupID = 42408
3333

3434
// CloudKittyAPIContainerImage - default fall-back image for CloudKitty API
35-
CloudKittyAPIContainerImage = "quay.io/podified-master-centos9/cloudkitty-api:current-podified"
35+
CloudKittyAPIContainerImage = "quay.io/podified-master-centos9/openstack-cloudkitty-api:current-podified"
3636
// CloudKittyProcContainerImage - default fall-back image for CloudKitty Processor
37-
CloudKittyProcContainerImage = "quay.io/podified-master-centos9/cloudkitty-processor:current-podified"
37+
CloudKittyProcContainerImage = "quay.io/podified-master-centos9/openstack-cloudkitty-processor:current-podified"
3838
// CloudKittyDbSyncHash hash
3939
CKDbSyncHash = "ckdbsync"
40+
// CKStorageInitHash hash
41+
CKStorageInitHash = "ckstorageinit"
4042
// CloudKittyReplicas - The number of replicas per each service deployed
4143
CloudKittyReplicas = 1
4244
)

‎api/v1beta1/cloudkittyproc_types.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ type CloudKittyProcTemplateCore struct {
3333
// +kubebuilder:validation:Minimum=0
3434
// Replicas - CloudKitty API Replicas
3535
Replicas *int32 `json:"replicas"`
36+
37+
// +kubebuilder:validation:Optional
38+
// +operator-sdk:csv:customresourcedefinitions:type=spec
39+
// TLS - Parameters related to the TLS
40+
TLS tls.SimpleService `json:"tls,omitempty"`
3641
}
3742

3843
// CloudKittyProcTemplate defines the input parameters for the CloudKitty Processor service
@@ -63,11 +68,6 @@ type CloudKittyProcSpec struct {
6368
// +kubebuilder:validation:Required
6469
// ServiceAccount - service account name used internally to provide CloudKitty services the default SA name
6570
ServiceAccount string `json:"serviceAccount"`
66-
67-
// +kubebuilder:validation:Optional
68-
// +operator-sdk:csv:customresourcedefinitions:type=spec
69-
// TLS - Parameters related to the TLS
70-
TLS tls.Ca `json:"tls,omitempty"`
7171
}
7272

7373
// CloudKittyProcStatus defines the observed state of CloudKitty Processor

‎api/v1beta1/conditions.go‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ const (
5454
// CloudKittyProcReadyCondition Status=True condition which indicates if the CloudKitty Processor is configured and operational
5555
CloudKittyProcReadyCondition condition.Type = "CloudKittyProcReady"
5656

57+
// CloudKittyStorageInitReadyCondition Status=True condition which indicates if the CloudKitty Storage Init process has ran
58+
CloudKittyStorageInitReadyCondition condition.Type = "CloudKittyStorageInitReady"
59+
5760
// LoggingCLONamespaceReadyCondition Status=True condition which indicates if the cluster-logging-operator namespace is created
5861
LoggingCLONamespaceReadyCondition condition.Type = "LoggingCLONamespaceReady"
5962

@@ -223,6 +226,21 @@ const (
223226
// CloudKittyReadyErrorMessage
224227
CloudKittyReadyErrorMessage = "CloudKitty error occured %s"
225228

229+
//
230+
// CloudKittyStorageInit condition messages
231+
//
232+
// CloudKittyStorageInitReadyInitMessage
233+
CloudKittyStorageInitReadyInitMessage = "CloudKittyStorageInit not started"
234+
235+
// CloudKittyStorageInitReadyMessage
236+
CloudKittyStorageInitReadyMessage = "CloudKittyStorageInit completed"
237+
238+
// CloudKittyStorageInitReadyRunning
239+
CloudKittyStorageInitReadyRunningMessage = "CloudKittyStorageInit job still running"
240+
241+
// CloudKittyStorageInitReadyErrorMessage
242+
CloudKittyStorageInitReadyErrorMessage = "CloudKittyStorageInit job error occurred %s"
243+
226244
//
227245
// CloudKittyAPIReady condition messages
228246
//

‎api/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,17 @@ spec:
450450
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
451451
type: object
452452
type: object
453+
tls:
454+
description: TLS - Parameters related to the TLS
455+
properties:
456+
caBundleSecretName:
457+
description: CaBundleSecretName - holding the CA certs in
458+
a pre-created bundle file
459+
type: string
460+
secretName:
461+
description: SecretName - holding the cert, key for the service
462+
type: string
463+
type: object
453464
topologyRef:
454465
description: |-
455466
TopologyRef to apply the Topology defined by the associated CR referenced

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,9 @@ spec:
196196
description: CaBundleSecretName - holding the CA certs in a pre-created
197197
bundle file
198198
type: string
199+
secretName:
200+
description: SecretName - holding the cert, key for the service
201+
type: string
199202
type: object
200203
topologyRef:
201204
description: |-

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,18 @@ spec:
10081008
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
10091009
type: object
10101010
type: object
1011+
tls:
1012+
description: TLS - Parameters related to the TLS
1013+
properties:
1014+
caBundleSecretName:
1015+
description: CaBundleSecretName - holding the CA certs
1016+
in a pre-created bundle file
1017+
type: string
1018+
secretName:
1019+
description: SecretName - holding the cert, key for the
1020+
service
1021+
type: string
1022+
type: object
10111023
topologyRef:
10121024
description: |-
10131025
TopologyRef to apply the Topology defined by the associated CR referenced

0 commit comments

Comments
 (0)