From df4663bd87d2d4d5748735be0b1f861c873e284b Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Thu, 23 May 2019 15:49:44 +0100 Subject: [PATCH 1/2] Handle empty Application Insights instrumentation key --- k8s/helm/basket-api/templates/configmap.yaml | 2 +- k8s/helm/catalog-api/templates/configmap.yaml | 2 +- k8s/helm/identity-api/templates/configmap.yaml | 2 +- k8s/helm/locations-api/templates/configmap.yaml | 2 +- k8s/helm/marketing-api/templates/configmap.yaml | 2 +- k8s/helm/mobileshoppingagg/templates/configmap.yaml | 2 +- k8s/helm/ordering-api/templates/configmap.yaml | 2 +- k8s/helm/ordering-backgroundtasks/templates/configmap.yaml | 2 +- k8s/helm/ordering-signalrhub/templates/configmap.yaml | 2 +- k8s/helm/payment-api/templates/configmap.yaml | 2 +- k8s/helm/webhooks-api/templates/configmap.yaml | 2 +- k8s/helm/webmvc/templates/configmap.yaml | 2 +- k8s/helm/webshoppingagg/templates/configmap.yaml | 2 +- k8s/helm/webspa/templates/configmap.yaml | 2 +- k8s/helm/webstatus/templates/configmap.yaml | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/k8s/helm/basket-api/templates/configmap.yaml b/k8s/helm/basket-api/templates/configmap.yaml index c851de359..911318fc1 100644 --- a/k8s/helm/basket-api/templates/configmap.yaml +++ b/k8s/helm/basket-api/templates/configmap.yaml @@ -15,5 +15,5 @@ data: urls__IdentityUrl: http://{{ $identity }} basket__EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}" all__EventBusConnection: {{ .Values.inf.eventbus.constr }} - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}" \ No newline at end of file diff --git a/k8s/helm/catalog-api/templates/configmap.yaml b/k8s/helm/catalog-api/templates/configmap.yaml index 95d8f2f9b..902b65f5c 100644 --- a/k8s/helm/catalog-api/templates/configmap.yaml +++ b/k8s/helm/catalog-api/templates/configmap.yaml @@ -16,5 +16,5 @@ data: catalog__PicBaseUrl: http://{{ $webshoppingapigw }}/api/v1/c/catalog/items/[0]/pic/ catalog__AzureStorageEnabled: "{{ .Values.inf.misc.useAzureStorage }}" all__EventBusConnection: {{ .Values.inf.eventbus.constr }} - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}" \ No newline at end of file diff --git a/k8s/helm/identity-api/templates/configmap.yaml b/k8s/helm/identity-api/templates/configmap.yaml index 67c0f21cb..264ceb745 100644 --- a/k8s/helm/identity-api/templates/configmap.yaml +++ b/k8s/helm/identity-api/templates/configmap.yaml @@ -24,7 +24,7 @@ metadata: data: identity__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.identity.db }};User Id={{ .Values.inf.sql.common.user }};Password={{ .Values.inf.sql.common.pwd }}; identity__keystore: {{ .Values.inf.redis.keystore.constr }} - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" mvc_e: http://{{ $mvc_url }} spa_e: http://{{ $spa_url }} locations_e: http://{{ $locations_url }} diff --git a/k8s/helm/locations-api/templates/configmap.yaml b/k8s/helm/locations-api/templates/configmap.yaml index 84881087d..c5d752509 100644 --- a/k8s/helm/locations-api/templates/configmap.yaml +++ b/k8s/helm/locations-api/templates/configmap.yaml @@ -13,7 +13,7 @@ metadata: heritage: {{ .Release.Service }} data: all__EventBusConnection: {{ .Values.inf.eventbus.constr }} - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}" all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}" internalurls__IdentityUrl: http://{{ .Values.app.svc.identity }} diff --git a/k8s/helm/marketing-api/templates/configmap.yaml b/k8s/helm/marketing-api/templates/configmap.yaml index 45f21e57d..123b21adf 100644 --- a/k8s/helm/marketing-api/templates/configmap.yaml +++ b/k8s/helm/marketing-api/templates/configmap.yaml @@ -15,7 +15,7 @@ metadata: heritage: {{ .Release.Service }} data: all__EventBusConnection: {{ .Values.inf.eventbus.constr }} - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}" all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}" internalurls__IdentityUrl: http://{{ .Values.app.svc.identity }} diff --git a/k8s/helm/mobileshoppingagg/templates/configmap.yaml b/k8s/helm/mobileshoppingagg/templates/configmap.yaml index d3e935409..6cad653a9 100644 --- a/k8s/helm/mobileshoppingagg/templates/configmap.yaml +++ b/k8s/helm/mobileshoppingagg/templates/configmap.yaml @@ -10,7 +10,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}" mobileshoppingagg__keystore: {{ .Values.inf.redis.keystore.constr }} internalurls__basket: http://{{ .Values.app.svc.basket }} diff --git a/k8s/helm/ordering-api/templates/configmap.yaml b/k8s/helm/ordering-api/templates/configmap.yaml index de4cb2d7a..efc829cda 100644 --- a/k8s/helm/ordering-api/templates/configmap.yaml +++ b/k8s/helm/ordering-api/templates/configmap.yaml @@ -16,5 +16,5 @@ data: ordering__EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}" urls__IdentityUrl: http://{{ $identity }} all__EventBusConnection: {{ .Values.inf.eventbus.constr }} - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}" \ No newline at end of file diff --git a/k8s/helm/ordering-backgroundtasks/templates/configmap.yaml b/k8s/helm/ordering-backgroundtasks/templates/configmap.yaml index 23041d4ac..7ed4a0e8e 100644 --- a/k8s/helm/ordering-backgroundtasks/templates/configmap.yaml +++ b/k8s/helm/ordering-backgroundtasks/templates/configmap.yaml @@ -15,7 +15,7 @@ data: ordering__ConnectionString: Server={{ $sqlsrv }};Initial Catalog={{ .Values.inf.sql.ordering.db }};User Id={{ .Values.inf.sql.common.user }};Password={{ .Values.inf.sql.common.pwd }}; ordering__EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}" all__EventBusConnection: {{ .Values.inf.eventbus.constr }} - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}" graceperiodmanager__CheckUpdateTime: "{{ .Values.cfg.checkUpdateTime }}" graceperiodmanager__GracePeriodTime: "{{ .Values.cfg.gracePeriodTime }}" \ No newline at end of file diff --git a/k8s/helm/ordering-signalrhub/templates/configmap.yaml b/k8s/helm/ordering-signalrhub/templates/configmap.yaml index addcf7e9d..bab4ebc94 100644 --- a/k8s/helm/ordering-signalrhub/templates/configmap.yaml +++ b/k8s/helm/ordering-signalrhub/templates/configmap.yaml @@ -12,7 +12,7 @@ metadata: heritage: {{ .Release.Service }} data: all__EventBusConnection: {{ .Values.inf.eventbus.constr }} - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}" signalr__StoreConnectionString: {{ .Values.inf.redis.keystore.constr }} urls__IdentityUrl: http://{{ $identity }} \ No newline at end of file diff --git a/k8s/helm/payment-api/templates/configmap.yaml b/k8s/helm/payment-api/templates/configmap.yaml index 6717705b5..3bdb95c0f 100644 --- a/k8s/helm/payment-api/templates/configmap.yaml +++ b/k8s/helm/payment-api/templates/configmap.yaml @@ -11,5 +11,5 @@ metadata: heritage: {{ .Release.Service }} data: all__EventBusConnection: {{ .Values.inf.eventbus.constr }} - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}" \ No newline at end of file diff --git a/k8s/helm/webhooks-api/templates/configmap.yaml b/k8s/helm/webhooks-api/templates/configmap.yaml index a18126858..ba1f21c42 100644 --- a/k8s/helm/webhooks-api/templates/configmap.yaml +++ b/k8s/helm/webhooks-api/templates/configmap.yaml @@ -16,5 +16,5 @@ data: urls__IdentityUrl: http://{{ $identity }} urls__IdentityUrlExternal: http://{{ $identity }} all__EventBusConnection: {{ .Values.inf.eventbus.constr }} - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}" \ No newline at end of file diff --git a/k8s/helm/webmvc/templates/configmap.yaml b/k8s/helm/webmvc/templates/configmap.yaml index 55c4e6b33..3e1e10cd1 100644 --- a/k8s/helm/webmvc/templates/configmap.yaml +++ b/k8s/helm/webmvc/templates/configmap.yaml @@ -14,7 +14,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}" all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}" webmvc__keystore: {{ .Values.inf.redis.keystore.constr }} diff --git a/k8s/helm/webshoppingagg/templates/configmap.yaml b/k8s/helm/webshoppingagg/templates/configmap.yaml index b4d3da041..efa3c7eaf 100644 --- a/k8s/helm/webshoppingagg/templates/configmap.yaml +++ b/k8s/helm/webshoppingagg/templates/configmap.yaml @@ -10,7 +10,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}" webshoppingagg__keystore: {{ .Values.inf.redis.keystore.constr }} internalurls__basket: http://{{ .Values.app.svc.basket }} diff --git a/k8s/helm/webspa/templates/configmap.yaml b/k8s/helm/webspa/templates/configmap.yaml index 7d4651a31..ea745436b 100644 --- a/k8s/helm/webspa/templates/configmap.yaml +++ b/k8s/helm/webspa/templates/configmap.yaml @@ -16,7 +16,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}" webspa__keystore: {{ .Values.inf.redis.keystore.constr }} internalurls__apigwws: http://{{ .Values.app.svc.webshoppingapigw }} diff --git a/k8s/helm/webstatus/templates/configmap.yaml b/k8s/helm/webstatus/templates/configmap.yaml index 3f32d7adc..4a1b612f2 100644 --- a/k8s/helm/webstatus/templates/configmap.yaml +++ b/k8s/helm/webstatus/templates/configmap.yaml @@ -15,7 +15,7 @@ metadata: release: {{ .Release.Name }} heritage: {{ .Release.Service }} data: - all__InstrumentationKey: {{ .Values.inf.appinsights.key }} + all__InstrumentationKey: "{{ .Values.inf.appinsights.key }}" all__UseAzureServiceBus: "{{ .Values.inf.eventbus.useAzure }}" all_EnableLoadTest: "{{ .Values.inf.misc.useLoadTest }}" webstatus__keystore: {{ .Values.inf.redis.keystore.constr }} From 0779a47565fa3f8e2dbb54ac1521f4b1d2ff1563 Mon Sep 17 00:00:00 2001 From: Miguel Veloso Date: Thu, 23 May 2019 16:11:35 +0100 Subject: [PATCH 2/2] =?UTF-8?q?Fix=20important=20comment=20formatting=20?= =?UTF-8?q?=F0=9F=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- k8s/helm/app.yaml | 2 +- k8s/helm/inf.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/k8s/helm/app.yaml b/k8s/helm/app.yaml index 6b1c36922..91e829b27 100644 --- a/k8s/helm/app.yaml +++ b/k8s/helm/app.yaml @@ -29,7 +29,7 @@ app: # app global settings catalog: catalog # service name for catalog api ordering: ordering # service name for ordering api orderingbackgroundtasks: orderingbackgroundtasks # service name for orderingbackgroundtasks - orderingsignalrhub: ordering-signalrhub # service name for orderingsignalrhub + orderingsignalrhub: ordering-signalrhub # service name for orderingsignalrhub identity: identity # service name for identity api mvc: webmvc # service name for web mvc spa: webspa # service name for web spa diff --git a/k8s/helm/inf.yaml b/k8s/helm/inf.yaml index b6ff102b0..ee4d1fde6 100644 --- a/k8s/helm/inf.yaml +++ b/k8s/helm/inf.yaml @@ -1,4 +1,4 @@ -# This heml values file defines all infrastructure used by eShopOnContainers. +# This helm values file defines all infrastructure used by eShopOnContainers. # It is used on all charts, so ** MUST BE INCLUDED ** on every deployment inf: @@ -15,11 +15,11 @@ inf: identity: db: IdentityDb # Ordering API SQL db name marketing: - db: MarketingDb # Marketing API SQL db name + db: MarketingDb # Marketing API SQL db name webhooks: - db: WebhooksDb # Webhooks DB + db: WebhooksDb # Webhooks DB mongo: -# host: my-nosql-data # Uncomment to use specify custom mongo host. By default nosql-data is used +# host: my-nosql-data # Uncomment to use specify custom mongo host. By default nosql-data is used locations: database: LocationsDb marketing: