Merge pull request #23 from mjudeikis/sttts-1.28-pre.3-patch-2

Nit updates for rebase
kcp-dev · Oct 8, 2023 · 349cce2 · 349cce2
2 parents 618d601 + 8a246cf
commit 349cce2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/.prow.yaml b/.prow.yaml
@@ -7,7 +7,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - make
             - verify-boilerplate
@@ -27,7 +27,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - make
             - verify-codegen
@@ -44,7 +44,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - make
             - lint
@@ -83,7 +83,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - make
             - test
@@ -103,7 +103,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - ./hack/run-with-prometheus.sh
             - make
@@ -130,7 +130,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - ./hack/run-with-prometheus.sh
             - make
@@ -159,7 +159,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - ./hack/run-with-prometheus.sh
             - make
@@ -184,7 +184,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.19.9-2
+        - image: ghcr.io/kcp-dev/infra/build:1.20.8-1
           command:
             - ./hack/run-with-prometheus.sh
             - make

diff --git a/pkg/server/scheme/scheme.go b/pkg/server/scheme/scheme.go
@@ -19,14 +19,12 @@ package scheme
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	admissionregistrationinstall "k8s.io/kubernetes/pkg/apis/admissionregistration/install"
 	authenticationinstall "k8s.io/kubernetes/pkg/apis/authentication/install"
 	authorizationinstall "k8s.io/kubernetes/pkg/apis/authorization/install"
 	certificatesinstall "k8s.io/kubernetes/pkg/apis/certificates/install"
 	coordinationinstall "k8s.io/kubernetes/pkg/apis/coordination/install"
 	"k8s.io/kubernetes/pkg/apis/core/install"
-	corev1 "k8s.io/kubernetes/pkg/apis/core/v1"
 	eventsinstall "k8s.io/kubernetes/pkg/apis/events/install"
 	rbacinstall "k8s.io/kubernetes/pkg/apis/rbac/install"
 )