Skip to content

Commit f19d0ee

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #504 from karelyatin/OSPRH-20823
Allow passing metric secret and honor certificate rotation
2 parents 0fa53d5 + b3e8a6a commit f19d0ee

18 files changed

+355
-16
lines changed

‎api/bases/ovn.openstack.org_ovncontrollers.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,17 @@ spec:
117117
description: MetricsEnabled enables the metrics daemonset for collecting
118118
OVN metrics
119119
type: boolean
120+
metricsTLS:
121+
description: MetricsTLS - Parameters related to TLS for metrics daemonset
122+
properties:
123+
caBundleSecretName:
124+
description: CaBundleSecretName - holding the CA certs in a pre-created
125+
bundle file
126+
type: string
127+
secretName:
128+
description: SecretName - holding the cert, key for the service
129+
type: string
130+
type: object
120131
networkAttachment:
121132
description: |-
122133
NetworkAttachment is a NetworkAttachment resource name to expose the service to the given network.

‎api/bases/ovn.openstack.org_ovndbclusters.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,17 @@ spec:
8585
description: MetricsEnabled enables the metrics sidecar container
8686
for collecting OVN DB metrics
8787
type: boolean
88+
metricsTLS:
89+
description: MetricsTLS - Parameters related to TLS for metrics sidecar
90+
properties:
91+
caBundleSecretName:
92+
description: CaBundleSecretName - holding the CA certs in a pre-created
93+
bundle file
94+
type: string
95+
secretName:
96+
description: SecretName - holding the cert, key for the service
97+
type: string
98+
type: object
8899
networkAttachment:
89100
description: |-
90101
NetworkAttachment is a NetworkAttachment resource name to expose the service to the given network.

‎api/bases/ovn.openstack.org_ovnnorthds.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@ spec:
6565
description: MetricsEnabled enables the metrics sidecar container
6666
for collecting OVN metrics
6767
type: boolean
68+
metricsTLS:
69+
description: MetricsTLS - Parameters related to TLS for metrics sidecar
70+
properties:
71+
caBundleSecretName:
72+
description: CaBundleSecretName - holding the CA certs in a pre-created
73+
bundle file
74+
type: string
75+
secretName:
76+
description: SecretName - holding the cert, key for the service
77+
type: string
78+
type: object
6879
nThreads:
6980
default: 1
7081
description: NThreads sets number of threads used for building logical
@@ -221,6 +232,11 @@ spec:
221232
- type
222233
type: object
223234
type: array
235+
hash:
236+
additionalProperties:
237+
type: string
238+
description: Map of hashes to track e.g. job status
239+
type: object
224240
lastAppliedTopology:
225241
description: LastAppliedTopology - the last applied Topology
226242
properties:

‎api/v1beta1/ovncontroller_types.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ type OVNControllerSpecCore struct {
108108
// +kubebuilder:default=true
109109
// MetricsEnabled enables the metrics daemonset for collecting OVN metrics
110110
MetricsEnabled *bool `json:"metricsEnabled,omitempty"`
111+
112+
// +kubebuilder:validation:Optional
113+
// MetricsTLS - Parameters related to TLS for metrics daemonset
114+
MetricsTLS tls.SimpleService `json:"metricsTLS,omitempty"`
111115
}
112116

113117
// OVNControllerStatus defines the observed state of OVNController

‎api/v1beta1/ovndbcluster_types.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,10 @@ type OVNDBClusterSpecCore struct {
139139
// +kubebuilder:default=true
140140
// MetricsEnabled enables the metrics sidecar container for collecting OVN DB metrics
141141
MetricsEnabled *bool `json:"metricsEnabled,omitempty"`
142+
143+
// +kubebuilder:validation:Optional
144+
// MetricsTLS - Parameters related to TLS for metrics sidecar
145+
MetricsTLS tls.SimpleService `json:"metricsTLS,omitempty"`
142146
}
143147

144148
// OVNDBClusterOverrideSpec to override the generated manifest of several child resources.

‎api/v1beta1/ovnnorthd_types.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,10 @@ type OVNNorthdSpecCore struct {
9595
// +kubebuilder:default=true
9696
// MetricsEnabled enables the metrics sidecar container for collecting OVN metrics
9797
MetricsEnabled *bool `json:"metricsEnabled,omitempty"`
98+
99+
// +kubebuilder:validation:Optional
100+
// MetricsTLS - Parameters related to TLS for metrics sidecar
101+
MetricsTLS tls.SimpleService `json:"metricsTLS,omitempty"`
98102
}
99103

100104
// OVNNorthdStatus defines the observed state of OVNNorthd
@@ -105,6 +109,9 @@ type OVNNorthdStatus struct {
105109
// Conditions
106110
Conditions condition.Conditions `json:"conditions,omitempty" optional:"true"`
107111

112+
// Map of hashes to track e.g. job status
113+
Hash map[string]string `json:"hash,omitempty"`
114+
108115
//ObservedGeneration - the most recent generation observed for this service. If the observed generation is less than the spec generation, then the controller has not processed the latest changes.
109116
ObservedGeneration int64 `json:"observedGeneration,omitempty"`
110117

‎api/v1beta1/zz_generated.deepcopy.go‎

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

‎config/crd/bases/ovn.openstack.org_ovncontrollers.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,17 @@ spec:
117117
description: MetricsEnabled enables the metrics daemonset for collecting
118118
OVN metrics
119119
type: boolean
120+
metricsTLS:
121+
description: MetricsTLS - Parameters related to TLS for metrics daemonset
122+
properties:
123+
caBundleSecretName:
124+
description: CaBundleSecretName - holding the CA certs in a pre-created
125+
bundle file
126+
type: string
127+
secretName:
128+
description: SecretName - holding the cert, key for the service
129+
type: string
130+
type: object
120131
networkAttachment:
121132
description: |-
122133
NetworkAttachment is a NetworkAttachment resource name to expose the service to the given network.

‎config/crd/bases/ovn.openstack.org_ovndbclusters.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,17 @@ spec:
8585
description: MetricsEnabled enables the metrics sidecar container
8686
for collecting OVN DB metrics
8787
type: boolean
88+
metricsTLS:
89+
description: MetricsTLS - Parameters related to TLS for metrics sidecar
90+
properties:
91+
caBundleSecretName:
92+
description: CaBundleSecretName - holding the CA certs in a pre-created
93+
bundle file
94+
type: string
95+
secretName:
96+
description: SecretName - holding the cert, key for the service
97+
type: string
98+
type: object
8899
networkAttachment:
89100
description: |-
90101
NetworkAttachment is a NetworkAttachment resource name to expose the service to the given network.

‎config/crd/bases/ovn.openstack.org_ovnnorthds.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@ spec:
6565
description: MetricsEnabled enables the metrics sidecar container
6666
for collecting OVN metrics
6767
type: boolean
68+
metricsTLS:
69+
description: MetricsTLS - Parameters related to TLS for metrics sidecar
70+
properties:
71+
caBundleSecretName:
72+
description: CaBundleSecretName - holding the CA certs in a pre-created
73+
bundle file
74+
type: string
75+
secretName:
76+
description: SecretName - holding the cert, key for the service
77+
type: string
78+
type: object
6879
nThreads:
6980
default: 1
7081
description: NThreads sets number of threads used for building logical
@@ -221,6 +232,11 @@ spec:
221232
- type
222233
type: object
223234
type: array
235+
hash:
236+
additionalProperties:
237+
type: string
238+
description: Map of hashes to track e.g. job status
239+
type: object
224240
lastAppliedTopology:
225241
description: LastAppliedTopology - the last applied Topology
226242
properties:

0 commit comments

Comments
 (0)