update with master content resolving merge conflicts

2019-06-19 19:10:18 +03:00
parent b42f019aae 42cbe1256e
commit 8781518d32
1439 changed files with 70927 additions and 43295 deletions
@@ -97,7 +97,7 @@ which should produce output like this:
    Selector:               app=example
    Type:                   LoadBalancer
    IP:                     10.67.252.103
-    LoadBalancer Ingress:   123.45.67.89
+    LoadBalancer Ingress:   192.0.2.89
    Port:                   <unnamed> 80/TCP
    NodePort:               <unnamed> 32445/TCP
    Endpoints:              10.64.0.4:80,10.64.1.5:80,10.64.2.4:80