From d7dadb442534cbe324e9e03869bcc2f58479a82b Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Wed, 28 Sep 2022 22:07:41 +0300 Subject: [PATCH] e2e: Update bootstrap test to Kubernetes 1.25.2 Signed-off-by: Stefan Prodan --- .github/workflows/bootstrap.yaml | 4 ++-- cmd/flux/create.go | 12 ++++++------ cmd/flux/get.go | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/bootstrap.yaml b/.github/workflows/bootstrap.yaml index 2b7effd3..e35b9176 100644 --- a/.github/workflows/bootstrap.yaml +++ b/.github/workflows/bootstrap.yaml @@ -27,8 +27,8 @@ jobs: - name: Setup Kubernetes uses: engineerd/setup-kind@v0.5.0 with: - version: v0.11.1 - image: kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6 + version: v0.16.0 + image: kindest/node:v1.25.2@sha256:9be91e9e9cdf116809841fc77ebdb8845443c4c72fe5218f3ae9eb57fdb4bace - name: Setup Kustomize uses: fluxcd/pkg//actions/kustomize@main - name: Build diff --git a/cmd/flux/create.go b/cmd/flux/create.go index ee339775..b0eb0e83 100644 --- a/cmd/flux/create.go +++ b/cmd/flux/create.go @@ -79,12 +79,12 @@ type upsertable interface { // want to update. The mutate function is nullary -- you mutate a // value in the closure, e.g., by doing this: // -// var existing Value -// existing.Name = name -// existing.Namespace = ns -// upsert(ctx, client, valueAdapter{&value}, func() error { -// value.Spec = onePreparedEarlier -// }) +// var existing Value +// existing.Name = name +// existing.Namespace = ns +// upsert(ctx, client, valueAdapter{&value}, func() error { +// value.Spec = onePreparedEarlier +// }) func (names apiType) upsert(ctx context.Context, kubeClient client.Client, object upsertable, mutate func() error) (types.NamespacedName, error) { nsname := types.NamespacedName{ Namespace: object.GetNamespace(), diff --git a/cmd/flux/get.go b/cmd/flux/get.go index 84a7573a..2236e36e 100644 --- a/cmd/flux/get.go +++ b/cmd/flux/get.go @@ -214,7 +214,6 @@ func getRowsToPrint(getAll bool, list summarisable) ([][]string, error) { return rows, nil } -// // watch starts a client-side watch of one or more resources. func (get *getCommand) watch(ctx context.Context, kubeClient client.WithWatch, cmd *cobra.Command, args []string, listOpts []client.ListOption) error { w, err := kubeClient.Watch(ctx, get.list.asClientList(), listOpts...)