Skip to content

Commit 12f20b1

Browse files
siegfriedwebersiegfriedweber
committed
test(smoke): Fix assertions
1 parent 75d3683 commit 12f20b1

2 files changed

Lines changed: 45 additions & 32 deletions

File tree

‎tests/templates/kuttl/security-config/11-assert.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ apiVersion: v1
3131
kind: ConfigMap
3232
metadata:
3333
name: opensearch-security-config
34+
annotations:
35+
restarter.stackable.tech/ignore: "true"
3436
data:
3537
action_groups.yml: '{"_meta":{"config_version":2,"type":"actiongroups"}}'
3638
allowlist.yml: '{"_meta":{"config_version":2,"type":"allowlist"},"config":{"enabled":false}}'

‎tests/templates/kuttl/smoke/10-assert.yaml.j2‎

Lines changed: 43 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -358,71 +358,71 @@ spec:
358358
- key: action_groups.yml
359359
mode: 432
360360
path: action_groups.yml
361-
name: opensearch-nodes-cluster-manager
361+
name: opensearch-security-config
362362
name: security-config-file-actiongroups
363363
- configMap:
364364
defaultMode: 420
365365
items:
366366
- key: allowlist.yml
367367
mode: 432
368368
path: allowlist.yml
369-
name: opensearch-nodes-cluster-manager
369+
name: opensearch-security-config
370370
name: security-config-file-allowlist
371371
- configMap:
372372
defaultMode: 420
373373
items:
374374
- key: audit.yml
375375
mode: 432
376376
path: audit.yml
377-
name: opensearch-nodes-cluster-manager
377+
name: opensearch-security-config
378378
name: security-config-file-audit
379379
- configMap:
380380
defaultMode: 420
381381
items:
382382
- key: config.yml
383383
mode: 432
384384
path: config.yml
385-
name: opensearch-nodes-cluster-manager
385+
name: opensearch-security-config
386386
name: security-config-file-config
387387
- configMap:
388388
defaultMode: 420
389389
items:
390390
- key: internal_users.yml
391391
mode: 432
392392
path: internal_users.yml
393-
name: opensearch-nodes-cluster-manager
393+
name: opensearch-security-config
394394
name: security-config-file-internalusers
395395
- configMap:
396396
defaultMode: 420
397397
items:
398398
- key: nodes_dn.yml
399399
mode: 432
400400
path: nodes_dn.yml
401-
name: opensearch-nodes-cluster-manager
401+
name: opensearch-security-config
402402
name: security-config-file-nodesdn
403403
- configMap:
404404
defaultMode: 420
405405
items:
406406
- key: roles.yml
407407
mode: 432
408408
path: roles.yml
409-
name: opensearch-nodes-cluster-manager
409+
name: opensearch-security-config
410410
name: security-config-file-roles
411411
- configMap:
412412
defaultMode: 420
413413
items:
414414
- key: roles_mapping.yml
415415
mode: 432
416416
path: roles_mapping.yml
417-
name: opensearch-nodes-cluster-manager
417+
name: opensearch-security-config
418418
name: security-config-file-rolesmapping
419419
- configMap:
420420
defaultMode: 420
421421
items:
422422
- key: tenants.yml
423423
mode: 432
424424
path: tenants.yml
425-
name: opensearch-nodes-cluster-manager
425+
name: opensearch-security-config
426426
name: security-config-file-tenants
427427
volumeClaimTemplates:
428428
- apiVersion: v1
@@ -834,71 +834,71 @@ spec:
834834
- key: action_groups.yml
835835
mode: 432
836836
path: action_groups.yml
837-
name: opensearch-nodes-data
837+
name: opensearch-security-config
838838
name: security-config-file-actiongroups
839839
- configMap:
840840
defaultMode: 420
841841
items:
842842
- key: allowlist.yml
843843
mode: 432
844844
path: allowlist.yml
845-
name: opensearch-nodes-data
845+
name: opensearch-security-config
846846
name: security-config-file-allowlist
847847
- configMap:
848848
defaultMode: 420
849849
items:
850850
- key: audit.yml
851851
mode: 432
852852
path: audit.yml
853-
name: opensearch-nodes-data
853+
name: opensearch-security-config
854854
name: security-config-file-audit
855855
- configMap:
856856
defaultMode: 420
857857
items:
858858
- key: config.yml
859859
mode: 432
860860
path: config.yml
861-
name: opensearch-nodes-data
861+
name: opensearch-security-config
862862
name: security-config-file-config
863863
- configMap:
864864
defaultMode: 420
865865
items:
866866
- key: internal_users.yml
867867
mode: 432
868868
path: internal_users.yml
869-
name: opensearch-nodes-data
869+
name: opensearch-security-config
870870
name: security-config-file-internalusers
871871
- configMap:
872872
defaultMode: 420
873873
items:
874874
- key: nodes_dn.yml
875875
mode: 432
876876
path: nodes_dn.yml
877-
name: opensearch-nodes-data
877+
name: opensearch-security-config
878878
name: security-config-file-nodesdn
879879
- configMap:
880880
defaultMode: 420
881881
items:
882882
- key: roles.yml
883883
mode: 432
884884
path: roles.yml
885-
name: opensearch-nodes-data
885+
name: opensearch-security-config
886886
name: security-config-file-roles
887887
- configMap:
888888
defaultMode: 420
889889
items:
890890
- key: roles_mapping.yml
891891
mode: 432
892892
path: roles_mapping.yml
893-
name: opensearch-nodes-data
893+
name: opensearch-security-config
894894
name: security-config-file-rolesmapping
895895
- configMap:
896896
defaultMode: 420
897897
items:
898898
- key: tenants.yml
899899
mode: 432
900900
path: tenants.yml
901-
name: opensearch-nodes-data
901+
name: opensearch-security-config
902902
name: security-config-file-tenants
903903
volumeClaimTemplates:
904904
- apiVersion: v1
@@ -941,15 +941,16 @@ status:
941941
apiVersion: v1
942942
kind: ConfigMap
943943
metadata:
944+
annotations:
945+
restarter.stackable.tech/ignore: "true"
944946
labels:
945947
app.kubernetes.io/component: nodes
946948
app.kubernetes.io/instance: opensearch
947949
app.kubernetes.io/managed-by: opensearch.stackable.tech_opensearchcluster
948950
app.kubernetes.io/name: opensearch
949-
app.kubernetes.io/role-group: cluster-manager
950951
app.kubernetes.io/version: {{ test_scenario['values']['opensearch'].split(',')[0] }}
951952
stackable.tech/vendor: Stackable
952-
name: opensearch-nodes-cluster-manager
953+
name: opensearch-security-config
953954
ownerReferences:
954955
- apiVersion: opensearch.stackable.tech/v1alpha1
955956
controller: true
@@ -962,6 +963,28 @@ data:
962963
config.yml: '{"_meta":{"config_version":2,"type":"config"},"config":{"dynamic":{"authc":{"basic_internal_auth_domain":{"authentication_backend":{"type":"intern"},"description":"Authenticate via HTTP Basic against internal users database","http_authenticator":{"challenge":true,"type":"basic"},"http_enabled":true,"order":1,"transport_enabled":true}},"authz":{}}}}'
963964
internal_users.yml: '{"_meta":{"config_version":2,"type":"internalusers"},"admin":{"backend_roles":["admin"],"description":"OpenSearch admin user","hash":"$2y$10$xRtHZFJ9QhG9GcYhRpAGpufCZYsk//nxsuel5URh0GWEBgmiI4Q/e","reserved":true}}'
964965
nodes_dn.yml: '{"_meta":{"config_version":2,"type":"nodesdn"}}'
966+
roles.yml: '{"_meta":{"config_version":2,"type":"roles"}}'
967+
roles_mapping.yml: '{"_meta":{"config_version":2,"type":"rolesmapping"},"all_access":{"backend_roles":["admin"],"reserved":false}}'
968+
tenants.yml: '{"_meta":{"config_version":2,"type":"tenants"}}'
969+
---
970+
apiVersion: v1
971+
kind: ConfigMap
972+
metadata:
973+
labels:
974+
app.kubernetes.io/component: nodes
975+
app.kubernetes.io/instance: opensearch
976+
app.kubernetes.io/managed-by: opensearch.stackable.tech_opensearchcluster
977+
app.kubernetes.io/name: opensearch
978+
app.kubernetes.io/role-group: cluster-manager
979+
app.kubernetes.io/version: {{ test_scenario['values']['opensearch'].split(',')[0] }}
980+
stackable.tech/vendor: Stackable
981+
name: opensearch-nodes-cluster-manager
982+
ownerReferences:
983+
- apiVersion: opensearch.stackable.tech/v1alpha1
984+
controller: true
985+
kind: OpenSearchCluster
986+
name: opensearch
987+
data:
965988
opensearch.yml: |-
966989
cluster.name: "opensearch"
967990
cluster.routing.allocation.disk.threshold_enabled: "false"
@@ -984,9 +1007,6 @@ data:
9841007
plugins.security.ssl.transport.pemcert_filepath: "{{ test_scenario['values']['opensearch_home'] }}/config/tls/internal/tls.crt"
9851008
plugins.security.ssl.transport.pemkey_filepath: "{{ test_scenario['values']['opensearch_home'] }}/config/tls/internal/tls.key"
9861009
plugins.security.ssl.transport.pemtrustedcas_filepath: "{{ test_scenario['values']['opensearch_home'] }}/config/tls/internal/ca.crt"
987-
roles.yml: '{"_meta":{"config_version":2,"type":"roles"}}'
988-
roles_mapping.yml: '{"_meta":{"config_version":2,"type":"rolesmapping"},"all_access":{"backend_roles":["admin"],"reserved":false}}'
989-
tenants.yml: '{"_meta":{"config_version":2,"type":"tenants"}}'
9901010
---
9911011
apiVersion: v1
9921012
kind: ConfigMap
@@ -1006,12 +1026,6 @@ metadata:
10061026
kind: OpenSearchCluster
10071027
name: opensearch
10081028
data:
1009-
action_groups.yml: '{"_meta":{"config_version":2,"type":"actiongroups"}}'
1010-
allowlist.yml: '{"_meta":{"config_version":2,"type":"allowlist"},"config":{"enabled":false}}'
1011-
audit.yml: '{"_meta":{"config_version":2,"type":"audit"},"config":{"enabled":false}}'
1012-
config.yml: '{"_meta":{"config_version":2,"type":"config"},"config":{"dynamic":{"authc":{"basic_internal_auth_domain":{"authentication_backend":{"type":"intern"},"description":"Authenticate via HTTP Basic against internal users database","http_authenticator":{"challenge":true,"type":"basic"},"http_enabled":true,"order":1,"transport_enabled":true}},"authz":{}}}}'
1013-
internal_users.yml: '{"_meta":{"config_version":2,"type":"internalusers"},"admin":{"backend_roles":["admin"],"description":"OpenSearch admin user","hash":"$2y$10$xRtHZFJ9QhG9GcYhRpAGpufCZYsk//nxsuel5URh0GWEBgmiI4Q/e","reserved":true}}'
1014-
nodes_dn.yml: '{"_meta":{"config_version":2,"type":"nodesdn"}}'
10151029
opensearch.yml: |-
10161030
cluster.name: "opensearch"
10171031
cluster.routing.allocation.disk.threshold_enabled: "false"
@@ -1034,9 +1048,6 @@ data:
10341048
plugins.security.ssl.transport.pemcert_filepath: "{{ test_scenario['values']['opensearch_home'] }}/config/tls/internal/tls.crt"
10351049
plugins.security.ssl.transport.pemkey_filepath: "{{ test_scenario['values']['opensearch_home'] }}/config/tls/internal/tls.key"
10361050
plugins.security.ssl.transport.pemtrustedcas_filepath: "{{ test_scenario['values']['opensearch_home'] }}/config/tls/internal/ca.crt"
1037-
roles.yml: '{"_meta":{"config_version":2,"type":"roles"}}'
1038-
roles_mapping.yml: '{"_meta":{"config_version":2,"type":"rolesmapping"},"all_access":{"backend_roles":["admin"],"reserved":false}}'
1039-
tenants.yml: '{"_meta":{"config_version":2,"type":"tenants"}}'
10401051
---
10411052
apiVersion: v1
10421053
kind: Service

0 commit comments

Comments
 (0)