Merge pull request #13881 from openshift-cherrypick-robot/cherry-pick…

…-13828-to-release-4.16 [release-4.16] OCPBUGS-34112: Fix Admission webhook warning for Route and BuildConfig creation via import flow
openshift · May 24, 2024 · f8c0696 · f8c0696
2 parents 3a7b184 + 7d56492
commit f8c0696
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/frontend/packages/dev-console/src/components/import/import-submit-utils.ts b/frontend/packages/dev-console/src/components/import/import-submit-utils.ts
@@ -278,7 +278,6 @@ export const createOrUpdateBuildConfig = (
         git: {
           uri: repository,
           ref,
-          type: 'Git',
         },
         ...(secretName ? { sourceSecret: { name: secretName } } : {}),
       },

diff --git a/...d/packages/dev-console/src/utils/__tests__/__snapshots__/shared-submit-utils.spec.ts.snap b/...d/packages/dev-console/src/utils/__tests__/__snapshots__/shared-submit-utils.spec.ts.snap
@@ -5,7 +5,7 @@ Object {
   "apiVersion": "route.openshift.io/v1",
   "kind": "Route",
   "metadata": Object {
-    "defaultAnnotations": Object {
+    "annotations": Object {
       "openshift.io/generated-by": "OpenShiftWebConsole",
     },
     "labels": Object {
@@ -40,7 +40,7 @@ Object {
   "apiVersion": "route.openshift.io/v1",
   "kind": "Route",
   "metadata": Object {
-    "defaultAnnotations": Object {
+    "annotations": Object {
       "app.openshift.io/vcs-ref": "",
       "app.openshift.io/vcs-uri": "https://github.com/test/repo",
       "openshift.io/generated-by": "OpenShiftWebConsole",

diff --git a/frontend/packages/dev-console/src/utils/shared-submit-utils.ts b/frontend/packages/dev-console/src/utils/shared-submit-utils.ts
@@ -175,7 +175,7 @@ export const createRoute = (
       name,
       namespace,
       labels: { ...defaultLabels, ...userLabels, ...routeLabels },
-      defaultAnnotations,
+      annotations: defaultAnnotations,
     },
     spec: {
       to: {

diff --git a/frontend/packages/knative-plugin/src/utils/create-knative-utils.ts b/frontend/packages/knative-plugin/src/utils/create-knative-utils.ts
@@ -155,6 +155,16 @@ export const getKnativeServiceDepResource = (
                 ],
               }),
               imagePullPolicy: imgPullPolicy,
+              securityContext: {
+                allowPrivilegeEscalation: false,
+                capabilities: {
+                  drop: ['ALL'],
+                },
+                runAsNonRoot: true,
+                seccompProfile: {
+                  type: 'RuntimeDefault',
+                },
+              },
               env,
               resources: {
                 ...((cpuLimit || memoryLimit) && {