chore: add k8s 1.23 to github CI and change default

aws · Aug 3, 2022 · 7452e3a · 7452e3a
1 parent 941b2cc
commit 7452e3a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
         matrix:
-          k8sVersion: ["1.19.x", "1.20.x", "1.21.x", "1.22.x"]
+          k8sVersion: ["1.19.x", "1.20.x", "1.21.x", "1.22.x", "1.23.x"]
     env:
       K8S_VERSION: ${{ matrix.k8sVersion }}
     steps:

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-export K8S_VERSION ?= 1.22.x
+export K8S_VERSION ?= 1.23.x
 export KUBEBUILDER_ASSETS ?= ${HOME}/.kubebuilder/bin
 
 ## Inject the app version into project.Version

diff --git a/pkg/test/expectations/expectations.go b/pkg/test/expectations/expectations.go
@@ -24,16 +24,16 @@ import (
 	"github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega" //nolint:revive,stylecheck
 	prometheus "github.com/prometheus/client_model/go"
-	"sigs.k8s.io/controller-runtime/pkg/metrics"
-
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/api/policy/v1beta1"
 	storagev1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"knative.dev/pkg/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/metrics"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	"github.com/aws/karpenter/pkg/apis/provisioning/v1alpha5"
@@ -208,8 +208,12 @@ func ExpectMetric(prefix string) *prometheus.MetricFamily {
 }
 func ExpectManualBinding(ctx context.Context, c client.Client, pod *v1.Pod, node *v1.Node) {
 	Expect(c.Create(ctx, &v1.Binding{
-		TypeMeta:   pod.TypeMeta,
-		ObjectMeta: pod.ObjectMeta,
+		TypeMeta: pod.TypeMeta,
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      pod.ObjectMeta.Name,
+			Namespace: pod.ObjectMeta.Namespace,
+			UID:       pod.ObjectMeta.UID,
+		},
 		Target: v1.ObjectReference{
 			Name: node.Name,
 		},