Skip to content

OCPBUGS-121353: Pass missing proxy vars to bootstrap MCC #6526

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
Sep 16, 2026
Merged

OCPBUGS-121353: Pass missing proxy vars to bootstrap MCC #6526

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
15 changes: 15 additions & 0 deletions manifests/bootstrap-pod-v2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,21 @@ spec:
privileged: true
readOnlyRootFilesystem: false
terminationMessagePolicy: FallbackToLogsOnError
{{if .ControllerConfig.Proxy}}
env:
{{if .ControllerConfig.Proxy.HTTPProxy}}
- name: HTTP_PROXY
value: {{.ControllerConfig.Proxy.HTTPProxy}}
{{end}}
{{if .ControllerConfig.Proxy.HTTPSProxy}}
- name: HTTPS_PROXY
value: {{.ControllerConfig.Proxy.HTTPSProxy}}
{{end}}
{{if .ControllerConfig.Proxy.NoProxy}}
- name: NO_PROXY
value: "{{.ControllerConfig.Proxy.NoProxy}}"
{{end}}
{{end}}
volumeMounts:
- name: bootstrap-manifests
mountPath: /etc/mcc/bootstrap
Expand Down
23 changes: 23 additions & 0 deletions pkg/operator/render_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,29 @@ func TestRenderAsset(t *testing.T) {
"--payload-version=4.8.0-rc.0",
},
},
{
// Test that bootstrap MCC pod is rendered correctly with proxy config
Path: "manifests/bootstrap-pod-v2.yaml",
RenderConfig: &renderConfig{
TargetNamespace: "testing-namespace",
ReleaseVersion: "4.8.0-rc.0",
Images: &ctrlcommon.RenderConfigImages{
MachineConfigOperator: "mco-operator-image",
},
ControllerConfig: mcfgv1.ControllerConfigSpec{
Proxy: &configv1.ProxyStatus{
HTTPSProxy: "https://i.am.a.proxy.server",
NoProxy: ".cluster.local",
},
},
},
FindExpected: []string{
"image: mco-operator-image",
"- name: HTTPS_PROXY\n value: https://i.am.a.proxy.server",
"- name: NO_PROXY\n value: \".cluster.local\"",
"--payload-version=4.8.0-rc.0",
},
},
}

for idx, test := range tests {
Expand Down