Replace apiserver runtime

.github/workflows/ci.yaml

@@ -11,9 +11,9 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.23'
+  GO_VERSION: '1.25.13'
   GOLANGCI_VERSION: 'v1.56'
-  KIND_VERSION: 'v0.29.0'
+  KIND_VERSION: 'v0.32.0'
 
 jobs:
 
@@ -57,7 +57,7 @@ jobs:
           go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 
           # Setup the test environment with the correct Kubernetes version
-          export KUBEBUILDER_ASSETS=$(setup-envtest use 1.31.x --print path --bin-dir ~/.local/bin)
+          export KUBEBUILDER_ASSETS=$(setup-envtest use 1.35.x --print path --bin-dir ~/.local/bin)
           echo "KUBEBUILDER_ASSETS=$KUBEBUILDER_ASSETS" >> $GITHUB_ENV
 
           # Verify the setup
@@ -68,10 +68,11 @@ jobs:
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: cover.out
+          files: cover.out
           flags: unit-test
           name: codecov-umbrella
-          fail_ci_if_error: true
+          fail_ci_if_error: false
+          use_pypi: true
           verbose: true
       - name: Run Make
         run: make
@@ -97,10 +98,10 @@ jobs:
           key: ${{ runner.os }}-pkg-${{ hashFiles('**/go.sum') }}
           restore-keys: ${{ runner.os }}-pkg-
       - name: Create k8s Kind Cluster
-        uses: helm/kind-action@v1.2.0
+        uses: helm/kind-action@v1.14.0
         with:
-          version: v0.29.0
-          node_image: kindest/node:v1.31.9
+          version: v0.32.0
+          node_image: kindest/node:v1.35.5
       - name: Build Image
         run: |
           make image
@@ -142,10 +143,10 @@ jobs:
       - name: Install clusteradm
         run: curl -L https://raw.githubusercontent.com/open-cluster-management-io/clusteradm/main/install.sh | bash
       - name: Create k8s Kind Cluster
-        uses: helm/kind-action@v1.2.0
+        uses: helm/kind-action@v1.14.0
         with:
-          version: v0.29.0
-          node_image: kindest/node:v1.31.9
+          version: v0.32.0
+          node_image: kindest/node:v1.35.5
       - name: Prepare OCM testing environment
         run: |
           clusteradm init --output-join-command-file join.sh --wait

.github/workflows/go-release.yml

@@ -6,7 +6,7 @@ on:
       - 'v*'
 env:
   # Common versions
-  GO_VERSION: '1.23'
+  GO_VERSION: '1.25.13'
   GO_REQUIRED_MIN_VERSION: ''
   GOPATH: '/home/runner/work/oamdev/cluster-gateway/go'
   GITHUB_REF: ${{ github.ref }}

Makefile

@@ -35,7 +35,6 @@ local-run:
 	go run ./cmd/apiserver/main.go \
 	--standalone-debug-mode=true \
     --bind-address=127.0.0.1 \
-    --etcd-servers=127.0.0.1:2379 \
     --secure-port=9443
 
 # Install CRDs into a cluster
@@ -76,7 +75,7 @@ ifeq (, $(shell which controller-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 ;\
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.3 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 CONTROLLER_GEN=$(GOBIN)/controller-gen
@@ -91,7 +90,7 @@ ifeq (, $(shell which openapi-gen))
 	CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
 	cd $$CONTROLLER_GEN_TMP_DIR ;\
 	go mod init tmp ;\
-	go install k8s.io/kube-openapi/cmd/openapi-gen@v0.0.0-20240228011516-70dd3763d340 ;\
+	go install k8s.io/kube-openapi/cmd/openapi-gen@v0.0.0-20250910181357-589584f1c912 ;\
 	rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
 	}
 OPENAPI_GEN=$(GOBIN)/openapi-gen
@@ -108,20 +107,23 @@ ifeq (, $(shell which kustomize))
 	go mod init tmp ;\
 	go get sigs.k8s.io/kustomize/kustomize/v3@v3.5.4 ;\
 	rm -rf $$KUSTOMIZE_GEN_TMP_DIR ;\
-	}chore: update event handling to use typed events and bump dependencies
+	}
 KUSTOMIZE=$(GOBIN)/kustomize
 else
 KUSTOMIZE=$(shell which kustomize)
 endif
 
 
 client-gen:
-	go install k8s.io/code-generator/cmd/client-gen@v0.31.1
-	apiserver-runtime-gen \
-		--module github.com/oam-dev/cluster-gateway \
-		-g client-gen \
-		--versions=github.com/oam-dev/cluster-gateway/pkg/apis/cluster/v1alpha1 \
-		--install-generators=false
+	go install k8s.io/code-generator/cmd/client-gen@v0.35.6
+	$(GOBIN)/client-gen \
+		--go-header-file=hack/boilerplate.go.txt \
+		--clientset-name=versioned \
+		--input-base="" \
+		--input=github.com/oam-dev/cluster-gateway/pkg/apis/cluster/v1alpha1 \
+		--output-pkg=github.com/oam-dev/cluster-gateway/pkg/generated/clientset \
+		--output-dir=pkg/generated/clientset \
+		--fake-clientset=false
 
 
 generate: controller-gen

charts/addon-manager/crds/clustergatewayconfigurations.yaml

@@ -1,11 +1,9 @@
-
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.4.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.17.3
   name: clustergatewayconfigurations.proxy.open-cluster-management.io
 spec:
   group: proxy.open-cluster-management.io
@@ -21,14 +19,19 @@ spec:
       openAPIV3Schema:
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
@@ -98,44 +101,35 @@ spec:
             properties:
               conditions:
                 items:
-                  description: "Condition contains details for one aspect of the current
-                    state of this API Resource. --- This struct is intended for direct
-                    use as an array at the field path .status.conditions.  For example,
-                    type FooStatus struct{     // Represents the observations of a
-                    foo's current state.     // Known .status.conditions.type are:
-                    \"Available\", \"Progressing\", and \"Degraded\"     // +patchMergeKey=type
-                    \    // +patchStrategy=merge     // +listType=map     // +listMapKey=type
-                    \    Conditions []metav1.Condition `json:\"conditions,omitempty\"
-                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
-                    \n     // other fields }"
+                  description: Condition contains details for one aspect of the current
+                    state of this API Resource.
                   properties:
                     lastTransitionTime:
-                      description: lastTransitionTime is the last time the condition
-                        transitioned from one status to another. This should be when
-                        the underlying condition changed.  If that is not known, then
-                        using the time when the API field changed is acceptable.
+                      description: |-
+                        lastTransitionTime is the last time the condition transitioned from one status to another.
+                        This should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.
                       format: date-time
                       type: string
                     message:
-                      description: message is a human readable message indicating
-                        details about the transition. This may be an empty string.
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
                       maxLength: 32768
                       type: string
                     observedGeneration:
-                      description: observedGeneration represents the .metadata.generation
-                        that the condition was set based upon. For instance, if .metadata.generation
-                        is currently 12, but the .status.conditions[x].observedGeneration
-                        is 9, the condition is out of date with respect to the current
-                        state of the instance.
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
                       format: int64
                       minimum: 0
                       type: integer
                     reason:
-                      description: reason contains a programmatic identifier indicating
-                        the reason for the condition's last transition. Producers
-                        of specific condition types may define expected values and
-                        meanings for this field, and whether the values are considered
-                        a guaranteed API. The value should be a CamelCase string.
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
                         This field may not be empty.
                       maxLength: 1024
                       minLength: 1
@@ -150,10 +144,6 @@ spec:
                       type: string
                     type:
                       description: type of condition in CamelCase or in foo.example.com/CamelCase.
-                        --- Many .condition.type values are consistent across resources
-                        like Available, but because arbitrary conditions can be useful
-                        (see .node.status.conditions), the ability to deconflict is
-                        important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string
@@ -174,9 +164,3 @@ spec:
     storage: true
     subresources:
       status: {}
-status:
-  acceptedNames:
-    kind: ""
-    plural: ""
-  conditions: []
-  storedVersions: []

cmd/addon-manager/Dockerfile

@@ -1,7 +1,7 @@
 ARG OS=linux
 ARG ARCH=amd64
 # Build the manager binary
-FROM golang:1.23 as builder
+FROM golang:1.25.13 as builder
 ARG OS
 ARG ARCH
 

cmd/apiserver/Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.23-alpine as builder
+FROM golang:1.25.13-alpine as builder
 ARG OS
 ARG ARCH