fixes issue with route creation in case of no ports exposed

openshift · Sep 2, 2020 · d48058a · d48058a
1 parent ceeaacf
commit d48058a
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 8 deletions.
diff --git a/...d/packages/dev-console/src/components/edit-application/__tests__/edit-application-data.ts b/...d/packages/dev-console/src/components/edit-application/__tests__/edit-application-data.ts
@@ -369,7 +369,7 @@ export const gitImportInitialValues: GitImportFormData = {
     disable: true,
     create: true,
     targetPort: '8080-tcp',
-    unknownTargetPort: '',
+    unknownTargetPort: '8080',
     defaultUnknownPort: 8080,
     path: '',
     hostname: 'nationalparks-py-div.apps.rorai-cluster34.devcluster.openshift.com',
@@ -450,7 +450,7 @@ export const externalImageValues: DeployImageFormData = {
     disable: true,
     create: true,
     targetPort: '8080-tcp',
-    unknownTargetPort: '',
+    unknownTargetPort: '8080',
     defaultUnknownPort: 8080,
     path: '',
     hostname: 'nationalparks-py-div.apps.rorai-cluster34.devcluster.openshift.com',
@@ -527,7 +527,7 @@ export const internalImageValues: DeployImageFormData = {
     disable: true,
     create: true,
     targetPort: '8080-tcp',
-    unknownTargetPort: '',
+    unknownTargetPort: '8080',
     defaultUnknownPort: 8080,
     path: '',
     hostname: 'nationalparks-py-div.apps.rorai-cluster34.devcluster.openshift.com',

diff --git a/frontend/packages/dev-console/src/components/edit-application/edit-application-utils.ts b/frontend/packages/dev-console/src/components/edit-application/edit-application-utils.ts
@@ -78,7 +78,7 @@ export const getRouteData = (route: K8sResourceKind, resource: K8sResourceKind)
     disable: !_.isEmpty(route),
     create: true,
     targetPort: _.get(route, 'spec.port.targetPort', ''),
-    unknownTargetPort: '',
+    unknownTargetPort: _.toString(route?.spec?.port?.targetPort?.split('-')?.[0]) || '',
     defaultUnknownPort: 8080,
     path: _.get(route, 'spec.path', ''),
     hostname: _.get(route, 'spec.host', ''),

diff --git a/frontend/packages/dev-console/src/components/import/ImportForm.tsx b/frontend/packages/dev-console/src/components/import/ImportForm.tsx
@@ -81,6 +81,7 @@ const ImportForm: React.FC<ImportFormProps & StateProps> = ({
       disable: false,
       create: true,
       targetPort: '',
+      defaultUnknownPort: 8080,
       path: '',
       hostname: '',
       secure: false,

diff --git a/frontend/packages/dev-console/src/components/import/__mocks__/import-validation-mock.ts b/frontend/packages/dev-console/src/components/import/__mocks__/import-validation-mock.ts
@@ -38,6 +38,7 @@ export const mockFormData: GitImportFormData = {
   route: {
     create: false,
     targetPort: '',
+    defaultUnknownPort: 8080,
     path: '',
     hostname: '',
     secure: false,

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
@@ -523,7 +523,7 @@ export const createOrUpdateResources = async (
     );
   }
 
-  if (!_.isEmpty(ports) || buildStrategy === 'Docker') {
+  if (!_.isEmpty(ports) || buildStrategy === 'Docker' || buildStrategy === 'Source') {
     const originalService = _.get(appResources, 'service.data');
     const service = createService(formData, imageStream, originalService);
     requests.push(

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
@@ -117,7 +117,14 @@ Object {
     "namespace": "mock-project",
   },
   "spec": Object {
-    "ports": Array [],
+    "ports": Array [
+      Object {
+        "name": "8080-tcp",
+        "port": 8080,
+        "protocol": "TCP",
+        "targetPort": 8080,
+      },
+    ],
     "selector": Object {
       "app": "test-app",
       "deploymentconfig": "test-app",

diff --git a/frontend/packages/dev-console/src/utils/shared-submit-utils.ts b/frontend/packages/dev-console/src/utils/shared-submit-utils.ts
@@ -29,6 +29,7 @@ export const createService = (
     name,
     labels: userLabels,
     image: { ports: imagePorts, tag: selectedTag },
+    route: { unknownTargetPort, defaultUnknownPort },
   } = formData;
 
   const imageStreamName = _.get(imageStreamData, 'metadata.name') || _.get(formData, 'image.name');
@@ -49,6 +50,10 @@ export const createService = (
       isi: { ports: isiPorts },
     } = formData;
     ports = isiPorts;
+  } else if (_.isEmpty(ports)) {
+    const portData = _.toInteger(unknownTargetPort) || defaultUnknownPort;
+    const port = { containerPort: portData, protocol: 'TCP' };
+    ports = [port];
   }
 
   const newService: any = {
@@ -87,7 +92,15 @@ export const createRoute = (
     application: { name: applicationName },
     name,
     labels: userLabels,
-    route: { hostname, secure, path, tls, targetPort: routeTargetPort },
+    route: {
+      hostname,
+      unknownTargetPort,
+      defaultUnknownPort,
+      secure,
+      path,
+      tls,
+      targetPort: routeTargetPort,
+    },
     image: { ports: imagePorts, tag: selectedTag },
   } = formData;
 
@@ -114,6 +127,11 @@ export const createRoute = (
       containerPort: _.toInteger(port),
       protocol: 'TCP',
     });
+  } else if (_.isEmpty(ports) && !routeTargetPort) {
+    targetPort = makePortName({
+      containerPort: _.toInteger(unknownTargetPort) || defaultUnknownPort,
+      protocol: 'TCP',
+    });
   } else {
     targetPort = routeTargetPort || makePortName(_.head(ports));
   }

diff --git a/frontend/packages/git-service/src/types/build-tools.ts b/frontend/packages/git-service/src/types/build-tools.ts
@@ -32,7 +32,7 @@ export const Golang: BuildTool = {
   name: 'Golang',
   type: 'golang',
   language: 'go',
-  expectedRegexps: RegExp([`main.go`, `Gopkg.toml`, `glide.yaml`].join('|')),
+  expectedRegexps: RegExp([`.*.go`, `Gopkg.toml`, `glide.yaml`].join('|')),
   expectedFiles: ['main.go', 'Gopkg.toml', 'glide.yaml'],
 };