Skip to content

OSASINFRA-3754: CCM: Remove check for clouds.conf key #233

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 10, 2025
Merged

OSASINFRA-3754: CCM: Remove check for clouds.conf key #233

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
16 changes: 2 additions & 14 deletions test/extended/openstack/cloud-provider-config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"github.com/gophercloud/gophercloud/v2"
"github.com/gophercloud/gophercloud/v2/openstack"
"github.com/gophercloud/gophercloud/v2/openstack/config/clouds"
ini "gopkg.in/ini.v1"

g "github.com/onsi/ginkgo/v2"
o "github.com/onsi/gomega"
Expand Down Expand Up @@ -192,29 +191,18 @@ var _ = g.Describe("[sig-installer][Suite:openshift/openstack] The Openshift", f
o.Expect(role.Rules[0].ResourceNames[0]).To(o.Equal(expectedSecretName),
"Unexpected resourceName on role %q in %q namespace", openstackCredsRole, systemNamespace)

g.By(fmt.Sprintf("Getting the openstack auth url from clouds.conf in secret %q in %q namespace",
expectedSecretName, systemNamespace))
g.By(fmt.Sprintf("Getting the credentials secret %q in %q namespace", expectedSecretName, systemNamespace))
secret, err := clientSet.CoreV1().Secrets(systemNamespace).Get(ctx, expectedSecretName, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred(), "Secret %q not found in %q namespace", expectedSecretName, systemNamespace)
conf, err := ini.Load([]byte(secret.Data["clouds.conf"]))
o.Expect(err).NotTo(o.HaveOccurred(),
"clouds.conf key not found on %q secret in %q namespace", expectedSecretName, systemNamespace)
globalSection, err := conf.GetSection("Global")
o.Expect(err).NotTo(o.HaveOccurred(),
"section Global not found on %q secret in %q namespace", expectedSecretName, systemNamespace)
authUrl, err := globalSection.GetKey("auth-url")
o.Expect(err).NotTo(o.HaveOccurred(),
"property auth-url not found on %q secret in %q namespace", expectedSecretName, systemNamespace)

g.By(fmt.Sprintf("Getting the openstack auth url from clouds.yaml in secret %q in %q namespace", expectedSecretName, systemNamespace))
g.By(fmt.Sprintf("Unmarshalling the clouds.yaml extracted from secret %q in %q namespace", expectedSecretName, systemNamespace))
cloudsYaml := make(map[string]map[string]*clouds.Cloud)
err = yaml.Unmarshal([]byte(secret.Data["clouds.yaml"]), &cloudsYaml)
o.Expect(err).NotTo(o.HaveOccurred(),
"Error unmarshaling clouds.yaml on %q secret in %q namespace", expectedSecretName, systemNamespace)
clouds := cloudsYaml["clouds"]["openstack"]

g.By("Compare cloud auth url on secret with openstack API")
o.Expect(computeClient.IdentityEndpoint).To(o.HavePrefix(authUrl.Value()), "Unexpected auth url on clouds.conf")
o.Expect(computeClient.IdentityEndpoint).To(o.HavePrefix(clouds.AuthInfo.AuthURL), "Unexpected auth url on clouds.yaml")

})
Expand Down