File tree Expand file tree Collapse file tree 4 files changed +29
-13
lines changed Expand file tree Collapse file tree 4 files changed +29
-13
lines changed Original file line number Diff line number Diff line change 14
14
from . import template
15
15
from . import repository # noqa: F401
16
16
from . import eks # noqa: F401
17
+ from . import cache # noqa: F401
18
+ from . import database # noqa: F401
19
+ from . import logs # noqa: F401
20
+ if not USE_GOVCLOUD :
21
+ # make sure this isn't added to the template for GovCloud, as it's not
22
+ # supported in this region
23
+ from . import search # noqa: F401
24
+
25
+ if USE_NAT_GATEWAY :
26
+ from . import bastion # noqa: F401
27
+
17
28
else :
18
29
from . import sftp # noqa: F401
19
30
from . import assets # noqa: F401
51
62
print ("# https://github.com/caktus/aws-web-stacks" )
52
63
print ("# at %s" % datetime .datetime .now ())
53
64
print ("# with parameters:" )
54
- use_parms = sorted (parm for parm in os .environ .keys () if parm .startswith ("USE_" ))
55
- for parm in use_parms :
65
+ parms_used = sorted (parm for parm in os .environ .keys () if parm .startswith ("USE_" ) or parm == "DEFAULTS_FILE" )
66
+ for parm in parms_used :
56
67
print ("#\t %s = %s" % (parm , os .environ [parm ]))
57
68
print ()
58
69
print (template .template .to_yaml ())
Original file line number Diff line number Diff line change 93
93
[
94
94
Output (
95
95
"ClusterEndpoint" ,
96
- Description = "The connection endpoint for the cluster API." ,
96
+ Description = "The connection endpoint for the EKS cluster API." ,
97
97
Value = GetAtt (cluster , "Endpoint" ),
98
98
),
99
99
]
Original file line number Diff line number Diff line change 17
17
repository = Repository (
18
18
"ApplicationRepository" ,
19
19
template = template ,
20
- RepositoryName = Ref (AWS_STACK_NAME ),
20
+ # Do we need to specify a repository name? The stack name might not be
21
+ # a valid repository name, and if we just leave it out, AWS will make one
22
+ # up for us.
23
+ #RepositoryName=Ref(AWS_STACK_NAME),
21
24
# Allow all account users to manage images.
22
25
RepositoryPolicyText = Policy (
23
26
Version = "2008-10-17" ,
Original file line number Diff line number Diff line change 59
59
SourceSecurityGroupId = Ref (load_balancer_security_group ),
60
60
))
61
61
62
- if not USE_NAT_GATEWAY :
63
- # Allow direct administrator access via SSH.
64
- ingress_rules .append (SecurityGroupRule (
65
- IpProtocol = "tcp" ,
66
- FromPort = "22" ,
67
- ToPort = "22" ,
68
- Description = "Administrator SSH Access" ,
69
- CidrIp = administrator_ip_address ,
70
- ))
62
+ if not USE_NAT_GATEWAY :
63
+ # Allow direct administrator access via SSH.
64
+ ingress_rules .append (SecurityGroupRule (
65
+ IpProtocol = "tcp" ,
66
+ FromPort = "22" ,
67
+ ToPort = "22" ,
68
+ Description = "Administrator SSH Access" ,
69
+ CidrIp = administrator_ip_address ,
70
+ ))
71
+ else :
72
+ ingress_rules = []
71
73
72
74
container_security_group = SecurityGroup (
73
75
# NOTE: If creating an EKS cluster, eks.py will modify this security group.
You can’t perform that action at this time.
0 commit comments