From 6ce340a33b29dfeb32c4b7605bcb51298f2edf8b Mon Sep 17 00:00:00 2001 From: jitender Date: Mon, 19 Aug 2019 15:22:51 +0530 Subject: [PATCH] Removed message service entry and used message-service k8s dns. Chart 0.5.0 --- charts/airdrop-service/Chart.yaml | 2 +- .../templates/serviceentry-message-server.yaml | 18 ------------------ .../virtualservice-message-server.yaml | 17 ----------------- charts/airdrop-service/values.yaml | 2 +- releases/dev/airdrop-service.yaml | 4 ++-- releases/prod/airdrop-service.yaml | 4 ++-- releases/staging/airdrop-service.yaml | 6 +++--- 7 files changed, 9 insertions(+), 44 deletions(-) delete mode 100644 charts/airdrop-service/templates/serviceentry-message-server.yaml delete mode 100644 charts/airdrop-service/templates/virtualservice-message-server.yaml diff --git a/charts/airdrop-service/Chart.yaml b/charts/airdrop-service/Chart.yaml index 162a044..01446f3 100644 --- a/charts/airdrop-service/Chart.yaml +++ b/charts/airdrop-service/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: Airdrop service. name: airdrop-service -version: 0.4.0 +version: 0.5.0 diff --git a/charts/airdrop-service/templates/serviceentry-message-server.yaml b/charts/airdrop-service/templates/serviceentry-message-server.yaml deleted file mode 100644 index 40b2353..0000000 --- a/charts/airdrop-service/templates/serviceentry-message-server.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: ServiceEntry -metadata: - name: {{ template "airdrop-service.fullname" . }}-message - labels: - app: {{ template "airdrop-service.name" . }} - chart: {{ template "airdrop-service.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - hosts: - - {{ .Values.external.hosts.message }} - location: MESH_EXTERNAL - ports: - - number: 8888 - name: http - protocol: HTTP - resolution: DNS \ No newline at end of file diff --git a/charts/airdrop-service/templates/virtualservice-message-server.yaml b/charts/airdrop-service/templates/virtualservice-message-server.yaml deleted file mode 100644 index 9e1bcdc..0000000 --- a/charts/airdrop-service/templates/virtualservice-message-server.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: networking.istio.io/v1alpha3 -kind: VirtualService -metadata: - name: {{ template "airdrop-service.fullname" . }}-message - labels: - app: {{ template "airdrop-service.name" . }} - chart: {{ template "airdrop-service.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -spec: - hosts: - - {{ .Values.external.hosts.message }} - http: - - route: - - destination: - host: {{ .Values.external.hosts.message }} - timeout: 30s \ No newline at end of file diff --git a/charts/airdrop-service/values.yaml b/charts/airdrop-service/values.yaml index bd89e7f..f62fb55 100644 --- a/charts/airdrop-service/values.yaml +++ b/charts/airdrop-service/values.yaml @@ -73,7 +73,7 @@ rest: external: hosts: qoinPro: "apis.qoinpro.com" - message: "" + #message: "" # LOGGING PROPERTIES logging: diff --git a/releases/dev/airdrop-service.yaml b/releases/dev/airdrop-service.yaml index 1a74191..432e15b 100644 --- a/releases/dev/airdrop-service.yaml +++ b/releases/dev/airdrop-service.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: airdrop-service - version: 0.4.0 + version: 0.5.0 values: replicaCount: 1 image: @@ -70,7 +70,7 @@ spec: external: hosts: qoinPro: "apis.qoinpro.com" - message: "nynja-dev-uw1-messaging01.dev.nynja.net" + #message: "nynja-dev-uw1-messaging01.dev.nynja.net" # LOGGING PROPERTIES logging: level: diff --git a/releases/prod/airdrop-service.yaml b/releases/prod/airdrop-service.yaml index e1f0080..8636efb 100644 --- a/releases/prod/airdrop-service.yaml +++ b/releases/prod/airdrop-service.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: airdrop-service - version: 0.4.0 + version: 0.5.0 values: replicaCount: 1 image: @@ -70,7 +70,7 @@ spec: external: hosts: qoinPro: "apis.qoinpro.com" - message: "messaging-service.messaging.svc.cluster.local" + #message: "messaging-service.messaging.svc.cluster.local" # LOGGING PROPERTIES logging: level: diff --git a/releases/staging/airdrop-service.yaml b/releases/staging/airdrop-service.yaml index ad14dbf..6e4e07a 100644 --- a/releases/staging/airdrop-service.yaml +++ b/releases/staging/airdrop-service.yaml @@ -8,7 +8,7 @@ spec: chart: repository: https://nynjagroup.jfrog.io/nynjagroup/helm/ name: airdrop-service - version: 0.4.0 + version: 0.5.0 values: replicaCount: 1 image: @@ -63,14 +63,14 @@ spec: # REST PROPERTIES rest: pushService: - address: "http://nynja-staging-ew3-messaging01.staging.nynja.net:8888" + address: "http://messaging-service.messaging.svc.cluster.local:8888" qoinPro: address: "https://apis.qoinpro.com" # External Hosts external: hosts: qoinPro: "apis.qoinpro.com" - message: "nynja-staging-ew3-messaging01.staging.nynja.net" + #message: "nynja-staging-ew3-messaging01.staging.nynja.net" # LOGGING PROPERTIES logging: level: -- GitLab