diff --git a/cmd/atc/handler.go b/cmd/atc/handler.go index 034c3ea9..4c58786d 100644 --- a/cmd/atc/handler.go +++ b/cmd/atc/handler.go @@ -823,7 +823,8 @@ func Handler(params HandlerParams) http.Handler { ResourceMatchers: flight.Spec.ResourceAccessMatchers, }, ManagedBy: "atc.yoke", - }); err != nil { + }, + ); err != nil { failReview(&review, metav1.Status{ Status: metav1.StatusFailure, Reason: metav1.StatusReasonBadRequest, diff --git a/cmd/atc/main_test.go b/cmd/atc/main_test.go index cde2a8af..33eddbe9 100644 --- a/cmd/atc/main_test.go +++ b/cmd/atc/main_test.go @@ -3558,7 +3558,8 @@ func TestValidationCycle(t *testing.T) { ) require.NoError(t, err) - require.NoError(t, + require.NoError( + t, client.WaitForReady(context.Background(), internal.Must2(internal.ToUnstructured(airway)), k8s.WaitOptions{ Timeout: 30 * time.Second, Interval: time.Second, @@ -3667,7 +3668,8 @@ func TestIdentityWithError(t *testing.T) { ) require.NoError(t, err) - require.NoError(t, + require.NoError( + t, client.WaitForReady(context.Background(), internal.Must2(internal.ToUnstructured(airway)), k8s.WaitOptions{ Timeout: 30 * time.Second, Interval: time.Second, @@ -3874,7 +3876,8 @@ func TestInvalidChecksum(t *testing.T) { airway, err = client.AirwayIntf().Create(context.Background(), airway, metav1.CreateOptions{}) require.NoError(t, err) - require.NoError(t, + require.NoError( + t, client.WaitForReady(context.Background(), internal.Must2(internal.ToUnstructured(airway)), k8s.WaitOptions{ Timeout: 30 * time.Second, Interval: time.Second, diff --git a/cmd/yokecd-installer/argocd/argo-cd-9.5.0.tgz b/cmd/yokecd-installer/argocd/argo-cd-9.5.0.tgz deleted file mode 100644 index 2adb7abb..00000000 Binary files a/cmd/yokecd-installer/argocd/argo-cd-9.5.0.tgz and /dev/null differ diff --git a/cmd/yokecd-installer/argocd/argo-cd-9.5.17.tgz b/cmd/yokecd-installer/argocd/argo-cd-9.5.17.tgz new file mode 100644 index 00000000..a18f50af Binary files /dev/null and b/cmd/yokecd-installer/argocd/argo-cd-9.5.17.tgz differ diff --git a/cmd/yokecd-installer/argocd/flight.go b/cmd/yokecd-installer/argocd/flight.go index 2c978052..30a64ac5 100644 --- a/cmd/yokecd-installer/argocd/flight.go +++ b/cmd/yokecd-installer/argocd/flight.go @@ -9,11 +9,11 @@ import ( "github.com/yokecd/yoke/pkg/helm" ) -//go:embed argo-cd-9.5.0.tgz +//go:embed argo-cd-9.5.17.tgz var archive []byte // RenderChart renders the chart downloaded from https://argoproj.github.io/argo-helm/argo-cd -// Producing version: 9.5.0 +// Producing version: 9.5.17 func RenderChart(release, namespace string, values map[string]any) ([]*unstructured.Unstructured, error) { chart, err := helm.LoadChartFromZippedArchive(archive) if err != nil { diff --git a/cmd/yokecd/internal/svr/run.go b/cmd/yokecd/internal/svr/run.go index 33b81c52..f7e04d76 100644 --- a/cmd/yokecd/internal/svr/run.go +++ b/cmd/yokecd/internal/svr/run.go @@ -69,7 +69,8 @@ func Run(ctx context.Context, cfg Config) (err error) { const addr = ":3666" - logger.Info("debug config", + logger.Info( + "debug config", "cacheFS", cfg.CacheFS, "addr", addr, ) diff --git a/internal/atc/reconciler_airway.go b/internal/atc/reconciler_airway.go index 22c9549b..ee4fad0b 100644 --- a/internal/atc/reconciler_airway.go +++ b/internal/atc/reconciler_airway.go @@ -224,9 +224,9 @@ func (atc atc) Reconcile(ctx context.Context, event ctrl.Event) (result ctrl.Res } statusSchema, ok := version.Schema.OpenAPIV3Schema.Properties["status"] if !ok { - version.Schema.OpenAPIV3Schema.Properties["status"] = *(openapi.SchemaFor[struct { + version.Schema.OpenAPIV3Schema.Properties["status"] = *openapi.SchemaFor[struct { Conditions flight.Conditions `json:"conditions,omitempty"` - }]()) + }]() } else { if statusSchema.Type != "object" { return ctrl.Result{}, fmt.Errorf("invalid airway: status must be an object but got type: %q", statusSchema.Type)