Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 11 additions & 4 deletions .github/workflows/on-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ permissions:

jobs:
validate:
uses: unbounded-tech/workflows-crossplane/.github/workflows/validate.yaml@v2.17.0
uses: unbounded-tech/workflows-crossplane/.github/workflows/validate.yaml@v2.20.0
with:
examples: |
[
Expand All @@ -40,16 +40,23 @@ jobs:
error_on_missing_schemas: true

test:
uses: unbounded-tech/workflows-crossplane/.github/workflows/test.yaml@v2.17.0
uses: unbounded-tech/workflows-crossplane/.github/workflows/test.yaml@v2.20.0

e2e:
uses: unbounded-tech/workflows-crossplane/.github/workflows/e2e.yaml@v2.17.0
uses: unbounded-tech/workflows-crossplane/.github/workflows/e2e.yaml@v2.20.0
with:
aws: true
aws-use-oidc: true
aws-account-id: "034489662075"
aws-region: us-east-2
aws-role-duration-seconds: 7200
write-env-files: true
env-vars: |
{
"ADMIN_ROLE_ARN": "${{ vars.ADMIN_ROLE_ARN }}",
"PRIVATE_SUBNET_ID_A": "${{ vars.PRIVATE_SUBNET_ID_A }}",
"PRIVATE_SUBNET_ID_B": "${{ vars.PRIVATE_SUBNET_ID_B }}"
}
debug-resource-types: |
[
"dnsstacks.aws.hops.ops.com.ai"
Expand All @@ -66,7 +73,7 @@ jobs:
needs:
- validate
- test
uses: unbounded-tech/workflows-crossplane/.github/workflows/publish.yaml@v2.17.0
uses: unbounded-tech/workflows-crossplane/.github/workflows/publish.yaml@v2.20.0
secrets: inherit
with:
tag: pr-${{ github.event.pull_request.number }}-${{ github.sha }}
13 changes: 10 additions & 3 deletions .github/workflows/on-push-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ permissions:

jobs:
validate:
uses: unbounded-tech/workflows-crossplane/.github/workflows/validate.yaml@v2.17.0
uses: unbounded-tech/workflows-crossplane/.github/workflows/validate.yaml@v2.20.0
with:
examples: |
[
Expand All @@ -36,16 +36,23 @@ jobs:
error_on_missing_schemas: true

test:
uses: unbounded-tech/workflows-crossplane/.github/workflows/test.yaml@v2.17.0
uses: unbounded-tech/workflows-crossplane/.github/workflows/test.yaml@v2.20.0

e2e:
uses: unbounded-tech/workflows-crossplane/.github/workflows/e2e.yaml@v2.17.0
uses: unbounded-tech/workflows-crossplane/.github/workflows/e2e.yaml@v2.20.0
with:
aws: true
aws-use-oidc: true
aws-account-id: "034489662075"
aws-region: us-east-2
aws-role-duration-seconds: 7200
write-env-files: true
env-vars: |
{
"ADMIN_ROLE_ARN": "${{ vars.ADMIN_ROLE_ARN }}",
"PRIVATE_SUBNET_ID_A": "${{ vars.PRIVATE_SUBNET_ID_A }}",
"PRIVATE_SUBNET_ID_B": "${{ vars.PRIVATE_SUBNET_ID_B }}"
}
debug-resource-types: |
[
"dnsstacks.aws.hops.ops.com.ai"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ apis/**/configuration.yaml
# E2E test credentials (never commit secrets)
**/aws-creds
tests/**/secrets/
tests/**/env/
10 changes: 5 additions & 5 deletions tests/e2etest-dnsstack/main.k
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ _base64_creds = base64.encode(_creds)
_now = str(int(math.floor(datetime.ticks())))
_test_name = "e2e-dns-" + _now
_namespace = "default"
_region = "us-east-2"
_region = file.read("env/AWS_REGION").strip()
# CI test account
_account_id = "034489662075"
_admin_role_arn = "arn:aws:iam::034489662075:role/aws-reserved/sso.amazonaws.com/us-east-2/AWSReservedSSO_AdminAccess_e8d960044a7864f6"
_account_id = file.read("env/AWS_ACCOUNT_ID").strip()
_admin_role_arn = file.read("env/ADMIN_ROLE_ARN").strip()
# =============================================================================
# Persistent Network Infrastructure (from aws-network e2e test - hops-test)
# =============================================================================
# Private subnet IDs for the EKS cluster - these are already created and orphaned
_private_subnet_ids = [
# private-a
"subnet-0ba2f584c25e9435d"
file.read("env/PRIVATE_SUBNET_ID_A").strip()
# private-b
"subnet-02e4d512f8859e684"
file.read("env/PRIVATE_SUBNET_ID_B").strip()
]

_items = [
Expand Down
Loading