Skip to content

Commit b9f5ae9

Browse files
authored
UID2-4243 Add E2E test for EUID eks (#1072)
* Add E2E test for EUID * Test kcc-UID2-4243-fix-e2e * Use image_tag * Pass in identity_scope * Add NAMESPACE_PLACEHOLDER * Remove nitro-enclave namespace * Add condition for testEUIDEks * Add condition for cleanup * Remove test EUID * Add back EUID E2E test * Change back to v3
1 parent 2910b48 commit b9f5ae9

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

.github/workflows/publish-aws-eks-nitro-enclave-docker.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,21 @@ jobs:
8989
identity_scope: UID2
9090
secrets: inherit
9191

92+
testEUIDEks:
93+
name: E2E Tests EUID EKS
94+
uses: ./.github/workflows/run-e2e-tests-on-operator.yaml
95+
needs: [buildEUIDImage]
96+
with:
97+
operator_image_version: ${{ needs.buildEUIDImage.outputs.image_tag }}
98+
operator_type: eks
99+
eks: '{ "pcr0":"${{ needs.buildEUIDImage.outputs.enclave_id }}"}'
100+
identity_scope: EUID
101+
secrets: inherit
102+
92103
cleanup:
93104
name: Cleanup Building AWS Image
94105
runs-on: ubuntu-latest
95-
needs: [buildUID2Image, buildEUIDImage, testUID2Eks]
106+
needs: [buildUID2Image, buildEUIDImage, testUID2Eks, testEUIDEks]
96107
steps:
97108
- name: Check disk usage
98109
shell: bash

scripts/aws/eks/deployment_files/test-deployment.yaml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apiVersion: v1
22
kind: Namespace
33
metadata:
4-
name: compute
4+
name: NAMESPACE_PLACEHOLDER
55
---
66
apiVersion: v1
77
kind: ConfigMap
88
metadata:
99
name: operator-and-validator-operators-configmap
10-
namespace: compute
10+
namespace: NAMESPACE_PLACEHOLDER
1111
data:
1212
client_side_token_generate: 'true'
1313
client_side_token_generate_log_invalid_http_origins: 'true'
@@ -23,7 +23,7 @@ metadata:
2323
labels:
2424
app: operator
2525
name: operator-service
26-
namespace: compute
26+
namespace: NAMESPACE_PLACEHOLDER
2727
spec:
2828
ports:
2929
- name: http
@@ -45,7 +45,7 @@ metadata:
4545
enclave: "true"
4646
flavor: operator
4747
name: operator
48-
namespace: compute
48+
namespace: NAMESPACE_PLACEHOLDER
4949
spec:
5050
progressDeadlineSeconds: 600
5151
replicas: 1
@@ -154,13 +154,6 @@ spec:
154154
secret:
155155
secretName: github-test-secret
156156
---
157-
apiVersion: v1
158-
kind: Namespace
159-
metadata:
160-
name: nitro-enclaves
161-
labels:
162-
name: nitro-enclaves
163-
---
164157
apiVersion: apps/v1
165158
kind: DaemonSet
166159
metadata:

0 commit comments

Comments
 (0)