Skip to content

feat(ctl): Support --helm-repo-multiarch #85

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

Closed
Techassi wants to merge 1 commit into from
Closed

feat(ctl): Support --helm-repo-multiarch #85

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
1 change: 1 addition & 0 deletions extra/completions/_stackablectl
View file
Open in desktop

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

6 changes: 5 additions & 1 deletion extra/completions/stackablectl.bash
View file
Open in desktop

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

1 change: 1 addition & 0 deletions extra/completions/stackablectl.fish
View file
Open in desktop

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

5 changes: 4 additions & 1 deletion extra/man/stackablectl.1
View file
Open in desktop

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

1 change: 1 addition & 0 deletions rust/stackable-cockpit/src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ pub const DEFAULT_CACHE_MAX_AGE: Duration = Duration::from_secs(60 * 60); // One
pub const CACHE_LAST_AUTO_PURGE_FILEPATH: &str = ".cache-last-purge";
pub const CACHE_PROTECTED_FILES: &[&str] = &[".cache-last-purge"];

pub const HELM_REPO_NAME_MULTIARCH: &str = "stackable-experimental";
pub const HELM_REPO_NAME_STABLE: &str = "stackable-stable";
pub const HELM_REPO_NAME_TEST: &str = "stackable-test";
pub const HELM_REPO_NAME_DEV: &str = "stackable-dev";
Expand Down
5 changes: 5 additions & 0 deletions rust/stackablectl/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ Options:

[default: https://repo.stackable.tech/repository/helm-dev/]

--helm-repo-multiarch <URL>
Provide a custom Helm multiarch repository URL

[default: https://repo.stackable.tech/repository/helm-experimental/]

-h, --help
Print help (see a summary with '-h')

Expand Down
14 changes: 11 additions & 3 deletions rust/stackablectl/src/cli/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ use tracing::{debug, instrument, Level};

use stackable_cockpit::{
constants::{
DEFAULT_NAMESPACE, HELM_REPO_NAME_DEV, HELM_REPO_NAME_STABLE, HELM_REPO_NAME_TEST,
DEFAULT_NAMESPACE, HELM_REPO_NAME_DEV, HELM_REPO_NAME_MULTIARCH, HELM_REPO_NAME_STABLE,
HELM_REPO_NAME_TEST,
},
helm::{self, HelmError},
utils::path::{
Expand All @@ -22,8 +23,8 @@ use crate::{
},
constants::{
CACHE_HOME_PATH, ENV_KEY_DEMO_FILES, ENV_KEY_RELEASE_FILES, ENV_KEY_STACK_FILES,
HELM_REPO_URL_DEV, HELM_REPO_URL_STABLE, HELM_REPO_URL_TEST, REMOTE_DEMO_FILE,
REMOTE_RELEASE_FILE, REMOTE_STACK_FILE,
HELM_REPO_URL_DEV, HELM_REPO_URL_MULTIARCH, HELM_REPO_URL_STABLE, HELM_REPO_URL_TEST,
REMOTE_DEMO_FILE, REMOTE_RELEASE_FILE, REMOTE_STACK_FILE,
},
};

Expand Down Expand Up @@ -108,6 +109,10 @@ to provide multiple additional release files.")]
#[arg(long, value_name = "URL", value_hint = ValueHint::Url, default_value = HELM_REPO_URL_DEV)]
pub helm_repo_dev: String,

/// Provide a custom Helm multiarch repository URL
#[arg(long, value_name = "URL", value_hint = ValueHint::Url, default_value = HELM_REPO_URL_MULTIARCH)]
pub helm_repo_multiarch: String,

#[command(subcommand)]
pub subcommand: Commands,
}
Expand Down Expand Up @@ -182,6 +187,9 @@ impl Cli {
// Dev repository
helm::add_repo(HELM_REPO_NAME_DEV, &self.helm_repo_dev)?;

// Multiarch repository
helm::add_repo(HELM_REPO_NAME_MULTIARCH, &self.helm_repo_multiarch)?;

Ok(())
}

Expand Down
2 changes: 2 additions & 0 deletions rust/stackablectl/src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ pub const REMOTE_STACK_FILE: &str =
pub const REMOTE_RELEASE_FILE: &str =
"https://github.com/raw/stackabletech/release/main/releases.yaml";

pub const HELM_REPO_URL_MULTIARCH: &str =
"https://repo.stackable.tech/repository/helm-experimental/";
pub const HELM_REPO_URL_STABLE: &str = "https://repo.stackable.tech/repository/helm-stable/";
pub const HELM_REPO_URL_TEST: &str = "https://repo.stackable.tech/repository/helm-test/";
pub const HELM_REPO_URL_DEV: &str = "https://repo.stackable.tech/repository/helm-dev/";
Expand Down
7 changes: 5 additions & 2 deletions rust/stackablectl/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ use std::env;

use snafu::Snafu;
use stackable_cockpit::constants::{
HELM_REPO_NAME_DEV, HELM_REPO_NAME_STABLE, HELM_REPO_NAME_TEST,
HELM_REPO_NAME_DEV, HELM_REPO_NAME_MULTIARCH, HELM_REPO_NAME_STABLE, HELM_REPO_NAME_TEST,
};

use crate::constants::{HELM_REPO_URL_DEV, HELM_REPO_URL_STABLE, HELM_REPO_URL_TEST};
use crate::constants::{
HELM_REPO_URL_DEV, HELM_REPO_URL_MULTIARCH, HELM_REPO_URL_STABLE, HELM_REPO_URL_TEST,
};

#[derive(Debug, Snafu)]
#[snafu(display("Invalid Helm repo name ({name}), cannot resolve to repo URL"))]
Expand All @@ -23,6 +25,7 @@ where
let repo_name = repo_name.as_ref();

match repo_name {
HELM_REPO_NAME_MULTIARCH => Ok(HELM_REPO_URL_MULTIARCH),
HELM_REPO_NAME_STABLE => Ok(HELM_REPO_URL_STABLE),
HELM_REPO_NAME_TEST => Ok(HELM_REPO_URL_TEST),
HELM_REPO_NAME_DEV => Ok(HELM_REPO_URL_DEV),
Expand Down