From bbdd92827af29f6aa2ae03416fb90684feac8216 Mon Sep 17 00:00:00 2001 From: Lan Date: Thu, 28 Mar 2024 21:50:24 +0800 Subject: [PATCH] Remove deprecated ServiceAccount field in ClusterSet type (#6134) Signed-off-by: Lan Luo --- .../apis/multicluster/v1alpha2/clusterset_types.go | 7 ------- .../build/yamls/antrea-multicluster-leader-global.yml | 7 ------- multicluster/build/yamls/antrea-multicluster-leader.yml | 7 ------- multicluster/build/yamls/antrea-multicluster-member.yml | 7 ------- .../crd/bases/multicluster.crd.antrea.io_clustersets.yaml | 7 ------- 5 files changed, 35 deletions(-) diff --git a/multicluster/apis/multicluster/v1alpha2/clusterset_types.go b/multicluster/apis/multicluster/v1alpha2/clusterset_types.go index ba99ecc8240..038e1291a2f 100644 --- 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 index d48efd8f64e..761391e20d1 100644 --- 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 index 52af7d58209..61d212972f0 100644 --- 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 index 5642c80ac57..d662c6dd22d 100644 --- 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 index 513e09fee5f..4e8d198617f 100644 --- 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