Browse Source

Fix errors on las commit

features/addIntegrationIstio
jmanuelcorral 6 years ago
parent
commit
b19d4f2fc8
1 changed files with 0 additions and 32 deletions
  1. +0
    -32
      k8s/istio/JourneyToIstio.md

+ 0
- 32
k8s/istio/JourneyToIstio.md View File

@ -4,7 +4,6 @@ You need the eshopsOnContainers configured on your local, with this
in a powershell console, we need to enter in /k8s/istio and execute
```
>kubectl get pods
<<<<<<< HEAD
NAME READY STATUS RESTARTS AGE
eshop-apigwmm-54ccc6c589-557fn 0/1 Running 31 4h
eshop-apigwms-7d5f86cf7c-2j2zp 0/1 Running 32 4h
@ -31,34 +30,6 @@ eshop-webmvc-55c596544b-9fqsj 1/1 Running 2
eshop-webshoppingagg-f8547f45b-4mjvp 0/1 Running 21 4h
eshop-webspa-84fd54466d-hzrlb 1/1 Running 2 4h
eshop-webstatus-775b487d4d-tbfbn 1/1 Running 1 4h
=======
NAME READY STATUS RESTARTS AGE
eshop-apigwmm-54ccc6c589-557fn 0/1 Running 26 3h
eshop-apigwms-7d5f86cf7c-2j2zp 0/1 CrashLoopBackOff 30 3h
eshop-apigwwm-7794b6d879-7j4mt 0/1 CrashLoopBackOff 39 3h
eshop-apigwws-8585f6899f-7kkg2 0/1 Running 11 3h
eshop-basket-api-8bfc5c5f6-8xxcv 0/1 Running 41 3h
eshop-basket-data-66fbc788cc-dmkgb 1/1 Running 0 3h
eshop-catalog-api-c77747b76-4gp6c 0/1 CrashLoopBackOff 40 3h
eshop-identity-api-7574f6b458-4rbp6 0/1 CrashLoopBackOff 44 3h
eshop-keystore-data-5c9c85cb99-s5qz7 1/1 Running 0 3h
eshop-locations-api-64847646d-5wv52 0/1 CrashLoopBackOff 36 3h
eshop-marketing-api-745f9546b8-krjqq 0/1 Running 33 3h
eshop-mobileshoppingagg-7d467f86bd-bw9c7 0/1 Running 22 3h
eshop-nosql-data-579c9d89f8-x4z2k 1/1 Running 0 3h
eshop-ordering-api-5c55bd5464-7hnjx 0/1 CrashLoopBackOff 38 3h
eshop-ordering-backgroundtasks-f6dcb7db4-xq7gr 1/1 Running 22 3h
eshop-ordering-signalrhub-6664868779-dphxm 1/1 Running 0 3h
eshop-payment-api-7988db5f76-z76tc 1/1 Running 17 3h
eshop-rabbitmq-6b68647bc4-qjjrb 1/1 Running 0 3h
eshop-sql-data-5c4fdcccf4-2z5dm 1/1 Running 0 3h
eshop-webhooks-api-588b58bb66-lmx5c 1/1 Running 0 3h
eshop-webhooks-web-565c68b59c-dk8hp 1/1 Running 0 3h
eshop-webmvc-55c596544b-9fqsj 1/1 Running 0 3h
eshop-webshoppingagg-f8547f45b-4mjvp 0/1 CrashLoopBackOff 16 3h
eshop-webspa-84fd54466d-hzrlb 1/1 Running 0 3h
eshop-webstatus-775b487d4d-tbfbn 1/1 Running 0 3h
>>>>>>> abb108e03dd0ddf0b43d7ea4b2f5b307452ac88e
```
```ps1
@ -100,7 +71,6 @@ enter in k8s/istio/kiali and execute:
```
this script will prompt for a valid account/password and setups the secret in kubernetes
(at the moment account/password will be admin/admin we need to modify the yml)
<<<<<<< HEAD
After enter in /k8s/istio/nginx-ingress that execute, we need to apply the istio integration with nginx-ingress for service-upstream.
@ -113,5 +83,3 @@ and run:
```
> ./apply-injection.ps1
````
=======
>>>>>>> abb108e03dd0ddf0b43d7ea4b2f5b307452ac88e

Loading…
Cancel
Save