new file mode 100755

@@ -0,0 +1,33 @@

+#!/bin/sh

+

+source $(dirname "${BASH_SOURCE}")/common.sh

+

+echo "Populating apps"

+

+export KUBECONFIG=${OPENSHIFT_ADMIN_CONFIG}

+

+gitrepos=(

+  https://github.com/openshift/hello-world.git

+)

+sources=($(oc get istag -n openshift -o template --template='{{ range .items }}{{ .metadata.name }}{{ "\n" }}{{ end }}'))

+num_sources=${#sources[@]}

+

+for ((i=1; i <=$NUM_APPS; i++))

+do

+  number=$RANDOM

+  let "number %= $NUM_PROJECTS"

+  oc project ${PROJECT_NAME_PREFIX}${number}

+

+  repo=""

+  if [[ $RANDOM -gt 20000 ]]; then

+    number=$RANDOM

+    let "number %= ${#gitrepos[@]}"

+    repo="~${gitrepos[$number]}"

+  fi

+

+  number=$RANDOM

+  let "number %= $num_sources"

+  oc new-app --name=app-${i} ${sources[$number]}${repo}

+done

+

+echo "Done"

\ No newline at end of file

@@ -6,14 +6,17 @@

 export OPENSHIFT_SERVER="${OPENSHIFT_SERVER:-https://10.0.2.15:8443}"

 # The admin user to populate

-export OPENSHIFT_ADMIN_CONFIG="${OPENSHIFT_ADMIN_CONFIG:-/openshift.local.config/master/admin.kubeconfig}"

+export OPENSHIFT_ADMIN_CONFIG="${OPENSHIFT_ADMIN_CONFIG:-./openshift.local.config/master/admin.kubeconfig}"

 # The ca cert to present when provisioning users

-export OPENSHIFT_CA_CERT="${OPENSHIFT_CA_CERT:-/openshift.local.config/master/ca.crt}"

+export OPENSHIFT_CA_CERT="${OPENSHIFT_CA_CERT:-./openshift.local.config/master/ca.crt}"

 # The number of users that are in the system

 export NUM_USERS="${NUM_USERS:-10}"

+# The number of applications to create across all projcets

+export NUM_APPS="${NUM_APPS:-100}"

+

 # The user name prefix

 export USER_NAME_PREFIX=hal-

@@ -11,6 +11,6 @@ source $(dirname "${BASH_SOURCE}")/templates.sh

 source $(dirname "${BASH_SOURCE}")/projects.sh

 source $(dirname "${BASH_SOURCE}")/limits.sh

 source $(dirname "${BASH_SOURCE}")/quotas.sh

-source $(dirname "${BASH_SOURCE}")/replication-controllers.sh

+source $(dirname "${BASH_SOURCE}")/apps.sh

 echo "Done"

@@ -12,8 +12,10 @@ export KUBECONFIG=${OPENSHIFT_ADMIN_CONFIG}

 for ((i=1; i <=$NUM_PROJECTS; i++))

 do

-  ADMIN_USER=${USER_NAME_PREFIX}$(shuf -i 1-$NUM_USERS -n 1)

-  openshift admin new-project ${PROJECT_NAME_PREFIX}${i} --admin=$ADMIN_USER>/dev/null

+  number=$RANDOM

+  let "number %= $NUM_USERS"

+  ADMIN_USER=${USER_NAME_PREFIX}${number}

+  oadm new-project ${PROJECT_NAME_PREFIX}${i} --admin=$ADMIN_USER>/dev/null

 done

 echo "Done"

\ No newline at end of file

deleted file mode 100644

@@ -1,33 +0,0 @@

-apiVersion: v1

-kind: ReplicationController

-metadata: 

-  labels: 

-    name: openshift

-  name: openshift

-spec: 

-  replicas: 0

-  selector: 

-    name: openshift

-  template: 

-    metadata: 

-      labels: 

-        name: openshift

-    spec: 

-      containers: 

-        - args: 

-            - start

-            - master

-            - --config=/config/master-config.yaml

-          image: "openshift/origin"

-          name: origin

-          ports: 

-            - containerPort: 8443

-              name: openshift

-          volumeMounts: 

-            - mountPath: /config

-              name: config

-              readOnly: true

-      volumes: 

-        - name: config

-          secret:

-            secretName: openshift-config

\ No newline at end of file

deleted file mode 100755

@@ -1,21 +0,0 @@

-#!/bin/bash

-

-# Replication Controllers

-

-# Populates each project with a replication controller whose replica size is 0

-# Intended to test large numbers of replication controllers in system

-

-source $(dirname "${BASH_SOURCE}")/common.sh

-

-echo "Populating replication controllers"

-

-export KUBECONFIG=${OPENSHIFT_ADMIN_CONFIG}

-

-RC=$(dirname "${BASH_SOURCE}")/replication-controller.yaml

-

-for ((i=1; i <=$NUM_PROJECTS; i++))

-do

-  openshift cli create -f $RC --namespace=${PROJECT_NAME_PREFIX}${i}

-done

-

-echo "Done"

\ No newline at end of file

@@ -20,7 +20,7 @@ $EXAMPLES_ROOT/image-streams/image-streams-centos*"

 for f in $TEMPLATES

 do

-  openshift cli create -f $f --namespace=openshift  

+  oc create -f $f --namespace=openshift

 done

 echo "Done"

\ No newline at end of file

@@ -11,8 +11,8 @@ for ((i=1; i <=$NUM_USERS; i++))

 do  

   USERNAME=${USER_NAME_PREFIX}${i}

   USERCONFIG=/tmp/${USERNAME}.config

-  openshift cli config view --minify -o yaml > ${USERCONFIG}

-  KUBECONFIG=${USERCONFIG} && openshift cli login ${OPENSHIFT_SERVER} --certificate-authority=${OPENSHIFT_CA_CERT} --username=$USERNAME --password=whocares >/dev/null

+  openshift cli config view --minify --raw -o yaml > ${USERCONFIG}

+  KUBECONFIG=${USERCONFIG} oc login --username=$USERNAME --password=whocares

 done

 echo "Done"

\ No newline at end of file