Skip to content

Commit 63108c7

Browse files
pahudpahud
committed
update snaps
1 parent 83a1ebb commit 63108c7

File tree

5 files changed

+51
-190
lines changed

5 files changed

+51
-190
lines changed

‎packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.helm-chart-logging.js.snapshot/aws-cdk-eks-helm-logging-test.assets.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.helm-chart-logging.js.snapshot/aws-cdk-eks-helm-logging-test.template.json‎

Lines changed: 42 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,5 @@
11
{
22
"Resources": {
3-
"AdminRole38563C57": {
4-
"Type": "AWS::IAM::Role",
5-
"Properties": {
6-
"AssumeRolePolicyDocument": {
7-
"Statement": [
8-
{
9-
"Action": "sts:AssumeRole",
10-
"Effect": "Allow",
11-
"Principal": {
12-
"AWS": {
13-
"Fn::Join": [
14-
"",
15-
[
16-
"arn:",
17-
{
18-
"Ref": "AWS::Partition"
19-
},
20-
":iam::",
21-
{
22-
"Ref": "AWS::AccountId"
23-
},
24-
":root"
25-
]
26-
]
27-
}
28-
}
29-
}
30-
],
31-
"Version": "2012-10-17"
32-
}
33-
}
34-
},
353
"Vpc8378EB38": {
364
"Type": "AWS::EC2::VPC",
375
"Properties": {
@@ -841,62 +809,6 @@
841809
"Cluster9EE0221C"
842810
]
843811
},
844-
"ClusterAwsAuthmanifestFE51F8AE": {
845-
"Type": "Custom::AWSCDK-EKS-KubernetesResource",
846-
"Properties": {
847-
"ServiceToken": {
848-
"Fn::GetAtt": [
849-
"awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B",
850-
"Outputs.awscdkekshelmloggingtestawscdkawseksKubectlProviderframeworkonEvent52632707Arn"
851-
]
852-
},
853-
"Manifest": {
854-
"Fn::Join": [
855-
"",
856-
[
857-
"[{\"apiVersion\":\"v1\",\"kind\":\"ConfigMap\",\"metadata\":{\"name\":\"aws-auth\",\"namespace\":\"kube-system\",\"labels\":{\"aws.cdk.eks/prune-c886367281041f7b27d3e642951af752eb589d369f\":\"\"}},\"data\":{\"mapRoles\":\"[{\\\"rolearn\\\":\\\"",
858-
{
859-
"Fn::GetAtt": [
860-
"AdminRole38563C57",
861-
"Arn"
862-
]
863-
},
864-
"\\\",\\\"username\\\":\\\"",
865-
{
866-
"Fn::GetAtt": [
867-
"AdminRole38563C57",
868-
"Arn"
869-
]
870-
},
871-
"\\\",\\\"groups\\\":[\\\"system:masters\\\"]},{\\\"rolearn\\\":\\\"",
872-
{
873-
"Fn::GetAtt": [
874-
"ClusterNodegroupDefaultCapacityNodeGroupRole55953B04",
875-
"Arn"
876-
]
877-
},
878-
"\\\",\\\"username\\\":\\\"system:node:{{EC2PrivateDNSName}}\\\",\\\"groups\\\":[\\\"system:bootstrappers\\\",\\\"system:nodes\\\"]}]\",\"mapUsers\":\"[]\",\"mapAccounts\":\"[]\"}}]"
879-
]
880-
]
881-
},
882-
"ClusterName": {
883-
"Ref": "Cluster9EE0221C"
884-
},
885-
"RoleArn": {
886-
"Fn::GetAtt": [
887-
"ClusterCreationRole360249B6",
888-
"Arn"
889-
]
890-
},
891-
"PruneLabel": "aws.cdk.eks/prune-c886367281041f7b27d3e642951af752eb589d369f",
892-
"Overwrite": true
893-
},
894-
"DependsOn": [
895-
"ClusterKubectlReadyBarrier200052AF"
896-
],
897-
"UpdateReplacePolicy": "Delete",
898-
"DeletionPolicy": "Delete"
899-
},
900812
"ClusterNodegroupDefaultCapacityNodeGroupRole55953B04": {
901813
"Type": "AWS::IAM::Role",
902814
"Properties": {
@@ -984,6 +896,48 @@
984896
]
985897
}
986898
},
899+
"ClusterAwsAuthmanifestFE51F8AE": {
900+
"Type": "Custom::AWSCDK-EKS-KubernetesResource",
901+
"Properties": {
902+
"ServiceToken": {
903+
"Fn::GetAtt": [
904+
"awscdkawseksKubectlProviderNestedStackawscdkawseksKubectlProviderNestedStackResourceA7AEBA6B",
905+
"Outputs.awscdkekshelmloggingtestawscdkawseksKubectlProviderframeworkonEvent52632707Arn"
906+
]
907+
},
908+
"Manifest": {
909+
"Fn::Join": [
910+
"",
911+
[
912+
"[{\"apiVersion\":\"v1\",\"kind\":\"ConfigMap\",\"metadata\":{\"name\":\"aws-auth\",\"namespace\":\"kube-system\",\"labels\":{\"aws.cdk.eks/prune-c886367281041f7b27d3e642951af752eb589d369f\":\"\"}},\"data\":{\"mapRoles\":\"[{\\\"rolearn\\\":\\\"",
913+
{
914+
"Fn::GetAtt": [
915+
"ClusterNodegroupDefaultCapacityNodeGroupRole55953B04",
916+
"Arn"
917+
]
918+
},
919+
"\\\",\\\"username\\\":\\\"system:node:{{EC2PrivateDNSName}}\\\",\\\"groups\\\":[\\\"system:bootstrappers\\\",\\\"system:nodes\\\"]}]\",\"mapUsers\":\"[]\",\"mapAccounts\":\"[]\"}}]"
920+
]
921+
]
922+
},
923+
"ClusterName": {
924+
"Ref": "Cluster9EE0221C"
925+
},
926+
"RoleArn": {
927+
"Fn::GetAtt": [
928+
"ClusterCreationRole360249B6",
929+
"Arn"
930+
]
931+
},
932+
"PruneLabel": "aws.cdk.eks/prune-c886367281041f7b27d3e642951af752eb589d369f",
933+
"Overwrite": true
934+
},
935+
"DependsOn": [
936+
"ClusterKubectlReadyBarrier200052AF"
937+
],
938+
"UpdateReplacePolicy": "Delete",
939+
"DeletionPolicy": "Delete"
940+
},
987941
"Clusterchartawsloadbalancercontroller9E1FDE79": {
988942
"Type": "Custom::AWSCDK-EKS-HelmChart",
989943
"Properties": {
@@ -1123,56 +1077,6 @@
11231077
]
11241078
}
11251079
},
1126-
"Outputs": {
1127-
"ClusterConfigCommand43AAE40F": {
1128-
"Value": {
1129-
"Fn::Join": [
1130-
"",
1131-
[
1132-
"aws eks update-kubeconfig --name ",
1133-
{
1134-
"Ref": "Cluster9EE0221C"
1135-
},
1136-
" --region ",
1137-
{
1138-
"Ref": "AWS::Region"
1139-
},
1140-
" --role-arn ",
1141-
{
1142-
"Fn::GetAtt": [
1143-
"AdminRole38563C57",
1144-
"Arn"
1145-
]
1146-
}
1147-
]
1148-
]
1149-
}
1150-
},
1151-
"ClusterGetTokenCommand06AE992E": {
1152-
"Value": {
1153-
"Fn::Join": [
1154-
"",
1155-
[
1156-
"aws eks get-token --cluster-name ",
1157-
{
1158-
"Ref": "Cluster9EE0221C"
1159-
},
1160-
" --region ",
1161-
{
1162-
"Ref": "AWS::Region"
1163-
},
1164-
" --role-arn ",
1165-
{
1166-
"Fn::GetAtt": [
1167-
"AdminRole38563C57",
1168-
"Arn"
1169-
]
1170-
}
1171-
]
1172-
]
1173-
}
1174-
}
1175-
},
11761080
"Parameters": {
11771081
"BootstrapVersion": {
11781082
"Type": "AWS::SSM::Parameter::Value<String>",

‎packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.helm-chart-logging.js.snapshot/manifest.json‎

Lines changed: 6 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.helm-chart-logging.js.snapshot/tree.json‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/@aws-cdk-testing/framework-integ/test/aws-eks/test/integ.helm-chart-logging.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/// !cdk-integ pragma:disable-update-workflow
22
import * as ec2 from 'aws-cdk-lib/aws-ec2';
3-
import * as iam from 'aws-cdk-lib/aws-iam';
43
import { App, Stack } from 'aws-cdk-lib';
54
import * as integ from '@aws-cdk/integ-tests-alpha';
65
import { getClusterVersionConfig } from './integ-tests-kubernetes-version';
@@ -16,11 +15,6 @@ class HelmChartLoggingStack extends Stack {
1615
constructor(scope: App, id: string) {
1716
super(scope, id);
1817

19-
// Allow all account users to assume this role to admin the cluster
20-
const mastersRole = new iam.Role(this, 'AdminRole', {
21-
assumedBy: new iam.AccountRootPrincipal(),
22-
});
23-
2418
// Create a minimal VPC with just one NAT gateway
2519
const vpc = new ec2.Vpc(this, 'Vpc', {
2620
natGateways: 1,
@@ -30,7 +24,6 @@ class HelmChartLoggingStack extends Stack {
3024
// Create a minimal EKS cluster
3125
const cluster = new eks.Cluster(this, 'Cluster', {
3226
vpc,
33-
mastersRole,
3427
defaultCapacity: 1,
3528
...getClusterVersionConfig(this),
3629
});

0 commit comments

Comments
 (0)