File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -74,7 +74,8 @@ create_codefresh_secret() {
74
74
\" ingressClass\" :\" ${CSDP_INGRESS_CLASS_NAME} \" ,
75
75
\" ingressController\" :\" ${CSDP_INGRESS_CONTROLLER} \" ,
76
76
\" componentNames\" :${COMPONENTS} ,
77
- \" runtimeVersion\" :\" v0.0.0\"
77
+ \" runtimeVersion\" :\" v0.0.0\" ,
78
+ \" managed\" :\" ${CSDP_MANAGED_RUNTIME} \"
78
79
}"
79
80
80
81
RUNTIME_CREATE_DATA=" {\" operationName\" :\" CreateRuntime\" ,\" variables\" :{\" args\" :$RUNTIME_CREATE_ARGS }"
390
391
fi
391
392
echo " "
392
393
394
+ <<< <<< < Updated upstream
393
395
# 4. Create argo-cd jwt token for events-reporter event-source
394
396
create_argocd_token_secret
395
397
echo " "
@@ -401,6 +403,9 @@ echo ""
401
403
# Complete installation for non managed runtimes
402
404
# a. create default git integration
403
405
# b. register user to default git integration
406
+ =======
407
+
408
+ >>>>>>> Stashed changes
404
409
if [[ " $CSDP_MANAGED_RUNTIME " -ne " true" ]] ; then
405
410
# 5. Check git integration
406
411
echo " Checking default git integration..."
You can’t perform that action at this time.
0 commit comments