Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(eks): unable to add multiple service accounts #8122

Merged
merged 9 commits into from
May 26, 2020
Merged

fix(eks): unable to add multiple service accounts #8122

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6bb6bf7
Fix service account resouce name conflict
vlesierse May 21, 2020
dd2865b
Update packages/@aws-cdk/aws-eks/lib/cluster.ts
vlesierse May 21, 2020
b3dd3d1
Merge branch 'master' into eks/bug-irsaid
vlesierse May 21, 2020
65d2c11
Merge branch 'master' into eks/bug-irsaid
vlesierse May 22, 2020
d37687f
Add changes to Integration Test
vlesierse May 22, 2020
c37770a
Merge branch 'master' into eks/bug-irsaid
vlesierse May 26, 2020
0968a64
Update packages/@aws-cdk/aws-eks/lib/service-account.ts
vlesierse May 26, 2020
5bbd648
Apply changes to integration test
vlesierse May 26, 2020
8e0062f
Merge branch 'master' into eks/bug-irsaid
mergify[bot] May 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-eks/lib/service-account.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export class ServiceAccount extends Construct implements IPrincipal {
this.grantPrincipal = this.role.grantPrincipal;
this.policyFragment = this.role.policyFragment;

cluster.addResource('ServiceAccount', {
cluster.addResource(`${id}ServiceAccountResource`, {
apiVersion: 'v1',
kind: 'ServiceAccount',
metadata: {
Expand Down
2 changes: 1 addition & 1 deletion packages/@aws-cdk/aws-eks/test/integ.eks-cluster.expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2298,7 +2298,7 @@
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
},
"ClustermanifestServiceAccountD03C306D": {
"ClustermanifestMyServiceAccountServiceAccountResource0EC03615": {
"Type": "Custom::AWSCDK-EKS-KubernetesResource",
"Properties": {
"ServiceToken": {
Expand Down
45 changes: 45 additions & 0 deletions packages/@aws-cdk/aws-eks/test/test.service-account.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,50 @@ export = {
}));
test.done();
},
'should have allow multiple services accounts'(test: Test) {
// GIVEN
const { stack, cluster } = testFixtureCluster();

// WHEN
cluster.addServiceAccount('MyServiceAccount');
cluster.addServiceAccount('MyOtherServiceAccount');

// THEN
expect(stack).to(haveResource(eks.KubernetesResource.RESOURCE_TYPE, {
ServiceToken: {
'Fn::GetAtt': [
'awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B',
'Outputs.StackawscdkawseksKubectlProviderframeworkonEvent8897FD9BArn',
],
},
Manifest: {
'Fn::Join': [
'',
[
'[{\"apiVersion\":\"v1\",\"kind\":\"ServiceAccount\",\"metadata\":{\"name\":\"stackclustermyotherserviceaccounta472761a\",\"namespace\":\"default\",\"labels\":{\"app.kubernetes.io/name\":\"stackclustermyotherserviceaccounta472761a\"},\"annotations\":{\"eks.amazonaws.com/role-arn\":\"',
{
'Fn::GetAtt': [
'ClusterMyOtherServiceAccountRole764583C5',
'Arn',
],
},
'\"}}}]',
],
],
},
}));
test.done();
},
'should have unique resource name'(test: Test) {
// GIVEN
const { cluster } = testFixtureCluster();

// WHEN
cluster.addServiceAccount('MyServiceAccount');

// THEN
test.throws(() => cluster.addServiceAccount('MyServiceAccount'));
test.done();
},
},
};