Pull in new operator-rs

stackabletech · Nov 20, 2023 · 50002fc · 50002fc
1 parent ac75ba3
commit 50002fc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/deploy/helm/trino-operator/crds/crds.yaml b/deploy/helm/trino-operator/crds/crds.yaml
@@ -31,19 +31,13 @@ spec:
                       default: []
                       description: Authentication options for Trino.
                       items:
-                        description: |-
-                          An enum of supported authentication providers. Each variant contains provider specific options. The structure is based on disussions around the [OIDC ADR][oidc-adr].
-
-                          [oidc-adr]: https://docs.stackable.tech/home/nightly/contributor/adr/adr032-oauth-oidc-support
-                        oneOf:
-                          - required:
-                              - oidc
                         properties:
                           authenticationClass:
                             description: A name/key which references an authentication class. To get the concrete [`AuthenticationClass`], we must resolve it. This resolution can be achieved by using [`ClientAuthenticationDetails::resolve_class`].
                             type: string
                           oidc:
-                            description: OIDC specific config options. These are set on the product config level.
+                            description: This field contains authentication provider specific configuration. It is flattened into the final CRD.
+                            nullable: true
                             properties:
                               clientCredentialsSecret:
                                 description: A reference to the OIDC client credentials secret. The secret contains the client id and secret.

diff --git a/rust/crd/src/authentication.rs b/rust/crd/src/authentication.rs
@@ -1,9 +1,7 @@
 use snafu::{ResultExt, Snafu};
 use stackable_operator::{
     client::Client,
-    commons::authentication::{
-        oidc, AuthenticationClass, ClientAuthenticationConfig, ClientAuthenticationDetails,
-    },
+    commons::authentication::{oidc, AuthenticationClass, ClientAuthenticationDetails},
 };
 
 #[derive(Snafu, Debug)]
@@ -33,11 +31,10 @@ pub async fn resolve_authentication_classes(
             .resolve_class(client)
             .await
             .context(AuthenticationClassRetrievalSnafu)?;
-        let ClientAuthenticationConfig::Oidc(oidc) = &client_authentication_detail.config;
 
         resolved_auth_classes.push(ResolvedAuthenticationClassRef {
             authentication_class: resolved_auth_class,
-            oidc: Some(oidc.clone()),
+            oidc: client_authentication_detail.oidc.clone(),
         });
     }