Skip to content
This repository has been archived by the owner on Jun 26, 2024. It is now read-only.

cherry-pick(release-v1.3.x): Create cluster-wide resources only once in performance test (#1308) #1373

Merged
Show file tree
Hide file tree
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: 10 additions & 0 deletions test/performance/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ METRICS_PID=$!

trap "kill -9 $METRICS_PID" EXIT

echo "Waiting for $WAIT_BEFORE to gather resource utilization before the load is started"
sleep $WAIT_BEFORE

pushd $WS/toolchain-e2e.git
Expand All @@ -23,18 +24,27 @@ DEFAULT_WORKLOADS=${DEFAULT_WORKLOADS:-$USERS_PER_SCENARIO}
SBO_NAMESPACE=${SBO_NAMESPACE:-openshift-operators}
SBO_DEPLOYMENT=${SBO_DEPLOYMENT:-service-binding-operator}

echo "Applying cluster-wide resources"
oc apply -f $WS/user-workloads/cluster-wide/sbo-test.yaml

echo "Running the performance scenario: sb-val"
yes | go run setup/main.go --template=$WS/user-workloads/valid/sbo-test.with-sbr.user-workloads.yaml --users $USERS_PER_SCENARIO --default $DEFAULT_WORKLOADS --custom $USERS_PER_SCENARIO --operators-limit 0 --workloads $SBO_NAMESPACE:$SBO_DEPLOYMENT --username $USER_NS_PREFIX-sb-val > $OUTPUT_DIR/$USER_NS_PREFIX-sb-val.log

echo "Running the performance scenario: nosb-val"
yes | go run setup/main.go --template=$WS/user-workloads/valid/sbo-test.without-sbr.user-workloads.yaml --users $USERS_PER_SCENARIO --default $DEFAULT_WORKLOADS --custom $USERS_PER_SCENARIO --operators-limit 0 --workloads $SBO_NAMESPACE:$SBO_DEPLOYMENT --username $USER_NS_PREFIX-nosb-val > $OUTPUT_DIR/$USER_NS_PREFIX-nosb-val.log
$WS/deploy-sbr.sh $WS/user-workloads/valid/sbo-test.sbr.yaml $USER_NS_PREFIX-nosb-val > $OUTPUT_DIR/$USER_NS_PREFIX-nosb-val.deploy-sbr.log
$WS/deploy-sbr.sh $WS/user-workloads/valid/sbo-test.sbr.spec.yaml $USER_NS_PREFIX-nosb-val >> $OUTPUT_DIR/$USER_NS_PREFIX-nosb-val.deploy-sbr.log

echo "Running the performance scenario: sb-inv"
yes | go run setup/main.go --template=$WS/user-workloads/invalid/sbo-test.with-sbr.user-workloads.yaml --users $USERS_PER_SCENARIO --default $DEFAULT_WORKLOADS --custom $USERS_PER_SCENARIO --operators-limit 0 --workloads $SBO_NAMESPACE:$SBO_DEPLOYMENT --username $USER_NS_PREFIX-sb-inv > $OUTPUT_DIR/$USER_NS_PREFIX-sb-inv.log

echo "Running the performance scenario: nosb-inv"
yes | go run setup/main.go --template=$WS/user-workloads/invalid/sbo-test.without-sbr.user-workloads.yaml --users $USERS_PER_SCENARIO --default $DEFAULT_WORKLOADS --custom $USERS_PER_SCENARIO --operators-limit 0 --workloads $SBO_NAMESPACE:$SBO_DEPLOYMENT --username $USER_NS_PREFIX-nosb-inv > $OUTPUT_DIR/$USER_NS_PREFIX-nosb-inv.log
$WS/deploy-sbr.sh $WS/user-workloads/invalid/sbo-test.sbr.yaml $USER_NS_PREFIX-nosb-inv > $OUTPUT_DIR/$USER_NS_PREFIX-nosb-inv.deploy-sbr.log
$WS/deploy-sbr.sh $WS/user-workloads/invalid/sbo-test.sbr.spec.yaml $USER_NS_PREFIX-nosb-inv >> $OUTPUT_DIR/$USER_NS_PREFIX-nosb-inv.deploy-sbr.log

echo "Running the performance scenario: sb-inc"
yes | go run setup/main.go --template=$WS/user-workloads/incomplete/sbo-test.with-sbr.user-workloads.yaml --users $USERS_PER_SCENARIO --default $DEFAULT_WORKLOADS --custom $USERS_PER_SCENARIO --operators-limit 0 --workloads $SBO_NAMESPACE:$SBO_DEPLOYMENT --username $USER_NS_PREFIX-sb-inc > $OUTPUT_DIR/$USER_NS_PREFIX-sb-inc.log

echo "Waiting for $WAIT_AFTER to gather resource utilization after the load is done"
sleep $WAIT_AFTER
30 changes: 30 additions & 0 deletions test/performance/user-workloads/cluster-wide/sbo-test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: sbo-perf-cronjobs-view
labels:
servicebinding.io/controller: "true"
rules:
- apiGroups:
- batch
resources:
- cronjobs
verbs:
- get
- list
- watch
- update
- patch
---
apiVersion: servicebinding.io/v1beta1
kind: ClusterWorkloadResourceMapping
metadata:
name: cronjobs.batch
spec:
versions:
- version: "*"
volumes: .spec.jobTemplate.spec.template.spec.volumes
containers:
- path: .spec.jobTemplate.spec.template.spec.containers[*]
- path: .spec.jobTemplate.spec.template.spec.initContainers[*]
Original file line number Diff line number Diff line change
Expand Up @@ -145,34 +145,6 @@ objects:
- '-c'
- date; echo 'Wake up!'
restartPolicy: Never
- apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: sbo-perf-cronjobs-view
labels:
servicebinding.io/controller: "true"
rules:
- apiGroups:
- batch
resources:
- cronjobs
verbs:
- get
- list
- watch
- update
- patch
- apiVersion: servicebinding.io/v1beta1
kind: ClusterWorkloadResourceMapping
metadata:
name: cronjobs.batch
spec:
versions:
- version: "*"
volumes: .spec.jobTemplate.spec.template.spec.volumes
containers:
- path: .spec.jobTemplate.spec.template.spec.containers[*]
- path: .spec.jobTemplate.spec.template.spec.initContainers[*]
- apiVersion: servicebinding.io/v1beta1
kind: ServiceBinding
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,31 +126,3 @@ objects:
- '-c'
- date; echo 'Wake up!'
restartPolicy: Never
- apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: sbo-perf-cronjobs-view
labels:
servicebinding.io/controller: "true"
rules:
- apiGroups:
- batch
resources:
- cronjobs
verbs:
- get
- list
- watch
- update
- patch
- apiVersion: servicebinding.io/v1beta1
kind: ClusterWorkloadResourceMapping
metadata:
name: cronjobs.batch
spec:
versions:
- version: "*"
volumes: .spec.jobTemplate.spec.template.spec.volumes
containers:
- path: .spec.jobTemplate.spec.template.spec.containers[*]
- path: .spec.jobTemplate.spec.template.spec.initContainers[*]
Original file line number Diff line number Diff line change
Expand Up @@ -145,34 +145,6 @@ objects:
- '-c'
- date; echo 'Wake up!'
restartPolicy: Never
- apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: sbo-perf-cronjobs-view
labels:
servicebinding.io/controller: "true"
rules:
- apiGroups:
- batch
resources:
- cronjobs
verbs:
- get
- list
- watch
- update
- patch
- apiVersion: servicebinding.io/v1beta1
kind: ClusterWorkloadResourceMapping
metadata:
name: cronjobs.batch
spec:
versions:
- version: "*"
volumes: .spec.jobTemplate.spec.template.spec.volumes
containers:
- path: .spec.jobTemplate.spec.template.spec.containers[*]
- path: .spec.jobTemplate.spec.template.spec.initContainers[*]
- apiVersion: servicebinding.io/v1beta1
kind: ServiceBinding
metadata:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,31 +126,3 @@ objects:
- '-c'
- date; echo 'Wake up!'
restartPolicy: Never
- apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
name: sbo-perf-cronjobs-view
labels:
servicebinding.io/controller: "true"
rules:
- apiGroups:
- batch
resources:
- cronjobs
verbs:
- get
- list
- watch
- update
- patch
- apiVersion: servicebinding.io/v1beta1
kind: ClusterWorkloadResourceMapping
metadata:
name: cronjobs.batch
spec:
versions:
- version: "*"
volumes: .spec.jobTemplate.spec.template.spec.volumes
containers:
- path: .spec.jobTemplate.spec.template.spec.containers[*]
- path: .spec.jobTemplate.spec.template.spec.initContainers[*]