diff --git a/deploy/azure/azure-terraform/main.tf b/deploy/azure/azure-terraform/main.tf index 720de190..0c351d4e 100644 --- a/deploy/azure/azure-terraform/main.tf +++ b/deploy/azure/azure-terraform/main.tf @@ -157,7 +157,7 @@ resource "azurerm_dns_zone" "second-dns-zone" { depends_on = [ azurerm_kubernetes_cluster.o2nextgen-aks ] - name = "prf-cent.com" + name = "pfr-centr.com" resource_group_name = var.k8s_resource_group tags = { @@ -268,6 +268,17 @@ resource "azurerm_role_assignment" "main" { role_definition_name = "DNS Zone Contributor" principal_id = azuread_service_principal.current.object_id } +# Create role assignment for service principal +resource "azurerm_role_assignment" "main-second" { + scope = azurerm_dns_zone.second-dns-zone.id + role_definition_name = "DNS Zone Contributor" + principal_id = azuread_service_principal.current.object_id +} +resource "azurerm_role_assignment" "main-third" { + scope = azurerm_dns_zone.third-dns-zone.id + role_definition_name = "DNS Zone Contributor" + principal_id = azuread_service_principal.current.object_id +} # Create role assignment for service principal resource "azurerm_role_assignment" "reader" { @@ -502,7 +513,7 @@ resource "helm_release" "external-dns" { } set { name = "domainFilters" - value = "{${azurerm_dns_zone.primary-dns-zone.name}}" + value = "{${azurerm_dns_zone.primary-dns-zone.name},${azurerm_dns_zone.second-dns-zone.name},${azurerm_dns_zone.third-dns-zone.name}}" } set { name = "azure.resourceGroup" diff --git a/deploy/helm/o2bionics-webapp/values.yaml b/deploy/helm/o2bionics-webapp/values.yaml index df340c62..a2a42fb7 100644 --- a/deploy/helm/o2bionics-webapp/values.yaml +++ b/deploy/helm/o2bionics-webapp/values.yaml @@ -52,10 +52,15 @@ ingress: paths: - path: / pathType: ImplementationSpecific + - host: o2bionics.com + paths: + - path: / + pathType: ImplementationSpecific tls: - - secretName: tls-secret-o2bus + - secretName: tls-secret-o2bionics-com hosts: - o2bionics.o2bus.com + - o2bionics.com resources: #{} # We usually recommend not to specify default resources and to leave this as a conscious diff --git a/deploy/helm/ontracker-api/values.yaml b/deploy/helm/ontracker-api/values.yaml index 2811e847..d6b725d5 100644 --- a/deploy/helm/ontracker-api/values.yaml +++ b/deploy/helm/ontracker-api/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 image: - repository: o2nextgen.azurecr.io/ontracker-api #nginx + repository: nginx pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "latest" diff --git a/deploy/helm/pfr-webapp/.helmignore b/deploy/helm/pfr-webapp/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/deploy/helm/pfr-webapp/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/deploy/helm/pfr-webapp/Chart.yaml b/deploy/helm/pfr-webapp/Chart.yaml new file mode 100644 index 00000000..2bb88d04 --- /dev/null +++ b/deploy/helm/pfr-webapp/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: pfr-webapp +description: A Helm chart for Kubernetes + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/deploy/helm/pfr-webapp/templates/NOTES.txt b/deploy/helm/pfr-webapp/templates/NOTES.txt new file mode 100644 index 00000000..af7bf10a --- /dev/null +++ b/deploy/helm/pfr-webapp/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "pfr-webapp.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "pfr-webapp.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "pfr-webapp.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "pfr-webapp.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/deploy/helm/pfr-webapp/templates/_helpers.tpl b/deploy/helm/pfr-webapp/templates/_helpers.tpl new file mode 100644 index 00000000..ebbb4b2c --- /dev/null +++ b/deploy/helm/pfr-webapp/templates/_helpers.tpl @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "pfr-webapp.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "pfr-webapp.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "pfr-webapp.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "pfr-webapp.labels" -}} +helm.sh/chart: {{ include "pfr-webapp.chart" . }} +{{ include "pfr-webapp.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "pfr-webapp.selectorLabels" -}} +app.kubernetes.io/name: {{ include "pfr-webapp.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "pfr-webapp.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "pfr-webapp.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/deploy/helm/pfr-webapp/templates/deployment.yaml b/deploy/helm/pfr-webapp/templates/deployment.yaml new file mode 100644 index 00000000..87a575d9 --- /dev/null +++ b/deploy/helm/pfr-webapp/templates/deployment.yaml @@ -0,0 +1,61 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "pfr-webapp.fullname" . }} + labels: + {{- include "pfr-webapp.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "pfr-webapp.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "pfr-webapp.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "pfr-webapp.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: 80 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + readinessProbe: + httpGet: + path: / + port: http + resources: + {{- toYaml .Values.resources | nindent 12 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/deploy/helm/pfr-webapp/templates/hpa.yaml b/deploy/helm/pfr-webapp/templates/hpa.yaml new file mode 100644 index 00000000..bee0a582 --- /dev/null +++ b/deploy/helm/pfr-webapp/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "pfr-webapp.fullname" . }} + labels: + {{- include "pfr-webapp.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "pfr-webapp.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/deploy/helm/pfr-webapp/templates/ingress.yaml b/deploy/helm/pfr-webapp/templates/ingress.yaml new file mode 100644 index 00000000..3400e931 --- /dev/null +++ b/deploy/helm/pfr-webapp/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "pfr-webapp.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "pfr-webapp.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/deploy/helm/pfr-webapp/templates/service.yaml b/deploy/helm/pfr-webapp/templates/service.yaml new file mode 100644 index 00000000..f507b28e --- /dev/null +++ b/deploy/helm/pfr-webapp/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "pfr-webapp.fullname" . }} + labels: + {{- include "pfr-webapp.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "pfr-webapp.selectorLabels" . | nindent 4 }} diff --git a/deploy/helm/pfr-webapp/templates/serviceaccount.yaml b/deploy/helm/pfr-webapp/templates/serviceaccount.yaml new file mode 100644 index 00000000..b30837c5 --- /dev/null +++ b/deploy/helm/pfr-webapp/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "pfr-webapp.serviceAccountName" . }} + labels: + {{- include "pfr-webapp.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/deploy/helm/pfr-webapp/templates/tests/test-connection.yaml b/deploy/helm/pfr-webapp/templates/tests/test-connection.yaml new file mode 100644 index 00000000..a538ca8d --- /dev/null +++ b/deploy/helm/pfr-webapp/templates/tests/test-connection.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Pod +metadata: + name: "{{ include "pfr-webapp.fullname" . }}-test-connection" + labels: + {{- include "pfr-webapp.labels" . | nindent 4 }} + annotations: + "helm.sh/hook": test +spec: + containers: + - name: wget + image: busybox + command: ['wget'] + args: ['{{ include "pfr-webapp.fullname" . }}:{{ .Values.service.port }}'] + restartPolicy: Never diff --git a/deploy/helm/pfr-webapp/values.yaml b/deploy/helm/pfr-webapp/values.yaml new file mode 100644 index 00000000..3fffaf7f --- /dev/null +++ b/deploy/helm/pfr-webapp/values.yaml @@ -0,0 +1,88 @@ +# Default values for pfr-webapp. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: nginx + pullPolicy: IfNotPresent + # Overrides the image tag whose default is the chart appVersion. + tag: "" + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: true + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} + # fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true + # runAsNonRoot: true + # runAsUser: 1000 + +service: + type: ClusterIP + port: 80 + +ingress: + enabled: true + className: "" + annotations: + cert-manager.io/cluster-issuer: letsencrypt + kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + # - host: pfr-webapp.o2bus.com + # paths: + # - path: / + # pathType: ImplementationSpecific + - host: pfr-centr.com + paths: + - path: / + pathType: ImplementationSpecific + tls: + - secretName: tls-secret-pfr-webapp-com + hosts: + # - pfr-webapp.o2bus.com + - pfr-centr.com + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/GeoController.cs b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/GeoController.cs index b51b44e0..b80dc7b7 100644 --- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/GeoController.cs +++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/GeoController.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System.Diagnostics; +using System.Linq; using System.Net; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Mvc; @@ -20,8 +21,11 @@ public GeoController(IGeoIpAddressResolver geoIpAddressResolver) [HttpGet] public ActionResult Get() { + Debug.WriteLine("start"); // var ip = HttpContext.Features.Get()?.RemoteIpAddress; - IPAddress remoteIpAddress = HttpContext.Features.Get()?.RemoteIpAddress;//Request.HttpContext.Connection.RemoteIpAddress; + //IPAddress remoteIpAddress = HttpContext.Features.Get()?.RemoteIpAddress;//Request.HttpContext.Connection.RemoteIpAddress; + //IPAddress remoteIpAddress = Request.HttpContext.Connection.RemoteIpAddress;// + IPAddress remoteIpAddress = HttpContext.Features.Get()?.RemoteIpAddress; string result = ""; if (remoteIpAddress != null) { @@ -34,37 +38,13 @@ public ActionResult Get() } result = remoteIpAddress.ToString(); } - + Debug.WriteLine(remoteIpAddress.ToString()); if (result.ToString() == "127.0.0.1") return Ok("request with localhost"); return Ok(_geoIpAddressResolver.ResolveAddress(IPAddress.Parse(result.ToString()))); // return new string[] { "value1", "value2" }; } - // GET api/values/5 - [HttpGet("{id}")] - public ActionResult Get(int id) - { - return "value"; - } - - // POST api/values - [HttpPost] - public void Post([FromBody] string value) - { - } - - // PUT api/values/5 - [HttpPut("{id}")] - public void Put(int id, [FromBody] string value) - { - } - - // DELETE api/values/5 - [HttpDelete("{id}")] - public void Delete(int id) - { - } } } diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/VersionController.cs b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/VersionController.cs new file mode 100644 index 00000000..bbef0412 --- /dev/null +++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Controllers/VersionController.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; + +// For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 + +namespace O2NextGen.OnTracker.Api.Controllers +{ + public class VersionController : Controller + { + // GET: // + public IActionResult Index() + { + return View(); + } + } +} + diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj index 0a30912c..25fa8b90 100644 --- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj +++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/O2NextGen.OnTracker.Api.csproj @@ -5,7 +5,6 @@ ../docker-compose.dcproj - diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Properties/launchSettings.json b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Properties/launchSettings.json index 449019e7..0ecbe017 100644 --- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Properties/launchSettings.json +++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Properties/launchSettings.json @@ -1,18 +1,9 @@ { "profiles": { - "O2.OnTracker.Api": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "swagger", - "applicationUrl": "https://localhost:57549;http://localhost:43192", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, "O2NextGen.OnTracker.Api": { "commandName": "Project", "launchBrowser": true, - "applicationUrl": "https://localhost:65042;http://localhost:49779", + "applicationUrl": "https://localhost:5001;http://localhost:5011", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs index a90cc930..e73c7900 100644 --- a/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs +++ b/src/Services/on-tracker/O2NextGen.OnTracker.Api/Startup.cs @@ -48,13 +48,14 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) { app.UseDeveloperExceptionPage(); } - else - { - app.UseHsts(); - } + //else + //{ + // app.UseHsts(); + //} + app.UseSwagger() .UseSwaggerUI(c => { c.SwaggerEndpoint($"/swagger/v1/swagger.json", "On-Tracker API V1"); }); - app.UseHttpsRedirection(); + //app.UseHttpsRedirection(); //app.UseMvc(routes => { // routes.MapRoute(name: "default", template: "{controller=Home}/{action=Index}/{id?}"); //});