Skip to content

Commit

Permalink
[tlse] TLS for telemetry ceilometer, metricstorage
Browse files Browse the repository at this point in the history
  • Loading branch information
@vyzigold
vyzigold committed Mar 27, 2024
1 parent a5d2738 commit fe50566
Show file tree
Hide file tree
Showing 13 changed files with 698 additions and 52 deletions.
249 changes: 238 additions & 11 deletions apis/bases/core.openstack.org_openstackcontrolplanes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15309,7 +15309,113 @@ spec:
type: object
telemetry:
properties:
apiOverride:
alertmanagerOverride:
properties:
route:
properties:
metadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object
spec:
properties:
alternateBackends:
items:
properties:
kind:
enum:
- Service
- ""
type: string
name:
type: string
weight:
format: int32
maximum: 256
minimum: 0
type: integer
type: object
maxItems: 3
type: array
host:
maxLength: 253
pattern: ^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$
type: string
path:
pattern: ^/
type: string
port:
properties:
targetPort:
anyOf:
- type: integer
- type: string
x-kubernetes-int-or-string: true
required:
- targetPort
type: object
subdomain:
maxLength: 253
pattern: ^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$
type: string
tls:
properties:
caCertificate:
type: string
certificate:
type: string
destinationCACertificate:
type: string
insecureEdgeTerminationPolicy:
type: string
key:
type: string
termination:
enum:
- edge
- reencrypt
- passthrough
type: string
required:
- termination
type: object
to:
properties:
kind:
enum:
- Service
- ""
type: string
name:
type: string
weight:
format: int32
maximum: 256
minimum: 0
type: integer
type: object
wildcardPolicy:
enum:
- None
- Subdomain
- ""
type: string
type: object
type: object
tls:
properties:
secretName:
type: string
type: object
type: object
aodhApiOverride:
properties:
route:
properties:
Expand Down Expand Up @@ -15418,6 +15524,112 @@ spec:
enabled:
default: true
type: boolean
prometheusOverride:
properties:
route:
properties:
metadata:
properties:
annotations:
additionalProperties:
type: string
type: object
labels:
additionalProperties:
type: string
type: object
type: object
spec:
properties:
alternateBackends:
items:
properties:
kind:
enum:
- Service
- ""
type: string
name:
type: string
weight:
format: int32
maximum: 256
minimum: 0
type: integer
type: object
maxItems: 3
type: array
host:
maxLength: 253
pattern: ^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$
type: string
path:
pattern: ^/
type: string
port:
properties:
targetPort:
anyOf:
- type: integer
- type: string
x-kubernetes-int-or-string: true
required:
- targetPort
type: object
subdomain:
maxLength: 253
pattern: ^([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]{0,61}[a-zA-Z0-9]))*$
type: string
tls:
properties:
caCertificate:
type: string
certificate:
type: string
destinationCACertificate:
type: string
insecureEdgeTerminationPolicy:
type: string
key:
type: string
termination:
enum:
- edge
- reencrypt
- passthrough
type: string
required:
- termination
type: object
to:
properties:
kind:
enum:
- Service
- ""
type: string
name:
type: string
weight:
format: int32
maximum: 256
minimum: 0
type: integer
type: object
wildcardPolicy:
enum:
- None
- Subdomain
- ""
type: string
type: object
type: object
tls:
properties:
secretName:
type: string
type: object
type: object
template:
properties:
autoscaling:
Expand All @@ -15429,11 +15641,11 @@ spec:
customServiceConfig:
default: '# add your customization here'
type: string
databaseInstance:
type: string
databaseUser:
databaseAccount:
default: aodh
type: string
databaseInstance:
type: string
defaultConfigOverwrite:
additionalProperties:
type: string
Expand Down Expand Up @@ -15505,14 +15717,10 @@ spec:
passwordSelector:
default:
aodhService: AodhPassword
database: AodhDatabasePassword
properties:
aodhService:
default: AodhPassword
type: string
database:
default: AodhDatabasePassword
type: string
service:
default: CeilometerPassword
type: string
Expand Down Expand Up @@ -15568,6 +15776,8 @@ spec:
maximum: 65535
minimum: 1
type: integer
prometheusTLS:
type: boolean
required:
- heatInstance
type: object
Expand Down Expand Up @@ -15602,13 +15812,12 @@ spec:
aodhService:
default: AodhPassword
type: string
database:
default: AodhDatabasePassword
type: string
service:
default: CeilometerPassword
type: string
type: object
proxyImage:
type: string
rabbitMqClusterName:
default: rabbitmq
type: string
Expand All @@ -15619,11 +15828,19 @@ spec:
type: string
sgCoreImage:
type: string
tls:
properties:
caBundleSecretName:
type: string
secretName:
type: string
type: object
required:
- centralImage
- computeImage
- ipmiImage
- notificationImage
- proxyImage
- secret
- sgCoreImage
type: object
Expand Down Expand Up @@ -16217,6 +16434,9 @@ spec:
alertingEnabled:
default: true
type: boolean
dashboardsEnabled:
default: false
type: boolean
dataplaneNetwork:
default: ctlplane
pattern: ^[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9]$
Expand Down Expand Up @@ -16275,6 +16495,13 @@ spec:
required:
- dataplaneNetwork
type: object
prometheusTls:
properties:
caBundleSecretName:
type: string
secretName:
type: string
type: object
type: object
type: object
type: object
Expand Down
14 changes: 12 additions & 2 deletions apis/core/v1beta1/openstackcontrolplane_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,8 +622,18 @@ type TelemetrySection struct {

// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// APIOverride, provides the ability to override the generated manifest of several child resources.
APIOverride Override `json:"apiOverride,omitempty"`
// AodhAPIOverride, provides the ability to override the generated manifest of several child resources.
AodhAPIOverride Override `json:"aodhApiOverride,omitempty"`

// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// PrometheusOverride, provides the ability to override the generated manifest of several child resources.
PrometheusOverride Override `json:"prometheusOverride,omitempty"`

// +kubebuilder:validation:Optional
// +operator-sdk:csv:customresourcedefinitions:type=spec
// AlertmanagerOverride, provides the ability to override the generated manifest of several child resources.
AlertmanagerOverride Override `json:"alertmanagerOverride,omitempty"`
}

// SwiftSection defines the desired state of Swift service
Expand Down
4 changes: 3 additions & 1 deletion apis/core/v1beta1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit fe50566

Please sign in to comment.