File tree Expand file tree Collapse file tree 2 files changed +3
-2
lines changed
controlplane/rosa/controllers Expand file tree Collapse file tree 2 files changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -39,6 +39,7 @@ import (
39
39
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
40
40
"k8s.io/apimachinery/pkg/types"
41
41
kerrors "k8s.io/apimachinery/pkg/util/errors"
42
+ "k8s.io/apiserver/pkg/storage/names"
42
43
restclient "k8s.io/client-go/rest"
43
44
"k8s.io/client-go/tools/clientcmd"
44
45
"k8s.io/client-go/tools/clientcmd/api"
@@ -645,7 +646,7 @@ func (r *ROSAControlPlaneReconciler) reconcileExternalAuthBootstrapKubeconfig(ct
645
646
646
647
// kubeconfig doesn't exist, generate a new one.
647
648
breakGlassConfig , err := cmv1 .NewBreakGlassCredential ().
648
- Username ("capi-admin" ).
649
+ Username (names . SimpleNameGenerator . GenerateName ( "capi-admin-" )). // OCM requires unique usernames
649
650
ExpirationTimestamp (time .Now ().Add (time .Hour * 24 )).
650
651
Build ()
651
652
if err != nil {
Original file line number Diff line number Diff line change @@ -47,6 +47,7 @@ require (
47
47
k8s.io/api v0.29.3
48
48
k8s.io/apiextensions-apiserver v0.29.3
49
49
k8s.io/apimachinery v0.29.3
50
+ k8s.io/apiserver v0.29.3
50
51
k8s.io/cli-runtime v0.29.3
51
52
k8s.io/client-go v0.29.3
52
53
k8s.io/component-base v0.29.3
@@ -217,7 +218,6 @@ require (
217
218
gopkg.in/inf.v0 v0.9.1 // indirect
218
219
gopkg.in/ini.v1 v1.67.0 // indirect
219
220
gopkg.in/yaml.v3 v3.0.1 // indirect
220
- k8s.io/apiserver v0.29.3 // indirect
221
221
k8s.io/cluster-bootstrap v0.29.3 // indirect
222
222
k8s.io/component-helpers v0.29.3 // indirect
223
223
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
You can’t perform that action at this time.
0 commit comments