diff --git a/cmd/ghalistener/config/config_validation_test.go b/cmd/ghalistener/config/config_validation_test.go index b8968b7c..308a0e3d 100644 --- a/cmd/ghalistener/config/config_validation_test.go +++ b/cmd/ghalistener/config/config_validation_test.go @@ -1,7 +1,6 @@ package config import ( - "fmt" "testing" "github.com/actions/actions-runner-controller/apis/actions.github.com/v1alpha1/appconfig" @@ -89,7 +88,7 @@ func TestConfigValidationOnlyOneTypeOfCredentials(t *testing.T) { RunnerScaleSetId: 1, } err := config.Validate() - expectedError := fmt.Sprintf(`AppConfig validation failed: both PAT and GitHub App credentials provided. should only provide one`) + expectedError := "AppConfig validation failed: both PAT and GitHub App credentials provided. should only provide one" assert.ErrorContains(t, err, expectedError, "Expected error about missing auth") } diff --git a/controllers/actions.github.com/autoscalinglistener_controller.go b/controllers/actions.github.com/autoscalinglistener_controller.go index 142cb2a7..85d7de86 100644 --- a/controllers/actions.github.com/autoscalinglistener_controller.go +++ b/controllers/actions.github.com/autoscalinglistener_controller.go @@ -529,23 +529,6 @@ func (r *AutoscalingListenerReconciler) certificate(ctx context.Context, autosca return certificate, nil } -func (r *AutoscalingListenerReconciler) createSecretsForListener(ctx context.Context, autoscalingListener *v1alpha1.AutoscalingListener, secret *corev1.Secret, logger logr.Logger) (ctrl.Result, error) { - newListenerSecret := r.newScaleSetListenerSecretMirror(autoscalingListener, secret) - - if err := ctrl.SetControllerReference(autoscalingListener, newListenerSecret, r.Scheme); err != nil { - return ctrl.Result{}, err - } - - logger.Info("Creating listener secret", "namespace", newListenerSecret.Namespace, "name", newListenerSecret.Name) - if err := r.Create(ctx, newListenerSecret); err != nil { - logger.Error(err, "Unable to create listener secret", "namespace", newListenerSecret.Namespace, "name", newListenerSecret.Name) - return ctrl.Result{}, err - } - - logger.Info("Created listener secret", "namespace", newListenerSecret.Namespace, "name", newListenerSecret.Name) - return ctrl.Result{Requeue: true}, nil -} - func (r *AutoscalingListenerReconciler) createProxySecret(ctx context.Context, autoscalingListener *v1alpha1.AutoscalingListener, logger logr.Logger) (ctrl.Result, error) { data, err := autoscalingListener.Spec.Proxy.ToSecretData(func(s string) (*corev1.Secret, error) { var secret corev1.Secret @@ -585,22 +568,6 @@ func (r *AutoscalingListenerReconciler) createProxySecret(ctx context.Context, a return ctrl.Result{Requeue: true}, nil } -func (r *AutoscalingListenerReconciler) updateSecretsForListener(ctx context.Context, secret *corev1.Secret, mirrorSecret *corev1.Secret, logger logr.Logger) (ctrl.Result, error) { - dataHash := hash.ComputeTemplateHash(secret.Data) - updatedMirrorSecret := mirrorSecret.DeepCopy() - updatedMirrorSecret.Labels["secret-data-hash"] = dataHash - updatedMirrorSecret.Data = secret.Data - - logger.Info("Updating listener mirror secret", "namespace", updatedMirrorSecret.Namespace, "name", updatedMirrorSecret.Name, "hash", dataHash) - if err := r.Update(ctx, updatedMirrorSecret); err != nil { - logger.Error(err, "Unable to update listener mirror secret", "namespace", updatedMirrorSecret.Namespace, "name", updatedMirrorSecret.Name) - return ctrl.Result{}, err - } - - logger.Info("Updated listener mirror secret", "namespace", updatedMirrorSecret.Namespace, "name", updatedMirrorSecret.Name, "hash", dataHash) - return ctrl.Result{Requeue: true}, nil -} - func (r *AutoscalingListenerReconciler) createRoleForListener(ctx context.Context, autoscalingListener *v1alpha1.AutoscalingListener, logger logr.Logger) (ctrl.Result, error) { newRole := r.newScaleSetListenerRole(autoscalingListener) diff --git a/controllers/actions.github.com/resourcebuilder.go b/controllers/actions.github.com/resourcebuilder.go index 28fd91e4..5a787e73 100644 --- a/controllers/actions.github.com/resourcebuilder.go +++ b/controllers/actions.github.com/resourcebuilder.go @@ -495,25 +495,6 @@ func (b *ResourceBuilder) newScaleSetListenerRoleBinding(autoscalingListener *v1 return newRoleBinding } -func (b *ResourceBuilder) newScaleSetListenerSecretMirror(autoscalingListener *v1alpha1.AutoscalingListener, secret *corev1.Secret) *corev1.Secret { - dataHash := hash.ComputeTemplateHash(&secret.Data) - - newListenerSecret := &corev1.Secret{ - ObjectMeta: metav1.ObjectMeta{ - Name: autoscalingListener.Name, - Namespace: autoscalingListener.Namespace, - Labels: b.mergeLabels(autoscalingListener.Labels, map[string]string{ - LabelKeyGitHubScaleSetNamespace: autoscalingListener.Spec.AutoscalingRunnerSetNamespace, - LabelKeyGitHubScaleSetName: autoscalingListener.Spec.AutoscalingRunnerSetName, - "secret-data-hash": dataHash, - }), - }, - Data: secret.DeepCopy().Data, - } - - return newListenerSecret -} - func (b *ResourceBuilder) newEphemeralRunnerSet(autoscalingRunnerSet *v1alpha1.AutoscalingRunnerSet) (*v1alpha1.EphemeralRunnerSet, error) { runnerScaleSetId, err := strconv.Atoi(autoscalingRunnerSet.Annotations[runnerScaleSetIdAnnotationKey]) if err != nil {