Skip to content

WRKLDS-1676: OCM config: Remove obsolete fields #2364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jun 11, 2025
Merged

WRKLDS-1676: OCM config: Remove obsolete fields #2364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions openapi/generated_openapi/zz_generated.openapi.go
View file
Open in desktop

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

5 changes: 0 additions & 5 deletions openapi/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26480,7 +26480,6 @@
"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.",
"type": "object",
"required": [
"kubeClientConfig",
"servingInfo",
"leaderElection",
"controllers",
Expand Down Expand Up @@ -26541,10 +26540,6 @@
"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",
"type": "string"
},
"kubeClientConfig": {
"default": {},
"$ref": "#/definitions/com.github.openshift.api.config.v1.KubeClientConfig"
},
"leaderElection": {
"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.",
"default": {},
Expand Down
5 changes: 4 additions & 1 deletion openshiftcontrolplane/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,10 @@ const (
type OpenShiftControllerManagerConfig struct {
metav1.TypeMeta `json:",inline"`

KubeClientConfig configv1.KubeClientConfig `json:"kubeClientConfig"`
// KubeClientConfig is no longer being used.
Copy link
Contributor

@JoelSpeed JoelSpeed Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No longer? Or never? Was it ever actually implemented?

Copy link
Contributor Author

@tchap tchap Jun 11, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was. Before using library-go to setup the executable, OCM used this field to configure the client. Kubeconfig file path is now being passed in using a command line flag and library-go machinery uses that to init a client.

Copy link
Contributor

@JoelSpeed JoelSpeed Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And who typically writes to this object? Is this generally only written to by an operator?

Copy link
Contributor Author

@tchap tchap Jun 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it's used by OCMO or Hypershift. But neither accesses this field.

Hypershift only sets it statically in a YAML and it's been updated for the library-go way of config in openshift/hypershift#6203

OCMO doesn't set the field, because OCM uses in-cluster config there and an explicit kubeconfig is not needed.

// The field is being ignored by OCM.
//
// KubeClientConfig configv1.KubeClientConfig `json:"kubeClientConfig"`

// servingInfo describes how to start serving
ServingInfo *configv1.HTTPServingInfo `json:"servingInfo"`
Expand Down
1 change: 0 additions & 1 deletion openshiftcontrolplane/v1/zz_generated.deepcopy.go
View file
Open in desktop

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