Skip to content

Use separate image for route controller manager #1790

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-robot merged 1 commit into from
Oct 7, 2022
Merged

Use separate image for route controller manager #1790

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
6 changes: 3 additions & 3 deletions control-plane-operator/controllers/hostedcontrolplane/routecm/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ func ReconcileDeployment(deployment *appsv1.Deployment, image string, config *co

func routeOCMContainerMain() *corev1.Container {
return &corev1.Container{
Name: "openshift-controller-manager",
Name: "route-controller-manager",
}
}

func buildRouteOCMContainerMain(image string) func(*corev1.Container) {
return func(c *corev1.Container) {
c.Image = image
c.Command = []string{"openshift-controller-manager"}
c.Command = []string{"route-controller-manager"}
c.Args = []string{
"route-controller-manager-start",
"start",
"--config",
path.Join(volumeMounts.Path(c.Name, routeOCMVolumeConfig().Name), configKey),
}
Expand Down
2 changes: 1 addition & 1 deletion control-plane-operator/controllers/hostedcontrolplane/routecm/params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ type OpenShiftRouteControllerManagerParams struct {

func NewOpenShiftRouteControllerManagerParams(hcp *hyperv1.HostedControlPlane, observedConfig *globalconfig.ObservedConfig, images map[string]string, setDefaultSecurityContext bool) *OpenShiftRouteControllerManagerParams {
params := &OpenShiftRouteControllerManagerParams{
OpenShiftControllerManagerImage: images["openshift-controller-manager"],
OpenShiftControllerManagerImage: images["route-controller-manager"],
}
if hcp.Spec.Configuration != nil {
params.APIServer = hcp.Spec.Configuration.APIServer
Expand Down