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.

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

Automate admin-tools installation #32

Merged
merged 2 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions 05_install_decapod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,6 @@ for dir in $(ls -l $ASSET_DIR/tks-flow/ |grep "^d" | grep -v dockerfiles |awk '{
kubectl apply -R -f $ASSET_DIR/tks-flow/$dir -n argo
done

log_info "Creating configmap from tks-proto..."
kubectl create cm tks-proto -n argo --from-file=$ASSET_DIR/tks-proto/tks_pb_python -o yaml --dry-run=client | kubectl apply -f -
log_info "... done"

log_info "Creating aws secret..."
if [[ " ${CAPI_INFRA_PROVIDERS[*]} " =~ " aws " ]]; then
argo submit --from wftmpl/tks-create-aws-conf-secret -n argo -p aws_access_key_id=$AWS_ACCESS_KEY_ID -p aws_secret_access_key=$AWS_SECRET_ACCESS_KEY -p aws_account_id=$AWS_ACCOUNT_ID -p aws_user=$AWS_USER --watch
Expand Down
16 changes: 16 additions & 0 deletions 05_z2_install_admin_tools.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

set -e

source lib/common.sh

export KUBECONFIG=~/.kube/config

##TODO: add workflow-template for tks-admin-tools


log_info "Calling workflow to install admin-tools(keycloak, harbor, etc)..."

argo submit --from wftmpl/tks-install-admin-tools -n argo -p install_nginx=$INSTALL_NGINX_INGRESS -p manifest_repo_url="${GIT_SVC_BASE_URL}/${GIT_SVC_USERNAME}/${CLUSTER_NAME}-manifests" -p site_name=${CLUSTER_NAME} --watch

log_info "...Done"
18 changes: 0 additions & 18 deletions 05_z2_install_nginx_ingress.sh

This file was deleted.

2 changes: 2 additions & 0 deletions conf.sh.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ TKS_RELEASE=main

BOOTSTRAP_CLUSTER_SERVER_IP="192.168.0.1"
DOWNLOAD_IMAGES=false
INSTALL_NGINX_INGRESS=false

# "aws" or "byoh"
TKS_ADMIN_CLUSTER_INFRA_PROVIDER="byoh"
Expand Down Expand Up @@ -31,3 +32,4 @@ DATABASE_PASSWORD=secretPassword
# Gitea
GITEA_ADMIN_USER=tks-admin
GITEA_ADMIN_PASSWORD=secretPassword