Remove deprecated ServiceAccount field in ClusterSet type (#6134)

Signed-off-by: Lan Luo <[email protected]>
antrea-io · Mar 28, 2024 · bbdd928 · bbdd928
1 parent 1be77c0
commit bbdd928
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 35 deletions.
diff --git a/multicluster/apis/multicluster/v1alpha2/clusterset_types.go b/multicluster/apis/multicluster/v1alpha2/clusterset_types.go
@@ -31,13 +31,6 @@ type LeaderClusterInfo struct {
 	// Name of the Secret resource in the member cluster, which stores
 	// the token to access the leader cluster's API server.
 	Secret string `json:"secret,omitempty"`
-	// ServiceAccount in the leader cluster, from which the member cluster's token
-	// is generated. This is an optional field which helps admin to check
-	// which ServiceAccount is used by a member cluster to access the leader cluster.
-	//
-	// DEPRECATED
-	// This field is planned to be removed in the future releases.
-	ServiceAccount string `json:"serviceAccount,omitempty"`
 }
 
 // ClusterSetSpec defines the desired state of ClusterSet.

diff --git a/multicluster/build/yamls/antrea-multicluster-leader-global.yml b/multicluster/build/yamls/antrea-multicluster-leader-global.yml
@@ -243,13 +243,6 @@ spec:
                       description: API server endpoint of the leader cluster. E.g.
                         "https://172.18.0.1:6443", "https://example.com:6443".
                       type: string
-                    serviceAccount:
-                      description: "ServiceAccount in the leader cluster, from which
-                        the member cluster's token is generated. This is an optional
-                        field which helps admin to check which ServiceAccount is used
-                        by a member cluster to access the leader cluster. \n DEPRECATED
-                        This field is planned to be removed in the future releases."
-                      type: string
                   type: object
                 maxItems: 1
                 minItems: 1

diff --git a/multicluster/build/yamls/antrea-multicluster-leader.yml b/multicluster/build/yamls/antrea-multicluster-leader.yml
@@ -243,13 +243,6 @@ spec:
                       description: API server endpoint of the leader cluster. E.g.
                         "https://172.18.0.1:6443", "https://example.com:6443".
                       type: string
-                    serviceAccount:
-                      description: "ServiceAccount in the leader cluster, from which
-                        the member cluster's token is generated. This is an optional
-                        field which helps admin to check which ServiceAccount is used
-                        by a member cluster to access the leader cluster. \n DEPRECATED
-                        This field is planned to be removed in the future releases."
-                      type: string
                   type: object
                 maxItems: 1
                 minItems: 1

diff --git a/multicluster/build/yamls/antrea-multicluster-member.yml b/multicluster/build/yamls/antrea-multicluster-member.yml
@@ -355,13 +355,6 @@ spec:
                       description: API server endpoint of the leader cluster. E.g.
                         "https://172.18.0.1:6443", "https://example.com:6443".
                       type: string
-                    serviceAccount:
-                      description: "ServiceAccount in the leader cluster, from which
-                        the member cluster's token is generated. This is an optional
-                        field which helps admin to check which ServiceAccount is used
-                        by a member cluster to access the leader cluster. \n DEPRECATED
-                        This field is planned to be removed in the future releases."
-                      type: string
                   type: object
                 maxItems: 1
                 minItems: 1

diff --git a/multicluster/config/crd/bases/multicluster.crd.antrea.io_clustersets.yaml b/multicluster/config/crd/bases/multicluster.crd.antrea.io_clustersets.yaml
@@ -242,13 +242,6 @@ spec:
                       description: API server endpoint of the leader cluster. E.g.
                         "https://172.18.0.1:6443", "https://example.com:6443".
                       type: string
-                    serviceAccount:
-                      description: "ServiceAccount in the leader cluster, from which
-                        the member cluster's token is generated. This is an optional
-                        field which helps admin to check which ServiceAccount is used
-                        by a member cluster to access the leader cluster. \n DEPRECATED
-                        This field is planned to be removed in the future releases."
-                      type: string
                   type: object
                 maxItems: 1
                 minItems: 1