Update fvt toolchain (#463)

- remove 'org' and 'space' from IKS login command - use DOCKER_BUILDKIT --------- Signed-off-by: Christian Kadner <[email protected]>
kserve · Dec 2, 2023 · 002870e · 002870e
1 parent bba0cec
commit 002870e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.tekton/task.yaml b/.tekton/task.yaml
@@ -20,11 +20,12 @@ spec:
       description: iam api key
     - name: resource-group
       description: resource group
-      default: default
+      default: "Default"
     - name: org
       description: organization
     - name: region
       description: region
+      default: "us-south"
     - name: space
       description: space
     - name: archive-dir
@@ -116,7 +117,6 @@ spec:
       description: docker sandbox namespace
     - name: publish-tag
       description: image publish tag
-
   workspaces:
   - name: task-pvc
     mountPath: /artifacts
@@ -420,6 +420,7 @@ spec:
       description: organization
     - name: region
       description: region
+      default: "us-south"
     - name: space
       description: space
     - name: archive-dir
@@ -481,7 +482,7 @@ spec:
 
           # Set up kubernetes config
           retry 3 3 ibmcloud login --apikey "${IBM_CLOUD_API_KEY}" --no-region
-          retry 3 3 ibmcloud target -r "$REGION" -o "$ORG" -s "$SPACE" -g "$RESOURCE_GROUP"
+          retry 3 3 ibmcloud target -r "$REGION" -g "$RESOURCE_GROUP"
           retry 3 3 ibmcloud ks cluster config -c "$SERVING_KUBERNETES_CLUSTER_NAME"
 
           $(params.test-commands)
diff --git a/scripts/deploy/iks/build-image-dind.sh b/scripts/deploy/iks/build-image-dind.sh
@@ -24,6 +24,8 @@ ORG=${ORG:-"dev-advo"}
 SPACE=${SPACE:-"dev"}
 RUN_TASK=${RUN_TASK:-"build"}
 
+DOCKER_BUILDKIT=1
+
 retry() {
   local max=$1; shift
   local interval=$1; shift
@@ -39,7 +41,9 @@ retry() {
 }
 
 retry 3 3 ibmcloud login --apikey "${IBM_CLOUD_API_KEY}" --no-region
-retry 3 3 ibmcloud target -r "$REGION" -o "$ORG" -s "$SPACE" -g "$RESOURCE_GROUP"
+#retry 3 3 ibmcloud target -r "$REGION" -o "$ORG" -s "$SPACE" -g "$RESOURCE_GROUP"
+retry 3 3 ibmcloud target -r "$REGION" -g "$RESOURCE_GROUP"
+
 
 ######################################################################################
 # Build image                                                                        #