Add OIDC flags

This commit is contained in:
Blake 2017-01-10 14:34:39 -08:00
parent 2d608070ba
commit 0b00ce6fd3
4 changed files with 29 additions and 0 deletions

View File

@ -384,6 +384,12 @@ type KubeAPIServerConfig struct {
KubeletPreferredAddressTypes []string `json:"kubeletPreferredAddressTypes,omitempty" flag:"kubelet-preferred-address-types"`
StorageBackend *string `json:"storageBackend,omitempty" flag:"storage-backend"`
OIDCUsernameClaim *string `json:"OIDCUsernameClaim,omitempty" flag:"oidc-username-claim"`
OIDCGroupsClaim *string `json:"OIDCGroupsClaim,omitempty" flag:"oidc-groups-claim"`
OIDCIssuerURL *string `json:"OIDCIssuerURL,omitempty" flag:"oidc-issuer-url"`
OIDCClientID *string `json:"OIDCClientID,omitempty" flag:"oidc-client-id"`
OIDCCAFile *string `json:"OIDCCAFile,omitempty" flag:"oidc-ca-file"`
}
type KubeControllerManagerConfig struct {

View File

@ -381,6 +381,12 @@ type KubeAPIServerConfig struct {
KubeletPreferredAddressTypes []string `json:"kubeletPreferredAddressTypes,omitempty" flag:"kubelet-preferred-address-types"`
StorageBackend *string `json:"storageBackend,omitempty" flag:"storage-backend"`
OIDCUsernameClaim *string `json:"OIDCUsernameClaim,omitempty" flag:"oidc-username-claim"`
OIDCGroupsClaim *string `json:"OIDCGroupsClaim,omitempty" flag:"oidc-groups-claim"`
OIDCIssuerURL *string `json:"OIDCIssuerURL,omitempty" flag:"oidc-issuer-url"`
OIDCClientID *string `json:"OIDCClientID,omitempty" flag:"oidc-client-id"`
OIDCCAFile *string `json:"OIDCCAFile,omitempty" flag:"oidc-ca-file"`
}
type KubeControllerManagerConfig struct {

View File

@ -918,6 +918,12 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.AnonymousAuth = in.AnonymousAuth
out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes
out.StorageBackend = in.StorageBackend
out.OIDCUsernameClaim = in.OIDCUsernameClaim
out.OIDCGroupsClaim = in.OIDCGroupsClaim
out.OIDCIssuerURL = in.OIDCIssuerURL
out.OIDCClientID = in.OIDCClientID
out.OIDCCAFile = in.OIDCCAFile
return nil
}
@ -948,6 +954,11 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
out.AnonymousAuth = in.AnonymousAuth
out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes
out.StorageBackend = in.StorageBackend
out.OIDCUsernameClaim = in.OIDCUsernameClaim
out.OIDCGroupsClaim = in.OIDCGroupsClaim
out.OIDCIssuerURL = in.OIDCIssuerURL
out.OIDCClientID = in.OIDCClientID
out.OIDCCAFile = in.OIDCCAFile
return nil
}

View File

@ -139,6 +139,12 @@ type KubeAPIServerConfig struct {
KubeletPreferredAddressTypes []string `json:"kubeletPreferredAddressTypes,omitempty" flag:"kubelet-preferred-address-types"`
StorageBackend *string `json:"storageBackend,omitempty" flag:"storage-backend"`
OIDCUsernameClaim *string `json:"OIDCUsernameClaim,omitempty" flag:"oidc-username-claim"`
OIDCGroupsClaim *string `json:"OIDCGroupsClaim,omitempty" flag:"oidc-groups-claim"`
OIDCIssuerURL *string `json:"OIDCIssuerURL,omitempty" flag:"oidc-issuer-url"`
OIDCClientID *string `json:"OIDCClientID,omitempty" flag:"oidc-client-id"`
OIDCCAFile *string `json:"OIDCCAFile,omitempty" flag:"oidc-ca-file"`
}
type KubeControllerManagerConfig struct {