Skip to content

[v13] operator: ProvisionToken support #26618

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.

Sign up for GitHub

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

Merged
hugoShaka merged 5 commits into from
May 22, 2023
Merged

[v13] operator: ProvisionToken support #26618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eede74e
crdgen: properly index nested types
hugoShaka May 19, 2023
2097331
integrations/operator: Add ProvisionTokenV2 CRD
hugoShaka May 19, 2023
e7ba5c5
integrations/operator: regenerate CRDs
hugoShaka May 19, 2023
387d872
integrations/operator: Add provisiontoken controller
hugoShaka May 19, 2023
96398ac
helm: update snapshots to include provisiontoken crs
hugoShaka May 19, 2023
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
12 changes: 11 additions & 1 deletion api/types/provisioning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func ValidateJoinMethod(method JoinMethod) error {

// ProvisionToken is a provisioning token
type ProvisionToken interface {
Resource
ResourceWithOrigin
// SetMetadata sets resource metatada
SetMetadata(meta Metadata)
// GetRoles returns a list of teleport roles
Expand Down Expand Up @@ -377,6 +377,16 @@ func (p *ProvisionTokenV2) SetMetadata(meta Metadata) {
p.Metadata = meta
}

// Origin returns the origin value of the resource.
func (p *ProvisionTokenV2) Origin() string {
return p.Metadata.Origin()
}

// SetOrigin sets the origin value of the resource.
func (p *ProvisionTokenV2) SetOrigin(origin string) {
p.Metadata.SetOrigin(origin)
}

// GetSuggestedLabels returns the labels the resource should set when using this token
func (p *ProvisionTokenV2) GetSuggestedLabels() Labels {
return p.Spec.SuggestedLabels
Expand Down
14 changes: 10 additions & 4 deletions ...t-cluster/charts/teleport-operator/templates/resources.teleport.dev_githubconnectors.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,33 @@ spec:
spec:
description: GithubConnector resource definition v3 from Teleport
properties:
api_endpoint_url:
description: APIEndpointURL is the URL of the API endpoint of the
Github instance this connector is for.
type: string
client_id:
description: ClientID is the GitHub OAuth app client ID.
description: ClientID is the Github OAuth app client ID.
type: string
client_secret:
description: ClientSecret is the GitHub OAuth app client secret.
description: ClientSecret is the Github OAuth app client secret.
type: string
display:
description: Display is the connector display name.
type: string
endpoint_url:
description: EndpointURL is the URL of the GitHub instance this connector
is for.
type: string
redirect_url:
description: RedirectURL is the authorization callback URL.
type: string
teams_to_roles:
description: TeamsToRoles maps GitHub team memberships onto allowed
description: TeamsToRoles maps Github team memberships onto allowed
roles.
items:
properties:
organization:
description: Organization is a GitHub organization a user belongs
description: Organization is a Github organization a user belongs
to.
type: string
roles:
Expand Down
Loading