Merge pull request #52 from sttts/sttts-embeddedetcd

🌱 Use github.com/kcp-dev/embeddedetcd

Author: sttts

.github/workflows/goreleaser.yml

@@ -22,7 +22,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-go@v5
       with:
-        go-version: v1.22.2
+        go-version: v1.23.7
     - name: Delete non-semver tags
       run: 'git tag -d $(git tag -l | grep -v "^v")'
     - name: Set LDFLAGS
@@ -47,7 +47,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         KREW_GITHUB_TOKEN: ${{ secrets.KREW_GITHUB_TOKEN }}
-    - uses: cytopia/upload-artifact[email protected]
+    - uses: actions/upload-artifact@v4
       if: ${{ always() }}
       with:
         name: binaries

.prow.yaml

@@ -7,7 +7,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.22.2-1
+        - image: ghcr.io/kcp-dev/infra/build:1.23.7-1
           command:
             - make
             - verify-boilerplate
@@ -25,7 +25,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.22.2-1
+        - image: ghcr.io/kcp-dev/infra/build:1.23.7-1
           command:
             - make
             - lint
@@ -64,7 +64,7 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.22.2-1
+        - image: ghcr.io/kcp-dev/infra/build:1.23.7-1
           command:
             - make
             - test

Dockerfile

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Build the binary
-FROM --platform=${BUILDPLATFORM} docker.io/golang:1.22.2 AS builder
+FROM --platform=${BUILDPLATFORM} docker.io/golang:1.23.7 AS builder
 WORKDIR /workspace
 
 # Install dependencies.

cmd/gcp/main.go

@@ -20,6 +20,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
+
 	"k8s.io/component-base/cli"
 	_ "k8s.io/component-base/logs/json/register"
 	_ "k8s.io/component-base/metrics/prometheus/clientgo"

go.mod

@@ -1,17 +1,18 @@
 module github.com/kcp-dev/generic-controlplane
 
-go 1.23.0
+go 1.23.7
 
 require (
 	github.com/google/uuid v1.6.0
+	github.com/kcp-dev/embeddedetcd v1.0.0
 	github.com/muesli/reflow v0.3.0
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6
 	k8s.io/apiextensions-apiserver v0.31.1
-	k8s.io/apimachinery v0.31.1
-	k8s.io/apiserver v0.31.1
-	k8s.io/client-go v0.31.1
-	k8s.io/component-base v0.31.1
+	k8s.io/apimachinery v0.32.3
+	k8s.io/apiserver v0.32.3
+	k8s.io/client-go v0.32.3
+	k8s.io/component-base v0.32.3
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kube-aggregator v0.31.1
 	k8s.io/kubernetes v1.31.1
@@ -141,12 +142,12 @@ require (
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/api v0.31.1
+	k8s.io/api v0.32.3
 	k8s.io/cloud-provider v0.30.0 // indirect
 	k8s.io/cluster-bootstrap v0.30.0 // indirect
 	k8s.io/controller-manager v0.31.1 // indirect
 	k8s.io/dynamic-resource-allocation v0.31.1 // indirect
-	k8s.io/kms v0.31.1 // indirect
+	k8s.io/kms v0.32.3 // indirect
 	k8s.io/kube-openapi v0.0.0-20250304201544-e5f78fe3ede9 // indirect
 	k8s.io/kubelet v0.31.1 // indirect
 	k8s.io/mount-utils v0.30.0 // indirect

go.sum

@@ -136,6 +136,8 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/kcp-dev/embeddedetcd v1.0.0 h1:enlggMKE2CHDSG4yXNcvGLgCqTZGJ/MWFgP99y5huAU=
+github.com/kcp-dev/embeddedetcd v1.0.0/go.mod h1:a/VuC6zl6UUtvRUiLdkk+wFEqvIY/cQSKol+i6ooTKQ=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=

server/batteries/battery.go

@@ -2,6 +2,7 @@ package batteries
 
 import (
 	"golang.org/x/exp/slices"
+
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apiserver/pkg/admission"
 	"k8s.io/apiserver/pkg/admission/plugin/namespace/lifecycle"
@@ -13,7 +14,6 @@ import (
 	"k8s.io/kubernetes/plugin/pkg/admission/admit"
 	certapproval "k8s.io/kubernetes/plugin/pkg/admission/certificates/approval"
 	"k8s.io/kubernetes/plugin/pkg/admission/certificates/ctbattest"
-
 	certsigning "k8s.io/kubernetes/plugin/pkg/admission/certificates/signing"
 	certsubjectrestriction "k8s.io/kubernetes/plugin/pkg/admission/certificates/subjectrestriction"
 	"k8s.io/kubernetes/plugin/pkg/admission/defaulttolerationseconds"

server/cmd/options/config.go

@@ -17,6 +17,8 @@ limitations under the License.
 package options
 
 import (
+	"github.com/kcp-dev/embeddedetcd"
+
 	apiextensionsapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apiserver/pkg/util/webhook"
@@ -28,7 +30,6 @@ import (
 	generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi"
 
 	"github.com/kcp-dev/generic-controlplane/server/batteries"
-	"github.com/kcp-dev/generic-controlplane/server/embeddedetcd"
 )
 
 // Config holds the configuration for the generic controlplane server.

server/cmd/options/options.go

@@ -23,11 +23,12 @@ import (
 	"os"
 	"path/filepath"
 
-	"k8s.io/client-go/informers"
+	etcdoptions "github.com/kcp-dev/embeddedetcd/options"
 
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apiserver/pkg/admission"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
+	"k8s.io/client-go/informers"
 	"k8s.io/client-go/util/keyutil"
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/klog/v2"
@@ -37,7 +38,6 @@ import (
 	"k8s.io/kubernetes/pkg/serviceaccount"
 
 	"github.com/kcp-dev/generic-controlplane/server/batteries"
-	etcdoptions "github.com/kcp-dev/generic-controlplane/server/embeddedetcd/options"
 	"github.com/kcp-dev/generic-controlplane/server/tokengetter"
 )
 

server/cmd/server.go

@@ -22,10 +22,13 @@ import (
 	"os"
 	"strings"
 
+	"github.com/kcp-dev/embeddedetcd"
 	"github.com/spf13/cobra"
+
+	apiextensionapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	_ "k8s.io/apiserver/pkg/admission" // for admission plugins
+	_ "k8s.io/apiserver/pkg/admission"
 	genericapifilters "k8s.io/apiserver/pkg/endpoints/filters"
 	genericapiserver "k8s.io/apiserver/pkg/server"
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
@@ -35,22 +38,19 @@ import (
 	cliflag "k8s.io/component-base/cli/flag"
 	"k8s.io/component-base/cli/globalflag"
 	"k8s.io/component-base/logs"
-	"k8s.io/klog/v2"
-
-	apiextensionapiserver "k8s.io/apiextensions-apiserver/pkg/apiserver"
 	logsapi "k8s.io/component-base/logs/api/v1"
-	_ "k8s.io/component-base/metrics/prometheus/workqueue" // for workqueue metrics
+	_ "k8s.io/component-base/metrics/prometheus/workqueue"
 	"k8s.io/component-base/term"
 	"k8s.io/component-base/version"
 	"k8s.io/component-base/version/verflag"
+	"k8s.io/klog/v2"
 	aggregatorapiserver "k8s.io/kube-aggregator/pkg/apiserver"
 	controlplaneapiserver "k8s.io/kubernetes/pkg/controlplane/apiserver"
-	_ "k8s.io/kubernetes/pkg/features" // add the kubernetes feature gates
+	_ "k8s.io/kubernetes/pkg/features"
 
 	"github.com/kcp-dev/generic-controlplane/server/batteries"
 	"github.com/kcp-dev/generic-controlplane/server/cmd/help"
 	options "github.com/kcp-dev/generic-controlplane/server/cmd/options"
-	"github.com/kcp-dev/generic-controlplane/server/embeddedetcd"
 	"github.com/kcp-dev/generic-controlplane/server/readiness"
 )