Skip to content

Commit 6e17e9e

Browse files
CNTRLPLANE-2777: add TypeMeta to GenericControllerConfig
The CVO now supports automatic injection of TLS security profile settings into operator ConfigMaps annotated with config.openshift.io/inject-tls . The CVO identifies eligible configuration types by checking the apiVersion and kind fields in YAML entries within the ConfigMap. The CVO currently supports two configuration types: - operator.openshift.io/v1alpha1.GenericOperatorConfig - config.openshift.io/v1.GenericControllerConfig The GenericControllerConfig type currently lacks apiVersion and kind fields (provided by TypeMeta), preventing the CVO from identifying it for automatic TLS profile injection. This change adds the missing TypeMeta field to enable proper type identification. When a matching type is identified, the CVO injects minTLSVersion and cipherSuites values from the cluster's APIServer tlsSecurityProfile into the configuration's .servingInfo section.
1 parent 30c2ef7 commit 6e17e9e

4 files changed

Lines changed: 22 additions & 2 deletions

File tree

config/v1/types.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,12 @@ type ClientConnectionOverrides struct {
284284
}
285285

286286
// GenericControllerConfig provides information to configure a controller
287+
//
288+
// Compatibility level 1: Stable within a major release for a minimum of 12 months or 3 minor releases (whichever is longer).
289+
// +openshift:compatibility-gen:level=1
287290
type GenericControllerConfig struct {
291+
metav1.TypeMeta `json:",inline"`
292+
288293
// servingInfo is the HTTP serving information for the controller's endpoints
289294
ServingInfo HTTPServingInfo `json:"servingInfo"`
290295

config/v1/zz_generated.deepcopy.go

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

config/v1/zz_generated.swagger_doc_generated.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.

openapi/generated_openapi/zz_generated.openapi.go

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

0 commit comments

Comments
 (0)