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.

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

ASC-402: Modify NSTemplateTierSpec to support SA token copy #380

Merged
merged 11 commits into from
Oct 17, 2023
Merged

ASC-402: Modify NSTemplateTierSpec to support SA token copy #380

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
faca306
modify NSTemplateTierSpec
Kartikey-star Oct 12, 2023
9b5f6e6
update nstemplatetier CRD
Kartikey-star Oct 12, 2023
642eff5
update NSTemplateTierSpec
Kartikey-star Oct 13, 2023
6c5b6a0
Merge branch 'master' into updateCRD
Kartikey-star Oct 13, 2023
6dd3df6
modify test to use docker config
Kartikey-star Oct 13, 2023
78eb937
Merge branch 'master' into updateCRD
Kartikey-star Oct 13, 2023
77419a5
update nstemplatetier spec
Kartikey-star Oct 16, 2023
83461f4
Merge branch 'master' into updateCRD
Kartikey-star Oct 16, 2023
b057edc
Modify NSTemplateTierSpec to support SA token copy
Kartikey-star Oct 16, 2023
bb80446
update NSTemplateTier CRD
Kartikey-star Oct 17, 2023
6a2b75b
update NSTemplateTier CRD
Kartikey-star Oct 17, 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
4 changes: 4 additions & 0 deletions api/v1alpha1/nstemplatetier_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ type NSTemplateTierSpec struct {
// +optional
// +mapType=atomic
SpaceRoles map[string]NSTemplateTierSpaceRole `json:"spaceRoles,omitempty"`

// flag to signify whether to copy SA token or not
// +optional
CopySaToken bool `json:"copySaToken,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a SpaceRequest specific configuration (it's used only when the Space is created based on SpaceRequest CR), not a generic one. I would structure it so it's easy to understand - something like this:

	// +optional
	SpaceRequestConfig SpaceRequestConfig `json:"spaceRequestConfig, omitempty"`
}

type SpaceRequestConfig struct {
	// +optional
	CopySaToken bool `json:"copySaToken,omitempty"`
}

if needed, we could easily extend the part by other values in the future, for example:

type SpaceRequestConfig struct {
	// +optional
	CopySaToken bool `json:"copySaToken,omitempty"`
	// +optional
	ManagerSaName string `json:"managerSaName,omitempty"`
}

another approach would be:

type SpaceRequestConfig struct {
	// +optional
	SaTokenToCopy string `json:"saTokenToCopy,omitempty"`
}

if nothing is provided, then the controller wouldn't copy anything, otherwise, it would contain the name of the SA whose token should be copied - ie. namespace-manager

WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's go with the last one . Looks better.
type SpaceRequestConfig struct {
// +optional
SaTokenToCopy string json:"saTokenToCopy,omitempty"
}

}

// NSTemplateTierNamespace the namespace definition in an NSTemplateTier resource
Expand Down