Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expose API Server flags needed for AWS pod identities #7610

Merged
merged 1 commit into from
Sep 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions pkg/apis/kops/componentconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,20 @@ type KubeAPIServerConfig struct {
// If unspecified, --tls-private-key-file is used.
ServiceAccountKeyFile []string `json:"serviceAccountKeyFile,omitempty" flag:"service-account-key-file"`

// Path to the file that contains the current private key of the service account token issuer.
// The issuer will sign issued ID tokens with this private key. (Requires the 'TokenRequest' feature gate.)
ServiceAccountSigningKeyFile *string `json:"serviceAccountSigningKeyFile,omitempty" flag:"service-account-signing-key-file"`

// Identifier of the service account token issuer. The issuer will assert this identifier
// in "iss" claim of issued tokens. This value is a string or URI.
ServiceAccountIssuer *string `json:"serviceAccountIssuer,omitempty" flag:"service-account-issuer"`

// Identifiers of the API. The service account token authenticator will validate that
// tokens used against the API are bound to at least one of these audiences. If the
// --service-account-issuer flag is configured and this flag is not, this field
// defaults to a single element list containing the issuer URL.
APIAudiences []string `json:"apiAudiences,omitempty" flag:"api-audiences"`

// CPURequest, cpu request compute resource for api server. Defaults to "150m"
CPURequest string `json:"cpuRequest,omitempty"`
}
Expand Down
14 changes: 14 additions & 0 deletions pkg/apis/kops/v1alpha1/componentconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,20 @@ type KubeAPIServerConfig struct {
// If unspecified, --tls-private-key-file is used.
ServiceAccountKeyFile []string `json:"serviceAccountKeyFile,omitempty" flag:"service-account-key-file"`

// Path to the file that contains the current private key of the service account token issuer.
// The issuer will sign issued ID tokens with this private key. (Requires the 'TokenRequest' feature gate.)
ServiceAccountSigningKeyFile *string `json:"serviceAccountSigningKeyFile,omitempty" flag:"service-account-signing-key-file"`

// Identifier of the service account token issuer. The issuer will assert this identifier
// in "iss" claim of issued tokens. This value is a string or URI.
ServiceAccountIssuer *string `json:"serviceAccountIssuer,omitempty" flag:"service-account-issuer"`

// Identifiers of the API. The service account token authenticator will validate that
// tokens used against the API are bound to at least one of these audiences. If the
// --service-account-issuer flag is configured and this flag is not, this field
// defaults to a single element list containing the issuer URL.
APIAudiences []string `json:"apiAudiences,omitempty" flag:"api-audiences"`

// CPURequest, cpu request compute resource for api server. Defaults to "150m"
CPURequest string `json:"cpuRequest,omitempty"`
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/apis/kops/v1alpha1/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions pkg/apis/kops/v1alpha2/componentconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,20 @@ type KubeAPIServerConfig struct {
// If unspecified, --tls-private-key-file is used.
ServiceAccountKeyFile []string `json:"serviceAccountKeyFile,omitempty" flag:"service-account-key-file"`

// Path to the file that contains the current private key of the service account token issuer.
// The issuer will sign issued ID tokens with this private key. (Requires the 'TokenRequest' feature gate.)
ServiceAccountSigningKeyFile *string `json:"serviceAccountSigningKeyFile,omitempty" flag:"service-account-signing-key-file"`

// Identifier of the service account token issuer. The issuer will assert this identifier
// in "iss" claim of issued tokens. This value is a string or URI.
ServiceAccountIssuer *string `json:"serviceAccountIssuer,omitempty" flag:"service-account-issuer"`

// Identifiers of the API. The service account token authenticator will validate that
// tokens used against the API are bound to at least one of these audiences. If the
// --service-account-issuer flag is configured and this flag is not, this field
// defaults to a single element list containing the issuer URL.
APIAudiences []string `json:"apiAudiences,omitempty" flag:"api-audiences"`

// CPURequest, cpu request compute resource for api server. Defaults to "150m"
CPURequest string `json:"cpuRequest,omitempty"`
}
Expand Down
6 changes: 6 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions pkg/apis/kops/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.