Compare commits

...

4 Commits

Author SHA1 Message Date
jmanuelcorral
b34be3d744 Fixed NPM packages 2019-06-06 11:39:03 +02:00
jmanuelcorral
54626b5175 Merge branch 'dev' into features/addIntegrationIstio 2019-06-05 18:32:58 +02:00
jmanuelcorral
36fce8584b wip 2019-04-10 12:09:20 +02:00
jmanuelcorral
cc8715c3c9 Merge branch 'dev' into features/addIntegrationIstio 2019-03-28 11:33:10 +01:00
9 changed files with 472 additions and 2409 deletions

View File

@ -20,7 +20,7 @@ $dns = $externalDns
# Instalamos Istio # Instalamos Istio
# Specify the Istio version that will be leveraged throughout these instructions # Specify the Istio version that will be leveraged throughout these instructions
$ISTIO_VERSION="1.0.6" $ISTIO_VERSION="1.1.1"
# Windows # Windows
$ProgressPreference = 'SilentlyContinue'; $ProgressPreference = 'SilentlyContinue';
@ -28,7 +28,7 @@ $ProgressPreference = 'SilentlyContinue';
Invoke-WebRequest -URI "https://github.com/istio/istio/releases/download/$ISTIO_VERSION/istio-$ISTIO_VERSION-win.zip" -OutFile "istio-$ISTIO_VERSION.zip" Invoke-WebRequest -URI "https://github.com/istio/istio/releases/download/$ISTIO_VERSION/istio-$ISTIO_VERSION-win.zip" -OutFile "istio-$ISTIO_VERSION.zip"
Remove-Item istio-$ISTIO_VERSION -Recurse -ErrorAction Ignore Remove-Item istio-$ISTIO_VERSION -Recurse -ErrorAction Ignore
Expand-Archive -Path "istio-$ISTIO_VERSION.zip" -DestinationPath . Expand-Archive -Path "istio-$ISTIO_VERSION.zip" -DestinationPath .
Pause
if($installIstioOnSystem -eq $true) { if($installIstioOnSystem -eq $true) {
New-Item -ItemType Directory -Force -Path "C:\Program Files\Istio" New-Item -ItemType Directory -Force -Path "C:\Program Files\Istio"
mv ./istio-$ISTIO_VERSION/bin/istioctl.exe "C:\Program Files/Istio/" mv ./istio-$ISTIO_VERSION/bin/istioctl.exe "C:\Program Files/Istio/"
@ -49,7 +49,7 @@ kubectl -n istio-system create secret generic kiali --from-literal=username=$kia
Write-Host "Deploying Istio in the cluster" -ForegroundColor Green Write-Host "Deploying Istio in the cluster" -ForegroundColor Green
helm install istio-$ISTIO_VERSION/install/kubernetes/helm/istio --wait --name istio --namespace istio-system --set global.controlPlaneSecurityEnabled=true --set grafana.enabled=true --set tracing.enabled=true --set kiali.enabled=true helm install istio-$ISTIO_VERSION/install/kubernetes/helm/istio --wait --name istio --namespace istio-system --set global.mtls.enabled=false --set global.controlPlaneSecurityEnabled=false --set grafana.enabled=true --set tracing.enabled=true --set kiali.enabled=true
Write-Host "Setting Up Gateway" Write-Host "Setting Up Gateway"
kubectl delete gateway istio-autogenerated-k8s-ingress -n istio-system kubectl delete gateway istio-autogenerated-k8s-ingress -n istio-system

View File

@ -0,0 +1,96 @@
apiVersion: networking.istio.io/v1alpha3
kind: ServiceEntry
metadata:
name: basket-data
spec:
hosts:
- basket-data
ports:
- name: tcp
number: 6379
protocol: tcp
location: MESH_EXTERNAL
---
apiVersion: networking.istio.io/v1alpha3
kind: ServiceEntry
metadata:
name: keystore-data
spec:
hosts:
- keystore-data
ports:
- name: tcp
number: 6379
protocol: tcp
location: MESH_EXTERNAL
---
apiVersion: networking.istio.io/v1alpha3
kind: ServiceEntry
metadata:
name: nosql-data
spec:
hosts:
- nosql-data
ports:
- name: tcp
number: 27017
protocol: tcp
location: MESH_EXTERNAL
---
apiVersion: networking.istio.io/v1alpha3
kind: ServiceEntry
metadata:
name: rabbitmq
spec:
hosts:
- rabbitmq
ports:
- name: tcp
number: 5672
protocol: tcp
location: MESH_EXTERNAL
---
apiVersion: networking.istio.io/v1alpha3
kind: ServiceEntry
metadata:
name: sql-data
spec:
hosts:
- sql-data
ports:
- name: tcp
number: 1433
protocol: tcp
location: MESH_EXTERNAL
---
apiVersion: "networking.istio.io/v1alpha3"
kind: "DestinationRule"
metadata:
name: external
namespace: default
spec:
host: "*.eshop-infra.svc.cluster.local"
trafficPolicy:
tls:
mode: DISABLE
---
apiVersion: "networking.istio.io/v1alpha3"
kind: "DestinationRule"
metadata:
name: externalsql2
namespace: default
spec:
host: "sql-data"
trafficPolicy:
tls:
mode: DISABLE
---
apiVersion: "networking.istio.io/v1alpha3"
kind: DestinationRule
metadata:
name: "disable-tls"
spec:
host: "*"
trafficPolicy:
tls:
mode: DISABLE

Binary file not shown.

View File

@ -0,0 +1,20 @@
apiVersion: networking.istio.io/v1alpha3
kind: Sidecar
metadata:
name: sidecarconf
namespace: default
spec:
ingress:
- port:
number: 6379
protocol: TCP
name: redisingress
egress:
- hosts:
- "default/*"
- port:
number: 6379
protocol: TCP
name: redisegress
hosts:
- "default/*"

View File

@ -0,0 +1,56 @@
kind: Service
apiVersion: v1
metadata:
name: basket-data
namespace: default
spec:
type: ExternalName
externalName: basket-data.eshop-infra.svc.cluster.local
ports:
- port: 6379
---
kind: Service
apiVersion: v1
metadata:
name: keystore-data
namespace: default
spec:
type: ExternalName
externalName: keystore-data.eshop-infra.svc.cluster.local
ports:
- port: 6379
---
kind: Service
apiVersion: v1
metadata:
name: nosql-data
namespace: default
spec:
type: ExternalName
externalName: nosql-data.eshop-infra.svc.cluster.local
ports:
- port: 27017
---
kind: Service
apiVersion: v1
metadata:
name: rabbitmq
namespace: default
spec:
type: ExternalName
externalName: rabbitmq.eshop-infra.svc.cluster.local
ports:
- port: 5672
---
kind: Service
apiVersion: v1
metadata:
name: sql-data
namespace: default
spec:
type: ExternalName
externalName: sql-data.eshop-infra.svc.cluster.local
ports:
- port: 1433

View File

@ -13,3 +13,68 @@ spec:
protocol: HTTP protocol: HTTP
hosts: hosts:
- "*" - "*"
- port:
number: 6379
name: redis
protocol: TCP
hosts:
- "*"
- port:
number: 27017
name: mongo
protocol: TCP
hosts:
- "*"
- port:
number: 5672
name: rabbitmq
protocol: TCP
hosts:
- "*"
- port:
number: 1433
name: sql
protocol: TCP
hosts:
- "*"
---
apiVersion: networking.istio.io/v1alpha3
kind: Gateway
metadata:
name: istio-egressgateway
spec:
selector:
istio: egressgateway
servers:
- port:
number: 80
name: http
protocol: HTTP
hosts:
- "*"
- port:
number: 6379
name: redis
protocol: TCP
hosts:
- "basket-data.default.svc.cluster.local"
- "keystore-data.default.svc.cluster.local"
- port:
number: 27017
name: mongo
protocol: TCP
hosts:
- "nosql-data.default.svc.cluster.local"
- port:
number: 5672
name: rabbitmq
protocol: TCP
hosts:
- "rabbitmq.default.svc.cluster.local"
- port:
number: 1433
name: sql
protocol: TCP
hosts:
- "sql-data.default.svc.cluster.local"

View File

@ -57,3 +57,51 @@ spec:
port: port:
number: 80 number: 80
host: identity host: identity
---
apiVersion: networking.istio.io/v1alpha3
kind: DestinationRule
metadata:
name: basket-data-storage-dr
spec:
host: basket-data.default.svc.cluster.local
trafficPolicy:
tls:
mode: ISTIO_MUTUAL
---
apiVersion: networking.istio.io/v1alpha3
kind: DestinationRule
metadata:
name: keystore-data-dr
spec:
host: keystore-data.default.svc.cluster.local
trafficPolicy:
tls:
mode: ISTIO_MUTUAL
---
apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
name: basket-data-vs
spec:
hosts:
- basket-data
tcp:
route:
- destination:
host: basket-data.default.svc.cluster.local
port:
number: 6379
---
apiVersion: networking.istio.io/v1alpha3
kind: VirtualService
metadata:
name: keystore-data-vs
spec:
hosts:
- keystore-data
tcp:
route:
- destination:
host: keystore-data.default.svc.cluster.local
port:
number: 6379

File diff suppressed because it is too large Load Diff

View File

@ -39,6 +39,7 @@
"@angular/router": "^7.2.10", "@angular/router": "^7.2.10",
"@aspnet/signalr": "1.0.3", "@aspnet/signalr": "1.0.3",
"@ng-bootstrap/ng-bootstrap": "3.3.0", "@ng-bootstrap/ng-bootstrap": "3.3.0",
"acorn": "^6.1.1",
"bootstrap": "4.3.1", "bootstrap": "4.3.1",
"core-js": "^2.5.0", "core-js": "^2.5.0",
"file-loader": "2.0.0", "file-loader": "2.0.0",
@ -55,7 +56,7 @@
"zone.js": "^0.8.29" "zone.js": "^0.8.29"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^0.13.6", "@angular-devkit/build-angular": "^0.12.4",
"@angular/cli": "^7.3.6", "@angular/cli": "^7.3.6",
"@angular/compiler-cli": "^7.2.10", "@angular/compiler-cli": "^7.2.10",
"@angular/language-service": "^7.2.10", "@angular/language-service": "^7.2.10",
@ -66,7 +67,7 @@
"@types/protractor": "4.0.0", "@types/protractor": "4.0.0",
"@types/selenium-webdriver": "3.0.10", "@types/selenium-webdriver": "3.0.10",
"codelyzer": "^5.0.0-beta.1", "codelyzer": "^5.0.0-beta.1",
"handlebars": "~4.0.13", "handlebars": "^4.1.2",
"jasmine-core": "^3.3.0", "jasmine-core": "^3.3.0",
"jasmine-spec-reporter": "^4.2.1", "jasmine-spec-reporter": "^4.2.1",
"karma": "^4.0.1", "karma": "^4.0.1",
@ -79,11 +80,11 @@
"npm-watch": "0.5.0", "npm-watch": "0.5.0",
"protractor": "^5.4.2", "protractor": "^5.4.2",
"rxjs-tslint": "^0.1.7", "rxjs-tslint": "^0.1.7",
"sass-lint": "1.12.1", "sass-lint": "^1.13.1",
"ts-helpers": "1.1.2", "ts-helpers": "1.1.2",
"ts-node": "~7.0.1", "ts-node": "~7.0.1",
"tslint": "^5.14.0", "tslint": "^5.14.0",
"typedoc": "0.12.0", "typedoc": "^0.14.2",
"typescript": "^3.2.4", "typescript": "^3.2.4",
"url-loader": "1.1.1", "url-loader": "1.1.1",
"webpack": "^4.29.6" "webpack": "^4.29.6"