Skip to content

Commit f5a5920

Browse files
committed
OCM config: Remove obsolete fields
As OCM moves to use library-go for configuration, some fields present into OpenShiftControllerManagerConfig are no longer needed since they are actually accessed via GenericOperatorConfig. Leaving the fields there commented out as a tombstone.
1 parent 74a8f24 commit f5a5920

File tree

4 files changed

+6
-15
lines changed

4 files changed

+6
-15
lines changed

openapi/generated_openapi/zz_generated.openapi.go

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

openapi/openapi.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26480,7 +26480,6 @@
2648026480
"description": "Compatibility level 4: No compatibility is provided, the API can change at any point for any reason. These capabilities should not be used by applications needing long term support.",
2648126481
"type": "object",
2648226482
"required": [
26483-
"kubeClientConfig",
2648426483
"servingInfo",
2648526484
"leaderElection",
2648626485
"controllers",
@@ -26541,10 +26540,6 @@
2654126540
"description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds",
2654226541
"type": "string"
2654326542
},
26544-
"kubeClientConfig": {
26545-
"default": {},
26546-
"$ref": "#/definitions/com.github.openshift.api.config.v1.KubeClientConfig"
26547-
},
2654826543
"leaderElection": {
2654926544
"description": "leaderElection defines the configuration for electing a controller instance to make changes to the cluster. If unspecified, the ControllerTTL value is checked to determine whether the legacy direct etcd election code will be used.",
2655026545
"default": {},

openshiftcontrolplane/v1/types.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,10 @@ const (
258258
type OpenShiftControllerManagerConfig struct {
259259
metav1.TypeMeta `json:",inline"`
260260

261-
KubeClientConfig configv1.KubeClientConfig `json:"kubeClientConfig"`
261+
// KubeClientConfig is no longer being used.
262+
// The field is being ignored by OCM.
263+
//
264+
// KubeClientConfig configv1.KubeClientConfig `json:"kubeClientConfig"`
262265

263266
// servingInfo describes how to start serving
264267
ServingInfo *configv1.HTTPServingInfo `json:"servingInfo"`

openshiftcontrolplane/v1/zz_generated.deepcopy.go

Lines changed: 0 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)