merged master into dev-1.18 to keep in sync

2020-03-07 23:59:18 +05:30
parent a2a791addd 159bf5983d
commit a02b7e90ba
41 changed files with 4956 additions and 208 deletions
@@ -136,10 +136,10 @@ kubectl get ingress test-ingress

 ```
 NAME           HOSTS     ADDRESS           PORTS     AGE
-test-ingress   *         107.178.254.228   80        59s
+test-ingress   *         203.0.113.123   80        59s
 ```

-Where `107.178.254.228` is the IP allocated by the Ingress controller to satisfy
+Where `203.0.113.123` is the IP allocated by the Ingress controller to satisfy
 this Ingress.

 {{< note >}}