Skip to content

Commit 6bc88f3

Browse files
committed
cm-helper: add gcp support
Signed-off-by: Snir Sheriber <[email protected]>
1 parent d81b666 commit 6bc88f3

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

scripts/cm-helpers/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ cloud provider, recommended best practices, and user-provided input.
99
* AWS
1010
* Azure
1111
* Libvirt
12+
* GCP
1213

1314
### Prerequisites
1415
* jq, kubectl or oc installed

scripts/cm-helpers/pp-cm-helper.sh

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ aws_optional=("PODVM_AMI_ID")
4848
azure_vars=("AZURE_INSTANCE_SIZE" "AZURE_INSTANCE_SIZES" "AZURE_SUBNET_ID" "AZURE_NSG_ID" "AZURE_REGION" "AZURE_RESOURCE_GROUP")
4949
azure_optional=("AZURE_IMAGE_ID")
5050

51+
gcp_vars=("GCP_PROJECT_ID" "GCP_ZONE" "GCP_NETWORK" "GCP_MACHINE_TYPE")
52+
gcp_optional=("GCP_IMAGE_NAME")
53+
5154
libvirt_vars=("LIBVIRT_POOL" "LIBVIRT_VOL_NAME" "LIBVIRT_DIR_NAME")
5255
libvirt_optional=("LIBVIRT_IMAGE_ID")
5356

@@ -122,8 +125,13 @@ spec:
122125
AZURE_RESOURCE_GROUP=\$(curl -s -m 15 -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance/compute/resourceGroupName?api-version=2017-08-01&format=text")
123126
AZURE_SUBSCRIPTION_ID=\$(curl -s -m 15 -H Metadata:true --noproxy "*" "http://169.254.169.254/metadata/instance/compute/subscriptionId?api-version=2017-08-01&format=text")
124127
EOS
128+
elif [ \${provider} == "gcp" ]; then
129+
cat <<EOS >> /tmp/cm.env
130+
GCP_PROJECT_ID=\$(curl -s -m 15 -H "Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/project/project-id)
131+
GCP_ZONE=\$(curl -s -m 15 -H "Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/zone | awk -F/ '{print \$(NF)}')
132+
EOS
125133
else
126-
echo "Uknown provider: \"\${provider}\"" && exit 0
134+
echo "Unknown provider: \"\${provider}\"" && exit 0
127135
fi
128136
cat /tmp/cm.env
129137
oc create cm peer-pods-cm --from-env-file=/tmp/cm.env -n openshift-sandboxed-containers-operator
@@ -164,6 +172,11 @@ function getLocalDefaults() {
164172
[[ "${DISABLECVM}" == true ]] && AZURE_INSTANCE_SIZES=${AZURE_INSTANCE_SIZES:-Standard_B2als_v2,Standard_D2as_v5,Standard_D4as_v5,Standard_D2ads_v5}
165173
#AZURE_IMAGE_ID=${AZURE_IMAGE_ID}
166174

175+
# gcp
176+
GCP_MACHINE_TYPE=${GCP_MACHINE_TYPE:-n2d-standard-2}
177+
GCP_NETWORK=${GCP_NETWORK:-global/networks/default}
178+
#GCP_IMAGE_NAME=${GCP_IMAGE_NAME}
179+
167180
# libvirt
168181
LIBVIRT_POOL=${LIBVIRT_POOL:-default}
169182
LIBVIRT_VOL_NAME=${LIBVIRT_VOL_NAME:-default}
@@ -182,6 +195,10 @@ function userVerification() {
182195
verifyAndSetVars "${azure_vars[@]}"
183196
verifyAndSetVars "${azure_optional[@]}"
184197
;;
198+
"gcp")
199+
verifyAndSetVars "${gcp_vars[@]}"
200+
verifyAndSetVars "${gcp_optional[@]}"
201+
;;
185202
"libvirt")
186203
verifyAndSetVars "${libvirt_vars[@]}"
187204
verifyAndSetVars "${libvirt_optional[@]}"

0 commit comments

Comments
 (0)