Skip to content

Remove Spire instance SG SSH rule #900

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

Open
farski wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Remove Spire instance SG SSH rule #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac2c4f7
Remove Spire instance SG SSH rule
farski May 15, 2026
e405e5f
Skip authorized_keys installation
farski May 15, 2026
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: 0 additions & 2 deletions spire/templates/root.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,6 @@ Resources:
RootStackName: !Ref AWS::StackName
RootStackId: !Ref AWS::StackName
NestedChangeSetScrubbingResourcesState: !Ref NestedChangeSetScrubbingResourcesState
AuthorizedKeys: !Join [",", !Ref AuthorizedKeys]
VpcPublicSubnet1Id: !GetAtt SharedVpcStack.Outputs.PublicSubnet1Id
VpcPublicSubnet2Id: !GetAtt SharedVpcStack.Outputs.PublicSubnet2Id
VpcPublicSubnet3Id: !GetAtt SharedVpcStack.Outputs.PublicSubnet3Id
Expand Down Expand Up @@ -433,7 +432,6 @@ Resources:
RootStackName: !Ref AWS::StackName
RootStackId: !Ref AWS::StackName
NestedChangeSetScrubbingResourcesState: !Ref NestedChangeSetScrubbingResourcesState
AuthorizedKeys: !Join [",", !Ref AuthorizedKeys]
VpcPublicSubnet1Id: !GetAtt SharedVpcStack.Outputs.PublicSubnet1Id
VpcPublicSubnet2Id: !GetAtt SharedVpcStack.Outputs.PublicSubnet2Id
VpcPublicSubnet3Id: !GetAtt SharedVpcStack.Outputs.PublicSubnet3Id
Expand Down
11 changes: 0 additions & 11 deletions spire/templates/shared-ecs/asg-aarch64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Parameters:
RootStackName: { Type: String }
RootStackId: { Type: String }
NestedChangeSetScrubbingResourcesState: { Type: String }
AuthorizedKeys: { Type: CommaDelimitedList }
VpcPublicSubnet1Id: { Type: AWS::EC2::Subnet::Id }
VpcPublicSubnet2Id: { Type: AWS::EC2::Subnet::Id }
VpcPublicSubnet3Id: { Type: AWS::EC2::Subnet::Id }
Expand Down Expand Up @@ -279,16 +278,6 @@ Resources:
text: !Sub >-
EC2 instance `'"$INSTANCE_ID"'` could not connect to `${DovetailRedisReplicationGroupEndpointAddress}`
at `'"$IP"'`. It will be marked as *unhealthy* in its auto scaling group and get replaced.
02_add_authorized_keys:
# For more information, see:
# https://github.com/PRX/internal/wiki/AWS:-Developer-Access
command: !Sub
- |-
#!/bin/bash
echo "Adding developer public keys to authorized_keys"
truncate -s 0 /home/ec2-user/.ssh/authorized_keys
echo "${developer_keys}" >> /home/ec2-user/.ssh/authorized_keys
- developer_keys: !Join ["\n", !Ref AuthorizedKeys]
services:
sysvinit:
cfn-hup:
Expand Down
20 changes: 0 additions & 20 deletions spire/templates/shared-ecs/asg-sg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,26 +47,6 @@ Resources:
IpProtocol: tcp
SourceSecurityGroupId: !Ref LoadBalancerSecurityGroupId
ToPort: 60999
InstanceSecurityGroupSshIpv4Ingress:
Type: AWS::EC2::SecurityGroupIngress
Properties:
CidrIp: 0.0.0.0/0
Description: !Sub >-
Allows inbound SSH traffic to ${EnvironmentType} ASG instances
FromPort: 22
GroupId: !GetAtt InstanceSecurityGroup.GroupId
IpProtocol: tcp
ToPort: 22
InstanceSecurityGroupSshIpv6Ingress:
Type: AWS::EC2::SecurityGroupIngress
Properties:
CidrIpv6: ::/0
Description: !Sub >-
Allows inbound SSH traffic to ${EnvironmentType} ASG instances
FromPort: 22
GroupId: !GetAtt InstanceSecurityGroup.GroupId
IpProtocol: tcp
ToPort: 22
InstanceSecurityGroupAllIpv4Egress:
Type: AWS::EC2::SecurityGroupEgress
Properties:
Expand Down
11 changes: 0 additions & 11 deletions spire/templates/shared-ecs/asg-x86-64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ Parameters:
RootStackName: { Type: String }
RootStackId: { Type: String }
NestedChangeSetScrubbingResourcesState: { Type: String }
AuthorizedKeys: { Type: CommaDelimitedList }
VpcPublicSubnet1Id: { Type: AWS::EC2::Subnet::Id }
VpcPublicSubnet2Id: { Type: AWS::EC2::Subnet::Id }
VpcPublicSubnet3Id: { Type: AWS::EC2::Subnet::Id }
Expand Down Expand Up @@ -289,16 +288,6 @@ Resources:
text: !Sub >-
EC2 instance `'"$INSTANCE_ID"'` could not connect to `${DovetailRedisReplicationGroupEndpointAddress}`
at `'"$IP"'`. It will be marked as *unhealthy* in its auto scaling group and get replaced.
02_add_authorized_keys:
# For more information, see:
# https://github.com/PRX/internal/wiki/AWS:-Developer-Access
command: !Sub
- |-
#!/bin/bash
echo "Adding developer public keys to authorized_keys"
truncate -s 0 /home/ec2-user/.ssh/authorized_keys
echo "${developer_keys}" >> /home/ec2-user/.ssh/authorized_keys
- developer_keys: !Join ["\n", !Ref AuthorizedKeys]
services:
sysvinit:
cfn-hup:
Expand Down