Browse Source

Merge pull request #318 from SychevIgor/SychevIgor/GracePeriodDropFromk8

dropped GracePeriodManager from k8
pull/322/head
Eduard Tomàs 7 years ago
committed by GitHub
parent
commit
e85ce8332c
4 changed files with 0 additions and 68 deletions
  1. +0
    -4
      k8s/conf_cloud.yml
  2. +0
    -3
      k8s/conf_local.yml
  3. +0
    -47
      k8s/deployments.yaml
  4. +0
    -14
      k8s/services.yaml

+ 0
- 4
k8s/conf_cloud.yml View File

@ -27,10 +27,6 @@ data:
OrderingSqlDb: Ordering SQL SERVER CONNECTION STRING (Server=xxxx;Intial Catalog=yyy;....) OrderingSqlDb: Ordering SQL SERVER CONNECTION STRING (Server=xxxx;Intial Catalog=yyy;....)
# Payment.API entries # Payment.API entries
PaymentBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure) PaymentBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
# GracePeriodManager entries
GracePeriodTime: "5" # Grace period duration (time when you can cancel order) in minutes
GracePeriodCheckUpdateTime: "60000" # Interval time to check new Order status (in milliseconds)
GracePeriodManagerBus: CONNECTION_STRING (NAME OF RABBITMQ CONTAINER OR Endpoint=sb://XXXX in case of using Azure)
# Global entries # Global entries
UseAzureServiceBus: "TRUE" IF USE AZURE SB ("FALSE" FOR USING RABBITMQ) UseAzureServiceBus: "TRUE" IF USE AZURE SB ("FALSE" FOR USING RABBITMQ)
keystore: REDIS CONNECTION STRING FOR KEYSTORE keystore: REDIS CONNECTION STRING FOR KEYSTORE

+ 0
- 3
k8s/conf_local.yml View File

@ -21,8 +21,5 @@ data:
OrderingBus: rabbitmq OrderingBus: rabbitmq
OrderingSqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word; OrderingSqlDb: Server=sql-data;Initial Catalog=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;
PaymentBus: rabbitmq PaymentBus: rabbitmq
GracePeriodTime: "1"
GracePeriodCheckUpdateTime: "60000"
GracePeriodManagerBus: rabbitmq
UseAzureServiceBus: "False" UseAzureServiceBus: "False"
keystore: keystore-data keystore: keystore-data

+ 0
- 47
k8s/deployments.yaml View File

@ -198,53 +198,6 @@ spec:
--- ---
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata:
name: graceperiodmanager
spec:
paused: true
template:
metadata:
labels:
app: eshop
component: graceperiodmanager
spec:
containers:
- name: graceperiodmanager
image: eshop/graceperiodmanager
imagePullPolicy: Always
env:
- name: ConnectionString
valueFrom:
configMapKeyRef:
name: externalcfg
key: OrderingSqlDb
- name: EventBusConnection
valueFrom:
configMapKeyRef:
name: externalcfg
key: GracePeriodManagerBus
- name: GracePeriodTime
valueFrom:
configMapKeyRef:
name: externalcfg
key: GracePeriodTime
- name: CheckUpdateTime
valueFrom:
configMapKeyRef:
name: externalcfg
key: GracePeriodCheckUpdateTime
- name: AzureServiceBusEnabled
valueFrom:
configMapKeyRef:
name: externalcfg
key: UseAzureServiceBus
ports:
- containerPort: 80
imagePullSecrets:
- name: registry-key
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata: metadata:
name: locations name: locations
spec: spec:


+ 0
- 14
k8s/services.yaml View File

@ -56,20 +56,6 @@ spec:
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata:
labels:
app: eshop
component: graceperiodmanager
name: graceperiodmanager
spec:
ports:
- port: 80
selector:
app: eshop
component: graceperiodmanager
---
apiVersion: v1
kind: Service
metadata: metadata:
labels: labels:
app: eshop app: eshop


Loading…
Cancel
Save