From 650e8be55901cc2c605c32349f3b29936fe59a89 Mon Sep 17 00:00:00 2001 From: donggyu Date: Mon, 6 Nov 2023 19:38:24 +0900 Subject: [PATCH 1/3] bugfix. change static keycloak domain render directory to dynamic --- git-repo/create-contract-repo.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/git-repo/create-contract-repo.yaml b/git-repo/create-contract-repo.yaml index 9363e94d..9937e9e8 100644 --- a/git-repo/create-contract-repo.yaml +++ b/git-repo/create-contract-repo.yaml @@ -70,16 +70,13 @@ spec: rm -rf aws-reference/openstack aws-reference/decapod-controller aws-reference/admin-tools rm -rf byoh-reference/openstack byoh-reference/decapod-controller byoh-reference/admin-tools + site_list=$(ls -d */ | sed 's/\///g' | egrep "-reference$") # Append Keycloak URL and Realm info KEYCLOAK_DOMAIN="${KEYCLOAK_URL#https://}" - sed -i "/keycloakDomain:/c\ keycloakDomain: ${KEYCLOAK_DOMAIN}" aws-reference/lma/site-values.yaml - sed -i "/realms:/c\ realms: ${CONTRACT_ID}" aws-reference/lma/site-values.yaml - sed -i "/keycloakDomain:/c\ keycloakDomain: ${KEYCLOAK_DOMAIN}" eks-reference/lma/site-values.yaml - sed -i "/realms:/c\ realms: ${CONTRACT_ID}" eks-reference/lma/site-values.yaml - sed -i "/keycloakDomain:/c\ keycloakDomain: ${KEYCLOAK_DOMAIN}" aws-msa-reference/lma/site-values.yaml - sed -i "/realms:/c\ realms: ${CONTRACT_ID}" aws-msa-reference/lma/site-values.yaml - sed -i "/keycloakDomain:/c\ keycloakDomain: ${KEYCLOAK_DOMAIN}" eks-msa-reference/lma/site-values.yaml - sed -i "/realms:/c\ realms: ${CONTRACT_ID}" eks-msa-reference/lma/site-values.yaml + for site in ${site_list} + do + yq -i e ".global.keycloakDomain=\"$KEYCLOAK_DOMAIN\"" $site/lma/site-values.yaml + done git config --global user.email "taco_support@sk.com" git config --global user.name "SKTelecom TACO" From 2ec5ada2d62e77caf874d6161461c660350c33c2 Mon Sep 17 00:00:00 2001 From: donggyu Date: Tue, 7 Nov 2023 10:30:47 +0900 Subject: [PATCH 2/3] bugfix. not supported in docker image. change yq -> sed --- git-repo/create-contract-repo.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/git-repo/create-contract-repo.yaml b/git-repo/create-contract-repo.yaml index 9937e9e8..8fd1cd81 100644 --- a/git-repo/create-contract-repo.yaml +++ b/git-repo/create-contract-repo.yaml @@ -69,15 +69,16 @@ spec: # For now, this hardcoding seems enough. rm -rf aws-reference/openstack aws-reference/decapod-controller aws-reference/admin-tools rm -rf byoh-reference/openstack byoh-reference/decapod-controller byoh-reference/admin-tools - + site_list=$(ls -d */ | sed 's/\///g' | egrep "-reference$") # Append Keycloak URL and Realm info KEYCLOAK_DOMAIN="${KEYCLOAK_URL#https://}" for site in ${site_list} do - yq -i e ".global.keycloakDomain=\"$KEYCLOAK_DOMAIN\"" $site/lma/site-values.yaml + sed -i "/keycloakDomain:/c\ keycloakDomain: ${KEYCLOAK_DOMAIN}" ${site}/lma/site-values.yaml + sed -i "/realms:/c\ realms: ${CONTRACT_ID}" ${site}/lma/site-values.yaml done - + git config --global user.email "taco_support@sk.com" git config --global user.name "SKTelecom TACO" git add . From 43a5138188bb7387ca9ba5ce3337044576c9ca59 Mon Sep 17 00:00:00 2001 From: Jugwan Eom Date: Tue, 7 Nov 2023 04:48:27 +0000 Subject: [PATCH 3/3] fix condition for removing cluster-autoscaler --- tks-cluster/remove-usercluster-wftpl.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tks-cluster/remove-usercluster-wftpl.yaml b/tks-cluster/remove-usercluster-wftpl.yaml index c6ef9b4d..ae4ce933 100644 --- a/tks-cluster/remove-usercluster-wftpl.yaml +++ b/tks-cluster/remove-usercluster-wftpl.yaml @@ -68,8 +68,7 @@ spec: - name: app_name value: "{{workflow.parameters.app_prefix}}-cluster-autoscaler" when: >- - {{steps.findInfraProvider.outputs.parameters.infra_provider}} != byoh && - {{steps.findInfraProvider.outputs.parameters.managed_cluster}} == false + {{steps.findInfraProvider.outputs.parameters.infra_provider}} != byoh - - name: deleteClusterAutoscalerRbacApp templateRef: