Skip to content

Commit dae5cdf

Browse files
dkokkinostephenfin
authored andcommitted
Modify secret generator
- Goal is to change how the aunthentication for the manila driver occurs.Changes the fields generated in the secret csi-manila-secrets
1 parent 3fbfbd5 commit dae5cdf

File tree

1 file changed

+3
-49
lines changed

1 file changed

+3
-49
lines changed

pkg/openstack-manila/secret/secretsync.go

Lines changed: 3 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -137,55 +137,9 @@ func (c *SecretSyncController) translateSecret(cloudSecret *v1.Secret) (*v1.Secr
137137
func cloudToConf(cloud clientconfig.Cloud) map[string][]byte {
138138
data := make(map[string][]byte)
139139

140-
if cloud.AuthInfo.AuthURL != "" {
141-
data["os-authURL"] = []byte(cloud.AuthInfo.AuthURL)
142-
}
143-
if cloud.RegionName != "" {
144-
data["os-region"] = []byte(cloud.RegionName)
145-
}
146-
if cloud.AuthInfo.UserID != "" {
147-
data["os-userID"] = []byte(cloud.AuthInfo.UserID)
148-
} else if cloud.AuthInfo.Username != "" {
149-
data["os-userName"] = []byte(cloud.AuthInfo.Username)
150-
}
151-
if cloud.AuthInfo.Password != "" {
152-
data["os-password"] = []byte(cloud.AuthInfo.Password)
153-
}
154-
if cloud.AuthInfo.ApplicationCredentialID != "" {
155-
data["os-applicationCredentialID"] = []byte(cloud.AuthInfo.ApplicationCredentialID)
156-
}
157-
if cloud.AuthInfo.ApplicationCredentialName != "" {
158-
data["os-applicationCredentialName"] = []byte(cloud.AuthInfo.ApplicationCredentialName)
159-
}
160-
if cloud.AuthInfo.ApplicationCredentialSecret != "" {
161-
data["os-applicationCredentialSecret"] = []byte(cloud.AuthInfo.ApplicationCredentialSecret)
162-
}
163-
if cloud.AuthInfo.ProjectID != "" {
164-
data["os-projectID"] = []byte(cloud.AuthInfo.ProjectID)
165-
} else if cloud.AuthInfo.ProjectName != "" {
166-
data["os-projectName"] = []byte(cloud.AuthInfo.ProjectName)
167-
}
168-
if cloud.AuthInfo.DomainID != "" {
169-
data["os-domainID"] = []byte(cloud.AuthInfo.DomainID)
170-
} else if cloud.AuthInfo.DomainName != "" {
171-
data["os-domainName"] = []byte(cloud.AuthInfo.DomainName)
172-
}
173-
if cloud.AuthInfo.ProjectDomainID != "" {
174-
data["os-projectDomainID"] = []byte(cloud.AuthInfo.ProjectDomainID)
175-
} else if cloud.AuthInfo.ProjectDomainName != "" {
176-
data["os-projectDomainName"] = []byte(cloud.AuthInfo.ProjectDomainName)
177-
}
178-
if cloud.AuthInfo.UserDomainID != "" {
179-
data["os-userDomainID"] = []byte(cloud.AuthInfo.UserDomainID)
180-
data["os-domainID"] = []byte(cloud.AuthInfo.UserDomainID)
181-
} else if cloud.AuthInfo.UserDomainName != "" {
182-
data["os-userDomainName"] = []byte(cloud.AuthInfo.UserDomainName)
183-
data["os-domainName"] = []byte(cloud.AuthInfo.UserDomainName)
184-
}
185-
if cloud.CACertFile != "" {
186-
// Replace the original cert authority path from clouds.yaml with the canonical one
187-
data["os-certAuthorityPath"] = []byte(cacertPath)
188-
}
140+
data["os-cloud"] = []byte(util.CloudName)
141+
data["os-use-clouds"] = []byte("true")
142+
data["os-clouds-file"] = []byte("/etc/openstack/clouds.yaml") //path to mounted secret
189143

190144
return data
191145
}

0 commit comments

Comments
 (0)