rename bootstrap sa name and remove 'delete token' cmd

Signed-off-by: Zhiwei Yin <[email protected]>
open-cluster-management-io · Jan 16, 2025 · c2ef824 · c2ef824
1 parent 4081bde
commit c2ef824
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 198 deletions.
diff --git a/go.mod b/go.mod
@@ -31,7 +31,7 @@ require (
 	open-cluster-management.io/api v0.15.1-0.20250109024121-1a5e25a78a43
 	open-cluster-management.io/cluster-proxy v0.4.0
 	open-cluster-management.io/managed-serviceaccount v0.6.0
-	open-cluster-management.io/ocm v0.15.1-0.20250110031959-11896ccda197
+	open-cluster-management.io/ocm v0.15.1-0.20250116024415-19fb9243ca2b
 	open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f
 	sigs.k8s.io/apiserver-network-proxy v0.29.0
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3

diff --git a/go.sum b/go.sum
@@ -563,8 +563,8 @@ open-cluster-management.io/cluster-proxy v0.4.0 h1:rm0UDaDWe3/P3xLzwqdHtqNksKwSz
 open-cluster-management.io/cluster-proxy v0.4.0/go.mod h1:gTvfDHAhGezhdg4BD3ECBn6jbg2Y5PbHhV2ceW5nrB0=
 open-cluster-management.io/managed-serviceaccount v0.6.0 h1:qIi5T9WQJBuoGqnYGIktXbtqfQoiN2H9XU2P/6lAQiw=
 open-cluster-management.io/managed-serviceaccount v0.6.0/go.mod h1:G4LUTbZiyrB8c0+rqi/xnDmGlsg7Rdr4T7MPLCWhyQI=
-open-cluster-management.io/ocm v0.15.1-0.20250110031959-11896ccda197 h1:ECwQuYbtUxDbKUKHfnmQYwLG2cV3i7OwsU4dJP/XrDg=
-open-cluster-management.io/ocm v0.15.1-0.20250110031959-11896ccda197/go.mod h1:daPkqFxkVqKb4O8UTX+7jCyEcJWarGOG7uDie9rFfck=
+open-cluster-management.io/ocm v0.15.1-0.20250116024415-19fb9243ca2b h1:zA4fOnKpgsjImN/Qc1JcwyumwYALmS7EUl9KT0lRUwk=
+open-cluster-management.io/ocm v0.15.1-0.20250116024415-19fb9243ca2b/go.mod h1:daPkqFxkVqKb4O8UTX+7jCyEcJWarGOG7uDie9rFfck=
 open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f h1:zeC7QrFNarfK2zY6jGtd+mX+yDrQQmnH/J8A7n5Nh38=
 open-cluster-management.io/sdk-go v0.15.1-0.20241125015855-1536c3970f8f/go.mod h1:fi5WBsbC5K3txKb8eRLuP0Sim/Oqz/PHX18skAEyjiA=
 oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo=

diff --git a/pkg/cmd/delete/cmd.go b/pkg/cmd/delete/cmd.go
@@ -5,7 +5,6 @@ import (
 	"github.com/spf13/cobra"
 	"k8s.io/cli-runtime/pkg/genericiooptions"
 	"open-cluster-management.io/clusteradm/pkg/cmd/delete/clusterset"
-	"open-cluster-management.io/clusteradm/pkg/cmd/delete/token"
 	"open-cluster-management.io/clusteradm/pkg/cmd/delete/work"
 	genericclioptionsclusteradm "open-cluster-management.io/clusteradm/pkg/genericclioptions"
 )
@@ -17,7 +16,6 @@ func NewCmd(clusteradmFlags *genericclioptionsclusteradm.ClusteradmFlags, stream
 		Short: "delete a resource",
 	}
 
-	cmd.AddCommand(token.NewCmd(clusteradmFlags, streams))
 	cmd.AddCommand(work.NewCmd(clusteradmFlags, streams))
 	cmd.AddCommand(clusterset.NewCmd(clusteradmFlags, streams))
 

diff --git a/pkg/cmd/delete/token/cmd.go b/pkg/cmd/delete/token/cmd.go
diff --git a/pkg/cmd/delete/token/exec.go b/pkg/cmd/delete/token/exec.go
diff --git a/pkg/cmd/delete/token/options.go b/pkg/cmd/delete/token/options.go
diff --git a/pkg/config/env.go b/pkg/config/env.go
@@ -3,16 +3,13 @@
 package config
 
 const (
-	OpenClusterManagementNamespace    = "open-cluster-management"
-	BootstrapSAName                   = "cluster-bootstrap"
-	BootstrapClusterRoleBindingName   = "cluster-bootstrap"
-	BootstrapClusterRoleBindingSAName = "cluster-bootstrap-sa"
-	BootstrapClusterRoleName          = "system:open-cluster-management:bootstrap"
-	ClusterManagerName                = "cluster-manager"
-	LabelApp                          = "app"
-	BootstrapSecretPrefix             = "bootstrap-token-"
-	HubClusterNamespace               = "open-cluster-management-hub"
-	ManagedClusterNamespace           = "open-cluster-management-agent"
-	ManagedProxyConfigurationName     = "cluster-proxy"
-	ImagePullSecret                   = "open-cluster-management-image-pull-credentials"
+	OpenClusterManagementNamespace = "open-cluster-management"
+	BootstrapSAName                = "agent-registration-bootstrap"
+	ClusterManagerName             = "cluster-manager"
+	LabelApp                       = "app"
+	BootstrapSecretPrefix          = "bootstrap-token-"
+	HubClusterNamespace            = "open-cluster-management-hub"
+	ManagedClusterNamespace        = "open-cluster-management-agent"
+	ManagedProxyConfigurationName  = "cluster-proxy"
+	ImagePullSecret                = "open-cluster-management-image-pull-credentials"
 )
diff --git a/test/e2e/clusteradm/joinhubscenario_bootstrsptoken_test.go b/test/e2e/clusteradm/joinhubscenario_bootstrsptoken_test.go
@@ -54,12 +54,6 @@ var _ = ginkgo.Describe("test clusteradm with bootstrap token", func() {
 
 			originalToken = e2e.CommandResult().RawCommand()
 
-			ginkgo.By("delete token")
-			err = e2e.Clusteradm().Delete(
-				"token",
-			)
-			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm delete token error")
-
 			ginkgo.By("get token from hub")
 			err = e2e.Clusteradm().Get(
 				"token",

diff --git a/test/e2e/clusteradm/joinhubscenario_sa_test.go b/test/e2e/clusteradm/joinhubscenario_sa_test.go
@@ -50,12 +50,6 @@ var _ = ginkgo.Describe("test clusteradm with service account", func() {
 
 			originalToken = e2e.CommandResult().RawCommand()
 
-			ginkgo.By("delete token")
-			err = e2e.Clusteradm().Delete(
-				"token",
-			)
-			gomega.Expect(err).NotTo(gomega.HaveOccurred(), "clusteradm delete token error")
-
 			ginkgo.By("get token from hub")
 			err = e2e.Clusteradm().Get(
 				"token",

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1282,7 +1282,7 @@ open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versio
 open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/scheme
 open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/typed/authentication/v1alpha1
 open-cluster-management.io/managed-serviceaccount/pkg/generated/clientset/versioned/typed/authentication/v1beta1
-# open-cluster-management.io/ocm v0.15.1-0.20250110031959-11896ccda197
+# open-cluster-management.io/ocm v0.15.1-0.20250116024415-19fb9243ca2b
 ## explicit; go 1.22.5
 open-cluster-management.io/ocm/deploy/cluster-manager/chart
 open-cluster-management.io/ocm/deploy/klusterlet/chart

diff --git a/...io/ocm/deploy/cluster-manager/chart/cluster-manager/templates/bootstrap_cluster_role.yaml b/...io/ocm/deploy/cluster-manager/chart/cluster-manager/templates/bootstrap_cluster_role.yaml
diff --git a/...eploy/cluster-manager/chart/cluster-manager/templates/bootstrap_cluster_role_binding.yaml b/...eploy/cluster-manager/chart/cluster-manager/templates/bootstrap_cluster_role_binding.yaml
diff --git a/...anagement.io/ocm/deploy/cluster-manager/chart/cluster-manager/templates/bootstrap_sa.yaml b/...anagement.io/ocm/deploy/cluster-manager/chart/cluster-manager/templates/bootstrap_sa.yaml
diff --git a/...oy/cluster-manager/chart/cluster-manager/templates/bootstrap_sa_cluster_role_binding.yaml b/...oy/cluster-manager/chart/cluster-manager/templates/bootstrap_sa_cluster_role_binding.yaml
diff --git a/...gement.io/ocm/deploy/cluster-manager/chart/cluster-manager/templates/cluster_manager.yaml b/...gement.io/ocm/deploy/cluster-manager/chart/cluster-manager/templates/cluster_manager.yaml
diff --git a/...anagement.io/ocm/deploy/cluster-manager/chart/cluster-manager/templates/cluster_role.yaml b/...anagement.io/ocm/deploy/cluster-manager/chart/cluster-manager/templates/cluster_role.yaml
diff --git a/vendor/open-cluster-management.io/ocm/pkg/operator/helpers/chart/config.go b/vendor/open-cluster-management.io/ocm/pkg/operator/helpers/chart/config.go