Skip to content

Commit

Permalink
update dependencies and fix zitadel issue (#147)
Browse files Browse the repository at this point in the history
  • Loading branch information
jessebot authored Feb 15, 2024
1 parent 8e5666a commit 7c341ac
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 30 deletions.
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,20 @@ Here's the <a href="https://youtu.be/2E9DVJpv440?feature=shared">same video with


# Installation
B sure to check out our full [installation guide](https://small-hack.github.io/smol-k8s-lab/installation/), but the gist of it is `smol-k8s-lab` can be installed via `pip` or `brew`.
B sure to check out our full [installation guide](https://small-hack.github.io/smol-k8s-lab/installation/), but the gist of it is `smol-k8s-lab` can be installed via `pipx` or `brew`.

## brew
## pipx
`smol-k8s-lab` requires Python 3.11+ (and [pipx](https://github.com/pypa/pipx)). If you've already got both and [other pre-reqs](https://small-hack.github.io/smol-k8s-lab/installation/#prerequisites), you should be able to:

```bash
# install the CLI
pipx install smol-k8s-lab

# Check the help menu before proceeding
smol-k8s-lab --help
```

## brew (still unstable)

[`brew`] is the future preferred installation method for macOS/Debian/Ubuntu, as this will also install any non-python prerequisites you need, so you don't need to worry about them. This method is new, so please [let us know if anything isn't working for you](https://github.com/small-hack/homebrew-tap/issues).

Expand All @@ -43,17 +54,6 @@ Then you should be able to check the version and cli options with:
smol-k8s-lab --help
```

## pip
`smol-k8s-lab` requires Python 3.11+ (and [pip](https://pip.pypa.io/en/stable/installation/)). If you've already got both and [other pre-reqs](https://small-hack.github.io/smol-k8s-lab/installation/#prerequisites), you should be able to:

```bash
# install the CLI
pip3.11 install smol-k8s-lab

# Check the help menu before proceeding
smol-k8s-lab --help
```

<p align="center">
<a href="https://raw.githubusercontent.com/jessebot/smol-k8s-lab/main/docs/assets/images/screenshots/help_text.svg">
<img src="./docs/assets/images/screenshots/help_text.svg" alt="Output of smol-k8s-lab --help after cloning the directory and installing the prerequisites.">
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/images/screenshots/help_text.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 6 additions & 9 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Then you should be able to check the version and cli options with:
smol-k8s-lab --help
```

## Install via `pip`
## Install via `pipx`

### Prerequisites

Expand All @@ -52,17 +52,14 @@ All of these are not Required for core functionality of `smol-k8s-lab`, but they
| [mc] | only if you want smol-k8s-lab to create MinIO users and buckets for you |


`pip` is probably the best way to install `smol-k8s-lab`, but you can also probably use `pipx`:
## pipx
`smol-k8s-lab` requires Python 3.11+ (and [pipx](https://github.com/pypa/pipx)). If you've already got both and [other pre-reqs](https://small-hack.github.io/smol-k8s-lab/installation/#prerequisites), you should be able to:

```bash
# smol-k8s-lab will also work on newer python versions
pip3.11 install smol-k8s-lab
```

If all was successful, you should be able to run:
# install the CLI
pipx install smol-k8s-lab

```bash
# this will show the help text
# Check the help menu before proceeding
smol-k8s-lab --help
```

Expand Down
6 changes: 3 additions & 3 deletions poetry.lock

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

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "smol_k8s_lab"
version = "2.0.4"
version = "2.0.5"
description = "CLI and TUI to quickly install slimmer Kubernetes distros and then manage apps declaratively using Argo CD"
authors = ["Jesse Hitch <[email protected]>",
"Max Roby <[email protected]>"]
Expand Down
4 changes: 2 additions & 2 deletions smol_k8s_lab/k8s_apps/identity_provider/zitadel.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ def configure_zitadel(k8s_obj: K8s,
pass

# Before initialization, we need to wait for zitadel's API to be up
wait_for_argocd_app('zitadel')
wait_for_argocd_app('zitadel-web-app')
wait_for_argocd_app('zitadel', retry=True)
wait_for_argocd_app('zitadel-web-app', retry=True)
vouch_dict = initialize_zitadel(k8s_obj=k8s_obj,
zitadel_hostname=zitadel_hostname,
api_tls_verify=api_tls_verify,
Expand Down
2 changes: 1 addition & 1 deletion smol_k8s_lab/k8s_tools/argocd_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def wait_for_argocd_app(app: str, retry: bool = False) -> None:
else:
error = False
else:
subproc([f"argocd app wait {app} --health"])
subproc([f"argocd app wait {app}"])


def create_argocd_project(k8s_obj: K8s,
Expand Down

0 comments on commit 7c341ac

Please sign in to comment.