Skip to content

Commit e349e74

Browse files
committed
cleanups
1 parent ed7d143 commit e349e74

3 files changed

Lines changed: 5 additions & 117 deletions

File tree

extra/crds.yaml

Lines changed: 0 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -12664,102 +12664,3 @@ spec:
1266412664
storage: false
1266512665
subresources:
1266612666
status: {}
12667-
---
12668-
apiVersion: apiextensions.k8s.io/v1
12669-
kind: CustomResourceDefinition
12670-
metadata:
12671-
name: openlineageconnections.openlineage.stackable.tech
12672-
spec:
12673-
group: openlineage.stackable.tech
12674-
names:
12675-
categories: []
12676-
kind: OpenLineageConnection
12677-
plural: openlineageconnections
12678-
shortNames: []
12679-
singular: openlineageconnection
12680-
scope: Namespaced
12681-
versions:
12682-
- additionalPrinterColumns: []
12683-
name: v1alpha1
12684-
schema:
12685-
openAPIV3Schema:
12686-
description: A reusable definition of a connection to an OpenLineage backend.
12687-
properties:
12688-
spec:
12689-
description: |-
12690-
OpenLineage connection definition as a resource.
12691-
Learn more about [OpenLineage](https://openlineage.io/).
12692-
properties:
12693-
credentialsSecretName:
12694-
description: |-
12695-
Name of a Secret containing the API key used to authenticate against the OpenLineage
12696-
backend. The API key must be stored under the key `apiKey`. The Secret must be located in
12697-
the same namespace as the workload using this connection. If not specified, no
12698-
authentication is used.
12699-
nullable: true
12700-
type: string
12701-
host:
12702-
description: 'Host of the OpenLineage backend without any protocol or port. For example: `marquez`.'
12703-
type: string
12704-
port:
12705-
description: 'Port the OpenLineage backend listens on. For example: `5000`.'
12706-
format: uint16
12707-
maximum: 65535.0
12708-
minimum: 0.0
12709-
type: integer
12710-
tls:
12711-
description: Use a TLS connection. If not specified no TLS will be used.
12712-
nullable: true
12713-
properties:
12714-
verification:
12715-
description: The verification method used to verify the certificates of the server and/or the client.
12716-
oneOf:
12717-
- required:
12718-
- none
12719-
- required:
12720-
- server
12721-
properties:
12722-
none:
12723-
description: Use TLS but don't verify certificates.
12724-
type: object
12725-
server:
12726-
description: Use TLS and a CA certificate to verify the server.
12727-
properties:
12728-
caCert:
12729-
description: CA cert to verify the server.
12730-
oneOf:
12731-
- required:
12732-
- webPki
12733-
- required:
12734-
- secretClass
12735-
properties:
12736-
secretClass:
12737-
description: |-
12738-
Name of the [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) which will provide the CA certificate.
12739-
Note that a SecretClass does not need to have a key but can also work with just a CA certificate,
12740-
so if you got provided with a CA cert but don't have access to the key you can still use this method.
12741-
type: string
12742-
webPki:
12743-
description: |-
12744-
Use TLS and the CA certificates trusted by the common web browsers to verify the server.
12745-
This can be useful when you e.g. use public AWS S3 or other public available services.
12746-
type: object
12747-
type: object
12748-
required:
12749-
- caCert
12750-
type: object
12751-
type: object
12752-
required:
12753-
- verification
12754-
type: object
12755-
required:
12756-
- host
12757-
- port
12758-
type: object
12759-
required:
12760-
- spec
12761-
title: OpenLineageConnection
12762-
type: object
12763-
served: true
12764-
storage: true
12765-
subresources: {}

rust/operator-binary/src/main.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ use futures::{FutureExt, StreamExt, TryFutureExt};
1010
use stackable_operator::{
1111
YamlSchema,
1212
cli::{Command, RunArguments},
13-
crd::{
14-
authentication::core as auth_core,
15-
openlineage::{self, OpenLineageConnection, OpenLineageConnectionVersion},
16-
},
13+
crd::{authentication::core as auth_core, openlineage},
1714
eos::EndOfSupportChecker,
1815
k8s_openapi::api::{
1916
apps::v1::StatefulSet,
@@ -66,8 +63,6 @@ async fn main() -> anyhow::Result<()> {
6663
Command::Crd => {
6764
AirflowCluster::merged_crd(AirflowClusterVersion::V1Alpha2)?
6865
.print_yaml_schema(built_info::PKG_VERSION, &SerializeOptions::default())?;
69-
OpenLineageConnection::merged_crd(OpenLineageConnectionVersion::V1Alpha1)?
70-
.print_yaml_schema(built_info::PKG_VERSION, &SerializeOptions::default())?;
7166
}
7267
Command::Run(RunArguments {
7368
watch_namespace,

rust/operator-binary/src/webhooks/conversion.rs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use snafu::{ResultExt, Snafu};
22
use stackable_operator::{
33
cli::OperatorEnvironmentOptions,
4-
crd::openlineage::{OpenLineageConnection, OpenLineageConnectionVersion},
54
kube::{Client, core::crd::MergeError},
65
webhook::{
76
WebhookServer, WebhookServerError, WebhookServerOptions,
@@ -30,17 +29,10 @@ pub async fn create_webhook_server(
3029
) -> Result<WebhookServer, Error> {
3130
// The conversion handlers are cast to fn pointers so both CRD entries share a single element
3231
// type (each `fn` item otherwise has its own unique type).
33-
let crds_and_handlers = vec![
34-
(
35-
AirflowCluster::merged_crd(AirflowClusterVersion::V1Alpha2).context(MergeCrdSnafu)?,
36-
AirflowCluster::try_convert as fn(ConversionReview) -> ConversionReview,
37-
),
38-
(
39-
OpenLineageConnection::merged_crd(OpenLineageConnectionVersion::V1Alpha1)
40-
.context(MergeCrdSnafu)?,
41-
OpenLineageConnection::try_convert as fn(ConversionReview) -> ConversionReview,
42-
),
43-
];
32+
let crds_and_handlers = vec![(
33+
AirflowCluster::merged_crd(AirflowClusterVersion::V1Alpha2).context(MergeCrdSnafu)?,
34+
AirflowCluster::try_convert as fn(ConversionReview) -> ConversionReview,
35+
)];
4436

4537
let conversion_webhook_options = ConversionWebhookOptions {
4638
disable_crd_maintenance,

0 commit comments

Comments
 (0)