diff --git a/grabdish/ingress/nginx/ingress-nginx-helm-values4oci.yaml b/grabdish/ingress/nginx/ingress-nginx-helm-values4oci.yaml index bc0b52779..c7e1168b6 100644 --- a/grabdish/ingress/nginx/ingress-nginx-helm-values4oci.yaml +++ b/grabdish/ingress/nginx/ingress-nginx-helm-values4oci.yaml @@ -28,9 +28,13 @@ controller: annotations: service.beta.kubernetes.io/oci-load-balancer-ssl-ports: "443" service.beta.kubernetes.io/oci-load-balancer-tls-secret: ssl-certificate-secret - service.beta.kubernetes.io/oci-load-balancer-shape: "flexible" - service.beta.kubernetes.io/oci-load-balancer-shape-flex-min: "10" - service.beta.kubernetes.io/oci-load-balancer-shape-flex-max: "100" + service.beta.kubernetes.io/oci-load-balancer-shape: "100Mbps" + + # The 10 Mbps shape is Always Free eligible. + # https://docs.oracle.com/en-us/iaas/Content/Balance/Concepts/balanceoverview.htm#Overview\_of\_Load\_Balancing + # service.beta.kubernetes.io/oci-load-balancer-shape: "flexible" + # service.beta.kubernetes.io/oci-load-balancer-shape-flex-min: "10" + # service.beta.kubernetes.io/oci-load-balancer-shape-flex-max: "100" # enableHttp: false # enableHttps: true diff --git a/grabdish/inventory-helidon/undeploy.sh b/grabdish/inventory-helidon/undeploy.sh index 017ca9abb..c2499276a 100755 --- a/grabdish/inventory-helidon/undeploy.sh +++ b/grabdish/inventory-helidon/undeploy.sh @@ -2,9 +2,10 @@ ## Copyright (c) 2021 Oracle and/or its affiliates. ## Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/ +echo delete inventory-helidon deployment and service... -echo delete inventory-helidon deployment... +# Delete inventory-helidon Service +kubectl delete service inventory -n msdataworkshop -kubectl delete deployment inventory-helidon -n msdataworkshop - -# kubectl delete service inventory -n msdataworkshop +# Delete inventory-helidon Deployment +kubectl delete deployment inventory-helidon -n msdataworkshop \ No newline at end of file