Skip to content

Commit 942254e

Browse files
committed
Adding support of applying limitranges / resourcequotas on minishift
Signed-off-by: Ilya Buziuk <ibuziuk@redhat.com>
1 parent 916cb75 commit 942254e

1 file changed

Lines changed: 15 additions & 1 deletion

File tree

dockerfiles/cli/scripts/openshift/deploy_che.sh

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ if [ "${OPENSHIFT_FLAVOR}" == "minishift" ]; then
119119
CHE_KEYCLOAK_DISABLED=${CHE_KEYCLOAK_DISABLED:-${DEFAULT_CHE_KEYCLOAK_DISABLED}}
120120
DEFAULT_CHE_DEBUGGING_ENABLED="true"
121121
CHE_DEBUGGING_ENABLED=${CHE_DEBUGGING_ENABLED:-${DEFAULT_CHE_DEBUGGING_ENABLED}}
122+
DEFAULT_CHE_APPLY_RESOURCE_QUOTAS="false"
123+
CHE_APPLY_RESOURCE_QUOTAS=${CHE_APPLY_RESOURCE_QUOTAS:-${DEFAULT_CHE_APPLY_RESOURCE_QUOTAS}}
122124

123125
elif [ "${OPENSHIFT_FLAVOR}" == "osio" ]; then
124126
# ----------------------
@@ -184,7 +186,6 @@ if ! oc get project "${CHE_OPENSHIFT_PROJECT}" &> /dev/null; then
184186

185187
echo -n "no creating it..."
186188
oc new-project "${CHE_OPENSHIFT_PROJECT}" &> /dev/null
187-
## TODO we should consider oc apply the latest http://central.maven.org/maven2/io/fabric8/tenant/packages/fabric8-tenant-che-quotas-oso/
188189
fi
189190
echo "done!"
190191

@@ -243,6 +244,19 @@ echo -n "[CHE] Retrieving latest version of fabric8 tenant Che template..."
243244
OSIO_VERSION=$(curl -sSL http://central.maven.org/maven2/io/fabric8/tenant/apps/che/maven-metadata.xml | grep latest | sed -e 's,.*<latest>\([^<]*\)</latest>.*,\1,g')
244245
echo "done! (v.${OSIO_VERSION})"
245246

247+
# --------------------------------------
248+
# Applying resource quotas on minishift
249+
# --------------------------------------
250+
if [ "${CHE_APPLY_RESOURCE_QUOTAS}" == "true" ] && [ "${OPENSHIFT_FLAVOR}" == "minishift" ]; then
251+
# Only cluster admin can set limitranges / resourcequotas
252+
oc login "${OPENSHIFT_ENDPOINT}" -u system:admin &> /dev/null
253+
echo "[CHE] Applying resource quotas for ${CHE_OPENSHIFT_PROJECT}"
254+
curl -sSL http://central.maven.org/maven2/io/fabric8/tenant/packages/fabric8-tenant-che-quotas-oso/"${OSIO_VERSION}"/fabric8-tenant-che-quotas-oso-"${OSIO_VERSION}"-openshift.yml |
255+
oc apply --force=true -f-
256+
echo "[CHE] Resource quotas have been successfully applied"
257+
oc login "${OPENSHIFT_ENDPOINT}" --token="${OPENSHIFT_TOKEN}" &> /dev/null
258+
fi
259+
246260
# ----------------------------------------------
247261
# Start the deployment
248262
# ----------------------------------------------

0 commit comments

Comments
 (0)