Merge branch 'cloud-ark:master' into master

Author: SuyogShinde942

examples/multitenancy/hello-world/hello-world-service-composition-localchart.yaml

@@ -24,17 +24,6 @@ spec:
         kind: HelloWorldService 
         group: platformapi.kubeplus
         version: v1alpha1
-      policy:
-        # Add following requests and limits for the first container of all the Pods that are related via 
-        # owner reference relationship to instances of resources specified above.
-        podconfig:
-          limits:
-            cpu: 200m
-            memory: 2Gi
-          requests:
-            cpu: 100m
-            memory: 1Gi
-          nodeSelector: values.nodeName
   # resmonitor identifies the resource instances that should be monitored for CPU/Memory/Storage.
   # All the Pods that are related to the resource instance through either ownerReference relationship, or all the relationships
   # (ownerReference, label, annotation, spec properties) are considered in calculating the statistics. 

examples/multitenancy/hello-world/hello-world-service-composition.yaml

@@ -24,17 +24,6 @@ spec:
         kind: HelloWorldService 
         group: platformapi.kubeplus
         version: v1alpha1
-      policy:
-        # Add following requests and limits for the first container of all the Pods that are related via 
-        # owner reference relationship to instances of resources specified above.
-        podconfig:
-          limits:
-            cpu: 200m
-            memory: 2Gi
-          requests:
-            cpu: 100m
-            memory: 1Gi
-          nodeSelector: values.nodeName
   # resmonitor identifies the resource instances that should be monitored for CPU/Memory/Storage.
   # All the Pods that are related to the resource instance through either ownerReference relationship, or all the relationships
   # (ownerReference, label, annotation, spec properties) are considered in calculating the statistics. 

examples/multitenancy/hello-world/steps-app-upgrade.txt

@@ -2,9 +2,7 @@ Hello World as-a-Service
 -------------------------
 
 This example shows a basic Hello World Service creation. The provider creates HelloWorldService from the Hello World Helm chart.
-While creating the HelloWorldService, provider defines the resource requests and limits for cpu and memory resources for the Pods
-that will be created as part of this service's instances. The node on which the Pod(s) should be deployed is also
-defined as part of instance  creation. The consumer creates instances of HelloWorldService to run a Pod that displays Hello World. 
+The consumer creates an instance of HelloWorldService to run a Pod that displays Hello World. 
 
 Setup:
 ------
@@ -58,7 +56,7 @@ You can use either the provider.conf or consumer.conf in below commands.
 
 1. Check HelloWorldService man page
    - kubectl man HelloWorldService -k consumer.conf
-   You will see that this is a Kubernetes CRD with a spec property "greeting".
+   You will see that this is a Kubernetes CRD with a spec property "greeting" and "replicas".
 
 2. Create a hello world instance
    - more hs1-no-replicas.yaml
@@ -70,15 +68,9 @@ You can use either the provider.conf or consumer.conf in below commands.
    - kubectl get pods -A --kubeconfig=consumer.conf
      - you should see the hello world Pod in hs1 namespace
 
-4. Verify that resource requests and limits for cpu and memory have been set
-   on the hello world Pod as defined in the ResourceComposition definition in hello-world-service-composition.yaml
-   - HELLOWORLD_POD=`kubectl get pods -A --kubeconfig=consumer.conf | grep hello | awk '{print $2}'`
-   - HELLOWORLD_NS=`kubectl get pods -A --kubeconfig=consumer.conf | grep hello | awk '{print $1}'`
-   - kubectl get pods $HELLOWORLD_POD --kubeconfig=consumer.conf -n $HELLOWORLD_NS -o json | jq -r '.spec.containers[0].resources'
-
-5. Check the Kubernetes resources created by KubePlus for the application
+4. Check the Kubernetes resources created by KubePlus for the application
    - kubectl appresources HelloWorldService hs1 default -k consumer.conf
-     - Should see output of following nature:
+     - Should see output of the following nature:
 
 	NAMESPACE                 KIND                      NAME                      
 	default                   HelloWorldService         hs1                       
@@ -89,17 +81,17 @@ You can use either the provider.conf or consumer.conf in below commands.
 	hs1                       NetworkPolicy             restrict-cross-ns-traffic 
 
 
-6. Retrievel application url
+5. Retrievel application url
    - kubectl appurl HelloWorldService hs1 default -k consumer.conf
    - curl <app-url> from above output
      - should see "Hello hello hello" displayed
 
-7. Retrievel application logs
+6. Retrievel application logs
    - kubectl applogs HelloWorldService hs1 default -k consumer.conf
 
-8. Retrievel application metrics
+7. Retrievel application metrics
    - kubectl metrics HelloWorldService hs1 default -k consumer.conf
-     - Should see output of following nature:
+     - Should see output of the following nature:
 	---------------------------------------------------------- 
 	Kubernetes Resources created:
     		Number of Sub-resources: -
@@ -115,10 +107,14 @@ You can use either the provider.conf or consumer.conf in below commands.
     		Total Network bytes transferred: 0
 	---------------------------------------------------------- 
 
-9. Check resource connectivity graph
-   - kubectl connections HelloWorldService hs1 default -k consumer.conf -o png
+8. Test application update
+   - kubectl apply -f hs1-replicas-2.yaml --kubeconfig=consumer.conf
+
+9. Verify that 2 Pods are created in the hs1 namespace
+    - kubectl get pods -n hs1
+    - kubectl appresources HelloWorldService hs1 default -k consumer.conf
+    - kubectl metrics HelloWorldService hs1 default -k consumer.conf 
 
-10. Follow steps from steps-app-upgrade.txt to see an example of application upgrade.
 
 Clean up:
 -----------