From 86ccd68a50c2429f31bcbc6cedf5087a21f00d4c Mon Sep 17 00:00:00 2001 From: kayrus Date: Mon, 23 Sep 2019 22:12:53 +0200 Subject: [PATCH] OpenStack: Extend auth options --- apis/management.cattle.io/v3/rke_types.go | 29 +++++---- .../v3/zz_generated_global_openstack_opts.go | 60 ++++++++++++------- 2 files changed, 55 insertions(+), 34 deletions(-) diff --git a/apis/management.cattle.io/v3/rke_types.go b/apis/management.cattle.io/v3/rke_types.go index eaa6c88c..ca48cc7a 100644 --- a/apis/management.cattle.io/v3/rke_types.go +++ b/apis/management.cattle.io/v3/rke_types.go @@ -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 { diff --git a/client/management/v3/zz_generated_global_openstack_opts.go b/client/management/v3/zz_generated_global_openstack_opts.go index 7db5e17e..3c81122c 100644 --- a/client/management/v3/zz_generated_global_openstack_opts.go +++ b/client/management/v3/zz_generated_global_openstack_opts.go @@ -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"` }