Skip to content

Commit cb7b4ea

Browse files
authored
Merge pull request kubernetes#126774 from aramase/aramase/c/sa_rm_unused_function
cleanup unused fn GetOrCreateServiceAccount in serviceaccount/util
2 parents de521a9 + 2f96a78 commit cb7b4ea

File tree

1 file changed

+0
-32
lines changed
  • staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount

1 file changed

+0
-32
lines changed

staging/src/k8s.io/apiserver/pkg/authentication/serviceaccount/util.go

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,12 @@ limitations under the License.
1717
package serviceaccount
1818

1919
import (
20-
"context"
2120
"fmt"
2221
"strings"
2322

2423
v1 "k8s.io/api/core/v1"
25-
apierrors "k8s.io/apimachinery/pkg/api/errors"
2624
apimachineryvalidation "k8s.io/apimachinery/pkg/api/validation"
27-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2825
"k8s.io/apiserver/pkg/authentication/user"
29-
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
30-
31-
"k8s.io/klog/v2"
3226
)
3327

3428
const (
@@ -200,29 +194,3 @@ func IsServiceAccountToken(secret *v1.Secret, sa *v1.ServiceAccount) bool {
200194

201195
return true
202196
}
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

Comments
 (0)