@@ -17,18 +17,12 @@ limitations under the License.
17
17
package serviceaccount
18
18
19
19
import (
20
- "context"
21
20
"fmt"
22
21
"strings"
23
22
24
23
v1 "k8s.io/api/core/v1"
25
- apierrors "k8s.io/apimachinery/pkg/api/errors"
26
24
apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation"
27
- metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
28
25
"k8s.io/apiserver/pkg/authentication/user"
29
- v1core "k8s.io/client-go/kubernetes/typed/core/v1"
30
-
31
- "k8s.io/klog/v2"
32
26
)
33
27
34
28
const (
@@ -200,29 +194,3 @@ func IsServiceAccountToken(secret *v1.Secret, sa *v1.ServiceAccount) bool {
200
194
201
195
return true
202
196
}
203
-
204
- func GetOrCreateServiceAccount (coreClient v1core.CoreV1Interface , namespace , name string ) (* v1.ServiceAccount , error ) {
205
- sa , err := coreClient .ServiceAccounts (namespace ).Get (context .TODO (), name , metav1.GetOptions {})
206
- if err == nil {
207
- return sa , nil
208
- }
209
- if ! apierrors .IsNotFound (err ) {
210
- return nil , err
211
- }
212
-
213
- // Create the namespace if we can't verify it exists.
214
- // Tolerate errors, since we don't know whether this component has namespace creation permissions.
215
- if _ , err := coreClient .Namespaces ().Get (context .TODO (), namespace , metav1.GetOptions {}); apierrors .IsNotFound (err ) {
216
- if _ , err = coreClient .Namespaces ().Create (context .TODO (), & v1.Namespace {ObjectMeta : metav1.ObjectMeta {Name : namespace }}, metav1.CreateOptions {}); err != nil && ! apierrors .IsAlreadyExists (err ) {
217
- klog .Warningf ("create non-exist namespace %s failed:%v" , namespace , err )
218
- }
219
- }
220
-
221
- // Create the service account
222
- sa , err = coreClient .ServiceAccounts (namespace ).Create (context .TODO (), & v1.ServiceAccount {ObjectMeta : metav1.ObjectMeta {Namespace : namespace , Name : name }}, metav1.CreateOptions {})
223
- if apierrors .IsAlreadyExists (err ) {
224
- // If we're racing to init and someone else already created it, re-fetch
225
- return coreClient .ServiceAccounts (namespace ).Get (context .TODO (), name , metav1.GetOptions {})
226
- }
227
- return sa , err
228
- }
0 commit comments