diff --git a/.gitignore b/.gitignore index 1f496ae78..0f9afe6d6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ /aws-k8s-tester */*/.DS_Store */.DS_Store +/_artifacts +/_rundir diff --git a/kubetest2/internal/deployers/eksapi/templates/unmanaged-nodegroup-efa.yaml b/kubetest2/internal/deployers/eksapi/templates/unmanaged-nodegroup-efa.yaml index 86c5e735b..e0ff19d33 100644 --- a/kubetest2/internal/deployers/eksapi/templates/unmanaged-nodegroup-efa.yaml +++ b/kubetest2/internal/deployers/eksapi/templates/unmanaged-nodegroup-efa.yaml @@ -35,9 +35,6 @@ Parameters: Description: The IAM role name of worker nodes. Type: String - SSHKeyPair: - Type: String - UserData: Type: String @@ -120,28 +117,6 @@ Resources: GroupId: !Ref EFASecurityGroup IpProtocol: "-1" - EFASecurityGroupIngressSSHIpv4: - Type: "AWS::EC2::SecurityGroupIngress" - DependsOn: EFASecurityGroup - Properties: - Description: Allow SSH - FromPort: 22 - ToPort: 22 - CidrIp: "0.0.0.0/0" - GroupId: !Ref EFASecurityGroup - IpProtocol: "tcp" - - EFASecurityGroupIngressSSHIpv6: - Type: "AWS::EC2::SecurityGroupIngress" - DependsOn: EFASecurityGroup - Properties: - Description: Allow SSH - FromPort: 22 - ToPort: 22 - CidrIpv6: "::/0" - GroupId: !Ref EFASecurityGroup - IpProtocol: "tcp" - EFASecurityGroupIngressControlPlane: Type: "AWS::EC2::SecurityGroupIngress" DependsOn: EFASecurityGroup @@ -225,7 +200,6 @@ Resources: Arn: !GetAtt NodeInstanceProfile.Arn ImageId: !Ref AMIId InstanceType: !Ref InstanceType - KeyName: !Ref SSHKeyPair NetworkInterfaces: Fn::If: - IsP5Node