Skip to content

Commit

Permalink
Add directory API keys to controller tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ronenh committed Jan 24, 2025
1 parent 62d50c7 commit 5ad924b
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 14 deletions.
2 changes: 1 addition & 1 deletion charts/controller/test/no-tls.values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
image:
tag: 0.33.11-c7bb8373-amd64
tag: 0.33.11-b041fc2e-amd64

imagePullSecrets:
- name: ghcr-creds
Expand Down
32 changes: 22 additions & 10 deletions charts/controller/test/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@ tests:
password: controller_reader
- name: controller-keys
values:
write: apikey_writer
read: apikey_reader
readStore: apikey_store_reader
writeStore: apikey_store_writer
write: controller_apikey_writer
read: controller_apikey_reader
readStore: controller_apikey_store_reader
writeStore: controller_apikey_store_writer
- name: directory-keys
values:
write: directory_apikey_writer
read: directory_apikey_reader
readStore: directory_apikey_store_reader
writeStore: directory_apikey_store_writer
config_maps:
- name: controller-admin-keys
keys:
Expand All @@ -34,7 +40,7 @@ tests:
localhost provision root-keys
- |
${TOPAZ:-topaz} ds get manifest -H localhost:8282 --tenant-id 00000000-0000-11ef-0000-000000000000 \
-k apikey_reader --stdout --plaintext
-k controller_apikey_reader --stdout --plaintext
- name: controller-tls
pull_secret: $GITHUB_TOKEN
Expand All @@ -49,10 +55,16 @@ tests:
password: controller_reader
- name: controller-keys
values:
write: apikey_writer
read: apikey_reader
readStore: apikey_store_reader
writeStore: apikey_store_writer
write: controller_apikey_writer
read: controller_apikey_reader
readStore: controller_apikey_store_reader
writeStore: controller_apikey_store_writer
- name: directory-keys
values:
write: directory_apikey_writer
read: directory_apikey_reader
readStore: directory_apikey_store_reader
writeStore: directory_apikey_store_writer
- name: grpc-cert
files:
tls.crt: $TOPAZ_CERTS_DIR/grpc.crt
Expand All @@ -79,4 +91,4 @@ tests:
localhost provision root-keys
- |
${TOPAZ:-topaz} ds get manifest -H localhost:8282 --tenant-id 00000000-0000-11ef-0000-000000000000 \
-k apikey_reader --stdout --insecure
-k controller_apikey_reader --stdout --insecure
2 changes: 1 addition & 1 deletion charts/controller/test/tls.values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
image:
tag: 0.33.11-c7bb8373-amd64
tag: 0.33.11-b041fc2e-amd64

imagePullSecrets:
- name: ghcr-creds
Expand Down
2 changes: 1 addition & 1 deletion charts/directory/test/no-tls.values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
image:
tag: 0.33.11-c7bb8373-amd64
tag: 0.33.11-b041fc2e-amd64

imagePullSecrets:
- name: ghcr-creds
Expand Down
2 changes: 1 addition & 1 deletion charts/directory/test/tls.values.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
image:
tag: 0.33.11-c7bb8373-amd64
tag: 0.33.11-b041fc2e-amd64

imagePullSecrets:
- name: ghcr-creds
Expand Down

0 comments on commit 5ad924b

Please sign in to comment.