diff --git a/release/istio-manifests.yaml b/release/istio-manifests.yaml index 57d669d5ff9..e40dcd4c5ca 100644 --- a/release/istio-manifests.yaml +++ b/release/istio-manifests.yaml @@ -16,6 +16,20 @@ # WARNING: This file is autogenerated. Do not manually edit. # ---------------------------------------------------------- +apiVersion: networking.istio.io/v1alpha3 +kind: VirtualService +metadata: + name: frontend +spec: + hosts: + - "frontend.default.svc.cluster.local" + http: + - route: + - destination: + host: frontend + port: + number: 80 +--- apiVersion: networking.istio.io/v1alpha3 kind: Gateway metadata: @@ -48,20 +62,6 @@ spec: number: 80 --- apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: frontend -spec: - hosts: - - "frontend.default.svc.cluster.local" - http: - - route: - - destination: - host: frontend - port: - number: 80 ---- -apiVersion: networking.istio.io/v1alpha3 kind: ServiceEntry metadata: name: whitelist-egress-googleapis diff --git a/release/kubernetes-manifests.yaml b/release/kubernetes-manifests.yaml index 6a5f9468dd7..1daf3e574d9 100644 --- a/release/kubernetes-manifests.yaml +++ b/release/kubernetes-manifests.yaml @@ -19,37 +19,124 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: emailservice + name: frontend spec: selector: matchLabels: - app: emailservice + app: frontend template: metadata: labels: - app: emailservice + app: frontend + annotations: + sidecar.istio.io/rewriteAppHTTPProbers: "true" + spec: + containers: + - name: server + image: gcr.io/google-samples/microservices-demo/frontend:v0.1.5 + ports: + - containerPort: 8080 + readinessProbe: + initialDelaySeconds: 10 + httpGet: + path: "/_healthz" + port: 8080 + httpHeaders: + - name: "Cookie" + value: "shop_session-id=x-readiness-probe" + livenessProbe: + initialDelaySeconds: 10 + httpGet: + path: "/_healthz" + port: 8080 + httpHeaders: + - name: "Cookie" + value: "shop_session-id=x-liveness-probe" + env: + - name: PORT + value: "8080" + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: "productcatalogservice:3550" + - name: CURRENCY_SERVICE_ADDR + value: "currencyservice:7000" + - name: CART_SERVICE_ADDR + value: "cartservice:7070" + - name: RECOMMENDATION_SERVICE_ADDR + value: "recommendationservice:8080" + - name: SHIPPING_SERVICE_ADDR + value: "shippingservice:50051" + - name: CHECKOUT_SERVICE_ADDR + value: "checkoutservice:5050" + - name: AD_SERVICE_ADDR + value: "adservice:9555" + # - name: DISABLE_TRACING + # value: "1" + # - name: DISABLE_PROFILER + # value: "1" + # - name: JAEGER_SERVICE_ADDR + # value: "jaeger-collector:14268" + resources: + requests: + cpu: 100m + memory: 64Mi + limits: + cpu: 200m + memory: 128Mi +--- +apiVersion: v1 +kind: Service +metadata: + name: frontend +spec: + type: ClusterIP + selector: + app: frontend + ports: + - name: http + port: 80 + targetPort: 8080 +--- +apiVersion: v1 +kind: Service +metadata: + name: frontend-external +spec: + type: LoadBalancer + selector: + app: frontend + ports: + - name: http + port: 80 + targetPort: 8080 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: paymentservice +spec: + selector: + matchLabels: + app: paymentservice + template: + metadata: + labels: + app: paymentservice spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/emailservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/paymentservice:v0.1.5 ports: - - containerPort: 8080 + - containerPort: 50051 env: - name: PORT - value: "8080" - # - name: DISABLE_TRACING - # value: "1" - - name: DISABLE_PROFILER - value: "1" + value: "50051" readinessProbe: - periodSeconds: 5 exec: - command: ["/bin/grpc_health_probe", "-addr=:8080"] + command: ["/bin/grpc_health_probe", "-addr=:50051"] livenessProbe: - periodSeconds: 5 exec: - command: ["/bin/grpc_health_probe", "-addr=:8080"] + command: ["/bin/grpc_health_probe", "-addr=:50051"] resources: requests: cpu: 100m @@ -61,15 +148,15 @@ spec: apiVersion: v1 kind: Service metadata: - name: emailservice + name: paymentservice spec: type: ClusterIP selector: - app: emailservice + app: paymentservice ports: - name: grpc - port: 5000 - targetPort: 8080 + port: 50051 + targetPort: 50051 --- apiVersion: apps/v1 kind: Deployment @@ -86,7 +173,7 @@ spec: spec: containers: - name: server - image: gcr.io/google-samples/microservices-demo/checkoutservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/checkoutservice:v0.1.5 ports: - containerPort: 5050 readinessProbe: @@ -142,183 +229,126 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: recommendationservice + name: loadgenerator spec: selector: matchLabels: - app: recommendationservice + app: loadgenerator + replicas: 1 template: metadata: labels: - app: recommendationservice + app: loadgenerator + annotations: + sidecar.istio.io/rewriteAppHTTPProbers: "true" spec: terminationGracePeriodSeconds: 5 + restartPolicy: Always containers: - - name: server - image: gcr.io/google-samples/microservices-demo/recommendationservice:v0.1.4 - ports: - - containerPort: 8080 - readinessProbe: - periodSeconds: 5 - exec: - command: ["/bin/grpc_health_probe", "-addr=:8080"] - livenessProbe: - periodSeconds: 5 - exec: - command: ["/bin/grpc_health_probe", "-addr=:8080"] + - name: main + image: gcr.io/google-samples/microservices-demo/loadgenerator:v0.1.5 env: - - name: PORT - value: "8080" - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: "productcatalogservice:3550" - # - name: DISABLE_TRACING - # value: "1" - # - name: DISABLE_PROFILER - # value: "1" - # - name: DISABLE_DEBUGGER - # value: "1" + - name: FRONTEND_ADDR + value: "frontend:80" + - name: USERS + value: "10" resources: requests: - cpu: 100m - memory: 220Mi + cpu: 300m + memory: 256Mi limits: - cpu: 200m - memory: 450Mi ---- -apiVersion: v1 -kind: Service -metadata: - name: recommendationservice -spec: - type: ClusterIP - selector: - app: recommendationservice - ports: - - name: grpc - port: 8080 - targetPort: 8080 + cpu: 500m + memory: 512Mi --- apiVersion: apps/v1 kind: Deployment metadata: - name: frontend + name: redis-cart spec: selector: matchLabels: - app: frontend + app: redis-cart template: metadata: labels: - app: frontend - annotations: - sidecar.istio.io/rewriteAppHTTPProbers: "true" + app: redis-cart spec: containers: - - name: server - image: gcr.io/google-samples/microservices-demo/frontend:v0.1.4 - ports: - - containerPort: 8080 - readinessProbe: - initialDelaySeconds: 10 - httpGet: - path: "/_healthz" - port: 8080 - httpHeaders: - - name: "Cookie" - value: "shop_session-id=x-readiness-probe" - livenessProbe: - initialDelaySeconds: 10 - httpGet: - path: "/_healthz" - port: 8080 - httpHeaders: - - name: "Cookie" - value: "shop_session-id=x-liveness-probe" - env: - - name: PORT - value: "8080" - - name: PRODUCT_CATALOG_SERVICE_ADDR - value: "productcatalogservice:3550" - - name: CURRENCY_SERVICE_ADDR - value: "currencyservice:7000" - - name: CART_SERVICE_ADDR - value: "cartservice:7070" - - name: RECOMMENDATION_SERVICE_ADDR - value: "recommendationservice:8080" - - name: SHIPPING_SERVICE_ADDR - value: "shippingservice:50051" - - name: CHECKOUT_SERVICE_ADDR - value: "checkoutservice:5050" - - name: AD_SERVICE_ADDR - value: "adservice:9555" - # - name: DISABLE_TRACING - # value: "1" - # - name: DISABLE_PROFILER - # value: "1" - # - name: JAEGER_SERVICE_ADDR - # value: "jaeger-collector:14268" - resources: - requests: - cpu: 100m - memory: 64Mi - limits: - cpu: 200m - memory: 128Mi + - name: redis + image: redis:alpine + ports: + - containerPort: 6379 + readinessProbe: + periodSeconds: 5 + tcpSocket: + port: 6379 + livenessProbe: + periodSeconds: 5 + tcpSocket: + port: 6379 + volumeMounts: + - mountPath: /data + name: redis-data + resources: + limits: + memory: 256Mi + cpu: 125m + requests: + cpu: 70m + memory: 200Mi + volumes: + - name: redis-data + emptyDir: {} --- apiVersion: v1 kind: Service metadata: - name: frontend + name: redis-cart spec: type: ClusterIP selector: - app: frontend - ports: - - name: http - port: 80 - targetPort: 8080 ---- -apiVersion: v1 -kind: Service -metadata: - name: frontend-external -spec: - type: LoadBalancer - selector: - app: frontend + app: redis-cart ports: - - name: http - port: 80 - targetPort: 8080 + - name: redis + port: 6379 + targetPort: 6379 --- apiVersion: apps/v1 kind: Deployment metadata: - name: paymentservice + name: productcatalogservice spec: selector: matchLabels: - app: paymentservice + app: productcatalogservice template: metadata: labels: - app: paymentservice + app: productcatalogservice spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/paymentservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/productcatalogservice:v0.1.5 ports: - - containerPort: 50051 + - containerPort: 3550 env: - name: PORT - value: "50051" + value: "3550" + # - name: DISABLE_STATS + # value: "1" + # - name: DISABLE_TRACING + # value: "1" + # - name: DISABLE_PROFILER + # value: "1" + # - name: JAEGER_SERVICE_ADDR + # value: "jaeger-collector:14268" readinessProbe: exec: - command: ["/bin/grpc_health_probe", "-addr=:50051"] + command: ["/bin/grpc_health_probe", "-addr=:3550"] livenessProbe: exec: - command: ["/bin/grpc_health_probe", "-addr=:50051"] + command: ["/bin/grpc_health_probe", "-addr=:3550"] resources: requests: cpu: 100m @@ -330,38 +360,37 @@ spec: apiVersion: v1 kind: Service metadata: - name: paymentservice + name: productcatalogservice spec: type: ClusterIP selector: - app: paymentservice + app: productcatalogservice ports: - name: grpc - port: 50051 - targetPort: 50051 + port: 3550 + targetPort: 3550 --- apiVersion: apps/v1 kind: Deployment metadata: - name: productcatalogservice + name: shippingservice spec: selector: matchLabels: - app: productcatalogservice + app: shippingservice template: metadata: labels: - app: productcatalogservice + app: shippingservice spec: - terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/productcatalogservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/shippingservice:v0.1.5 ports: - - containerPort: 3550 + - containerPort: 50051 env: - name: PORT - value: "3550" + value: "50051" # - name: DISABLE_STATS # value: "1" # - name: DISABLE_TRACING @@ -371,11 +400,12 @@ spec: # - name: JAEGER_SERVICE_ADDR # value: "jaeger-collector:14268" readinessProbe: + periodSeconds: 5 exec: - command: ["/bin/grpc_health_probe", "-addr=:3550"] + command: ["/bin/grpc_health_probe", "-addr=:50051"] livenessProbe: exec: - command: ["/bin/grpc_health_probe", "-addr=:3550"] + command: ["/bin/grpc_health_probe", "-addr=:50051"] resources: requests: cpu: 100m @@ -387,105 +417,74 @@ spec: apiVersion: v1 kind: Service metadata: - name: productcatalogservice + name: shippingservice spec: type: ClusterIP selector: - app: productcatalogservice + app: shippingservice ports: - name: grpc - port: 3550 - targetPort: 3550 + port: 50051 + targetPort: 50051 --- apiVersion: apps/v1 kind: Deployment metadata: - name: cartservice + name: adservice spec: selector: matchLabels: - app: cartservice + app: adservice template: metadata: labels: - app: cartservice + app: adservice spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/cartservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/adservice:v0.1.5 ports: - - containerPort: 7070 + - containerPort: 9555 env: - - name: REDIS_ADDR - value: "redis-cart:6379" - name: PORT - value: "7070" - - name: LISTEN_ADDR - value: "0.0.0.0" + value: "9555" + # - name: DISABLE_STATS + # value: "1" + # - name: DISABLE_TRACING + # value: "1" + #- name: JAEGER_SERVICE_ADDR + # value: "jaeger-collector:14268" resources: requests: cpu: 200m - memory: 64Mi + memory: 180Mi limits: cpu: 300m - memory: 128Mi + memory: 300Mi readinessProbe: - initialDelaySeconds: 15 + initialDelaySeconds: 20 + periodSeconds: 15 exec: - command: ["/bin/grpc_health_probe", "-addr=:7070", "-rpc-timeout=5s"] + command: ["/bin/grpc_health_probe", "-addr=:9555"] livenessProbe: - initialDelaySeconds: 15 - periodSeconds: 10 + initialDelaySeconds: 20 + periodSeconds: 15 exec: - command: ["/bin/grpc_health_probe", "-addr=:7070", "-rpc-timeout=5s"] + command: ["/bin/grpc_health_probe", "-addr=:9555"] --- apiVersion: v1 kind: Service metadata: - name: cartservice + name: adservice spec: type: ClusterIP selector: - app: cartservice + app: adservice ports: - name: grpc - port: 7070 - targetPort: 7070 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: loadgenerator -spec: - selector: - matchLabels: - app: loadgenerator - replicas: 1 - template: - metadata: - labels: - app: loadgenerator - annotations: - sidecar.istio.io/rewriteAppHTTPProbers: "true" - spec: - terminationGracePeriodSeconds: 5 - restartPolicy: Always - containers: - - name: main - image: gcr.io/google-samples/microservices-demo/loadgenerator:v0.1.4 - env: - - name: FRONTEND_ADDR - value: "frontend:80" - - name: USERS - value: "10" - resources: - requests: - cpu: 300m - memory: 256Mi - limits: - cpu: 500m - memory: 512Mi + port: 9555 + targetPort: 9555 --- apiVersion: apps/v1 kind: Deployment @@ -503,7 +502,7 @@ spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/currencyservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/currencyservice:v0.1.5 ports: - name: grpc containerPort: 7000 @@ -546,169 +545,170 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: shippingservice + name: recommendationservice spec: selector: matchLabels: - app: shippingservice + app: recommendationservice template: metadata: labels: - app: shippingservice + app: recommendationservice spec: + terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/shippingservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/recommendationservice:v0.1.5 ports: - - containerPort: 50051 + - containerPort: 8080 + readinessProbe: + periodSeconds: 5 + exec: + command: ["/bin/grpc_health_probe", "-addr=:8080"] + livenessProbe: + periodSeconds: 5 + exec: + command: ["/bin/grpc_health_probe", "-addr=:8080"] env: - name: PORT - value: "50051" - # - name: DISABLE_STATS - # value: "1" + value: "8080" + - name: PRODUCT_CATALOG_SERVICE_ADDR + value: "productcatalogservice:3550" # - name: DISABLE_TRACING # value: "1" # - name: DISABLE_PROFILER # value: "1" - # - name: JAEGER_SERVICE_ADDR - # value: "jaeger-collector:14268" - readinessProbe: - periodSeconds: 5 - exec: - command: ["/bin/grpc_health_probe", "-addr=:50051"] - livenessProbe: - exec: - command: ["/bin/grpc_health_probe", "-addr=:50051"] + # - name: DISABLE_DEBUGGER + # value: "1" resources: requests: cpu: 100m - memory: 64Mi + memory: 220Mi limits: cpu: 200m - memory: 128Mi + memory: 450Mi --- apiVersion: v1 kind: Service metadata: - name: shippingservice + name: recommendationservice spec: type: ClusterIP selector: - app: shippingservice + app: recommendationservice ports: - name: grpc - port: 50051 - targetPort: 50051 + port: 8080 + targetPort: 8080 --- apiVersion: apps/v1 kind: Deployment metadata: - name: redis-cart + name: cartservice spec: selector: matchLabels: - app: redis-cart + app: cartservice template: metadata: labels: - app: redis-cart + app: cartservice spec: + terminationGracePeriodSeconds: 5 containers: - - name: redis - image: redis:alpine + - name: server + image: gcr.io/google-samples/microservices-demo/cartservice:v0.1.5 ports: - - containerPort: 6379 - readinessProbe: - periodSeconds: 5 - tcpSocket: - port: 6379 - livenessProbe: - periodSeconds: 5 - tcpSocket: - port: 6379 - volumeMounts: - - mountPath: /data - name: redis-data + - containerPort: 7070 + env: + - name: REDIS_ADDR + value: "redis-cart:6379" + - name: PORT + value: "7070" + - name: LISTEN_ADDR + value: "0.0.0.0" resources: - limits: - memory: 256Mi - cpu: 125m requests: - cpu: 70m - memory: 200Mi - volumes: - - name: redis-data - emptyDir: {} + cpu: 200m + memory: 64Mi + limits: + cpu: 300m + memory: 128Mi + readinessProbe: + initialDelaySeconds: 15 + exec: + command: ["/bin/grpc_health_probe", "-addr=:7070", "-rpc-timeout=5s"] + livenessProbe: + initialDelaySeconds: 15 + periodSeconds: 10 + exec: + command: ["/bin/grpc_health_probe", "-addr=:7070", "-rpc-timeout=5s"] --- apiVersion: v1 kind: Service metadata: - name: redis-cart + name: cartservice spec: type: ClusterIP selector: - app: redis-cart + app: cartservice ports: - - name: redis - port: 6379 - targetPort: 6379 + - name: grpc + port: 7070 + targetPort: 7070 --- apiVersion: apps/v1 kind: Deployment metadata: - name: adservice + name: emailservice spec: selector: matchLabels: - app: adservice + app: emailservice template: metadata: labels: - app: adservice + app: emailservice spec: terminationGracePeriodSeconds: 5 containers: - name: server - image: gcr.io/google-samples/microservices-demo/adservice:v0.1.4 + image: gcr.io/google-samples/microservices-demo/emailservice:v0.1.5 ports: - - containerPort: 9555 + - containerPort: 8080 env: - name: PORT - value: "9555" - # - name: DISABLE_STATS - # value: "1" + value: "8080" # - name: DISABLE_TRACING # value: "1" - #- name: JAEGER_SERVICE_ADDR - # value: "jaeger-collector:14268" - resources: - requests: - cpu: 200m - memory: 180Mi - limits: - cpu: 300m - memory: 300Mi + - name: DISABLE_PROFILER + value: "1" readinessProbe: - initialDelaySeconds: 20 - periodSeconds: 15 + periodSeconds: 5 exec: - command: ["/bin/grpc_health_probe", "-addr=:9555"] + command: ["/bin/grpc_health_probe", "-addr=:8080"] livenessProbe: - initialDelaySeconds: 20 - periodSeconds: 15 + periodSeconds: 5 exec: - command: ["/bin/grpc_health_probe", "-addr=:9555"] + command: ["/bin/grpc_health_probe", "-addr=:8080"] + resources: + requests: + cpu: 100m + memory: 64Mi + limits: + cpu: 200m + memory: 128Mi --- apiVersion: v1 kind: Service metadata: - name: adservice + name: emailservice spec: type: ClusterIP selector: - app: adservice + app: emailservice ports: - name: grpc - port: 9555 - targetPort: 9555 + port: 5000 + targetPort: 8080 ---