Skip to content

Use automatic cluster domain detection #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use automatic cluster domain detection #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
224 changes: 69 additions & 155 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

669 changes: 139 additions & 530 deletions Cargo.nix
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,4 @@ walkdir = "2.5.0"
[patch."https://github.com/stackabletech/operator-rs.git"]
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "feature/cluster-detection-local-kubelet" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

todo: update this when the feature is released in stackable-operator (after 25.7.0)

14 changes: 7 additions & 7 deletions crate-hashes.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions deploy/helm/listener-operator/templates/controller-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ spec:
env:
- name: CSI_ENDPOINT
value: /csi/csi.sock
- name: KUBERNETES_NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
{{- if .Values.kubernetesClusterDomain }}
- name: KUBERNETES_CLUSTER_DOMAIN
value: {{ .Values.kubernetesClusterDomain | quote }}
Expand Down
2 changes: 1 addition & 1 deletion deploy/helm/listener-operator/templates/node-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
env:
- name: CSI_ENDPOINT
value: /csi/csi.sock
- name: NODE_NAME
- name: KUBERNETES_NODE_NAME
valueFrom:
fieldRef:
apiVersion: v1
Expand Down
6 changes: 6 additions & 0 deletions deploy/helm/listener-operator/templates/roles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ rules:
- get
- list
- watch
- apiGroups:
- ""
resources:
- nodes/proxy
verbs:
- get
- apiGroups:
- storage.k8s.io
resources:
Expand Down
20 changes: 10 additions & 10 deletions rust/operator-binary/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ use csi_server::{
use futures::{FutureExt, TryStreamExt, pin_mut};
use stackable_operator::{
self, YamlSchema,
crd::listener::{Listener, ListenerClass, PodListeners},
crd::listener::{
Listener, ListenerClass, ListenerClassVersion, ListenerVersion, PodListeners,
PodListenersVersion,
},
shared::yaml::SerializeOptions,
telemetry::{Tracing, tracing::TelemetryOptions},
utils::cluster_info::KubernetesClusterInfoOpts,
Expand Down Expand Up @@ -53,10 +56,7 @@ struct ListenerOperatorRun {
#[derive(Debug, clap::Parser, strum::AsRefStr, strum::Display)]
enum RunMode {
Controller,
Node {
#[clap(long, env)]
node_name: String,
},
Node,
}

mod built_info {
Expand All @@ -71,11 +71,11 @@ async fn main() -> anyhow::Result<()> {
let opts = Opts::parse();
match opts.cmd {
stackable_operator::cli::Command::Crd => {
ListenerClass::merged_crd(ListenerClass::V1Alpha1)?
ListenerClass::merged_crd(ListenerClassVersion::V1Alpha1)?
.print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
Listener::merged_crd(Listener::V1Alpha1)?
Listener::merged_crd(ListenerVersion::V1Alpha1)?
.print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
PodListeners::merged_crd(PodListeners::V1Alpha1)?
PodListeners::merged_crd(PodListenersVersion::V1Alpha1)?
.print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
}
stackable_operator::cli::Command::Run(ListenerOperatorRun {
Expand Down Expand Up @@ -137,11 +137,11 @@ async fn main() -> anyhow::Result<()> {
.await
.map_err(|err| err.factor_first().0)?;
}
RunMode::Node { node_name } => {
RunMode::Node => {
csi_server
.add_service(NodeServer::new(ListenerOperatorNode {
client: client.clone(),
node_name,
node_name: cluster_info_opts.kubernetes_node_name,
}))
.serve_with_incoming_shutdown(csi_listener, sigterm.recv().map(|_| ()))
.await?;
Expand Down