Attempted merge branch 'master' of github.com:lynn-orrell/reddog

.github/workflows/package-services.yaml

@@ -73,15 +73,26 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v2
 
-    - name: Pushes manifests to the target repo
+    - name: Push branch manifests
       uses: dmnemec/copy_file_to_another_repo_action@main
       env:
         API_TOKEN_GITHUB: ${{ secrets.CR_PAT }}
       with:
-        source_file: 'components/'
+        source_file: 'manifests/branch'
         destination_repo: 'cloudnativegbb/paas-vnext'
         destination_branch: 'ghactions-manifests'
-#         destination_folder: 'test-dir'
+        destination_folder: 'app/manifests'
+        user_email: 'noreply-cloudnativegbb@microsoft.com'
+        user_name: 'cloudnativegbb'
+
+    - name: Push corporate manifests
+      uses: dmnemec/copy_file_to_another_repo_action@main
+      env:
+        API_TOKEN_GITHUB: ${{ secrets.CR_PAT }}
+      with:
+        source_file: 'manifests/corporate'
+        destination_repo: 'cloudnativegbb/paas-vnext'
+        destination_branch: 'ghactions-manifests'
+        destination_folder: 'app/manifests'
         user_email: 'noreply-cloudnativegbb@microsoft.com'
         user_name: 'cloudnativegbb'
-#         commit_message: 'A custom message for the commit'

.gitignore

@@ -645,64 +645,9 @@ yarn-error.log
 
 # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
 
-# Remove binary folders, except for the NodeJS services
-**/csharp/[Bb]in/
-
-
-**/components/local
-!RedDog.UI/src/components/*
-!RedDog.UI/src/components/Cards/*
-!RedDog.UI/src/components/Charts/*
-!RedDog.UI/src/components/Inputs/*
-!RedDog.UI/src/components/NotificationPlugin/*
-!RedDog.UI/src/components/SidebarPlugin/*
-!components/local/.keep
+manifests/local/branch/**
+manifests/local/corporate/**
+!manifests/local/branch/.keep
+!manifests/local/corporate/.keep
 
 **/*.pfx
-
-**/__debug_bin
-Vigilantes.DaprWorkshop.LoyaltyService/golang/main
-Vigilantes.DaprWorkshop.MakelineService/golang/main
-Vigilantes.DaprWorkshop.OrderService/golang/main
-Vigilantes.DaprWorkshop.ReceiptGenerationService/golang/main
-
-Vigilantes.DaprWorkshop.LoyaltyService/golang/loyalty-service.exe
-Vigilantes.DaprWorkshop.MakelineService/golang/make-line-service.exe
-Vigilantes.DaprWorkshop.OrderService/golang/order-service.exe
-Vigilantes.DaprWorkshop.ReceiptGenerationService/golang/receipt-generation-service.exe
-Vigilantes.DaprWorkshop.VirtualBarista/golang/virtual-barista.exe
-Vigilantes.DaprWorkshop.LoyaltyService/golang/loyalty-service
-Vigilantes.DaprWorkshop.MakeLineService/golang/make-line-service
-Vigilantes.DaprWorkshop.OrderService/golang/order-service
-Vigilantes.DaprWorkshop.ReceiptGenerationService/golang/receipt-generation-service
-Vigilantes.DaprWorkshop.VirtualBarista/golang/virtual-barista
-
-##############################
-## Java
-##############################
-.mtj.tmp/
-*.class
-*.jar
-*.war
-*.ear
-*.nar
-hs_err_pid*
-*.classpath
-*.project
-*.settings
-*.factorypath
-
-##############################
-## Maven
-##############################
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-pom.xml.bak
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn*
-mvnw*

.vscode/tasks.json

@@ -129,7 +129,7 @@
                 "--app-id",
                 "order-service",
                 "--components-path",
-                "${workspaceFolder}/components/local",
+                "${workspaceFolder}/manifests/local/branch",
                 "--app-port",
                 "5100",
                 "--dapr-grpc-port",
@@ -147,7 +147,7 @@
                 "--app-id",
                 "make-line-service",
                 "--components-path",
-                "${workspaceFolder}/components/local",
+                "${workspaceFolder}/manifests/local/branch",
                 "--app-port",
                 "5200",
                 "--dapr-grpc-port",
@@ -165,7 +165,7 @@
                 "--app-id",
                 "receipt-generation-service",
                 "--components-path",
-                "${workspaceFolder}/components/local",
+                "${workspaceFolder}/manifests/local/branch",
                 "--app-port",
                 "5300",
                 "--dapr-grpc-port",
@@ -183,7 +183,7 @@
                 "--app-id",
                 "loyalty-service",
                 "--components-path",
-                "${workspaceFolder}/components/local",
+                "${workspaceFolder}/manifests/local/branch",
                 "--app-port",
                 "5400",
                 "--dapr-grpc-port",
@@ -201,7 +201,7 @@
                 "--app-id",
                 "accounting-service",
                 "--components-path",
-                "${workspaceFolder}/components/local",
+                "${workspaceFolder}/manifests/local/branch",
                 "--app-port",
                 "5700",
                 "--dapr-grpc-port",
@@ -219,7 +219,7 @@
                 "--app-id",
                 "accounting-service-corp",
                 "--components-path",
-                "${workspaceFolder}/components/corporate",
+                "${workspaceFolder}/manifests/local/corporate",
                 "--app-port",
                 "6700",
                 "--dapr-grpc-port",
@@ -237,7 +237,7 @@
                 "--app-id",
                 "virtual-worker",
                 "--components-path",
-                "${workspaceFolder}/components/local",
+                "${workspaceFolder}/manifests/local/branch",
                 "--app-port",
                 "5500",
                 "--dapr-grpc-port",
@@ -255,7 +255,7 @@
                 "--app-id",
                 "virtual-customers",
                 "--components-path",
-                "${workspaceFolder}/components/local",
+                "${workspaceFolder}/manifests/local/branch",
                 "--dapr-grpc-port",
                 "5601",
                 "--dapr-http-port",
@@ -271,7 +271,7 @@
                 "--app-id",
                 "reddog-ui",
                 "--components-path",
-                "${workspaceFolder}/components/local",
+                "${workspaceFolder}/manifests/local/branch",
                 "--dapr-grpc-port",
                 "5901",
                 "--dapr-http-port",
@@ -287,7 +287,7 @@
                 "--app-id",
                 "bootstrapper",
                 "--components-path",
-                "${workspaceFolder}/components/local",
+                "${workspaceFolder}/manifests/local/branch",
                 "--dapr-grpc-port",
                 "5801",
                 "--dapr-http-port",
@@ -308,99 +308,6 @@
                 "Dapr UI"
             ],
             "problemMatcher": []
-        },
-        {
-            "label": "build",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "build",
-                "${workspaceFolder}/RedDog.MakeLineService/RedDog.MakeLineService.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "publish",
-                "${workspaceFolder}/RedDog.MakeLineService/RedDog.MakeLineService.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "watch",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "watch",
-                "run",
-                "${workspaceFolder}/RedDog.MakeLineService/RedDog.MakeLineService.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "type": "docker-build",
-            "label": "docker-build: debug",
-            "dependsOn": [
-                "build"
-            ],
-            "dockerBuild": {
-                "tag": "reddog:dev",
-                "target": "base",
-                "dockerfile": "${workspaceFolder}/RedDog.Bootstrapper/Dockerfile",
-                "context": "${workspaceFolder}",
-                "pull": true
-            },
-            "netCore": {
-                "appProject": "${workspaceFolder}/RedDog.Bootstrapper/RedDog.Bootstrapper.csproj"
-            }
-        },
-        {
-            "type": "docker-build",
-            "label": "docker-build: release",
-            "dependsOn": [
-                "build"
-            ],
-            "dockerBuild": {
-                "tag": "reddog:latest",
-                "dockerfile": "${workspaceFolder}/RedDog.Bootstrapper/Dockerfile",
-                "context": "${workspaceFolder}",
-                "pull": true
-            },
-            "netCore": {
-                "appProject": "${workspaceFolder}/RedDog.Bootstrapper/RedDog.Bootstrapper.csproj"
-            }
-        },
-        {
-            "type": "docker-run",
-            "label": "docker-run: debug",
-            "dependsOn": [
-                "docker-build: debug"
-            ],
-            "dockerRun": {},
-            "netCore": {
-                "appProject": "${workspaceFolder}/RedDog.Bootstrapper/RedDog.Bootstrapper.csproj",
-                "enableDebugging": true
-            }
-        },
-        {
-            "type": "docker-run",
-            "label": "docker-run: release",
-            "dependsOn": [
-                "docker-build: release"
-            ],
-            "dockerRun": {},
-            "netCore": {
-                "appProject": "${workspaceFolder}/RedDog.Bootstrapper/RedDog.Bootstrapper.csproj"
-            }
         }
     ]
 }

RedDog.UI/vue.config.js

@@ -3,8 +3,8 @@ const fetch = require("node-fetch");
 // const axios = require('axios').default;
 
 
-let MAKELINE_SERVICE = "http://0.0.0.0:5980/v1.0/invoke/make-line-service/method/orders/Redmond"
-let ACCOUNTING_SERVICE = "http://0.0.0.0:5980/v1.0/invoke/accounting-service/method/OrderMetrics"
+let MAKELINE_SERVICE = "http://127.0.0.1:5980/v1.0/invoke/make-line-service/method/orders/Redmond"
+let ACCOUNTING_SERVICE = "http://127.0.0.1:5980/v1.0/invoke/accounting-service/method/OrderMetrics"
 
 if (process.env.NODE_ENV === 'production'){
   console.log('setting prod environment variables')
@@ -43,8 +43,8 @@ module.exports = {
         "X-Requested-With, content-type, Authorization"
     },
     disableHostCheck: true,
-    host: "0.0.0.0",
-    public: "0.0.0.0:8080",
+    host: "127.0.0.1",
+    public: "127.0.0.1:8080",
     port: 8080,
 
     before: (app)=> {

kustomization.yaml

@@ -1,11 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- ./manifests/accounting-service.yaml
-- ./manifests/loyalty-service.yaml
-- ./manifests/make-line-service.yaml
-- ./manifests/order-service.yaml
-- ./manifests/receipt-generation-service.yaml
-- ./manifests/ui.yaml
-- ./manifests/virtual-customers.yaml
-- ./manifests/virtual-worker.yaml

manifests/branch/deployments/virtual-customers.yaml

@@ -17,7 +17,7 @@ spec:
       annotations:
         dapr.io/enabled: "true"
         dapr.io/app-id: "virtual-customers"
-        dapr.io/config: "tracing"
+        dapr.io/config: "reddog.config"
     spec:
       containers:
         - name: virtual-customers

manifests/branch/deployments/virtual-worker.yaml

@@ -18,7 +18,7 @@ spec:
         dapr.io/enabled: "true"
         dapr.io/app-id: "virtual-worker"
         dapr.io/app-port: "80"
-        dapr.io/config: "tracing"
+        dapr.io/config: "reddog.config"
     spec:
       containers:
         - name: virtual-worker

manifests/branch/kustomization.yaml

@@ -0,0 +1,19 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ./components/reddog.binding.receipt.yaml
+- ./components/reddog.binding.virtualworker.yaml
+- ./components/reddog.config.yaml
+- ./components/reddog.pubsub.yaml
+- ./components/reddog.secretstore.yaml
+- ./components/reddog.state.loyalty.yaml
+- ./components/reddog.state.makeline.yaml
+- ./deployments/accounting-service.yaml
+- ./deployments/bootstrapper.yaml
+- ./deployments/loyalty-service.yaml
+- ./deployments/make-line-service.yaml
+- ./deployments/order-service.yaml
+- ./deployments/receipt-generation-service.yaml
+- ./deployments/ui.yaml
+- ./deployments/virtual-customers.yaml
+- ./deployments/virtual-worker.yaml

manifests/corporate/deployments/accounting-service.yaml

@@ -0,0 +1,28 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: accounting-service
+  namespace: reddog
+  labels:
+    app: accounting-service
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: accounting-service
+  template:
+    metadata:
+      labels:
+        app: accounting-service
+      annotations:
+        dapr.io/enabled: "true"
+        dapr.io/app-id: "accounting-service"
+        dapr.io/app-port: "80"
+        dapr.io/config: "reddog.config"
+    spec:
+      containers:
+        - name: accounting-service
+          image: "ghcr.io/cloudnativegbb/paas-vnext/reddog-accounting-service:latest"
+          ports:
+            - containerPort: 80
+          imagePullPolicy: Always

manifests/corporate/deployments/bootstrapper.yaml

@@ -0,0 +1,21 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: bootstrapper
+  namespace: reddog
+  labels:
+    app: bootstrapper
+spec:
+  template:
+    metadata:
+      name: bootstrapper
+      labels:
+        app: bootstrapper
+      annotations:
+        dapr.io/enabled: "true"
+        dapr.io/app-id: "bootstrapper"
+        dapr.io/config: "reddog.config"
+    spec:
+      containers:
+      - name: bootstrapper
+        image: "ghcr.io/cloudnativegbb/paas-vnext/reddog-bootstrapper:latest"

manifests/corporate/kustomization.yaml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ./components/reddog.config.yaml
+- ./components/reddog.pubsub.yaml
+- ./components/reddog.secretstore.yaml
+- ./deployments/accounting-service.yaml
+- ./deployments/bootstrapper.yaml