Skip to content
This repository was archived by the owner on Mar 25, 2024. It is now read-only.

OpenStack: Extend auth options #984

Open
kayrus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OpenStack: Extend auth options #984

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
29 changes: 18 additions & 11 deletions apis/management.cattle.io/v3/rke_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,17 +544,24 @@ type OpenstackCloudProvider struct {
}

type GlobalOpenstackOpts struct {
AuthURL string `json:"auth-url" yaml:"auth-url" ini:"auth-url,omitempty"`
Username string `json:"username" yaml:"username" ini:"username,omitempty"`
UserID string `json:"user-id" yaml:"user-id" ini:"user-id,omitempty"`
Password string `json:"password" yaml:"password" ini:"password,omitempty" norman:"type=password"`
TenantID string `json:"tenant-id" yaml:"tenant-id" ini:"tenant-id,omitempty"`
TenantName string `json:"tenant-name" yaml:"tenant-name" ini:"tenant-name,omitempty"`
TrustID string `json:"trust-id" yaml:"trust-id" ini:"trust-id,omitempty"`
DomainID string `json:"domain-id" yaml:"domain-id" ini:"domain-id,omitempty"`
DomainName string `json:"domain-name" yaml:"domain-name" ini:"domain-name,omitempty"`
Region string `json:"region" yaml:"region" ini:"region,omitempty"`
CAFile string `json:"ca-file" yaml:"ca-file" ini:"ca-file,omitempty"`
AuthURL string `json:"auth-url" yaml:"auth-url" ini:"auth-url,omitempty"`
Username string `json:"username" yaml:"username" ini:"username,omitempty"`
UserID string `json:"user-id" yaml:"user-id" ini:"user-id,omitempty"`
Password string `json:"password" yaml:"password" ini:"password,omitempty" norman:"type=password"`
TenantID string `json:"tenant-id" yaml:"tenant-id" ini:"tenant-id,omitempty"`
TenantName string `json:"tenant-name" yaml:"tenant-name" ini:"tenant-name,omitempty"`
TenantDomainID string `json:"tenant-domain-id" yaml:"tenant-domain-id" ini:"tenant-domain-id,omitempty"`
TenantDomainName string `json:"tenant-domain-name" yaml:"tenant-domain-name" ini:"tenant-domain-name,omitempty"`
TrustID string `json:"trust-id" yaml:"trust-id" ini:"trust-id,omitempty"`
DomainID string `json:"domain-id" yaml:"domain-id" ini:"domain-id,omitempty"`
DomainName string `json:"domain-name" yaml:"domain-name" ini:"domain-name,omitempty"`
UserDomainID string `json:"user-domain-id" yaml:"user-domain-id" ini:"user-domain-id,omitempty"`
UserDomainName string `json:"user-domain-name" yaml:"user-domain-name" ini:"user-domain-name,omitempty"`
ApplicationCredentialID string `json:"application-credential-id" yaml:"application-credential-id" ini:"application-credential-id,omitempty"`
ApplicationCredentialName string `json:"application-credential-name" yaml:"application-credential-name" ini:"application-credential-name,omitempty"`
ApplicationCredentialSecret string `json:"application-credential-secret" yaml:"application-credential-secret" ini:"application-credential-secret,omitempty" norman:"type=password"`
Region string `json:"region" yaml:"region" ini:"region,omitempty"`
CAFile string `json:"ca-file" yaml:"ca-file" ini:"ca-file,omitempty"`
}

type LoadBalancerOpenstackOpts struct {
Expand Down
60 changes: 37 additions & 23 deletions client/management/v3/zz_generated_global_openstack_opts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,44 @@
package client

const (
GlobalOpenstackOptsType = "globalOpenstackOpts"
GlobalOpenstackOptsFieldAuthURL = "auth-url"
GlobalOpenstackOptsFieldCAFile = "ca-file"
GlobalOpenstackOptsFieldDomainID = "domain-id"
GlobalOpenstackOptsFieldDomainName = "domain-name"
GlobalOpenstackOptsFieldPassword = "password"
GlobalOpenstackOptsFieldRegion = "region"
GlobalOpenstackOptsFieldTenantID = "tenant-id"
GlobalOpenstackOptsFieldTenantName = "tenant-name"
GlobalOpenstackOptsFieldTrustID = "trust-id"
GlobalOpenstackOptsFieldUserID = "user-id"
GlobalOpenstackOptsFieldUsername = "username"
GlobalOpenstackOptsType = "globalOpenstackOpts"
GlobalOpenstackOptsFieldApplicationCredentialID = "application-credential-id"
GlobalOpenstackOptsFieldApplicationCredentialName = "application-credential-name"
GlobalOpenstackOptsFieldApplicationCredentialSecret = "application-credential-secret"
GlobalOpenstackOptsFieldAuthURL = "auth-url"
GlobalOpenstackOptsFieldCAFile = "ca-file"
GlobalOpenstackOptsFieldDomainID = "domain-id"
GlobalOpenstackOptsFieldDomainName = "domain-name"
GlobalOpenstackOptsFieldPassword = "password"
GlobalOpenstackOptsFieldRegion = "region"
GlobalOpenstackOptsFieldTenantDomainID = "tenant-domain-id"
GlobalOpenstackOptsFieldTenantDomainName = "tenant-domain-name"
GlobalOpenstackOptsFieldTenantID = "tenant-id"
GlobalOpenstackOptsFieldTenantName = "tenant-name"
GlobalOpenstackOptsFieldTrustID = "trust-id"
GlobalOpenstackOptsFieldUserDomainID = "user-domain-id"
GlobalOpenstackOptsFieldUserDomainName = "user-domain-name"
GlobalOpenstackOptsFieldUserID = "user-id"
GlobalOpenstackOptsFieldUsername = "username"
)

type GlobalOpenstackOpts struct {
AuthURL string `json:"auth-url,omitempty" yaml:"auth-url,omitempty"`
CAFile string `json:"ca-file,omitempty" yaml:"ca-file,omitempty"`
DomainID string `json:"domain-id,omitempty" yaml:"domain-id,omitempty"`
DomainName string `json:"domain-name,omitempty" yaml:"domain-name,omitempty"`
Password string `json:"password,omitempty" yaml:"password,omitempty"`
Region string `json:"region,omitempty" yaml:"region,omitempty"`
TenantID string `json:"tenant-id,omitempty" yaml:"tenant-id,omitempty"`
TenantName string `json:"tenant-name,omitempty" yaml:"tenant-name,omitempty"`
TrustID string `json:"trust-id,omitempty" yaml:"trust-id,omitempty"`
UserID string `json:"user-id,omitempty" yaml:"user-id,omitempty"`
Username string `json:"username,omitempty" yaml:"username,omitempty"`
ApplicationCredentialID string `json:"application-credential-id,omitempty" yaml:"application-credential-id,omitempty"`
ApplicationCredentialName string `json:"application-credential-name,omitempty" yaml:"application-credential-name,omitempty"`
ApplicationCredentialSecret string `json:"application-credential-secret,omitempty" yaml:"application-credential-secret,omitempty"`
AuthURL string `json:"auth-url,omitempty" yaml:"auth-url,omitempty"`
CAFile string `json:"ca-file,omitempty" yaml:"ca-file,omitempty"`
DomainID string `json:"domain-id,omitempty" yaml:"domain-id,omitempty"`
DomainName string `json:"domain-name,omitempty" yaml:"domain-name,omitempty"`
Password string `json:"password,omitempty" yaml:"password,omitempty"`
Region string `json:"region,omitempty" yaml:"region,omitempty"`
TenantDomainID string `json:"tenant-domain-id,omitempty" yaml:"tenant-domain-id,omitempty"`
TenantDomainName string `json:"tenant-domain-name,omitempty" yaml:"tenant-domain-name,omitempty"`
TenantID string `json:"tenant-id,omitempty" yaml:"tenant-id,omitempty"`
TenantName string `json:"tenant-name,omitempty" yaml:"tenant-name,omitempty"`
TrustID string `json:"trust-id,omitempty" yaml:"trust-id,omitempty"`
UserDomainID string `json:"user-domain-id,omitempty" yaml:"user-domain-id,omitempty"`
UserDomainName string `json:"user-domain-name,omitempty" yaml:"user-domain-name,omitempty"`
UserID string `json:"user-id,omitempty" yaml:"user-id,omitempty"`
Username string `json:"username,omitempty" yaml:"username,omitempty"`
}