Improve oc smart login

This commit is contained in:
yves-sbb committed 2026-10-07 14:06:50 +02:00
1 parent eb82f66226
commit d3b8591fa1
4 files changed
+263 -152

No files matched your search

+166 -129
View File
@@ -1,7 +1,8 @@
# ============================================================================
# OCP Smart Login/Context Switch Aliases
# ============================================================================
# These aliases intelligently switch between OCP clusters:
# These are actually functions (not aliases) for proper variable expansion.
# They intelligently switch between OCP clusters:
# - If logged in with valid token: just switch context (fast)
# - If token expired or not logged in: full login with browser (safe)
#
@@ -12,171 +13,204 @@
source ~/.bash_oc_smart.sh &>/dev/null
# ============================================================================
# AWS Shared Clusters - Smart Switch Aliases
# AWS Shared Clusters - Smart Switch Functions
# ============================================================================
# AWS-Test1 (aws01t)
alias ocAWS-Test1='oc_smart_switch \
"aws01t" \
"AWS-Test1" \
"kihub-u241100-dev/api-aws01t-sbb-aws-test-net:6443/u241100" \
"kihub-dev-u241100" \
"OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.aws01t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.aws01t.sbb-aws-test.net/oauth/token/request"'
ocAWS-Test1() {
oc_smart_switch \
"aws01t" \
"AWS-Test1" \
"kihub-u241100-dev/api-aws01t-sbb-aws-test-net:6443/u241100" \
"kihub-dev-u241100" \
"$OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.aws01t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.aws01t.sbb-aws-test.net/oauth/token/request"
}
# AWS-Test2 (aws02t)
alias ocAWS-Test2='oc_smart_switch \
"aws02t" \
"AWS-Test2" \
"kihub-u241100-dev/api-aws02t-sbb-aws-test-net:6443/u241100" \
"kihub-dev-u241100" \
"OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.aws02t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.aws02t.sbb-aws-test.net/oauth/token/request"'
ocAWS-Test2() {
oc_smart_switch \
"aws02t" \
"AWS-Test2" \
"kihub-u241100-dev/api-aws02t-sbb-aws-test-net:6443/u241100" \
"kihub-dev-u241100" \
"$OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.aws02t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.aws02t.sbb-aws-test.net/oauth/token/request"
}
# AWS-Int (Integration on Lisa)
alias ocAWS-Int='oc_smart_switch \
"lisa" \
"AWS-Int" \
"kihub-int/api-lisa-sbb-aws-net:6443/u241100" \
"kihub-int" \
"OPENSHIFT_TOKEN_AWS_PROD" \
"https://api.lisa.sbb-aws.net:6443" \
"https://oauth-openshift.apps.lisa.sbb-aws.net/oauth/token/request"'
ocAWS-Int() {
oc_smart_switch \
"lisa" \
"AWS-Int" \
"kihub-int/api-lisa-sbb-aws-net:6443/u241100" \
"kihub-int" \
"$OPENSHIFT_TOKEN_AWS_PROD" \
"https://api.lisa.sbb-aws.net:6443" \
"https://oauth-openshift.apps.lisa.sbb-aws.net/oauth/token/request"
}
# AWS-Prod (Production on Lisa)
alias ocAWS-Prod='oc_smart_switch \
"lisa" \
"AWS-Prod" \
"kihub-prod/api-lisa-sbb-aws-net:6443/u241100" \
"kihub-prod" \
"OPENSHIFT_TOKEN_AWS_PROD" \
"https://api.lisa.sbb-aws.net:6443" \
"https://oauth-openshift.apps.lisa.sbb-aws.net/oauth/token/request"'
ocAWS-Prod() {
oc_smart_switch \
"lisa" \
"AWS-Prod" \
"kihub-prod/api-lisa-sbb-aws-net:6443/u241100" \
"kihub-prod" \
"$OPENSHIFT_TOKEN_AWS_PROD" \
"https://api.lisa.sbb-aws.net:6443" \
"https://oauth-openshift.apps.lisa.sbb-aws.net/oauth/token/request"
}
# AWS-Lisa (Production cluster)
alias ocAWS-Lisa='oc_smart_switch \
"lisa" \
"AWS-Lisa" \
"kihub-prod/api-lisa-sbb-aws-net:6443/u241100" \
"kihub-prod" \
"OPENSHIFT_TOKEN_AWS_PROD" \
"https://api.lisa.sbb-aws.net:6443" \
"https://oauth-openshift.apps.lisa.sbb-aws.net/oauth/token/request"'
ocAWS-Lisa() {
oc_smart_switch \
"lisa" \
"AWS-Lisa" \
"kihub-prod/api-lisa-sbb-aws-net:6443/u241100" \
"kihub-prod" \
"$OPENSHIFT_TOKEN_AWS_PROD" \
"https://api.lisa.sbb-aws.net:6443" \
"https://oauth-openshift.apps.lisa.sbb-aws.net/oauth/token/request"
}
# AWS-Maggie (Production cluster)
alias ocAWS-Maggie='oc_smart_switch \
"maggie" \
"AWS-Maggie" \
"kihub-prod/api-maggie-sbb-aws-net:6443/u241100" \
"kihub-prod" \
"OPENSHIFT_TOKEN_AWS_PROD" \
"https://api.maggie.sbb-aws.net:6443" \
"https://oauth-openshift.apps.maggie.sbb-aws.net/oauth/token/request"'
ocAWS-Maggie() {
oc_smart_switch \
"maggie" \
"AWS-Maggie" \
"kihub-prod/api-maggie-sbb-aws-net:6443/u241100" \
"kihub-prod" \
"$OPENSHIFT_TOKEN_AWS_PROD" \
"https://api.maggie.sbb-aws.net:6443" \
"https://oauth-openshift.apps.maggie.sbb-aws.net/oauth/token/request"
}
# AWS-WZU
alias ocAWS-WZU='oc_smart_switch \
"wzu01t" \
"AWS-WZU" \
"kihub-test/api-wzu01t-ocp-test-sbb-aws-net:6443/u241100" \
"" \
"OPENSHIFT_TOKEN_WZU" \
"https://api.wzu01t.ocp-test.sbb-aws.net:6443" \
"https://oauth-openshift.apps.wzu01t.ocp-test.sbb-aws.net/oauth/token/request"'
ocAWS-WZU() {
oc_smart_switch \
"wzu01t" \
"AWS-WZU" \
"kihub-test/api-wzu01t-ocp-test-sbb-aws-net:6443/u241100" \
"" \
"$OPENSHIFT_TOKEN_WZU" \
"https://api.wzu01t.ocp-test.sbb-aws.net:6443" \
"https://oauth-openshift.apps.wzu01t.ocp-test.sbb-aws.net/oauth/token/request"
}
# ============================================================================
# CUS Private Clusters - Smart Switch Aliases
# CUS Private Clusters - Smart Switch Functions
# ============================================================================
# AWS-Dev (Development on aws01t)
alias ocCUS-Dev='oc_smart_switch \
"cus01t" \
"AWS-Dev" \
"kihub-dev-u241100/api-cus01t-sbb-aws-test-net:6443/u241100" \
"kihub-dev-u241100" \
"OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.cus01t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"'
ocCUS-Dev() {
oc_smart_switch \
"cus01t" \
"AWS-Dev" \
"kihub-dev-u241100/api-cus01t-sbb-aws-test-net:6443/u241100" \
"kihub-dev-u241100" \
"$OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.cus01t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"
}
# AWS-RT (Runtime on aws01t)
alias ocCUS-RT='oc_smart_switch \
"cus01t" \
"AWS-RT" \
"kihub-dev-rt/api-cus01t-sbb-aws-test-net:6443/u241100" \
"kihub-dev-rt" \
"OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.cus01t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"'
ocCUS-RT() {
oc_smart_switch \
"cus01t" \
"AWS-RT" \
"kihub-dev-rt/api-cus01t-sbb-aws-test-net:6443/u241100" \
"kihub-dev-rt" \
"$OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.cus01t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"
}
# AWS-Test (Test on aws01t)
alias ocCUS-Test='oc_smart_switch \
"cus01t" \
"CUS-Test" \
"kihub-test/api-cus01t-sbb-aws-test-net:6443/u241100" \
"kihub-test" \
"OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.cus01t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"'
ocCUS-Test() {
oc_smart_switch \
"cus01t" \
"CUS-Test" \
"kihub-test/api-cus01t-sbb-aws-test-net:6443/u241100" \
"kihub-test" \
"$OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.cus01t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"
}
# AWS-Test (Test on aws01t)
alias ocCUS-Int='oc_smart_switch \
"cus01t" \
"CUS-Int" \
"kihub-int/api-cus01t-sbb-aws-test-net:6443/u241100" \
"kihub-int" \
"OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.cus01t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"'
# AWS-Int (Test on aws01t)
ocCUS-Int() {
oc_smart_switch \
"cus01t" \
"CUS-Int" \
"kihub-int/api-cus01t-sbb-aws-test-net:6443/u241100" \
"kihub-int" \
"$OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.cus01t.sbb-aws-test.net:6443" \
"https://oauth-openshift.apps.cus01t.sbb-aws-test.net/oauth/token/request"
}
# AWS-Test (Test on aws01t)
alias ocCUS-Prod='oc_smart_switch \
"cus01p" \
"CUS-Prod" \
"kihub-prod/api-cus01p-sbb-aws-net:6443/u241100" \
"kihub-prod" \
"OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.cus01p.sbb-aws-net:6443" \
"https://oauth-openshift.apps.cus01p.sbb-aws.net/oauth/token/request"'
# AWS-Prod (Test on aws01t)
ocCUS-Prod() {
oc_smart_switch \
"cus01p" \
"CUS-Prod" \
"kihub-prod/api-cus01p-sbb-aws-net:6443/u241100" \
"kihub-prod" \
"$OPENSHIFT_TOKEN_AWS_TEST" \
"https://api.cus01p.sbb-aws-net:6443" \
"https://oauth-openshift.apps.cus01p.sbb-aws.net/oauth/token/request"
}
# ============================================================================
# SC (OTC) Clusters - Smart Switch Aliases
# SC (OTC) Clusters - Smart Switch Functions
# IMPORTANT: These clusters require separate tokens from AWS clusters!
# Set OPENSHIFT_TOKEN_SC02 and OPENSHIFT_TOKEN_SCSputnix in ~/.profile
# ============================================================================
# SC-Test (Test on sc02t)
alias ocSC-Test='oc_smart_switch \
"sc02t" \
"SC-Test" \
"kihub-test/api-sc02t-otc-test-sbb-ch:6443/u241100" \
"kihub-test" \
"OPENSHIFT_TOKEN_SC02" \
"https://api.sc02t.otc-test.sbb.ch:6443" \
"https://oauth-openshift.apps.sc02t.otc-test.sbb.ch/oauth/token/request"'
# SC-Test (Test on sc02t - OTC, not AWS!)
ocSC-Test() {
oc_smart_switch \
"sc02t" \
"SC-Test" \
"kihub-test/api-sc02t-otc-test-sbb-ch:6443/u241100" \
"kihub-test" \
"$OPENSHIFT_TOKEN_SC02" \
"https://api.sc02t.otc-test.sbb.ch:6443" \
"https://oauth-openshift.apps.sc02t.otc-test.sbb.ch/oauth/token/request"
}
# SC-Int (Integration on Sputnix)
alias ocSC-Int='oc_smart_switch \
"sputnix" \
"SC-Int" \
"kihub-int/api-sputnix-otc-sbb-ch:6443/u241100" \
"kihub-int" \
"OPENSHIFT_TOKEN_SCSputnix" \
"https://api.sputnix.otc.sbb.ch:6443" \
"https://oauth-openshift.apps.sputnix.otc.sbb.ch/oauth/token/request"'
# SC-Int (Integration on Sputnix - OTC, not AWS!)
ocSC-Int() {
oc_smart_switch \
"sputnix" \
"SC-Int" \
"kihub-int/api-sputnix-otc-sbb-ch:6443/u241100" \
"kihub-int" \
"$OPENSHIFT_TOKEN_SCSputnix" \
"https://api.sputnix.otc.sbb.ch:6443" \
"https://oauth-openshift.apps.sputnix.otc.sbb.ch/oauth/token/request"
}
# SC-Prod (Production on Sputnix)
alias ocSC-Prod='oc_smart_switch \
"sputnix" \
"SC-Prod" \
"kihub-prod/api-sputnix-otc-sbb-ch:6443/u241100" \
"kihub-prod" \
"OPENSHIFT_TOKEN_SCSputnix" \
"https://api.sputnix.otc.sbb.ch:6443" \
"https://oauth-openshift.apps.sputnix.otc.sbb.ch/oauth/token/request"'
# SC-Prod (Production on Sputnix - OTC, not AWS!)
ocSC-Prod() {
oc_smart_switch \
"sputnix" \
"SC-Prod" \
"kihub-prod/api-sputnix-otc-sbb-ch:6443/u241100" \
"kihub-prod" \
"$OPENSHIFT_TOKEN_SCSputnix" \
"https://api.sputnix.otc.sbb.ch:6443" \
"https://oauth-openshift.apps.sputnix.otc.sbb.ch/oauth/token/request"
}
# ============================================================================
# Convenience Aliases for Helper Functions
# ============================================================================
# These can stay as aliases since they're just shortcuts to functions
alias ocStatus='oc_status'
alias ocCtx='oc_contexts'
alias ocLogout='oc_logout'
@@ -195,6 +229,9 @@ alias ocWhoami='oc whoami'
# - Logged in? → Switch context only (FAST)
# - Not logged in? → Full login (SAFE)
#
# Note: These are FUNCTIONS (not aliases) for proper variable expansion
# in bash and zsh.
#
# Helper commands:
# ocStatus → Show current auth status
# ocCtx → List all available contexts