Skip to content

Commit 61f4e85

Browse files
authored
Update CFT and uid2-shared-actions version for publishing private operator (#1857)
1 parent 4384809 commit 61f4e85

4 files changed

Lines changed: 16 additions & 6 deletions

File tree

.github/actions/update_operator_version/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ runs:
3434
steps:
3535
- name: Check branch and release type
3636
id: checkRelease
37-
uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v2
37+
uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v3
3838
with:
3939
release_type: ${{ inputs.release_type }}
4040

@@ -81,7 +81,7 @@ runs:
8181

8282
- name: Set version number
8383
id: version
84-
uses: IABTechLab/uid2-shared-actions/actions/version_number@v2
84+
uses: IABTechLab/uid2-shared-actions/actions/version_number@v3
8585
with:
8686
type: ${{ inputs.release_type }}
8787
version_number: ${{ inputs.version_number_input }}

.github/workflows/publish-all-operators.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
GITHUB_CONTEXT: ${{ toJson(github) }}
6060

6161
- name: Check branch and release type
62-
uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v2
62+
uses: IABTechLab/uid2-shared-actions/actions/check_branch_and_release_type@v3
6363
with:
6464
release_type: ${{ inputs.release_type }}
6565

@@ -76,7 +76,7 @@ jobs:
7676

7777
- name: Set version number
7878
id: version
79-
uses: IABTechLab/uid2-shared-actions/actions/version_number@v2
79+
uses: IABTechLab/uid2-shared-actions/actions/version_number@v3
8080
with:
8181
type: ${{ env.RELEASE_TYPE }}
8282
branch_name: ${{ github.ref }}

scripts/aws/EUID_CloudFormation.template.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Parameters:
2424
AllowedPattern: '(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})'
2525
ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
2626
InstanceType:
27-
Description: EC2 instance type. Minimum 4 vCPUs needed.
27+
Description: EC2 instance type. Minimum 8 vCPUs needed.
2828
Type: String
2929
Default: m5.2xlarge
3030
AllowedValues:
@@ -256,6 +256,11 @@ Resources:
256256
sudo yum update -y --security
257257
while ! nc -z localhost 80;do sleep 10;done
258258
/opt/aws/bin/cfn-signal -e 0 --stack ${AWS::StackName} --resource AutoScalingGroup --region ${AWS::Region}
259+
MetadataOptions:
260+
HttpEndpoint: enabled
261+
HttpTokens: required # Enforces IMDSv2
262+
HttpPutResponseHopLimit: 1
263+
InstanceMetadataTags: enabled
259264
AutoScalingGroup:
260265
Type: AWS::AutoScaling::AutoScalingGroup
261266
DependsOn:

scripts/aws/UID_CloudFormation.template.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Parameters:
2424
AllowedPattern: '(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})/(\d{1,2})'
2525
ConstraintDescription: must be a valid IP CIDR range of the form x.x.x.x/x.
2626
InstanceType:
27-
Description: EC2 instance type. Minimum 4 vCPUs needed.
27+
Description: EC2 instance type. Minimum 8 vCPUs needed.
2828
Type: String
2929
Default: m5.2xlarge
3030
AllowedValues:
@@ -256,6 +256,11 @@ Resources:
256256
sudo yum update -y --security
257257
while ! nc -z localhost 80;do sleep 10;done
258258
/opt/aws/bin/cfn-signal -e 0 --stack ${AWS::StackName} --resource AutoScalingGroup --region ${AWS::Region}
259+
MetadataOptions:
260+
HttpEndpoint: enabled
261+
HttpTokens: required # Enforces IMDSv2
262+
HttpPutResponseHopLimit: 1
263+
InstanceMetadataTags: enabled
259264
AutoScalingGroup:
260265
Type: AWS::AutoScaling::AutoScalingGroup
261266
DependsOn:

0 commit comments

Comments
 (0)