Skip to content

Commit

Permalink
fix a few merge errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Elad Ben-Israel committed Aug 13, 2019
1 parent e3318c5 commit d2ee84c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class EksClusterStack extends cdk.Stack {

const cluster = new eks.Cluster(this, 'EKSCluster', {
vpc,
kubectlEnabled: false
kubectlEnabled: false,
defaultCapacity: 0,
});

Expand Down
3 changes: 1 addition & 2 deletions packages/@aws-cdk/aws-eks/test/test.awsauth.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { countResources, expect, haveResource } from '@aws-cdk/assert';
import ec2 = require('@aws-cdk/aws-ec2');
import iam = require('@aws-cdk/aws-iam');
import { Test } from 'nodeunit';
import { Cluster, KubernetesResource } from '../lib';
import { AwsAuth } from '../lib/aws-auth';
import { testFixture, testFixtureNoVpc } from './util';
import { testFixtureNoVpc } from './util';

// tslint:disable:max-line-length

Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-eks/test/test.cluster.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect, haveResource, haveResourceLike, not } from '@aws-cdk/assert';
import ec2 = require('@aws-cdk/aws-ec2');
import iam = require('@aws-cdk/aws-iam');
import cdk = require('@aws-cdk/core');
import { CfnOutput, Stack } from '@aws-cdk/core';
import { CfnOutput } from '@aws-cdk/core';
import { Test } from 'nodeunit';
import eks = require('../lib');
import { KubernetesResource } from '../lib';
Expand Down

0 comments on commit d2ee84c

Please sign in to comment.