Skip to content

OSASINFRA-3730: Add support for storing OpenStack CA bundles #9194

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 2 commits into from
Mar 28, 2025
Merged

OSASINFRA-3730: Add support for storing OpenStack CA bundles #9194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d300fb9
openstack: Rename variables
stephenfin Nov 8, 2024
6db3887
openstack: Embed CA cert in root credential
stephenfin Nov 8, 2024
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
7 changes: 5 additions & 2 deletions data/data/manifests/openshift/cloud-creds-secret.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ data:
{{- else if .CloudCreds.IBMCloud}}
ibmcloud_api_key: {{.CloudCreds.IBMCloud.Base64encodeAPIKey}}
{{- else if .CloudCreds.OpenStack}}
clouds.yaml: {{.CloudCreds.OpenStack.Base64encodeCloudCreds}}
clouds.conf: {{.CloudCreds.OpenStack.Base64encodeCloudCredsINI}}
clouds.yaml: {{.CloudCreds.OpenStack.Base64encodeCloudsYAML}}
clouds.conf: {{.CloudCreds.OpenStack.Base64encodeCloudsConf}}
{{- if .CloudCreds.OpenStack.Base64encodeCACert}}
cacert: {{.CloudCreds.OpenStack.Base64encodeCACert}}
{{- end}}
{{- else if .CloudCreds.VSphere}}
{{- range .CloudCreds.VSphere}}
{{.VCenter}}.username: {{.Base64encodeUsername}}
Expand Down
16 changes: 12 additions & 4 deletions pkg/asset/manifests/openshift.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,14 @@ func (o *Openshift) Generate(ctx context.Context, dependencies asset.Parents) er
return err
}

// We need to replace the local cacert path with one that is used in OpenShift
var caCert []byte
if cloud.CACertFile != "" {
var err error
caCert, err = os.ReadFile(cloud.CACertFile)
if err != nil {
return err
}
// We need to replace the local cacert path with one that is used in OpenShift
cloud.CACertFile = "/etc/kubernetes/static-pod-resources/configmaps/cloud-config/ca-bundle.pem"
}

Expand Down Expand Up @@ -189,11 +195,13 @@ func (o *Openshift) Generate(ctx context.Context, dependencies asset.Parents) er
}

credsEncoded := base64.StdEncoding.EncodeToString(marshalled)
credsINIEncoded := base64.StdEncoding.EncodeToString(cloudProviderConf)
cloudProviderConfEncoded := base64.StdEncoding.EncodeToString(cloudProviderConf)
caCertEncoded := base64.StdEncoding.EncodeToString(caCert)
cloudCreds = cloudCredsSecretData{
OpenStack: &OpenStackCredsSecretData{
Base64encodeCloudCreds: credsEncoded,
Base64encodeCloudCredsINI: credsINIEncoded,
Base64encodeCloudsYAML: credsEncoded,
Base64encodeCloudsConf: cloudProviderConfEncoded,
Base64encodeCACert: caCertEncoded,
},
}
case vspheretypes.Name:
Expand Down
1 change: 1 addition & 0 deletions pkg/asset/manifests/openstack/cloudproviderconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func (e Error) Unwrap() error { return e.err }

// CloudProviderConfigSecret generates the cloud provider config for the OpenStack
// platform, that will be stored in the system secret.
// TODO: I think this is crud for the legacy cloud-provider and is no longer needed. Burn it with fire?
func CloudProviderConfigSecret(cloud *clientconfig.Cloud) ([]byte, error) {
domainID := cloud.AuthInfo.DomainID
if domainID == "" {
Expand Down
5 changes: 3 additions & 2 deletions pkg/asset/manifests/template.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ type IBMCloudCredsSecretData struct {

// OpenStackCredsSecretData holds encoded credentials and is used to generate cloud-creds secret
type OpenStackCredsSecretData struct {
Base64encodeCloudCreds string
Base64encodeCloudCredsINI string
Base64encodeCloudsYAML string
Base64encodeCloudsConf string
Base64encodeCACert string
}

// VSphereCredsSecretData holds encoded credentials and is used to generated cloud-creds secret
Expand Down