Minor fixes & cleanup

atomist · Nov 4, 2019 · 3095d26 · 3095d26
1 parent 32e988e
commit 3095d26
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/lib/goal/container/k8s.ts b/lib/goal/container/k8s.ts
@@ -180,7 +180,7 @@ export function k8sFulfillmentCallback(
         if (!k8sScheduler.podSpec) {
             throw new Error("KubernetesGoalScheduler has no podSpec defined");
         }
-        const initContainer: k8s.V1Container = _.cloneDeep(k8sScheduler.podSpec.spec.containers[0]);
+        const initContainer = _.cloneDeep(k8sScheduler.podSpec.spec.containers[0]);
         delete initContainer.lifecycle;
         delete initContainer.livenessProbe;
         delete initContainer.readinessProbe;

diff --git a/lib/pack/k8s/KubernetesGoalScheduler.ts b/lib/pack/k8s/KubernetesGoalScheduler.ts
@@ -321,8 +321,7 @@ export function createJobSpec(podSpec: k8s.V1Pod, podNs: string, gi: GoalInvocat
             }
             if (!!data[ServiceRegistrationGoalDataKey]) {
                 _.forEach(data[ServiceRegistrationGoalDataKey], (v, k) => {
-                    logger.debug(
-                        `Service with name '${k}' and type '${v.type}' found for goal '${goalEvent.uniqueName}'`);
+                    logger.debug(`Service with name '${k}' and type '${v.type}' found for goal '${goalEvent.uniqueName}'`);
                     if (v.type === K8sServiceRegistrationType.K8sService) {
                         const spec = v.spec as K8sServiceSpec;
                         if (!!spec.container) {

diff --git a/test/goal/container/docker.test.ts b/test/goal/container/docker.test.ts
@@ -242,7 +242,7 @@ describe("goal/container/docker", () => {
                 return;
             }
             try {
-                await execPromise("docker", ["pull", "alpine:3.9.4"]);
+                await execPromise("docker", ["pull", "alpine:3.9.4"], { timeout: 18000 });
             } catch (e) {
                 // tslint:disable-next-line:no-invalid-this
                 this.skip();