Skip to content

Commit 41d7eec

Browse files
committed
adapt entra name
1 parent 261df99 commit 41d7eec

File tree

2 files changed

+33
-43
lines changed

2 files changed

+33
-43
lines changed

deploy/helm/opa-operator/crds/crds.yaml

Lines changed: 32 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ spec:
6565
- required:
6666
- experimentalActiveDirectory
6767
- required:
68-
- experimentalEntraBackend
68+
- experimentalEntra
6969
properties:
7070
experimentalActiveDirectory:
7171
description: Backend that fetches user information from Active Directory
@@ -139,7 +139,7 @@ spec:
139139
- kerberosSecretClassName
140140
- ldapServer
141141
type: object
142-
experimentalEntraBackend:
142+
experimentalEntra:
143143
description: Backend that fetches user information from Microsoft Entra
144144
properties:
145145
clientCredentialsSecret:
@@ -162,54 +162,44 @@ spec:
162162
description: The Microsoft Entra tenant ID.
163163
type: string
164164
tls:
165-
default:
166-
tls:
167-
verification:
168-
server:
169-
caCert:
170-
webPki: {}
171-
description: Use a TLS connection. Should usually be set to WebPki.
165+
description: Use a TLS connection. If not specified no TLS will be used.
166+
nullable: true
172167
properties:
173-
tls:
174-
description: Use a TLS connection. If not specified no TLS will be used.
175-
nullable: true
168+
verification:
169+
description: The verification method used to verify the certificates of the server and/or the client.
170+
oneOf:
171+
- required:
172+
- none
173+
- required:
174+
- server
176175
properties:
177-
verification:
178-
description: The verification method used to verify the certificates of the server and/or the client.
179-
oneOf:
180-
- required:
181-
- none
182-
- required:
183-
- server
176+
none:
177+
description: Use TLS but don't verify certificates.
178+
type: object
179+
server:
180+
description: Use TLS and a CA certificate to verify the server.
184181
properties:
185-
none:
186-
description: Use TLS but don't verify certificates.
187-
type: object
188-
server:
189-
description: Use TLS and a CA certificate to verify the server.
182+
caCert:
183+
description: CA cert to verify the server.
184+
oneOf:
185+
- required:
186+
- webPki
187+
- required:
188+
- secretClass
190189
properties:
191-
caCert:
192-
description: CA cert to verify the server.
193-
oneOf:
194-
- required:
195-
- webPki
196-
- required:
197-
- secretClass
198-
properties:
199-
secretClass:
200-
description: Name of the [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) which will provide the CA certificate. Note that a SecretClass does not need to have a key but can also work with just a CA certificate, so if you got provided with a CA cert but don't have access to the key you can still use this method.
201-
type: string
202-
webPki:
203-
description: Use TLS and the CA certificates trusted by the common web browsers to verify the server. This can be useful when you e.g. use public AWS S3 or other public available services.
204-
type: object
190+
secretClass:
191+
description: Name of the [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) which will provide the CA certificate. Note that a SecretClass does not need to have a key but can also work with just a CA certificate, so if you got provided with a CA cert but don't have access to the key you can still use this method.
192+
type: string
193+
webPki:
194+
description: Use TLS and the CA certificates trusted by the common web browsers to verify the server. This can be useful when you e.g. use public AWS S3 or other public available services.
205195
type: object
206-
required:
207-
- caCert
208196
type: object
197+
required:
198+
- caCert
209199
type: object
210-
required:
211-
- verification
212200
type: object
201+
required:
202+
- verification
213203
type: object
214204
required:
215205
- clientCredentialsSecret

rust/operator-binary/src/crd/user_info_fetcher.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub mod versioned {
4040
ActiveDirectory(v1alpha1::ActiveDirectoryBackend),
4141

4242
/// Backend that fetches user information from Microsoft Entra
43-
#[serde(rename = "experimentalEntraBackend")]
43+
#[serde(rename = "experimentalEntra")]
4444
Entra(v1alpha1::EntraBackend),
4545
}
4646

0 commit comments

Comments
 (0)