From 05b52da6e8b42a1fec33a997169f658a2d002285 Mon Sep 17 00:00:00 2001 From: awol2005ex Date: Thu, 6 Feb 2025 16:04:26 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=20=E8=B4=9F=E8=BD=BD=E7=BC=96=E8=BE=91ya?= =?UTF-8?q?ml=E6=97=B6=E7=94=B1=E4=BA=8ErunAsUser=3D0=E6=97=B6=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=90=8E=E4=B8=A2=E5=A4=B1securityContext=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ko-workloads/ko-security-context.vue | 8 +++---- .../ko-workloads/ko-spec/ko-spec-security.vue | 21 ++++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/web/dashboard/src/components/ko-workloads/ko-security-context.vue b/web/dashboard/src/components/ko-workloads/ko-security-context.vue index 8eafaf2e9..32ff3653d 100644 --- a/web/dashboard/src/components/ko-workloads/ko-security-context.vue +++ b/web/dashboard/src/components/ko-workloads/ko-security-context.vue @@ -147,8 +147,8 @@ export default { parentFrom.securityContext.allowPrivilegeEscalation = this.form.allowPrivilegeEscalation || undefined parentFrom.securityContext.runAsNonRoot = this.form.runAsNonRoot || undefined parentFrom.securityContext.readOnlyRootFilesystem = this.form.readOnlyRootFilesystem || undefined - parentFrom.securityContext.runAsUser = this.form.runAsUser || undefined - parentFrom.securityContext.runAsGroup = this.form.runAsGroup || undefined + parentFrom.securityContext.runAsUser = (this.form.runAsUser === undefined || this.form.runAsUser === "") ? undefined : parseInt(this.form.runAsUser) + parentFrom.securityContext.runAsGroup = (this.form.runAsGroup === undefined || this.form.runAsGroup === "") ? undefined : parseInt(this.form.runAsGroup) parentFrom.securityContext.procMount = this.form.procMount || undefined parentFrom.securityContext.capabilities = { add: this.form.capabilities.add.length !== 0 ? this.form.capabilities.add : undefined, @@ -177,10 +177,10 @@ export default { if (this.securityContextParentObj.securityContext.readOnlyRootFilesystem !== undefined) { this.form.readOnlyRootFilesystem = this.securityContextParentObj.securityContext.readOnlyRootFilesystem } - if (this.securityContextParentObj.securityContext.runAsUser) { + if (this.securityContextParentObj.securityContext.runAsUser !== undefined && this.securityContextParentObj.securityContext.runAsUser !== "" ) { this.form.runAsUser = this.securityContextParentObj.securityContext.runAsUser } - if (this.securityContextParentObj.securityContext.runAsGroup) { + if (this.securityContextParentObj.securityContext.runAsGroup !== undefined && this.securityContextParentObj.securityContext.runAsGroup !== "") { this.form.runAsGroup = this.securityContextParentObj.securityContext.runAsGroup } if (this.securityContextParentObj.securityContext.procMount) { diff --git a/web/dashboard/src/components/ko-workloads/ko-spec/ko-spec-security.vue b/web/dashboard/src/components/ko-workloads/ko-spec/ko-spec-security.vue index d9f7c5d2c..ec2d38fd4 100644 --- a/web/dashboard/src/components/ko-workloads/ko-spec/ko-spec-security.vue +++ b/web/dashboard/src/components/ko-workloads/ko-spec/ko-spec-security.vue @@ -167,9 +167,9 @@ export default { } parentFrom.securityContext.runAsNonRoot = this.form.runAsNonRoot || undefined - parentFrom.securityContext.runAsUser = this.form.runAsUser || undefined - parentFrom.securityContext.runAsGroup = this.form.runAsGroup || undefined - parentFrom.securityContext.fsGroup = this.form.fsGroup || undefined + parentFrom.securityContext.runAsUser = (this.form.runAsUser === undefined || this.form.runAsUser === "") ? undefined : parseInt(this.form.runAsUser) + parentFrom.securityContext.runAsGroup = (this.form.runAsGroup === undefined || this.form.runAsGroup === "") ? undefined : parseInt(this.form.runAsGroup) + parentFrom.securityContext.fsGroup = (this.form.fsGroup === undefined || this.form.fsGroup === "") ? undefined : parseInt(this.form.fsGroup) let supplementalGroups = [] for (const s of this.form.supplementalGroups) { @@ -193,16 +193,16 @@ export default { this.form.runAsNonRoot = this.securityContextParentObj.securityContext.runAsNonRoot } - if (this.securityContextParentObj.securityContext.runAsUser) { - this.form.runAsUser = this.securityContextParentObj.securityContext.runAsUser + if (this.securityContextParentObj.securityContext.runAsUser !== undefined && this.securityContextParentObj.securityContext.runAsUser !== null) { + this.form.runAsUser = parseInt(this.securityContextParentObj.securityContext.runAsUser) } - if (this.securityContextParentObj.securityContext.runAsGroup) { - this.form.runAsGroup = this.securityContextParentObj.securityContext.runAsGroup + if (this.securityContextParentObj.securityContext.runAsGroup !== undefined && this.securityContextParentObj.securityContext.runAsGroup !== null) { + this.form.runAsGroup = parseInt(this.securityContextParentObj.securityContext.runAsGroup) } - if (this.securityContextParentObj.securityContext.fsGroup) { - this.form.fsGroup = this.securityContextParentObj.securityContext.fsGroup + if (this.securityContextParentObj.securityContext.fsGroup !== undefined && this.securityContextParentObj.securityContext.fsGroup !== null) { + this.form.fsGroup = parseInt(this.securityContextParentObj.securityContext.fsGroup) } - if (this.securityContextParentObj.securityContext.supplementalGroups) { + if (this.securityContextParentObj.securityContext.supplementalGroups ) { this.form.supplementalGroups = [] for (const s of this.securityContextParentObj.securityContext.supplementalGroups) { this.form.supplementalGroups.push({ value: s }) @@ -217,6 +217,7 @@ export default { } } } + console.log(this.form) }, } \ No newline at end of file