Skip to content

Commit aa64f59

Browse files
karamaru-alphakaramaru-alpha
committed
refactor(golangci-lint): run "golangci-lint run --fix"
Signed-off-by: karamaru-alpha <[email protected]>
1 parent 0ef6efc commit aa64f59

29 files changed

+198
-197
lines changed

‎charts/gha-runner-scale-set/tests/template_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,7 @@ func TestTemplateRenderedWithTLS(t *testing.T) {
11781178
}
11791179
}
11801180
require.NotNil(t, volume)
1181-
assert.Equal(t, "certs-configmap", volume.ConfigMap.LocalObjectReference.Name)
1181+
assert.Equal(t, "certs-configmap", volume.ConfigMap.Name)
11821182
assert.Equal(t, "cert.pem", volume.ConfigMap.Items[0].Key)
11831183
assert.Equal(t, "cert.pem", volume.ConfigMap.Items[0].Path)
11841184

@@ -1238,7 +1238,7 @@ func TestTemplateRenderedWithTLS(t *testing.T) {
12381238
}
12391239
}
12401240
require.NotNil(t, volume)
1241-
assert.Equal(t, "certs-configmap", volume.ConfigMap.LocalObjectReference.Name)
1241+
assert.Equal(t, "certs-configmap", volume.ConfigMap.Name)
12421242
assert.Equal(t, "cert.pem", volume.ConfigMap.Items[0].Key)
12431243
assert.Equal(t, "cert.pem", volume.ConfigMap.Items[0].Path)
12441244

@@ -1298,7 +1298,7 @@ func TestTemplateRenderedWithTLS(t *testing.T) {
12981298
}
12991299
}
13001300
require.NotNil(t, volume)
1301-
assert.Equal(t, "certs-configmap", volume.ConfigMap.LocalObjectReference.Name)
1301+
assert.Equal(t, "certs-configmap", volume.ConfigMap.Name)
13021302
assert.Equal(t, "cert.pem", volume.ConfigMap.Items[0].Key)
13031303
assert.Equal(t, "cert.pem", volume.ConfigMap.Items[0].Path)
13041304

‎cmd/ghalistener/metrics/metrics.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ func (e *exporter) ListenAndServe(ctx context.Context) error {
287287
}
288288

289289
func (e *exporter) setGauge(name string, allLabels prometheus.Labels, val float64) {
290-
m, ok := e.metrics.gauges[name]
290+
m, ok := e.gauges[name]
291291
if !ok {
292292
return
293293
}
@@ -299,7 +299,7 @@ func (e *exporter) setGauge(name string, allLabels prometheus.Labels, val float6
299299
}
300300

301301
func (e *exporter) incCounter(name string, allLabels prometheus.Labels) {
302-
m, ok := e.metrics.counters[name]
302+
m, ok := e.counters[name]
303303
if !ok {
304304
return
305305
}
@@ -311,7 +311,7 @@ func (e *exporter) incCounter(name string, allLabels prometheus.Labels) {
311311
}
312312

313313
func (e *exporter) observeHistogram(name string, allLabels prometheus.Labels, val float64) {
314-
m, ok := e.metrics.histograms[name]
314+
m, ok := e.histograms[name]
315315
if !ok {
316316
return
317317
}
@@ -339,15 +339,15 @@ func (e *exporter) PublishJobStarted(msg *actions.JobStarted) {
339339
l := e.startedJobLabels(msg)
340340
e.incCounter(MetricStartedJobsTotal, l)
341341

342-
startupDuration := msg.JobMessageBase.RunnerAssignTime.Unix() - msg.JobMessageBase.ScaleSetAssignTime.Unix()
342+
startupDuration := msg.RunnerAssignTime.Unix() - msg.ScaleSetAssignTime.Unix()
343343
e.observeHistogram(MetricJobStartupDurationSeconds, l, float64(startupDuration))
344344
}
345345

346346
func (e *exporter) PublishJobCompleted(msg *actions.JobCompleted) {
347347
l := e.completedJobLabels(msg)
348348
e.incCounter(MetricCompletedJobsTotal, l)
349349

350-
executionDuration := msg.JobMessageBase.FinishTime.Unix() - msg.JobMessageBase.RunnerAssignTime.Unix()
350+
executionDuration := msg.FinishTime.Unix() - msg.RunnerAssignTime.Unix()
351351
e.observeHistogram(MetricJobExecutionDurationSeconds, l, float64(executionDuration))
352352
}
353353

‎controllers/actions.github.com/autoscalinglistener_controller.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (r *AutoscalingListenerReconciler) Reconcile(ctx context.Context, req ctrl.
7777
return ctrl.Result{}, client.IgnoreNotFound(err)
7878
}
7979

80-
if !autoscalingListener.ObjectMeta.DeletionTimestamp.IsZero() {
80+
if !autoscalingListener.DeletionTimestamp.IsZero() {
8181
if !controllerutil.ContainsFinalizer(autoscalingListener, autoscalingListenerFinalizerName) {
8282
return ctrl.Result{}, nil
8383
}
@@ -281,7 +281,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
281281
err = r.Get(ctx, types.NamespacedName{Name: autoscalingListener.Name, Namespace: autoscalingListener.Namespace}, listenerPod)
282282
switch {
283283
case err == nil:
284-
if listenerPod.ObjectMeta.DeletionTimestamp.IsZero() {
284+
if listenerPod.DeletionTimestamp.IsZero() {
285285
logger.Info("Deleting the listener pod")
286286
if err := r.Delete(ctx, listenerPod); err != nil {
287287
return false, fmt.Errorf("failed to delete listener pod: %w", err)
@@ -299,7 +299,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
299299
err = r.Get(ctx, types.NamespacedName{Namespace: autoscalingListener.Namespace, Name: scaleSetListenerConfigName(autoscalingListener)}, &secret)
300300
switch {
301301
case err == nil:
302-
if secret.ObjectMeta.DeletionTimestamp.IsZero() {
302+
if secret.DeletionTimestamp.IsZero() {
303303
logger.Info("Deleting the listener config secret")
304304
if err := r.Delete(ctx, &secret); err != nil {
305305
return false, fmt.Errorf("failed to delete listener config secret: %w", err)
@@ -316,7 +316,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
316316
err = r.Get(ctx, types.NamespacedName{Name: proxyListenerSecretName(autoscalingListener), Namespace: autoscalingListener.Namespace}, proxySecret)
317317
switch {
318318
case err == nil:
319-
if proxySecret.ObjectMeta.DeletionTimestamp.IsZero() {
319+
if proxySecret.DeletionTimestamp.IsZero() {
320320
logger.Info("Deleting the listener proxy secret")
321321
if err := r.Delete(ctx, proxySecret); err != nil {
322322
return false, fmt.Errorf("failed to delete listener proxy secret: %w", err)
@@ -333,7 +333,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
333333
err = r.Get(ctx, types.NamespacedName{Namespace: autoscalingListener.Spec.AutoscalingRunnerSetNamespace, Name: scaleSetListenerRoleName(autoscalingListener)}, listenerRoleBinding)
334334
switch {
335335
case err == nil:
336-
if listenerRoleBinding.ObjectMeta.DeletionTimestamp.IsZero() {
336+
if listenerRoleBinding.DeletionTimestamp.IsZero() {
337337
logger.Info("Deleting the listener role binding")
338338
if err := r.Delete(ctx, listenerRoleBinding); err != nil {
339339
return false, fmt.Errorf("failed to delete listener role binding: %w", err)
@@ -349,7 +349,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
349349
err = r.Get(ctx, types.NamespacedName{Namespace: autoscalingListener.Spec.AutoscalingRunnerSetNamespace, Name: scaleSetListenerRoleName(autoscalingListener)}, listenerRole)
350350
switch {
351351
case err == nil:
352-
if listenerRole.ObjectMeta.DeletionTimestamp.IsZero() {
352+
if listenerRole.DeletionTimestamp.IsZero() {
353353
logger.Info("Deleting the listener role")
354354
if err := r.Delete(ctx, listenerRole); err != nil {
355355
return false, fmt.Errorf("failed to delete listener role: %w", err)
@@ -366,7 +366,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
366366
err = r.Get(ctx, types.NamespacedName{Name: scaleSetListenerServiceAccountName(autoscalingListener), Namespace: autoscalingListener.Namespace}, listenerSa)
367367
switch {
368368
case err == nil:
369-
if listenerSa.ObjectMeta.DeletionTimestamp.IsZero() {
369+
if listenerSa.DeletionTimestamp.IsZero() {
370370
logger.Info("Deleting the listener service account")
371371
if err := r.Delete(ctx, listenerSa); err != nil {
372372
return false, fmt.Errorf("failed to delete listener service account: %w", err)
@@ -382,7 +382,7 @@ func (r *AutoscalingListenerReconciler) cleanupResources(ctx context.Context, au
382382
}
383383

384384
func (r *AutoscalingListenerReconciler) createServiceAccountForListener(ctx context.Context, autoscalingListener *v1alpha1.AutoscalingListener, logger logr.Logger) (ctrl.Result, error) {
385-
newServiceAccount := r.ResourceBuilder.newScaleSetListenerServiceAccount(autoscalingListener)
385+
newServiceAccount := r.newScaleSetListenerServiceAccount(autoscalingListener)
386386

387387
if err := ctrl.SetControllerReference(autoscalingListener, newServiceAccount, r.Scheme); err != nil {
388388
return ctrl.Result{}, err
@@ -467,7 +467,7 @@ func (r *AutoscalingListenerReconciler) createListenerPod(ctx context.Context, a
467467

468468
logger.Info("Creating listener config secret")
469469

470-
podConfig, err := r.ResourceBuilder.newScaleSetListenerConfig(autoscalingListener, secret, metricsConfig, cert)
470+
podConfig, err := r.newScaleSetListenerConfig(autoscalingListener, secret, metricsConfig, cert)
471471
if err != nil {
472472
logger.Error(err, "Failed to build listener config secret")
473473
return ctrl.Result{}, err
@@ -486,7 +486,7 @@ func (r *AutoscalingListenerReconciler) createListenerPod(ctx context.Context, a
486486
return ctrl.Result{Requeue: true}, nil
487487
}
488488

489-
newPod, err := r.ResourceBuilder.newScaleSetListenerPod(autoscalingListener, &podConfig, serviceAccount, secret, metricsConfig, envs...)
489+
newPod, err := r.newScaleSetListenerPod(autoscalingListener, &podConfig, serviceAccount, secret, metricsConfig, envs...)
490490
if err != nil {
491491
logger.Error(err, "Failed to build listener pod")
492492
return ctrl.Result{}, err
@@ -546,7 +546,7 @@ func (r *AutoscalingListenerReconciler) certificate(ctx context.Context, autosca
546546
}
547547

548548
func (r *AutoscalingListenerReconciler) createSecretsForListener(ctx context.Context, autoscalingListener *v1alpha1.AutoscalingListener, secret *corev1.Secret, logger logr.Logger) (ctrl.Result, error) {
549-
newListenerSecret := r.ResourceBuilder.newScaleSetListenerSecretMirror(autoscalingListener, secret)
549+
newListenerSecret := r.newScaleSetListenerSecretMirror(autoscalingListener, secret)
550550

551551
if err := ctrl.SetControllerReference(autoscalingListener, newListenerSecret, r.Scheme); err != nil {
552552
return ctrl.Result{}, err
@@ -618,7 +618,7 @@ func (r *AutoscalingListenerReconciler) updateSecretsForListener(ctx context.Con
618618
}
619619

620620
func (r *AutoscalingListenerReconciler) createRoleForListener(ctx context.Context, autoscalingListener *v1alpha1.AutoscalingListener, logger logr.Logger) (ctrl.Result, error) {
621-
newRole := r.ResourceBuilder.newScaleSetListenerRole(autoscalingListener)
621+
newRole := r.newScaleSetListenerRole(autoscalingListener)
622622

623623
logger.Info("Creating listener role", "namespace", newRole.Namespace, "name", newRole.Name, "rules", newRole.Rules)
624624
if err := r.Create(ctx, newRole); err != nil {
@@ -646,7 +646,7 @@ func (r *AutoscalingListenerReconciler) updateRoleForListener(ctx context.Contex
646646
}
647647

648648
func (r *AutoscalingListenerReconciler) createRoleBindingForListener(ctx context.Context, autoscalingListener *v1alpha1.AutoscalingListener, listenerRole *rbacv1.Role, serviceAccount *corev1.ServiceAccount, logger logr.Logger) (ctrl.Result, error) {
649-
newRoleBinding := r.ResourceBuilder.newScaleSetListenerRoleBinding(autoscalingListener, listenerRole, serviceAccount)
649+
newRoleBinding := r.newScaleSetListenerRoleBinding(autoscalingListener, listenerRole, serviceAccount)
650650

651651
logger.Info("Creating listener role binding",
652652
"namespace", newRoleBinding.Namespace,

‎controllers/actions.github.com/autoscalingrunnerset_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func (r *AutoscalingRunnerSetReconciler) Reconcile(ctx context.Context, req ctrl
9999
return ctrl.Result{}, client.IgnoreNotFound(err)
100100
}
101101

102-
if !autoscalingRunnerSet.ObjectMeta.DeletionTimestamp.IsZero() {
102+
if !autoscalingRunnerSet.DeletionTimestamp.IsZero() {
103103
if !controllerutil.ContainsFinalizer(autoscalingRunnerSet, autoscalingRunnerSetFinalizerName) {
104104
return ctrl.Result{}, nil
105105
}
@@ -332,7 +332,7 @@ func (r *AutoscalingRunnerSetReconciler) cleanupListener(ctx context.Context, au
332332
err = r.Get(ctx, client.ObjectKey{Namespace: r.ControllerNamespace, Name: scaleSetListenerName(autoscalingRunnerSet)}, &listener)
333333
switch {
334334
case err == nil:
335-
if listener.ObjectMeta.DeletionTimestamp.IsZero() {
335+
if listener.DeletionTimestamp.IsZero() {
336336
logger.Info("Deleting the listener")
337337
if err := r.Delete(ctx, &listener); err != nil {
338338
return false, fmt.Errorf("failed to delete listener: %w", err)
@@ -369,7 +369,7 @@ func (r *AutoscalingRunnerSetReconciler) deleteEphemeralRunnerSets(ctx context.C
369369
for i := range oldRunnerSets {
370370
rs := &oldRunnerSets[i]
371371
// already deleted but contains finalizer so it still exists
372-
if !rs.ObjectMeta.DeletionTimestamp.IsZero() {
372+
if !rs.DeletionTimestamp.IsZero() {
373373
logger.Info("Skip ephemeral runner set since it is already marked for deletion", "name", rs.Name)
374374
continue
375375
}
@@ -622,7 +622,7 @@ func (r *AutoscalingRunnerSetReconciler) deleteRunnerScaleSet(ctx context.Contex
622622
}
623623

624624
func (r *AutoscalingRunnerSetReconciler) createEphemeralRunnerSet(ctx context.Context, autoscalingRunnerSet *v1alpha1.AutoscalingRunnerSet, log logr.Logger) (ctrl.Result, error) {
625-
desiredRunnerSet, err := r.ResourceBuilder.newEphemeralRunnerSet(autoscalingRunnerSet)
625+
desiredRunnerSet, err := r.newEphemeralRunnerSet(autoscalingRunnerSet)
626626
if err != nil {
627627
log.Error(err, "Could not create EphemeralRunnerSet")
628628
return ctrl.Result{}, err
@@ -651,7 +651,7 @@ func (r *AutoscalingRunnerSetReconciler) createAutoScalingListenerForRunnerSet(c
651651
})
652652
}
653653

654-
autoscalingListener, err := r.ResourceBuilder.newAutoScalingListener(autoscalingRunnerSet, ephemeralRunnerSet, r.ControllerNamespace, r.DefaultRunnerScaleSetListenerImage, imagePullSecrets)
654+
autoscalingListener, err := r.newAutoScalingListener(autoscalingRunnerSet, ephemeralRunnerSet, r.ControllerNamespace, r.DefaultRunnerScaleSetListenerImage, imagePullSecrets)
655655
if err != nil {
656656
log.Error(err, "Could not create AutoscalingListener spec")
657657
return ctrl.Result{}, err

‎controllers/actions.github.com/autoscalingrunnerset_controller_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,10 @@ var _ = Describe("Test AutoScalingRunnerSet controller", Ordered, func() {
280280
// This should trigger re-creation of EphemeralRunnerSet and Listener
281281
patched := autoscalingRunnerSet.DeepCopy()
282282
patched.Spec.Template.Spec.PriorityClassName = "test-priority-class"
283-
if patched.ObjectMeta.Annotations == nil {
284-
patched.ObjectMeta.Annotations = make(map[string]string)
283+
if patched.Annotations == nil {
284+
patched.Annotations = make(map[string]string)
285285
}
286-
patched.ObjectMeta.Annotations[annotationKeyValuesHash] = "test-hash"
286+
patched.Annotations[annotationKeyValuesHash] = "test-hash"
287287
err = k8sClient.Patch(ctx, patched, client.MergeFrom(autoscalingRunnerSet))
288288
Expect(err).NotTo(HaveOccurred(), "failed to patch AutoScalingRunnerSet")
289289
autoscalingRunnerSet = patched.DeepCopy()
@@ -383,7 +383,7 @@ var _ = Describe("Test AutoScalingRunnerSet controller", Ordered, func() {
383383
Expect(err).NotTo(HaveOccurred(), "failed to get Listener")
384384

385385
patched = autoscalingRunnerSet.DeepCopy()
386-
patched.ObjectMeta.Annotations[annotationKeyValuesHash] = "hash-changes"
386+
patched.Annotations[annotationKeyValuesHash] = "hash-changes"
387387
err = k8sClient.Patch(ctx, patched, client.MergeFrom(autoscalingRunnerSet))
388388
Expect(err).NotTo(HaveOccurred(), "failed to patch AutoScalingRunnerSet")
389389

@@ -546,10 +546,10 @@ var _ = Describe("Test AutoScalingRunnerSet controller", Ordered, func() {
546546
// Patch the AutoScalingRunnerSet image which should trigger
547547
// the recreation of the Listener and EphemeralRunnerSet
548548
patched := autoscalingRunnerSet.DeepCopy()
549-
if patched.ObjectMeta.Annotations == nil {
550-
patched.ObjectMeta.Annotations = make(map[string]string)
549+
if patched.Annotations == nil {
550+
patched.Annotations = make(map[string]string)
551551
}
552-
patched.ObjectMeta.Annotations[annotationKeyValuesHash] = "testgroup2"
552+
patched.Annotations[annotationKeyValuesHash] = "testgroup2"
553553
patched.Spec.Template.Spec = corev1.PodSpec{
554554
Containers: []corev1.Container{
555555
{
@@ -875,7 +875,7 @@ var _ = Describe("Test AutoscalingController creation failures", Ordered, func()
875875
autoscalingRunnerSetTestInterval,
876876
).Should(BeEquivalentTo(autoscalingRunnerSetFinalizerName), "AutoScalingRunnerSet should have a finalizer")
877877

878-
ars.ObjectMeta.Annotations = make(map[string]string)
878+
ars.Annotations = make(map[string]string)
879879
err = k8sClient.Update(ctx, ars)
880880
Expect(err).NotTo(HaveOccurred(), "Update autoscaling runner set without annotation should be successful")
881881

‎controllers/actions.github.com/ephemeralrunner_controller.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func (r *EphemeralRunnerReconciler) Reconcile(ctx context.Context, req ctrl.Requ
7070
return ctrl.Result{}, client.IgnoreNotFound(err)
7171
}
7272

73-
if !ephemeralRunner.ObjectMeta.DeletionTimestamp.IsZero() {
73+
if !ephemeralRunner.DeletionTimestamp.IsZero() {
7474
if !controllerutil.ContainsFinalizer(ephemeralRunner, ephemeralRunnerFinalizerName) {
7575
return ctrl.Result{}, nil
7676
}
@@ -319,7 +319,7 @@ func (r *EphemeralRunnerReconciler) cleanupResources(ctx context.Context, epheme
319319
err := r.Get(ctx, types.NamespacedName{Namespace: ephemeralRunner.Namespace, Name: ephemeralRunner.Name}, pod)
320320
switch {
321321
case err == nil:
322-
if pod.ObjectMeta.DeletionTimestamp.IsZero() {
322+
if pod.DeletionTimestamp.IsZero() {
323323
log.Info("Deleting the runner pod")
324324
if err := r.Delete(ctx, pod); err != nil && !kerrors.IsNotFound(err) {
325325
return fmt.Errorf("failed to delete pod: %w", err)
@@ -339,7 +339,7 @@ func (r *EphemeralRunnerReconciler) cleanupResources(ctx context.Context, epheme
339339
err = r.Get(ctx, types.NamespacedName{Namespace: ephemeralRunner.Namespace, Name: ephemeralRunner.Name}, secret)
340340
switch {
341341
case err == nil:
342-
if secret.ObjectMeta.DeletionTimestamp.IsZero() {
342+
if secret.DeletionTimestamp.IsZero() {
343343
log.Info("Deleting the jitconfig secret")
344344
if err := r.Delete(ctx, secret); err != nil && !kerrors.IsNotFound(err) {
345345
return fmt.Errorf("failed to delete secret: %w", err)
@@ -393,7 +393,7 @@ func (r *EphemeralRunnerReconciler) cleanupRunnerLinkedPods(ctx context.Context,
393393
var errs []error
394394
for i := range runnerLinkedPodList.Items {
395395
linkedPod := &runnerLinkedPodList.Items[i]
396-
if !linkedPod.ObjectMeta.DeletionTimestamp.IsZero() {
396+
if !linkedPod.DeletionTimestamp.IsZero() {
397397
continue
398398
}
399399

@@ -409,7 +409,7 @@ func (r *EphemeralRunnerReconciler) cleanupRunnerLinkedPods(ctx context.Context,
409409
func (r *EphemeralRunnerReconciler) cleanupRunnerLinkedSecrets(ctx context.Context, ephemeralRunner *v1alpha1.EphemeralRunner, log logr.Logger) error {
410410
runnerLinkedLabels := client.MatchingLabels(
411411
map[string]string{
412-
"runner-pod": ephemeralRunner.ObjectMeta.Name,
412+
"runner-pod": ephemeralRunner.Name,
413413
},
414414
)
415415
var runnerLinkedSecretList corev1.SecretList
@@ -427,7 +427,7 @@ func (r *EphemeralRunnerReconciler) cleanupRunnerLinkedSecrets(ctx context.Conte
427427
var errs []error
428428
for i := range runnerLinkedSecretList.Items {
429429
s := &runnerLinkedSecretList.Items[i]
430-
if !s.ObjectMeta.DeletionTimestamp.IsZero() {
430+
if !s.DeletionTimestamp.IsZero() {
431431
continue
432432
}
433433

@@ -474,7 +474,7 @@ func (r *EphemeralRunnerReconciler) markAsFinished(ctx context.Context, ephemera
474474
// deletePodAsFailed is responsible for deleting the pod and updating the .Status.Failures for tracking failure count.
475475
// It should not be responsible for setting the status to Failed.
476476
func (r *EphemeralRunnerReconciler) deletePodAsFailed(ctx context.Context, ephemeralRunner *v1alpha1.EphemeralRunner, pod *corev1.Pod, log logr.Logger) error {
477-
if pod.ObjectMeta.DeletionTimestamp.IsZero() {
477+
if pod.DeletionTimestamp.IsZero() {
478478
log.Info("Deleting the ephemeral runner pod", "podId", pod.UID)
479479
if err := r.Delete(ctx, pod); err != nil && !kerrors.IsNotFound(err) {
480480
return fmt.Errorf("failed to delete pod with status failed: %w", err)
@@ -640,7 +640,7 @@ func (r *EphemeralRunnerReconciler) createPod(ctx context.Context, runner *v1alp
640640
}
641641

642642
log.Info("Creating new pod for ephemeral runner")
643-
newPod := r.ResourceBuilder.newEphemeralRunnerPod(ctx, runner, secret, envs...)
643+
newPod := r.newEphemeralRunnerPod(ctx, runner, secret, envs...)
644644

645645
if err := ctrl.SetControllerReference(runner, newPod, r.Scheme); err != nil {
646646
log.Error(err, "Failed to set controller reference to a new pod")
@@ -665,7 +665,7 @@ func (r *EphemeralRunnerReconciler) createPod(ctx context.Context, runner *v1alp
665665

666666
func (r *EphemeralRunnerReconciler) createSecret(ctx context.Context, runner *v1alpha1.EphemeralRunner, log logr.Logger) (*ctrl.Result, error) {
667667
log.Info("Creating new secret for ephemeral runner")
668-
jitSecret := r.ResourceBuilder.newEphemeralRunnerJitSecret(runner)
668+
jitSecret := r.newEphemeralRunnerJitSecret(runner)
669669

670670
if err := ctrl.SetControllerReference(runner, jitSecret, r.Scheme); err != nil {
671671
return &ctrl.Result{}, fmt.Errorf("failed to set controller reference: %w", err)

0 commit comments

Comments
 (0)