Merge branch 'dev'

petabridge · Jun 24, 2020 · fc2b342 · fc2b342
2 parents 13dc4fd + 86fd405
commit fc2b342
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 28 deletions.
diff --git a/.kodiak.toml b/.kodiak.toml
@@ -0,0 +1,8 @@
+# .kodiak.toml
+version = 1
+
+[merge]
+require_automerge_label = false # merge everything
+method = "squash"
+delete_branch_on_merge = true
+block_on_reviews_requested = true
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,2 +1,3 @@
-#### 0.1.6 August 16 2019 ####
-* Added cluster singleton for pricing entity startup.
+#### 0.2.0 June 24 2020 ####
+* Upgraded to latest version of Akka.NET
+* Upgraded all K8s files to support latest v1 stable APIs
diff --git a/build.fsx b/build.fsx
@@ -47,6 +47,8 @@ Target "Clean" (fun _ ->
     CleanDir outputPerfTests
     CleanDir outputNuGet
     CleanDir "docs/_site"
+    CleanDirs !! "./**/bin"
+    CleanDirs !! "./**/obj"
 )
 
 Target "AssemblyInfo" (fun _ ->
@@ -285,7 +287,6 @@ Target "PublishCode" (fun _ ->
                     Project = project
                     Configuration = configuration
                     VersionSuffix = overrideVersionSuffix project
-                    AdditionalArgs = ["--no-restore --output bin/Release/netcoreapp2.1/publish"] // would be ideal to change publish dir via MSBuild
                     })
 
     projects |> Seq.iter (runSingleProject)
@@ -306,6 +307,9 @@ Target "BuildDockerImages" (fun _ ->
 
     let remoteRegistryUrl = getBuildParamOrDefault "remoteRegistry" ""
 
+    let composedGetFileNameWithoutExtension (p:string) =
+        System.IO.Path.GetFileNameWithoutExtension p
+
     let buildDockerImage imageName projectPath =
 
         let args = 
@@ -341,7 +345,7 @@ Target "BuildDockerImages" (fun _ ->
                 info.Arguments <- args) (System.TimeSpan.FromMinutes 5.0) (* Reasonably long-running task. *)
 
     let runSingleProject project =
-        let projectName = Path.GetFileNameWithoutExtension project
+        let projectName = composedGetFileNameWithoutExtension project
         let imageName = mapDockerImageName projectName
         let result = match imageName with
                         | None -> 0

diff --git a/k8s/jaeger-all-in-one.yaml b/k8s/jaeger-all-in-one.yaml
@@ -15,7 +15,7 @@
 apiVersion: v1
 kind: List
 items:
-- apiVersion: extensions/v1beta1
+- apiVersion: apps/v1
   kind: Deployment
   metadata:
     namespace: akka-cqrs
@@ -26,6 +26,9 @@ items:
       app.kubernetes.io/component: all-in-one
   spec:
     replicas: 1
+    selector:
+      matchLabels:
+        app: jaeger
     strategy:
       type: Recreate
     template:

diff --git a/k8s/mongodb-deploy.yaml b/k8s/mongodb-deploy.yaml
@@ -9,13 +9,16 @@ spec:
   selector:
     app: mongodb
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   namespace: akka-cqrs
   name: mongodb
 spec:
   replicas: 1
+  selector:
+      matchLabels:
+        app: mongodb
   template:
     metadata:
       labels:

diff --git a/k8s/statsd-deploy.yaml b/k8s/statsd-deploy.yaml
@@ -40,7 +40,7 @@ spec:
     app: statsd
   type: LoadBalancer
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   namespace: akka-cqrs
@@ -49,6 +49,9 @@ metadata:
     app: statsd
 spec:
   replicas: 1
+  selector:
+      matchLabels:
+        app: statsd
   template:
     metadata:
       labels:

diff --git a/src/Akka.CQRS.Pricing.Cli/Akka.CQRS.Pricing.Cli.csproj b/src/Akka.CQRS.Pricing.Cli/Akka.CQRS.Pricing.Cli.csproj
@@ -6,7 +6,7 @@
     <Configurations>Debug;Release;Phobos</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Petabridge.Cmd.Host" Version="0.6.1" />
+    <PackageReference Include="Petabridge.Cmd.Host" Version="0.8.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Akka.CQRS.Pricing.Service/Akka.CQRS.Pricing.Service.csproj b/src/Akka.CQRS.Pricing.Service/Akka.CQRS.Pricing.Service.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Phobos|AnyCPU'">
-    <OutputPath>bin\Release\$(NetCoreVersion)\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,10 +17,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.HealthCheck.Persistence" Version="0.2.1" />
-    <PackageReference Include="Akka.Persistence.MongoDb" Version="1.3.12" />
+    <PackageReference Include="Akka.HealthCheck.Persistence" Version="0.3.0" />
+    <PackageReference Include="Akka.Persistence.MongoDb" Version="1.4.5" />
     <PackageReference Include="Petabridge.Cmd.Cluster" Version="$(PetabridgeCmdVersion)" />
-    <PackageReference Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PetabridgeCmdVersion)-beta" />
+    <PackageReference Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PetabridgeCmdVersion)" />
     <PackageReference Include="Petabridge.Cmd.Remote" Version="$(PetabridgeCmdVersion)" />
   </ItemGroup>
 

diff --git a/src/Akka.CQRS.Pricing.Web/Akka.CQRS.Pricing.Web.csproj b/src/Akka.CQRS.Pricing.Web/Akka.CQRS.Pricing.Web.csproj
@@ -5,8 +5,8 @@
     <Configurations>Debug;Release;Phobos</Configurations>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Phobos|AnyCPU'">
-    <OutputPath>bin\Release\$(NetCoreVersion)\</OutputPath>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Phobos|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Akka.CQRS.TradePlacers.Service/Akka.CQRS.TradePlacers.Service.csproj b/src/Akka.CQRS.TradePlacers.Service/Akka.CQRS.TradePlacers.Service.csproj
@@ -6,8 +6,8 @@
     <Configurations>Debug;Release;Phobos</Configurations>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Phobos|AnyCPU'">
-    <OutputPath>bin\Release\$(NetCoreVersion)\</OutputPath>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Phobos|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="Petabridge.Cmd.Cluster" Version="$(PetabridgeCmdVersion)" />
-    <PackageReference Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PetabridgeCmdVersion)-beta" />
+    <PackageReference Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PetabridgeCmdVersion)" />
     <PackageReference Include="Petabridge.Cmd.Remote" Version="$(PetabridgeCmdVersion)" />
   </ItemGroup>
 

diff --git a/src/Akka.CQRS.TradeProcessor.Service/Akka.CQRS.TradeProcessor.Service.csproj b/src/Akka.CQRS.TradeProcessor.Service/Akka.CQRS.TradeProcessor.Service.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Phobos|AnyCPU'">
-    <OutputPath>bin\Release\$(NetCoreVersion)\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,10 +17,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.HealthCheck.Persistence" Version="0.2.1" />
-    <PackageReference Include="Akka.Persistence.MongoDb" Version="1.3.12" />
+    <PackageReference Include="Akka.HealthCheck.Persistence" Version="0.3.0" />
+    <PackageReference Include="Akka.Persistence.MongoDb" Version="1.4.5" />
     <PackageReference Include="Petabridge.Cmd.Cluster" Version="$(PetabridgeCmdVersion)" />
-    <PackageReference Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PetabridgeCmdVersion)-beta" />
+    <PackageReference Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PetabridgeCmdVersion)" />
     <PackageReference Include="Petabridge.Cmd.Remote" Version="$(PetabridgeCmdVersion)" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/common.props b/src/common.props
@@ -15,13 +15,13 @@
   <PropertyGroup>
     <NBenchVersion>1.2.2</NBenchVersion>
     <XunitVersion>2.4.1</XunitVersion>
-    <TestSdkVersion>15.9.0</TestSdkVersion>
-    <AkkaVersion>1.3.14</AkkaVersion>
-    <AkkaBootstrapVersion>0.2.1</AkkaBootstrapVersion>
-    <AkkaPersistenceExtrasVersion>0.4.3</AkkaPersistenceExtrasVersion>
-    <FluentAssertionsVersion>5.6.0</FluentAssertionsVersion>
-    <GoogleProtobufVersion>3.4.0</GoogleProtobufVersion>
-    <PetabridgeCmdVersion>0.6.3</PetabridgeCmdVersion>
+    <TestSdkVersion>16.6.1</TestSdkVersion>
+    <AkkaVersion>1.4.8</AkkaVersion>
+    <AkkaBootstrapVersion>0.4.0</AkkaBootstrapVersion>
+    <AkkaPersistenceExtrasVersion>0.5.0</AkkaPersistenceExtrasVersion>
+    <FluentAssertionsVersion>5.10.3</FluentAssertionsVersion>
+    <GoogleProtobufVersion>3.12.3</GoogleProtobufVersion>
+    <PetabridgeCmdVersion>0.8.0</PetabridgeCmdVersion>
   </PropertyGroup>
   <PropertyGroup>
     <NetCoreVersion>netcoreapp2.1</NetCoreVersion>