Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bluemix to IBM Cloud #172

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions kubernetes-service/task-deploy-to-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.annotations['devops.cloud.ibm.com/triggered-by']
- name: PIPELINE_BLUEMIX_API_KEY
- name: PIPELINE_IBMCLOUD_API_KEY
valueFrom:
secretKeyRef:
name: $(params.continuous-delivery-context-secret)
key: $(params.kubernetes-service-apikey-secret-key)
- name: PIPELINE_BLUEMIX_RESOURCE_GROUP
- name: PIPELINE_IBMCLOUD_RESOURCE_GROUP
value: $(params.resource-group)
- name: PIPELINE_KUBERNETES_CLUSTER_NAME
value: $(params.cluster-name)
Expand Down Expand Up @@ -111,10 +111,10 @@ spec:
else
export IBM_CLOUD_REGION=$(jq -r '.region_id' /artifacts/_toolchain.json | awk -F: '{print $3}')
fi
ibmcloud login -a $(params.ibmcloud-api) -r $IBM_CLOUD_REGION --apikey $PIPELINE_BLUEMIX_API_KEY
ibmcloud login -a $(params.ibmcloud-api) -r $IBM_CLOUD_REGION --apikey $PIPELINE_IBMCLOUD_API_KEY

if [ "$PIPELINE_BLUEMIX_RESOURCE_GROUP" ]; then
ibmcloud target -g "$PIPELINE_BLUEMIX_RESOURCE_GROUP"
if [ "$PIPELINE_IBMCLOUD_RESOURCE_GROUP" ]; then
ibmcloud target -g "$PIPELINE_IBMCLOUD_RESOURCE_GROUP"
fi

if ibmcloud ks cluster get --cluster $PIPELINE_KUBERNETES_CLUSTER_NAME; then
Expand Down