github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #95995 from serathius/datapolicy-legacy-cloud-providers

Browse Source 
Add datapolicy tags to  staging/src/k8s.io/legacy-cloud-providers
This commit is contained in:
Kubernetes Prow Robot 2020-11-03 09:38:03 -08:00 committed by GitHub
commit e9cfb34b8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/cinder/cinder_test.go
View File

@ -316,7 +316,7 @@ func getOpenstackConfig() openstack.Config {
AuthURL string `gcfg:"auth-url"` AuthURL string `gcfg:"auth-url"`
Username string Username string
UserID string `gcfg:"user-id"` UserID string `gcfg:"user-id"`
Password string Password string `datapolicy:"password"`
TenantID string `gcfg:"tenant-id"` TenantID string `gcfg:"tenant-id"`
TenantName string `gcfg:"tenant-name"` TenantName string `gcfg:"tenant-name"`
TrustID string `gcfg:"trust-id"` TrustID string `gcfg:"trust-id"`

4
staging/src/k8s.io/legacy-cloud-providers/azure/auth/azure_auth.go
View File

@ -49,11 +49,11 @@ type AzureAuthConfig struct {
// The ClientID for an AAD application with RBAC access to talk to Azure RM APIs // The ClientID for an AAD application with RBAC access to talk to Azure RM APIs
AADClientID string `json:"aadClientId,omitempty" yaml:"aadClientId,omitempty"` AADClientID string `json:"aadClientId,omitempty" yaml:"aadClientId,omitempty"`
// The ClientSecret for an AAD application with RBAC access to talk to Azure RM APIs // The ClientSecret for an AAD application with RBAC access to talk to Azure RM APIs
AADClientSecret string `json:"aadClientSecret,omitempty" yaml:"aadClientSecret,omitempty"` AADClientSecret string `json:"aadClientSecret,omitempty" yaml:"aadClientSecret,omitempty" datapolicy:"token"`
// The path of a client certificate for an AAD application with RBAC access to talk to Azure RM APIs // The path of a client certificate for an AAD application with RBAC access to talk to Azure RM APIs
AADClientCertPath string `json:"aadClientCertPath,omitempty" yaml:"aadClientCertPath,omitempty"` AADClientCertPath string `json:"aadClientCertPath,omitempty" yaml:"aadClientCertPath,omitempty"`
// The password of the client certificate for an AAD application with RBAC access to talk to Azure RM APIs // The password of the client certificate for an AAD application with RBAC access to talk to Azure RM APIs
AADClientCertPassword string `json:"aadClientCertPassword,omitempty" yaml:"aadClientCertPassword,omitempty"` AADClientCertPassword string `json:"aadClientCertPassword,omitempty" yaml:"aadClientCertPassword,omitempty" datapolicy:"password"`
// Use managed service identity for the virtual machine to access Azure ARM APIs // Use managed service identity for the virtual machine to access Azure ARM APIs
UseManagedIdentityExtension bool `json:"useManagedIdentityExtension,omitempty" yaml:"useManagedIdentityExtension,omitempty"` UseManagedIdentityExtension bool `json:"useManagedIdentityExtension,omitempty" yaml:"useManagedIdentityExtension,omitempty"`
// UserAssignedIdentityID contains the Client ID of the user assigned MSI which is assigned to the underlying VMs. If empty the user assigned identity is not used. // UserAssignedIdentityID contains the Client ID of the user assigned MSI which is assigned to the underlying VMs. If empty the user assigned identity is not used.

2
staging/src/k8s.io/legacy-cloud-providers/gce/gce.go
View File

@ -172,7 +172,7 @@ type Cloud struct {
// TODO: replace gcfg with json // TODO: replace gcfg with json
type ConfigGlobal struct { type ConfigGlobal struct {
TokenURL string `gcfg:"token-url"` TokenURL string `gcfg:"token-url"`
TokenBody string `gcfg:"token-body"` TokenBody string `gcfg:"token-body" datapolicy:"token"`
// ProjectID and NetworkProjectID can either be the numeric or string-based // ProjectID and NetworkProjectID can either be the numeric or string-based
// unique identifier that starts with [a-z]. // unique identifier that starts with [a-z].
ProjectID string `gcfg:"project-id"` ProjectID string `gcfg:"project-id"`

4
staging/src/k8s.io/legacy-cloud-providers/gce/token_source.go
View File

@ -75,7 +75,7 @@ func init() {
type AltTokenSource struct { type AltTokenSource struct {
oauthClient *http.Client oauthClient *http.Client
tokenURL string tokenURL string
tokenBody string tokenBody string `datapolicy:"token"`
throttle flowcontrol.RateLimiter throttle flowcontrol.RateLimiter
} }
@ -104,7 +104,7 @@ func (a *AltTokenSource) token() (*oauth2.Token, error) {
return nil, err return nil, err
} }
var tok struct { var tok struct {
AccessToken string `json:"accessToken"` AccessToken string `json:"accessToken" datapolicy:"token"`
ExpireTime time.Time `json:"expireTime"` ExpireTime time.Time `json:"expireTime"`
} }
if err := json.NewDecoder(res.Body).Decode(&tok); err != nil { if err := json.NewDecoder(res.Body).Decode(&tok); err != nil {

2
staging/src/k8s.io/legacy-cloud-providers/openstack/openstack.go
View File

@ -158,7 +158,7 @@ type Config struct {
AuthURL string `gcfg:"auth-url"` AuthURL string `gcfg:"auth-url"`
Username string Username string
UserID string `gcfg:"user-id"` UserID string `gcfg:"user-id"`
Password string Password string `datapolicy:"password"`
TenantID string `gcfg:"tenant-id"` TenantID string `gcfg:"tenant-id"`
TenantName string `gcfg:"tenant-name"` TenantName string `gcfg:"tenant-name"`
TrustID string `gcfg:"trust-id"` TrustID string `gcfg:"trust-id"`

2
staging/src/k8s.io/legacy-cloud-providers/vsphere/credentialmanager.go
View File

@ -53,7 +53,7 @@ type SecretCache struct {
type Credential struct { type Credential struct {
User string `gcfg:"user"` User string `gcfg:"user"`
Password string `gcfg:"password"` Password string `gcfg:"password" datapolicy:"password"`
} }
type SecretCredentialManager struct { type SecretCredentialManager struct {

2
staging/src/k8s.io/legacy-cloud-providers/vsphere/vclib/connection.go
View File

@ -37,7 +37,7 @@ import (
type VSphereConnection struct { type VSphereConnection struct {
Client *vim25.Client Client *vim25.Client
Username string Username string
Password string Password string `datapolicy:"password"`
Hostname string Hostname string
Port string Port string
CACert string CACert string

4
staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere.go
View File

@ -113,7 +113,7 @@ type VirtualCenterConfig struct {
// vCenter username. // vCenter username.
User string `gcfg:"user"` User string `gcfg:"user"`
// vCenter password in clear text. // vCenter password in clear text.
Password string `gcfg:"password"` Password string `gcfg:"password" datapolicy:"password"`
// vCenter port. // vCenter port.
VCenterPort string `gcfg:"port"` VCenterPort string `gcfg:"port"`
// Datacenter in which VMs are located. // Datacenter in which VMs are located.
@ -137,7 +137,7 @@ type VSphereConfig struct {
// vCenter username. // vCenter username.
User string `gcfg:"user"` User string `gcfg:"user"`
// vCenter password in clear text. // vCenter password in clear text.
Password string `gcfg:"password"` Password string `gcfg:"password" datapolicy:"password"`
// Deprecated. Use VirtualCenter to specify multiple vCenter Servers. // Deprecated. Use VirtualCenter to specify multiple vCenter Servers.
// vCenter IP. // vCenter IP.
VCenterIP string `gcfg:"server"` VCenterIP string `gcfg:"server"`