Skip to content
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

Jump to bottom

fix: allow version pass to avoid latest install always #8517

Merged
merged 2 commits into from
Jul 11, 2024
Merged

fix: allow version pass to avoid latest install always #8517

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15401a1
fix: allow version pass to avoid latest install always
misba7 May 15, 2024
0278367
Merge branch 'main' into fix-jans-script
moabu Jul 11, 2024
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
11 changes: 4 additions & 7 deletions automation/startjanssendemo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
set -eo pipefail
JANS_FQDN=$1
JANS_PERSISTENCE=$2
JANS_CI_CD_RUN=$3
JANS_VERSION=$3
Copy link
Contributor

@iromli iromli May 16, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@misba7 What's the default JANS_VERSION?

EXT_IP=$4
INSTALL_ISTIO=$5
HELM_DEVELOPMENT_REPO=$6
JANS_CI_CD_RUN=$5
INSTALL_ISTIO=$6
if [[ ! "$JANS_FQDN" ]]; then
read -rp "Enter Hostname [demoexample.jans.io]: " JANS_FQDN
fi
Expand All @@ -21,9 +21,6 @@ if [[ $JANS_PERSISTENCE != "LDAP" ]] && [[ $JANS_PERSISTENCE != "MYSQL" ]] && [[
echo "[E] Incorrect entry. Please enter either LDAP, MYSQL or PGSQL"
exit 1
fi
if [[ ! "$HELM_DEVELOPMENT_REPO" ]]; then
HELM_DEVELOPMENT_REPO=""
fi

LOG_TARGET="FILE"
LOG_LEVEL="TRACE"
Expand Down Expand Up @@ -242,7 +239,7 @@ auth-server:
EOF
sudo helm repo add janssen https://docs.jans.io/charts
sudo helm repo update
sudo helm install janssen janssen/janssen -n jans -f override.yaml --kubeconfig="$KUBECONFIG" "$HELM_DEVELOPMENT_REPO"
sudo helm install janssen janssen/janssen -n jans -f override.yaml --kubeconfig="$KUBECONFIG" --version="$JANS_VERSION"
Copy link
Contributor

Choose a reason for hiding this comment

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

@misba7 have we handle empty $JANS_VERSION?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

empty JANS_VERSION installs latest, which was the default behavior.
I added the variable to be able to override it as needed.

Copy link
Contributor

@iromli iromli May 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

did you mean command like helm install --version= (empty JANS_VERSION) also work?

Copy link
Contributor

@iromli iromli May 17, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

ignore my last comment, i have tested it. The --version= <other-ops> is working while --version <other-ops> is not.


wait_for_services jans-config-api/api/v1/health/ready
wait_for_services jans-scim/sys/health-check
Expand Down