hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

fix CRB's not being able to specify names, fixed SA not being bound to their namespace

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2021-06-08 08:26:13 -04:00
parent 755d1b383b
commit c20850fbd4
3 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/renderer/api/endpoints/cluster-role-binding.api.ts
View File

@ -27,6 +27,7 @@ export interface ClusterRoleBindingSubject {
kind: ClusterRoleBindingSubjectKind;
name: string;
apiGroup?: string;
namespace?: string;
}
export interface ClusterRoleBinding {

29
src/renderer/components/+user-management/+cluster-role-bindings/dialog.tsx
View File

@ -39,6 +39,7 @@ import { clusterRoleBindingsStore } from "./store";
import { clusterRolesStore } from "../+cluster-roles/store";
import { getRoleRefSelectOption, ServiceAccountOption } from "../select-options";
import { ObservableHashSet, nFircate } from "../../../utils";
import { Input } from "../../input";
interface Props extends Partial<DialogProps> {
}
@ -94,6 +95,7 @@ export class ClusterRoleBindingDialog extends React.Component<Props> {
const serviceAccounts = Array.from(this.selectedAccounts, sa => ({
name: sa.getName(),
kind: "ServiceAccount" as const,
namespace: sa.getNs(),
}));
const users = Array.from(this.selectedUsers, user => ({
name: user,
@ -143,7 +145,7 @@ export class ClusterRoleBindingDialog extends React.Component<Props> {
this.selectedRoleRef = clusterRolesStore
.items
.find(item => item.getName() === binding.roleRef.name);
this.bindingName = this.selectedRoleRef.getName();
this.bindingName = this.clusterRoleBinding.getName();
const [saSubjects, uSubjects, gSubjects] = nFircate(binding.getSubjects(), "kind", ["ServiceAccount", "User", "Group"]);
const accountNames = new Set(saSubjects.map(acc => acc.name));
@ -152,7 +154,6 @@ export class ClusterRoleBindingDialog extends React.Component<Props> {
serviceAccountsStore.items
.filter(sa => accountNames.has(sa.getName()))
);
console.log("onOpen", this.selectedAccounts.size, this.selectedAccounts.toJSON());
this.selectedUsers.replace(uSubjects.map(user => user.name));
this.selectedGroups.replace(gSubjects.map(group => group.name));
};
@ -197,7 +198,18 @@ export class ClusterRoleBindingDialog extends React.Component<Props> {
isDisabled={this.isEditing}
options={this.clusterRoleRefoptions}
value={this.selectedRoleRef}
onChange={({ value }) => this.selectedRoleRef = value}
onChange={({ value }) => {
this.selectedRoleRef = value;
this.bindingName = this.selectedRoleRef.getName();
}}
/>
<SubTitle title="Binding Name" />
<Input
placeholder="Name of ClusterRoleBinding ..."
disabled={this.isEditing}
value={this.bindingName}
onChange={val => this.bindingName = val}
/>
<SubTitle title="Binding targets" />
@ -241,13 +253,8 @@ export class ClusterRoleBindingDialog extends React.Component<Props> {
render() {
const { ...dialogProps } = this.props;
const { isEditing, clusterRoleBinding, selectedRoleRef, selectedBindings } = this;
const clusterRoleBindingName = clusterRoleBinding?.getName();
const header = clusterRoleBindingName
? <h5>Edit ClusterRoleBinding <span className="name">{clusterRoleBindingName}</span></h5>
: <h5>Add ClusterRoleBinding</h5>;
const disableNext = !selectedRoleRef || !selectedBindings.length;
const nextLabel = isEditing ? "Update" : "Create";
const [action, nextLabel] = this.isEditing ? ["Edit", "Update"] : ["Add", "Create"];
const disableNext = !this.selectedRoleRef || !this.selectedBindings.length;
return (
<Dialog
@ -259,7 +266,7 @@ export class ClusterRoleBindingDialog extends React.Component<Props> {
onOpen={this.onOpen}
>
<Wizard
header={header}
header={<h5>{action} ClusterRoleBinding</h5>}
done={ClusterRoleBindingDialog.close}
>
<WizardStep

33
src/renderer/components/+user-management/+role-bindings/dialog.tsx
View File

@ -222,18 +222,17 @@ export class RoleBindingDialog extends React.Component<Props> {
if (this.selectedRoleRef.kind === "Role") {
this.bindingNamespace = this.selectedRoleRef.getNs();
}
this.bindingName = this.selectedRoleRef.getName();
}}
/>
{!this.isEditing && (
<>
<SubTitle title="Role Binding Name" />
<Input
value={this.bindingName}
onChange={value => this.bindingName = value}
/>
</>
)}
<SubTitle title="Role Binding Name" />
<Input
disabled={this.isEditing}
value={this.bindingName}
onChange={value => this.bindingName = value}
/>
<SubTitle title="Binding targets" />
@ -276,18 +275,8 @@ export class RoleBindingDialog extends React.Component<Props> {
render() {
const { ...dialogProps } = this.props;
const { isEditing, roleBinding, selectedRoleRef, selectedBindings } = this;
const roleBindingName = roleBinding ? roleBinding.getName() : "";
const header = (
<h5>
{roleBindingName
? <>Edit RoleBinding <span className="name">{roleBindingName}</span></>
: "Add RoleBinding"
}
</h5>
);
const disableNext = !selectedRoleRef || !selectedBindings.length;
const nextLabel = isEditing ? "Update" : "Create";
const [action, nextLabel] = this.isEditing ? ["Edit", "Update"] : ["Add", "Create"];
const disableNext = !this.selectedRoleRef || !this.selectedBindings.length;
return (
<Dialog
@ -299,7 +288,7 @@ export class RoleBindingDialog extends React.Component<Props> {
onOpen={this.onOpen}
>
<Wizard
header={header}
header={<h5>{action} RoleBinding</h5>}
done={RoleBindingDialog.close}
>
<WizardStep