Skip to content

Commit

Permalink
chore: remove old connector crd (#3319)
Browse files Browse the repository at this point in the history
Co-authored-by: morenol <[email protected]>
  • Loading branch information
morenol and morenol committed Jun 9, 2023
1 parent a40165e commit ee4dec1
Show file tree
Hide file tree
Showing 13 changed files with 4 additions and 86 deletions.
2 changes: 1 addition & 1 deletion crates/fluvio-cli/src/client/tableformat/delete.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use fluvio::metadata::tableformat::TableFormatSpec;

#[derive(Debug, Parser)]
pub struct DeleteTableFormatOpt {
/// The name of the connector to delete
/// The name of the table format to delete
name: String,
}

Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-cli/src/client/tableformat/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub struct ListTableFormatsOpt {
}

impl ListTableFormatsOpt {
/// Process list connectors cli request
/// Process list table format cli request
pub async fn process<O: Terminal>(self, out: Arc<O>, fluvio: &Fluvio) -> Result<()> {
let admin = fluvio.admin().await;
let lists = admin.all::<TableFormatSpec>().await?;
Expand Down
1 change: 0 additions & 1 deletion crates/fluvio-cluster/src/cli/start/k8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ pub async fn process_k8(opt: StartOpt, platform_version: Version, upgrade: bool)
.hide_spinner(false)
.upgrade(upgrade)
.spu_config(opt.spu_config.as_spu_config())
.connector_prefixes(opt.connector_prefix)
.with_if(opt.skip_checks, |b| b.skip_checks(true))
.use_k8_port_forwarding(opt.k8_config.use_k8_port_forwarding);

Expand Down
4 changes: 0 additions & 4 deletions crates/fluvio-cluster/src/cli/start/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,6 @@ pub struct StartOpt {
/// Service Type
#[arg(long)]
pub service_type: Option<String>,

/// Connector Prefix
#[arg(long, value_name = "connector_prefix")]
pub connector_prefix: Vec<String>,
}

impl StartOpt {
Expand Down
10 changes: 0 additions & 10 deletions crates/fluvio-cluster/src/start/k8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,6 @@ pub struct ClusterConfig {
#[builder(setter(into), default)]
spu_config: SpuConfig,

#[builder(setter(into), default)]
connector_prefixes: Vec<String>,

#[builder(setter(into), default = "TLS_SERVER_SECRET_NAME.to_string()")]
tls_server_secret_name: String,

Expand Down Expand Up @@ -744,13 +741,6 @@ impl ClusterInstaller {
install_settings.push(("image.tag", Cow::Borrowed(tag)));
}

if !self.config.connector_prefixes.is_empty() {
install_settings.push((
"connectorPrefixes",
Cow::Owned(self.config.connector_prefixes.join(" ")),
));
}

// If configured with TLS, copy certs to server
if let (TlsPolicy::Verified(server_tls), TlsPolicy::Verified(client_tls)) = (
&self.config.server_tls_policy,
Expand Down
9 changes: 0 additions & 9 deletions crates/fluvio-sc/src/k8/objects/spu_k8_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ pub struct ScK8Config {
pub lb_service_annotations: HashMap<String, String>,
pub service: Option<ServiceSpec>,
pub spu_pod_config: PodConfig,
pub connector_prefixes: Vec<String>,
}

impl ScK8Config {
Expand Down Expand Up @@ -86,20 +85,12 @@ impl ScK8Config {

info!(?spu_pod_config, "spu pod config");

let connector_prefixes: Vec<String> =
if let Some(prefix_string) = data.remove("connectorPrefixes") {
prefix_string.split(' ').map(|s| s.to_owned()).collect()
} else {
Vec::new()
};

Ok(Self {
image,
pod_security_context,
lb_service_annotations,
service,
spu_pod_config,
connector_prefixes,
})
}

Expand Down
3 changes: 0 additions & 3 deletions crates/fluvio-sc/test-data/auth_config/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
"SpuGroup": [
"All"
],
"ManagedConnector": [
"All"
],
"SmartModule": [
"All"
],
Expand Down
1 change: 0 additions & 1 deletion crates/fluvio-test/src/tests/smoke/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ pub fn smoke(mut test_driver: FluvioTestDriver, mut test_case: TestCase) {
);

Some(table_format_process)
// Create a managed connector
} else {
None
};
Expand Down
2 changes: 1 addition & 1 deletion k8-util/helm/fluvio-app/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v2
name: fluvio-app
description: A Helm chart for Fluvio
type: application
version: 0.9.2
version: 0.9.3
1 change: 0 additions & 1 deletion k8-util/helm/fluvio-app/templates/spu-k8-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@ data:
spuPodConfig: {{ .Values.spuPod | toJson | quote }}
lbServiceAnnotations: {{ .Values.loadBalancer.serviceAnnotations | toJson | quote }}
service: {{ .Values.service | toJson | quote }}
connectorPrefixes: {{ .Values.connectorPrefixes }}
1 change: 0 additions & 1 deletion k8-util/helm/fluvio-app/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,3 @@ rbac:
serviceAccount:
name: fluvio
podSecurityContext: {}
connectorPrefixes: nil
2 changes: 1 addition & 1 deletion k8-util/helm/fluvio-sys/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v2
name: fluvio-sys
description: A Helm chart for Fluvio
type: application
version: 0.9.11
version: 0.9.12
52 changes: 0 additions & 52 deletions k8-util/helm/fluvio-sys/templates/crd_managed_connector.yaml

This file was deleted.

0 comments on commit ee4dec1

Please sign in to comment.