Update for latest kwok

Signed-off-by: James Busche <[email protected]>

Author: jbusche

test/perf-test/cleanup-mcad-kwok.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-for i in `kubectl get appwrapper -n default |grep fake-defaultaw | awk '{print $1}'`; do kubectl delete appwrapper $i -n default ; done
+for i in `kubectl get appwrappers.workload.codeflare.dev -n default |grep fake-defaultaw | awk '{print $1}'`; do kubectl delete appwrappers.workload.codeflare.dev $i -n default ; done

test/perf-test/cleanup.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-for i in `kubectl get appwrapper -n default |grep defaultaw | awk '{print $1}'`; do kubectl delete appwrapper $i -n default ; done
+for i in `kubectl get appwrappers.workload.codeflare.dev -n default |grep defaultaw | awk '{print $1}'`; do kubectl delete appwrappers.workload.codeflare.dev $i -n default ; done

test/perf-test/preempt-exp-kwok.yaml

@@ -11,7 +11,6 @@ spec:
         growthType: "exponential" 
   priority: 9
   resources:
-    Items: []
     GenericItems:
     - replicas: 1
       completionstatus: Complete
@@ -38,7 +37,7 @@ spec:
             metadata:
               namespace: default
               labels:
-                appwrapper.mcad.ibm.com: "fake-defaultaw-schd-spec-with-timeout-1"
+                appwrappers.workload.codeflare.dev: "fake-defaultaw-schd-spec-with-timeout-1"
             spec:
               affinity:
                 nodeAffinity:

test/perf-test/preempt-exp.yaml

@@ -11,7 +11,6 @@ spec:
         growthType: "exponential" 
   priority: 9
   resources:
-    Items: []
     GenericItems:
     - replicas: 1
       completionstatus: Complete
@@ -32,15 +31,15 @@ spec:
           namespace: default
           name: defaultaw-schd-spec-with-timeout-1
           # labels:
-          #   appwrapper.mcad.ibm.com: defaultaw-schd-spec-with-timeout-1
+          #   appwrappers.workload.codeflare.dev: defaultaw-schd-spec-with-timeout-1
         spec:
           parallelism: 1
           completions: 1
           template:
             metadata:
               namespace: default
               labels:
-                appwrapper.mcad.ibm.com: "defaultaw-schd-spec-with-timeout-1"
+                appwrappers.workload.codeflare.dev: "defaultaw-schd-spec-with-timeout-1"
             spec:
               containers:
               - name: defaultaw-schd-spec-with-timeout-1

test/perf-test/simulatingnodesandappwrappers.md

@@ -80,40 +80,23 @@ kubectl get pods -n kube-system |grep mcad
 brew install jq
 ```
 
-### 2.2 Install the latest version of Kustomize
+### Step 2.2. Install KWOK in your KIND Cluster: 
+### 2.2.1 Variable Prep:
 ```
-brew install kustomize
+# KWOK repository
+KWOK_REPO=kubernetes-sigs/kwok
+# Get latest
+KWOK_LATEST_RELEASE=$(curl "https://api.github.com/repos/${KWOK_REPO}/releases/latest" | jq -r '.tag_name')
 ```
-
-### Step 2.3. Install KWOK in your KIND Cluster: 
-### 2.3.1 Variable Prep:
-```
-export KWOK_WORK_DIR=$(mktemp -d)
-export KWOK_REPO=kubernetes-sigs/kwok
-export KWOK_LATEST_RELEASE=$(curl "https://api.github.com/repos/${KWOK_REPO}/releases/latest" | jq -r '.tag_name')
-```
-### 2.3.2 Render kustomization yaml
-```
-cat <<EOF > "${KWOK_WORK_DIR}/kustomization.yaml"
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-  - name: registry.k8s.io/kwok/kwok
-    newTag: "${KWOK_LATEST_RELEASE}"
-resources:
-  - "https://github.com/${KWOK_REPO}/kustomize/kwok?ref=${KWOK_LATEST_RELEASE}"
-EOF
-```
-### 2.3.3 Render it with the prepared variables.
+### 2.2.2 Deployment kwok and set up CRDs
 ```
-kubectl kustomize "${KWOK_WORK_DIR}" > "${KWOK_WORK_DIR}/kwok.yaml"
+kubectl apply -f "https://github.com/${KWOK_REPO}/releases/download/${KWOK_LATEST_RELEASE}/kwok.yaml"
 ```
-### Step 2.4 Install the KWOK Controller in kube-system namespace:
-### 2.4.1 Apply your rendered yaml file from step 1.3 above:
+### 2.3.3 Set up default CRs of Stages (required)
 ```
-kubectl apply -f "${KWOK_WORK_DIR}/kwok.yaml"
+kubectl apply -f "https://github.com/${KWOK_REPO}/releases/download/${KWOK_LATEST_RELEASE}/stage-fast.yaml"
 ```
-### 2.4.2 Check to make sure the kwok controller started:
+### 2.4 Check to make sure the kwok controller started:
 ```
 kubectl get pods -n kube-system |grep kwok-controller
 ```
@@ -170,43 +153,23 @@ kubectl get pods -A |grep mcad-controller
 yum install make podman git tree jq go bc -y
 ```
 
-### 0.5 Install the latest version of Kustomize
-```
-OS=$(uname)
-curl -s "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"  | bash
-mv kustomize /usr/local/bin
-kustomize version
-```
-
 ## Step 1. Install KWOK in Cluster: 
 ### 1.1 Variable Prep:
 ```
-export KWOK_WORK_DIR=$(mktemp -d)
-export KWOK_REPO=kubernetes-sigs/kwok
-export KWOK_LATEST_RELEASE=$(curl "https://api.github.com/repos/${KWOK_REPO}/releases/latest" | jq -r '.tag_name')
-```
-### 1.2 Render kustomization yaml
-```
-cat <<EOF > "${KWOK_WORK_DIR}/kustomization.yaml"
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-  - name: registry.k8s.io/kwok/kwok
-    newTag: "${KWOK_LATEST_RELEASE}"
-resources:
-  - "https://github.com/${KWOK_REPO}/kustomize/kwok?ref=${KWOK_LATEST_RELEASE}"
-EOF
+# KWOK repository
+KWOK_REPO=kubernetes-sigs/kwok
+# Get latest
+KWOK_LATEST_RELEASE=$(curl "https://api.github.com/repos/${KWOK_REPO}/releases/latest" | jq -r '.tag_name')
 ```
-### 1.3 Render it with the prepared variables.
+### 1.2 Deployment kwok and set up CRDs
 ```
-kubectl kustomize "${KWOK_WORK_DIR}" > "${KWOK_WORK_DIR}/kwok.yaml"
+kubectl apply -f "https://github.com/${KWOK_REPO}/releases/download/${KWOK_LATEST_RELEASE}/kwok.yaml"
 ```
-## Step 2. Install the KWOK Controller in kube-system namespace:
-### 2.1 Apply your rendered yaml file from step 1.3 above:
+### 1.3 Set up default CRs of Stages (required)
 ```
-kubectl apply -f "${KWOK_WORK_DIR}/kwok.yaml"
+kubectl apply -f "https://github.com/${KWOK_REPO}/releases/download/${KWOK_LATEST_RELEASE}/stage-fast.yaml"
 ```
-### 2.2 Check to make sure the kwok controller started:
+### 2. Check to make sure the kwok controller started:
 ```
 kubectl get pods -n kube-system |grep kwok-controller
 ```