Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ parameters:
required: true
- name: NAMESPACE
required: true
- name: IMAGE_FORMAT
- name: IMAGE_TESTS
required: true
- name: IMAGE_UPI_INSTALLER
Expand Down Expand Up @@ -230,16 +231,20 @@ objects:
- name: artifacts
mountPath: /tmp/artifacts
env:
- name: AWS_SHARED_CREDENTIALS_FILE
value: /tmp/cluster/.awscred
- name: AWS_REGION
value: us-east-1
- name: ARTIFACT_DIR
value: /tmp/artifacts
- name: AWS_SHARED_CREDENTIALS_FILE
value: /tmp/cluster/.awscred
- name: AZURE_AUTH_LOCATION
value: /tmp/cluster/osServicePrincipal.json
- name: GCP_SHARED_CREDENTIALS_FILE
value: /tmp/cluster/gce.json
- name: ARTIFACT_DIR
value: /tmp/artifacts
- name: HOME
value: /tmp/home
- name: IMAGE_FORMAT
value: ${IMAGE_FORMAT}
- name: KUBECONFIG
value: /tmp/artifacts/installer/auth/kubeconfig
command:
Expand Down Expand Up @@ -278,6 +283,18 @@ objects:
oc create -f /tmp/cluster/insights-live.yaml || true
fi

function setup-google-cloud-sdk() {
pushd /tmp
curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-256.0.0-linux-x86_64.tar.gz
tar -xzf google-cloud-sdk-256.0.0-linux-x86_64.tar.gz
export PATH=$PATH:/tmp/google-cloud-sdk/bin
mkdir gcloudconfig
export CLOUDSDK_CONFIG=/tmp/gcloudconfig
gcloud auth activate-service-account --key-file="${GCP_SHARED_CREDENTIALS_FILE}"
gcloud config set project openshift-gce-devel-ci
popd
}

# set up cloud-provider-specific env vars
export KUBE_SSH_BASTION="$( oc --insecure-skip-tls-verify get node -l node-role.kubernetes.io/master -o 'jsonpath={.items[0].status.addresses[?(@.type=="ExternalIP")].address}' ):22"
export KUBE_SSH_KEY_PATH=/tmp/cluster/ssh-privatekey
Expand All @@ -294,6 +311,15 @@ objects:
# TODO: make openshift-tests auto-discover this from cluster config
export TEST_PROVIDER='{"type":"aws","region":"us-east-1","zone":"us-east-1a","multizone":true,"multimaster":true}'
export KUBE_SSH_USER=core
elif [[ "${CLUSTER_TYPE}" == "azure4" ]]; then
export TEST_PROVIDER='azure'
elif [[ "${CLUSTER_TYPE}" == "openstack" ]]; then
mkdir -p ~/.ssh
cp /tmp/cluster/ssh-privatekey ~/.ssh/kube_openstack_rsa || true
fi

if [[ "${CLUSTER_TYPE}" == "gcp" ]]; then
setup-google-cloud-sdk
fi

mkdir -p /tmp/output
Expand Down Expand Up @@ -506,7 +532,7 @@ objects:
}
EOF
cat > /tmp/artifacts/installer/install-config.yaml << EOF
apiVersion: v1beta4
apiVersion: v1
baseDomain: ${base_domain}
metadata:
name: ${CLUSTER_NAME}
Expand Down