support eks mode, fixing irsasetup_controller

This commit is contained in:
kkb0318
2024-07-26 20:50:28 +09:00
parent 9d7542b7ad
commit 7f8135d4dc
3 changed files with 66 additions and 10 deletions
+6 -6
View File
@@ -11,7 +11,7 @@ type OIDCIssuerMeta interface {
IssuerUrl() string
}
type S3IssuerMeta struct {
type s3IssuerMeta struct {
region string
bucketName string
}
@@ -20,25 +20,25 @@ func NewOIDCIssuerMeta(i *irsav1alpha1.IRSASetup) (OIDCIssuerMeta, error) {
if i.Spec.Mode == irsav1alpha1.ModeEks {
return newIamOIDCProviderIssuerMeta(i.Spec.IamOIDCProvider)
}
return NewS3IssuerMeta(&i.Spec.Discovery.S3)
return newS3IssuerMeta(&i.Spec.Discovery.S3)
}
func NewS3IssuerMeta(s3 *irsav1alpha1.S3Discovery) (*S3IssuerMeta, error) {
func newS3IssuerMeta(s3 *irsav1alpha1.S3Discovery) (*s3IssuerMeta, error) {
region := s3.Region
bucketName := s3.BucketName
if region == "" || bucketName == "" {
return nil, fmt.Errorf("s3 region and bucket name must not be empty. region: %s, bucketName: %s", region, bucketName)
}
return &S3IssuerMeta{region, bucketName}, nil
return &s3IssuerMeta{region, bucketName}, nil
}
func (i *S3IssuerMeta) IssuerHostPath() string {
func (i *s3IssuerMeta) IssuerHostPath() string {
return fmt.Sprintf("s3-%s.amazonaws.com/%s", i.region, i.bucketName)
}
// IssuerUrl constructs the URL path for the OIDC issuer based on the provided AWS region and bucket name.
// This utility function generates the expected host path for accessing the OIDC configuration stored in an S3 bucket.
func (i *S3IssuerMeta) IssuerUrl() string {
func (i *s3IssuerMeta) IssuerUrl() string {
return fmt.Sprintf("https://%s", i.IssuerHostPath())
}