mvc devspace

k8s/helm/webmvc/templates/configmap.yaml

@@ -2,7 +2,6 @@
 {{- $identity := include "url-of" (list .Values.app.ingress.entries.identity .) -}}
 {{- $webshoppingapigw := include "url-of" (list .Values.app.ingress.entries.webshoppingapigw .) -}}
 {{- $mvc := include "url-of" (list .Values.app.ingress.entries.mvc .) -}}
-{{- $mongo := include "mongo-name" . -}}
 
 
 apiVersion: v1

src/Services/Catalog/Catalog.API/inf.yaml

@@ -10,6 +10,7 @@ inf:
       pid: Developer
     catalog:                # inf.sql.catalog: settings for the catalog-api sql (user, pwd, db) 
       db: CatalogDb         # Catalog API SQL db name
+  redis:
     keystore:
       svc: keystore-data    # Name of k8s svc for keystore-data redis
       constr: keystore-data # Connection string to Redis used as a Keystore (by Identity API)

src/Services/Identity/Identity.API/inf.yaml

@@ -10,9 +10,6 @@ inf:
       pid: Developer
     identity:
       db: IdentityDb        # Ordering API SQL db name
-    keystore:
-      svc: keystore-data    # Name of k8s svc for keystore-data redis
-      constr: keystore-data # Connection string to Redis used as a Keystore (by Identity API)
   redis:                    # inf.redis defines the redis' connection strings
     keystore:
       svc: keystore-data    # Name of k8s svc for keystore-data redis

src/Web/WebMVC/.dockerignore

@@ -0,0 +1,14 @@
+.dockerignore
+.git
+.gitignore
+.vs
+.vscode
+**/*.*proj.user
+**/azds.yaml
+**/bin
+**/charts
+**/Dockerfile
+**/Dockerfile.develop
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml

src/Web/WebMVC/Dockerfile.develop

@@ -0,0 +1,16 @@
+FROM microsoft/dotnet:2.1-sdk
+ARG BUILD_CONFIGURATION=Debug
+ENV ASPNETCORE_ENVIRONMENT=Development
+ENV DOTNET_USE_POLLING_FILE_WATCHER=true
+EXPOSE 80
+
+WORKDIR /src
+COPY ["src/Web/WebMVC/WebMVC.csproj", "src/Web/WebMVC/"]
+COPY ["src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/Microsoft.AspNetCore.HealthChecks.csproj", "src/BuildingBlocks/HealthChecks/src/Microsoft.AspNetCore.HealthChecks/"]
+COPY ["src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/Microsoft.Extensions.HealthChecks.csproj", "src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks/"]
+RUN dotnet restore "src/Web/WebMVC/WebMVC.csproj"
+COPY . .
+WORKDIR "/src/src/Web/WebMVC"
+RUN dotnet build --no-restore -c $BUILD_CONFIGURATION
+
+ENTRYPOINT ["dotnet", "run", "--no-restore", "--no-build", "--no-launch-profile", "-c", "$BUILD_CONFIGURATION", "--"]

src/Web/WebMVC/app.yaml

@@ -0,0 +1,39 @@
+app:                                                  # app global settings
+  name: "my-eshop"                                    # Override for custom app name
+  ingress:                                            # ingress related settings
+    entries:
+      basket: basket-api                              # ingress entry for basket api
+      catalog: catalog-api                            # ingress entry for catalog api
+      ordering: ordering-api                          # ingress entry for ordering api
+      identity: identity                              # ingress entry for identity api
+      mvc: webmvc                                     # ingress entry for web mvc
+      spa: ""                                         # ingress entry for web spa
+      status: webstatus                               # ingress entry for web status
+      webshoppingapigw: webshoppingapigw              # ingress entry for web shopping Agw
+      webmarketingapigw: webmarketingapigw            # ingress entry for web mkg Agw
+      mobilemarketingapigw: mobilemarketingapigw      # ingress entry for mobile mkg Agw
+      mobileshoppingapigw: mobileshoppingapigw        # ingress entry for mobile shopping Agw
+      webshoppingagg: webshoppingagg                  # ingress entry for web shopping aggregator
+      mobileshoppingagg: mobileshoppingagg            # ingress entry for mobile shopping aggregator
+      payment: payment-api                            # ingress entry for payment api
+      locations: locations-api                        # ingress entry for locations api
+      marketing: marketing-api                        # ingress entry for marketing api 
+  svc:
+      basket: basket                                    # service name for basket api
+      catalog: catalog                                  # service name for catalog api
+      ordering: ordering                                # service name for ordering api
+      orderingbackgroundtasks: orderingbackgroundtasks  # service name for orderingbackgroundtasks
+      orderingsignalrhub: orderingsignalrhub            # 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
+      status: webstatus                                 # service name for web status
+      webshoppingapigw: webshoppingapigw                # service name for web shopping Agw
+      webmarketingapigw: webmarketingapigw              # service name for web mkg Agw
+      mobilemarketingapigw: mobilemarketingapigw        # service name for mobile mkg Agw
+      mobileshoppingapigw: mobileshoppingapigw          # service name for mobile shopping Agw
+      webshoppingagg: webshoppingagg                    # service name for web shopping aggregator
+      mobileshoppingagg: mobileshoppingagg              # service name for mobile shopping aggregator
+      payment: payment                                  # service name for payment api
+      locations: locations                              # service name for locations api
+      marketing: marketing                              # service name for marketing api

src/Web/WebMVC/azds.yaml

@@ -0,0 +1,42 @@
+kind: helm-release
+apiVersion: 1.0
+build:
+  context: ..\..\..\
+  dockerfile: Dockerfile
+install:
+  chart: ../../../k8s/helm/webmvc
+  values:
+  - values.dev.yaml?
+  - secrets.dev.yaml?
+  - inf.yaml
+  - app.yaml
+  set:
+    replicaCount: 1
+    image:
+      tag: $(tag)
+      pullPolicy: Never
+    inf:
+      k8s:
+        dns: "$(spacePrefix)webmvc$(hostSuffix)"
+    ingress:
+      hosts:
+      # This expands to [space.s.]webmvc.<guid>.<region>.aksapp.io
+      - $(spacePrefix)webmvc$(hostSuffix)
+configurations:
+  develop:
+    build:
+      dockerfile: Dockerfile.develop
+      useGitIgnore: true
+      args:
+        BUILD_CONFIGURATION: ${BUILD_CONFIGURATION:-Debug}
+    container:
+      sync:
+      - "**/Pages/**"
+      - "**/Views/**"
+      - "**/wwwroot/**"
+      - "!**/*.{sln,csproj}"
+      command: [dotnet, run, --no-restore, --no-build, --no-launch-profile, -c, "${BUILD_CONFIGURATION:-Debug}"]
+      iterate:
+        processesToKill: [dotnet, vsdbg]
+        buildCommands:
+        - [dotnet, build, --no-restore, -c, "${BUILD_CONFIGURATION:-Debug}"]

src/Web/WebMVC/inf.yaml

@@ -0,0 +1,24 @@
+# This heml values file defines all infrastructure used by eShopOnContainers.
+# It is used on all charts, so ** MUST BE INCLUDED ** on every deployment
+
+inf:
+  redis:
+    keystore:
+      svc: keystore-data    # Name of k8s svc for keystore-data redis
+      constr: keystore-data # Connection string to Redis used as a Keystore (by Identity API)
+  appinsights:
+      key: ""               # App insights to use
+  k8s: {}
+  eventbus:
+    svc: rabbitmq           # Name of k8s svc for rabbitmq
+    constr: rabbitmq        # Event bus connection string
+    useAzure: false         # true if use Azure Service Bus. False if RabbitMQ
+  misc:                     # inf.misc contains miscellaneous configuration related to infrastructure
+    useLoadTest: false      # If running under loading test or not
+    useAzureStorage: false  # If catalog api uses azure storage or not
+
+ingress:
+  annotations:
+    kubernetes.io/ingress.class: addon-http-application-routing
+    ingress.kubernetes.io/ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"

src/Web/WebMVC/package-lock.json

@@ -19,7 +19,7 @@
       "resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.4.tgz",
       "integrity": "sha1-i0O+ZPudDEFIcURvLbjoyk6V8YE=",
       "requires": {
-        "jquery": "3.3.1"
+        "jquery": ">=1.12.0"
       }
     }
   }