Skip to content

Bug 1769879: add AdditionalTrustBundles to master and worker shims #2639

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

Closed
iamemilio wants to merge 1 commit into from
Closed

Bug 1769879: add AdditionalTrustBundles to master and worker shims #2639

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
12 changes: 9 additions & 3 deletions pkg/asset/ignition/machine/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ import (
// served by the machine config server.
func pointerIgnitionConfig(installConfig *types.InstallConfig, rootCA []byte, role string) *ignition.Config {
var ignitionHost string
CAs := []ignition.CaReference{{
Source: dataurl.EncodeBytes(rootCA),
}}
if installConfig.AdditionalTrustBundle != "" {
CAs = append(CAs, ignition.CaReference{
Source: dataurl.EncodeBytes([]byte(installConfig.AdditionalTrustBundle)),
})
}
switch installConfig.Platform.Name() {
case baremetaltypes.Name:
// Baremetal needs to point directly at the VIP because we don't have a
Expand Down Expand Up @@ -49,9 +57,7 @@ func pointerIgnitionConfig(installConfig *types.InstallConfig, rootCA []byte, ro
},
Security: ignition.Security{
TLS: ignition.TLS{
CertificateAuthorities: []ignition.CaReference{{
Source: dataurl.EncodeBytes(rootCA),
}},
CertificateAuthorities: CAs,
},
},
},
Expand Down