Skip to content

OCPBUGS-28230: add FallbackToLogsOnError for easier debugging #1211

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
Jan 26, 2024
Merged

OCPBUGS-28230: add FallbackToLogsOnError for easier debugging #1211

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
2 changes: 2 additions & 0 deletions install/0000_30_machine-api-operator_11_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ spec:
requests:
memory: 20Mi
cpu: 10m
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- name: config
mountPath: /etc/kube-rbac-proxy
Expand Down Expand Up @@ -78,6 +79,7 @@ spec:
requests:
cpu: 10m
memory: 50Mi
terminationMessagePolicy: FallbackToLogsOnError
volumeMounts:
- name: images
mountPath: /etc/machine-api-operator-config/images
Expand Down
27 changes: 16 additions & 11 deletions pkg/operator/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,7 @@ func newContainers(config *OperatorConfig, features map[string]bool) []corev1.Co
},
},
},
TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
VolumeMounts: []corev1.VolumeMount{
{
MountPath: "/etc/machine-api-operator/tls",
Expand Down Expand Up @@ -743,6 +744,7 @@ func newContainers(config *OperatorConfig, features map[string]bool) []corev1.Co
},
},
},
TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
VolumeMounts: []corev1.VolumeMount{
{
MountPath: "/etc/pki/ca-trust/extracted/pem",
Expand All @@ -762,12 +764,13 @@ func newContainers(config *OperatorConfig, features map[string]bool) []corev1.Co
},
},
{
Name: "nodelink-controller",
Image: config.Controllers.NodeLink,
Command: []string{"/nodelink-controller"},
Args: args,
Env: proxyEnvArgs,
Resources: resources,
Name: "nodelink-controller",
Image: config.Controllers.NodeLink,
Command: []string{"/nodelink-controller"},
Args: args,
Env: proxyEnvArgs,
Resources: resources,
TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
},
}
if config.Controllers.MachineHealthCheck != "" {
Expand Down Expand Up @@ -800,6 +803,7 @@ func newContainers(config *OperatorConfig, features map[string]bool) []corev1.Co
},
},
},
TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
})
}
return containers
Expand Down Expand Up @@ -843,11 +847,12 @@ func newKubeProxyContainer(image, portName, upstreamPort string, exposePort int3
}}

return corev1.Container{
Name: fmt.Sprintf("kube-rbac-proxy-%s", portName),
Image: image,
Args: args,
Resources: resources,
Ports: ports,
Name: fmt.Sprintf("kube-rbac-proxy-%s", portName),
Image: image,
Args: args,
Resources: resources,
Ports: ports,
TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
VolumeMounts: []corev1.VolumeMount{
{
Name: kubeRBACConfigName,
Expand Down