Upgrade api deps to 0.16.0 and Kubernetes to 0.31.4 (#149)

* Upgrade api deps to 0.16.0 and Kubernetes to 0.31.4

Signed-off-by: clyang82 <[email protected]>

* Fix verify issues

Signed-off-by: clyang82 <[email protected]>

* Fix cannot start api server issue

Signed-off-by: clyang82 <[email protected]>

* use msa 0.8.0

Signed-off-by: clyang82 <[email protected]>

---------

Signed-off-by: clyang82 <[email protected]>

Author: clyang82

Makefile

@@ -22,7 +22,7 @@ check: check-copyright
 .PHONY: check
 
 verify-gocilint:
-	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.53.2
+	go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8
 	go vet ./...
 	golangci-lint run --timeout=3m ./...
 .PHONY: verify-gocilint

charts/multicluster-controlplane/Chart.yaml

@@ -15,10 +15,10 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.3.0
+version: 0.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.3.0"
+appVersion: "0.7.0"

charts/multicluster-controlplane/templates/deployment.yaml

@@ -27,7 +27,7 @@ spec:
         - "--feature-gates={{ .Values.features }}"
         {{- end }}
         {{- if .Values.autoApprovalBootstrapUsers }}
-        - "--cluster-auto-approval-users={{ .Values.autoApprovalBootstrapUsers }}"
+        - "--auto-approved-csr-users={{ .Values.autoApprovalBootstrapUsers }}"
         {{- end }}
         {{- if eq .Values.enableSelfManagement true }}
         - "--self-management"

go.mod

@@ -79,7 +79,7 @@ function start_apiserver {
     "${GO_OUT}/multicluster-controlplane" \
     "server" \
     --controlplane-config-dir="${CONFIG_DIR}" \
-    --cluster-auto-approval-users="${BOOTSTRAP_USERS}" \
+    --auto-approved-csr-users="${BOOTSTRAP_USERS}" \
     --feature-gates="${FEATURE_GATES}"  >"${APISERVER_LOG}" 2>&1 &
 
     APISERVER_PID=$!
@@ -89,7 +89,7 @@ function start_apiserver {
     || { echo "check apiserver logs: ${APISERVER_LOG}" ; exit 1 ; }
 
     echo "use 'kubectl --kubeconfig=${DATA_DIR}/cert/kube-aggregator.kubeconfig' to access the controlplane"
-    echo "$APISERVER_PID" > "${REPO_DIR}/_output/controlplane/controlpane_pid"
+    echo "$APISERVER_PID" > "${REPO_DIR}/_output/controlplane/controlplane_pid"
     chmod a+r ${DATA_DIR}/cert/kube-aggregator.kubeconfig
 }
 

go.sum

@@ -17,6 +17,7 @@ import (
 	mcfeature "open-cluster-management.io/multicluster-controlplane/pkg/feature"
 	"open-cluster-management.io/multicluster-controlplane/pkg/servers"
 	"open-cluster-management.io/multicluster-controlplane/pkg/servers/options"
+	"open-cluster-management.io/multicluster-controlplane/pkg/util"
 )
 
 func init() {
@@ -48,7 +49,7 @@ func NewController() *cobra.Command {
 				return err
 			}
 
-			return servers.NewServer(*options).Start(stopChan)
+			return servers.NewServer(*options).Start(util.GoContext(stopChan))
 		},
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {

hack/start-multicluster-controlplane.sh

@@ -23,20 +23,20 @@ import (
 )
 
 var baseCRDs = []string{
+	"crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
 	"crds/0000_00_clusters.open-cluster-management.io_managedclusters.crd.yaml",
 	"crds/0000_00_clusters.open-cluster-management.io_managedclustersets.crd.yaml",
-	"crds/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml",
+	"crds/0000_00_multicluster.x-k8s.io_clusterprofiles.crd.yaml",
 	"crds/0000_00_work.open-cluster-management.io_manifestworks.crd.yaml",
 	"crds/0000_00_work.open-cluster-management.io_manifestworkreplicasets.crd.yaml",
-	"crds/0000_00_addon.open-cluster-management.io_clustermanagementaddons.crd.yaml",
 	"crds/0000_01_addon.open-cluster-management.io_managedclusteraddons.crd.yaml",
+	"crds/0000_01_clusters.open-cluster-management.io_managedclustersetbindings.crd.yaml",
 	"crds/0000_02_addon.open-cluster-management.io_addondeploymentconfigs.crd.yaml",
-	"crds/0000_03_addon.open-cluster-management.io_addontemplates.crd.yaml",
 	"crds/0000_02_clusters.open-cluster-management.io_placements.crd.yaml",
+	"crds/0000_03_addon.open-cluster-management.io_addontemplates.crd.yaml",
 	"crds/0000_03_clusters.open-cluster-management.io_placementdecisions.crd.yaml",
 	"crds/0000_05_clusters.open-cluster-management.io_addonplacementscores.crd.yaml",
 	"crds/0000_06_authentication.open-cluster-management.io_managedserviceaccounts_crd.yaml",
-	"crds/multicluster.x-k8s.io_clusterprofiles.yaml",
 }
 
 var ocmCRDs = []string{
@@ -53,6 +53,7 @@ var ocmCRDs = []string{
 	"placements.cluster.open-cluster-management.io",
 	"addonplacementscores.cluster.open-cluster-management.io",
 	"managedserviceaccounts.authentication.open-cluster-management.io",
+	"clusterprofiles.multicluster.x-k8s.io",
 }
 
 var (