Skip to content

Commit f4a6240

Browse files
x10an14-navReasonable-SolutionsMuni10
committed
tests/valkey: Properly check for mounted/split secrets
Co-Authored-By: @Reasonable-Solutions <[email protected]> Co-Authored-By: @Muni10 <[email protected]>
1 parent da3f8c9 commit f4a6240

File tree

2 files changed

+152
-17
lines changed

2 files changed

+152
-17
lines changed

‎pkg/resourcecreator/testdata/naisjob/cronjob_valkey.yaml

Lines changed: 87 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ tests:
2929
resource:
3030
spec:
3131
valkey:
32-
- secretName: ^aiven-valkey-mynaisjob-.{8}-\d{4}-\d\d?-0$
32+
- secretName: ^aiven-valkey-naistest(1|2)-mynaisjob-.{8}-\d{4}-\d\d?-0$
3333
- name: "instance and access is propagated"
3434
type: subset
3535
resource:
@@ -58,32 +58,113 @@ tests:
5858
containers:
5959
- name: "mynaisjob"
6060
env:
61+
- name: REDIS_USERNAME_NAISTEST2
62+
valueFrom:
63+
secretKeyRef:
64+
key: REDIS_USERNAME_NAISTEST2
65+
name: ^aiven-valkey-naistest2-mynaisjob-.{8}-\d{4}-\d\d?-0$
66+
- name: REDIS_PASSWORD_NAISTEST2
67+
valueFrom:
68+
secretKeyRef:
69+
key: REDIS_PASSWORD_NAISTEST2
70+
name: ^aiven-valkey-naistest2-mynaisjob-.{8}-\d{4}-\d\d?-0$
71+
- name: REDIS_URI_NAISTEST2
72+
valueFrom:
73+
secretKeyRef:
74+
key: REDIS_URI_NAISTEST2
75+
name: ^aiven-valkey-naistest2-mynaisjob-.{8}-\d{4}-\d\d?-0$
76+
- name: REDIS_HOST_NAISTEST2
77+
valueFrom:
78+
secretKeyRef:
79+
key: REDIS_HOST_NAISTEST2
80+
name: ^aiven-valkey-naistest2-mynaisjob-.{8}-\d{4}-\d\d?-0$
81+
optional: true
82+
- name: REDIS_PORT_NAISTEST2
83+
valueFrom:
84+
secretKeyRef:
85+
key: REDIS_PORT_NAISTEST2
86+
name: ^aiven-valkey-naistest2-mynaisjob-.{8}-\d{4}-\d\d?-0$
87+
optional: true
88+
- name: VALKEY_USERNAME_NAISTEST2
89+
valueFrom:
90+
secretKeyRef:
91+
key: VALKEY_USERNAME_NAISTEST2
92+
name: ^aiven-valkey-naistest2-mynaisjob-.{8}-\d{4}-\d\d?-0$
93+
- name: VALKEY_PASSWORD_NAISTEST2
94+
valueFrom:
95+
secretKeyRef:
96+
key: VALKEY_PASSWORD_NAISTEST2
97+
name: ^aiven-valkey-naistest2-mynaisjob-.{8}-\d{4}-\d\d?-0$
98+
- name: VALKEY_URI_NAISTEST2
99+
valueFrom:
100+
secretKeyRef:
101+
key: VALKEY_URI_NAISTEST2
102+
name: ^aiven-valkey-naistest2-mynaisjob-.{8}-\d{4}-\d\d?-0$
103+
- name: VALKEY_HOST_NAISTEST2
104+
valueFrom:
105+
secretKeyRef:
106+
key: VALKEY_HOST_NAISTEST2
107+
name: ^aiven-valkey-naistest2-mynaisjob-.{8}-\d{4}-\d\d?-0$
108+
optional: true
109+
- name: VALKEY_PORT_NAISTEST2
110+
valueFrom:
111+
secretKeyRef:
112+
key: VALKEY_PORT_NAISTEST2
113+
name: ^aiven-valkey-naistest2-mynaisjob-.{8}-\d{4}-\d\d?-0$
114+
optional: true
115+
- name: REDIS_USERNAME_NAISTEST1
116+
valueFrom:
117+
secretKeyRef:
118+
key: REDIS_USERNAME_NAISTEST1
119+
name: ^aiven-valkey-naistest1-mynaisjob-.{8}-\d{4}-\d\d?-0$
120+
- name: REDIS_PASSWORD_NAISTEST1
121+
valueFrom:
122+
secretKeyRef:
123+
key: REDIS_PASSWORD_NAISTEST1
124+
name: ^aiven-valkey-naistest1-mynaisjob-.{8}-\d{4}-\d\d?-0$
125+
- name: REDIS_URI_NAISTEST1
126+
valueFrom:
127+
secretKeyRef:
128+
key: REDIS_URI_NAISTEST1
129+
name: ^aiven-valkey-naistest1-mynaisjob-.{8}-\d{4}-\d\d?-0$
130+
- name: REDIS_HOST_NAISTEST1
131+
valueFrom:
132+
secretKeyRef:
133+
key: REDIS_HOST_NAISTEST1
134+
name: ^aiven-valkey-naistest1-mynaisjob-.{8}-\d{4}-\d\d?-0$
135+
optional: true
136+
- name: REDIS_PORT_NAISTEST1
137+
valueFrom:
138+
secretKeyRef:
139+
key: REDIS_PORT_NAISTEST1
140+
name: ^aiven-valkey-naistest1-mynaisjob-.{8}-\d{4}-\d\d?-0$
141+
optional: true
61142
- name: VALKEY_USERNAME_NAISTEST1
62143
valueFrom:
63144
secretKeyRef:
64145
key: VALKEY_USERNAME_NAISTEST1
65-
name: ^aiven-valkey-mynaisjob-.{8}-\d{4}-\d\d?-0$
146+
name: ^aiven-valkey-naistest(1|2)-mynaisjob-.{8}-\d{4}-\d\d?-0$
66147
- name: VALKEY_PASSWORD_NAISTEST1
67148
valueFrom:
68149
secretKeyRef:
69150
key: VALKEY_PASSWORD_NAISTEST1
70-
name: ^aiven-valkey-mynaisjob-.{8}-\d{4}-\d\d?-0$
151+
name: ^aiven-valkey-naistest(1|2)-mynaisjob-.{8}-\d{4}-\d\d?-0$
71152
- name: VALKEY_URI_NAISTEST1
72153
valueFrom:
73154
secretKeyRef:
74155
key: VALKEY_URI_NAISTEST1
75-
name: ^aiven-valkey-mynaisjob-.{8}-\d{4}-\d\d?-0$
156+
name: ^aiven-valkey-naistest(1|2)-mynaisjob-.{8}-\d{4}-\d\d?-0$
76157
- name: VALKEY_HOST_NAISTEST1
77158
valueFrom:
78159
secretKeyRef:
79160
key: VALKEY_HOST_NAISTEST1
80-
name: ^aiven-valkey-mynaisjob-.{8}-\d{4}-\d\d?-0$
161+
name: ^aiven-valkey-naistest(1|2)-mynaisjob-.{8}-\d{4}-\d\d?-0$
81162
optional: true
82163
- name: VALKEY_PORT_NAISTEST1
83164
valueFrom:
84165
secretKeyRef:
85166
key: VALKEY_PORT_NAISTEST1
86-
name: ^aiven-valkey-mynaisjob-.{8}-\d{4}-\d\d?-0$
167+
name: ^aiven-valkey-naistest(1|2)-mynaisjob-.{8}-\d{4}-\d\d?-0$
87168
optional: true
88169
- operation: CreateIfNotExists
89170
apiVersion: aiven.io/v1alpha1

‎pkg/resourcecreator/testdata/valkey.yaml

Lines changed: 65 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ tests:
2828
resource:
2929
spec:
3030
valkey:
31-
- secretName: ^aiven-valkey-myapplication-.{8}-\d{4}-\d\d?-0$
31+
- secretName: ^aiven-valkey-naistest(1|2)-myapplication-.{8}-\d{4}-\d\d?-0$
3232
- name: "instance and access is propagated"
3333
type: subset
3434
resource:
@@ -55,59 +55,113 @@ tests:
5555
containers:
5656
- name: "myapplication"
5757
env:
58+
- name: REDIS_USERNAME_NAISTEST2
59+
valueFrom:
60+
secretKeyRef:
61+
key: REDIS_USERNAME_NAISTEST2
62+
name: ^aiven-valkey-naistest2-myapplication-.{8}-\d{4}-\d\d?-0$
63+
- name: REDIS_PASSWORD_NAISTEST2
64+
valueFrom:
65+
secretKeyRef:
66+
key: REDIS_PASSWORD_NAISTEST2
67+
name: ^aiven-valkey-naistest2-myapplication-.{8}-\d{4}-\d\d?-0$
68+
- name: REDIS_URI_NAISTEST2
69+
valueFrom:
70+
secretKeyRef:
71+
key: REDIS_URI_NAISTEST2
72+
name: ^aiven-valkey-naistest2-myapplication-.{8}-\d{4}-\d\d?-0$
73+
- name: REDIS_HOST_NAISTEST2
74+
valueFrom:
75+
secretKeyRef:
76+
key: REDIS_HOST_NAISTEST2
77+
name: ^aiven-valkey-naistest2-myapplication-.{8}-\d{4}-\d\d?-0$
78+
optional: true
79+
- name: REDIS_PORT_NAISTEST2
80+
valueFrom:
81+
secretKeyRef:
82+
key: REDIS_PORT_NAISTEST2
83+
name: ^aiven-valkey-naistest2-myapplication-.{8}-\d{4}-\d\d?-0$
84+
optional: true
85+
- name: VALKEY_USERNAME_NAISTEST2
86+
valueFrom:
87+
secretKeyRef:
88+
key: VALKEY_USERNAME_NAISTEST2
89+
name: ^aiven-valkey-naistest2-myapplication-.{8}-\d{4}-\d\d?-0$
90+
- name: VALKEY_PASSWORD_NAISTEST2
91+
valueFrom:
92+
secretKeyRef:
93+
key: VALKEY_PASSWORD_NAISTEST2
94+
name: ^aiven-valkey-naistest2-myapplication-.{8}-\d{4}-\d\d?-0$
95+
- name: VALKEY_URI_NAISTEST2
96+
valueFrom:
97+
secretKeyRef:
98+
key: VALKEY_URI_NAISTEST2
99+
name: ^aiven-valkey-naistest2-myapplication-.{8}-\d{4}-\d\d?-0$
100+
- name: VALKEY_HOST_NAISTEST2
101+
valueFrom:
102+
secretKeyRef:
103+
key: VALKEY_HOST_NAISTEST2
104+
name: ^aiven-valkey-naistest2-myapplication-.{8}-\d{4}-\d\d?-0$
105+
optional: true
106+
- name: VALKEY_PORT_NAISTEST2
107+
valueFrom:
108+
secretKeyRef:
109+
key: VALKEY_PORT_NAISTEST2
110+
name: ^aiven-valkey-naistest2-myapplication-.{8}-\d{4}-\d\d?-0$
111+
optional: true
58112
- name: REDIS_USERNAME_NAISTEST1
59113
valueFrom:
60114
secretKeyRef:
61115
key: REDIS_USERNAME_NAISTEST1
62-
name: ^aiven-valkey-myapplication-.{8}-\d{4}-\d\d?-0$
116+
name: ^aiven-valkey-naistest1-myapplication-.{8}-\d{4}-\d\d?-0$
63117
- name: REDIS_PASSWORD_NAISTEST1
64118
valueFrom:
65119
secretKeyRef:
66120
key: REDIS_PASSWORD_NAISTEST1
67-
name: ^aiven-valkey-myapplication-.{8}-\d{4}-\d\d?-0$
121+
name: ^aiven-valkey-naistest1-myapplication-.{8}-\d{4}-\d\d?-0$
68122
- name: REDIS_URI_NAISTEST1
69123
valueFrom:
70124
secretKeyRef:
71125
key: REDIS_URI_NAISTEST1
72-
name: ^aiven-valkey-myapplication-.{8}-\d{4}-\d\d?-0$
126+
name: ^aiven-valkey-naistest1-myapplication-.{8}-\d{4}-\d\d?-0$
73127
- name: REDIS_HOST_NAISTEST1
74128
valueFrom:
75129
secretKeyRef:
76130
key: REDIS_HOST_NAISTEST1
77-
name: ^aiven-valkey-myapplication-.{8}-\d{4}-\d\d?-0$
131+
name: ^aiven-valkey-naistest1-myapplication-.{8}-\d{4}-\d\d?-0$
78132
optional: true
79133
- name: REDIS_PORT_NAISTEST1
80134
valueFrom:
81135
secretKeyRef:
82136
key: REDIS_PORT_NAISTEST1
83-
name: ^aiven-valkey-myapplication-.{8}-\d{4}-\d\d?-0$
137+
name: ^aiven-valkey-naistest1-myapplication-.{8}-\d{4}-\d\d?-0$
84138
optional: true
85139
- name: VALKEY_USERNAME_NAISTEST1
86140
valueFrom:
87141
secretKeyRef:
88142
key: VALKEY_USERNAME_NAISTEST1
89-
name: ^aiven-valkey-myapplication-.{8}-\d{4}-\d\d?-0$
143+
name: ^aiven-valkey-naistest1-myapplication-.{8}-\d{4}-\d\d?-0$
90144
- name: VALKEY_PASSWORD_NAISTEST1
91145
valueFrom:
92146
secretKeyRef:
93147
key: VALKEY_PASSWORD_NAISTEST1
94-
name: ^aiven-valkey-myapplication-.{8}-\d{4}-\d\d?-0$
148+
name: ^aiven-valkey-naistest1-myapplication-.{8}-\d{4}-\d\d?-0$
95149
- name: VALKEY_URI_NAISTEST1
96150
valueFrom:
97151
secretKeyRef:
98152
key: VALKEY_URI_NAISTEST1
99-
name: ^aiven-valkey-myapplication-.{8}-\d{4}-\d\d?-0$
153+
name: ^aiven-valkey-naistest1-myapplication-.{8}-\d{4}-\d\d?-0$
100154
- name: VALKEY_HOST_NAISTEST1
101155
valueFrom:
102156
secretKeyRef:
103157
key: VALKEY_HOST_NAISTEST1
104-
name: ^aiven-valkey-myapplication-.{8}-\d{4}-\d\d?-0$
158+
name: ^aiven-valkey-naistest1-myapplication-.{8}-\d{4}-\d\d?-0$
105159
optional: true
106160
- name: VALKEY_PORT_NAISTEST1
107161
valueFrom:
108162
secretKeyRef:
109163
key: VALKEY_PORT_NAISTEST1
110-
name: ^aiven-valkey-myapplication-.{8}-\d{4}-\d\d?-0$
164+
name: ^aiven-valkey-naistest1-myapplication-.{8}-\d{4}-\d\d?-0$
111165
optional: true
112166
- operation: CreateIfNotExists
113167
apiVersion: aiven.io/v1alpha1

0 commit comments

Comments
 (0)