Skip to content

Properly set the service account name in ESR template #316

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
merged 1 commit into from
Nov 29, 2024
Merged

Properly set the service account name in ESR template #316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 6 deletions internal/etos/suitestarter/suitestarter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,9 @@ func (r *ETOSSuiteStarterDeployment) reconcileConfig(ctx context.Context, logger
}

// reconcileTemplate will reconcile the ETOS SuiteRunner template to its expected state.
func (r *ETOSSuiteStarterDeployment) reconcileTemplate(ctx context.Context, logger logr.Logger, name types.NamespacedName, owner metav1.Object) (*corev1.Secret, error) {
name = types.NamespacedName{Name: fmt.Sprintf("%s-template", name.Name), Namespace: name.Namespace}
target := r.suiteRunnerTemplate(name)
func (r *ETOSSuiteStarterDeployment) reconcileTemplate(ctx context.Context, logger logr.Logger, saName types.NamespacedName, owner metav1.Object) (*corev1.Secret, error) {
name := types.NamespacedName{Name: fmt.Sprintf("%s-template", saName.Name), Namespace: saName.Namespace}
target := r.suiteRunnerTemplate(name, saName)
if err := ctrl.SetControllerReference(owner, target, r.Scheme); err != nil {
return target, err
}
Expand Down Expand Up @@ -532,7 +532,7 @@ func (r *ETOSSuiteStarterDeployment) container(name types.NamespacedName, secret
}

// suiteRunnerTemplate creates a secret resource for the ETOS SuiteStarter.
func (r *ETOSSuiteStarterDeployment) suiteRunnerTemplate(name types.NamespacedName) *corev1.Secret {
func (r *ETOSSuiteStarterDeployment) suiteRunnerTemplate(templateName types.NamespacedName, saName types.NamespacedName) *corev1.Secret {
data := map[string][]byte{
"suite_runner_template.yaml": []byte(fmt.Sprintf(`
apiVersion: batch/v1
Expand Down Expand Up @@ -631,10 +631,10 @@ func (r *ETOSSuiteStarterDeployment) suiteRunnerTemplate(name types.NamespacedNa
mountPath: /kubexit
restartPolicy: Never
backoffLimit: 0
`, name.Name)),
`, saName.Name)),
}
return &corev1.Secret{
ObjectMeta: r.meta(name),
ObjectMeta: r.meta(templateName),
Data: data,
}
}
Expand Down