From 09ef59b482415d50ec5af9e3715bec78747dc141 Mon Sep 17 00:00:00 2001 From: "taekyu.kang" Date: Mon, 9 Sep 2024 13:53:21 +0900 Subject: [PATCH 1/2] trivial. change max timeout when byoh creating --- tks-cli/tks-cli.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tks-cli/tks-cli.yaml b/tks-cli/tks-cli.yaml index 9192101..3a4675f 100644 --- a/tks-cli/tks-cli.yaml +++ b/tks-cli/tks-cli.yaml @@ -181,7 +181,7 @@ spec: echo "* Install $CL_NAME cluster" tks cluster install -c ${CL_ID} - threshold=720 + threshold=120000 for i in $(seq 1 $threshold) do CL_STATUS=$(tks cluster list "{{inputs.parameters.organization_id}}" | grep -w $CL_ID | awk '{ print $4 }') From bea276193e71f35ad1012c5789e880ca0447a546 Mon Sep 17 00:00:00 2001 From: "taekyu.kang" Date: Mon, 9 Sep 2024 14:50:14 +0900 Subject: [PATCH 2/2] trivial. add secret loki-user to tks-enndpoint-secret --- tks-cluster/create-usercluster-wftpl.yaml | 4 ++++ tks-cluster/import-usercluster-wftpl.yaml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tks-cluster/create-usercluster-wftpl.yaml b/tks-cluster/create-usercluster-wftpl.yaml index 9fb81f5..8ef3175 100644 --- a/tks-cluster/create-usercluster-wftpl.yaml +++ b/tks-cluster/create-usercluster-wftpl.yaml @@ -869,6 +869,8 @@ spec: MINIO_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("minio"))|.url)'[]) PROMETHEUS_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("prometheus"))|.url)'[]) THANOS_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("thanos"))|.url)'[]) + LOKI_USER_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("loki_user"))|.url)'[]) + THANOS_RULER_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("thanos_ruler"))|.url)'[]) KIALI_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("kiali"))|.url)'[]) JAEGER_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("jaeger"))|.url)'[]) @@ -885,6 +887,8 @@ spec: minio: $(echo ${MINIO_URL} | base64) # 30003 prometheus: $(echo ${PROMETHEUS_URL} | base64) # 30004 thanos: $(echo ${THANOS_URL} | base64) # 30005 (queryfrontend만 합시다...) + loki_user: $(echo ${LOKI_USER_URL} | base64) # 30006 + thanos_ruler: $(echo ${THANOS_RULER_URL} | base64) # 30007 kiali: $(echo ${KIALI_URL} | base64) # 30011 jaeger: $(echo ${JAEGER_URL} | base64) # 30012 EOF diff --git a/tks-cluster/import-usercluster-wftpl.yaml b/tks-cluster/import-usercluster-wftpl.yaml index 3da5e9e..a9be5b7 100644 --- a/tks-cluster/import-usercluster-wftpl.yaml +++ b/tks-cluster/import-usercluster-wftpl.yaml @@ -280,6 +280,8 @@ spec: MINIO_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("minio"))|.url)'[]) PROMETHEUS_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("prometheus"))|.url)'[]) THANOS_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("thanos"))|.url)'[]) + LOKI_USER_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("loki_user"))|.url)'[]) + THANOS_RULER_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("thanos_ruler"))|.url)'[]) KIALI_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("kiali"))|.url)'[]) JAEGER_URL=$(echo $CLUSTER_DOMAINS | jq -r '. | map(select(.domainType | contains("jaeger"))|.url)'[]) @@ -296,6 +298,8 @@ spec: minio: $(echo ${MINIO_URL} | base64) # 30003 prometheus: $(echo ${PROMETHEUS_URL} | base64) # 30004 thanos: $(echo ${THANOS_URL} | base64) # 30005 (queryfrontend만 합시다...) + loki_user: $(echo ${LOKI_USER_URL} | base64) # 30006 + thanos_ruler: $(echo ${THANOS_RULER_URL} | base64) # 30007 kiali: $(echo ${KIALI_URL} | base64) # 30011 jaeger: $(echo ${JAEGER_URL} | base64) # 30012 EOF