diff --git a/.kodiak.toml b/.kodiak.toml new file mode 100644 index 00000000..2a874b9f --- /dev/null +++ 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 \ No newline at end of file diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index f364596b..d6a0fcea 100644 --- 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. \ No newline at end of file +#### 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 index f3ef3fff..a5ebeda2 100644 --- 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 index 54caa02d..5279e542 100644 --- 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 index 4536ca20..deea57a6 100644 --- 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 index 3eb6f604..582851b6 100644 --- 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 index bb37f4df..2b23550b 100644 --- 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 @@ Debug;Release;Phobos - + diff --git a/src/Akka.CQRS.Pricing.Service/Akka.CQRS.Pricing.Service.csproj b/src/Akka.CQRS.Pricing.Service/Akka.CQRS.Pricing.Service.csproj index 2f66bc97..7af1426b 100644 --- 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 @@ - bin\Release\$(NetCoreVersion)\ + bin\Release\ @@ -17,10 +17,10 @@ - - + + - + diff --git a/src/Akka.CQRS.Pricing.Web/Akka.CQRS.Pricing.Web.csproj b/src/Akka.CQRS.Pricing.Web/Akka.CQRS.Pricing.Web.csproj index 756daf00..ac56c303 100644 --- 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 @@ Debug;Release;Phobos - - bin\Release\$(NetCoreVersion)\ + + bin\Release\ diff --git a/src/Akka.CQRS.TradePlacers.Service/Akka.CQRS.TradePlacers.Service.csproj b/src/Akka.CQRS.TradePlacers.Service/Akka.CQRS.TradePlacers.Service.csproj index 17d4916b..106b4fc5 100644 --- 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 @@ Debug;Release;Phobos - - bin\Release\$(NetCoreVersion)\ + + bin\Release\ @@ -18,7 +18,7 @@ - + diff --git a/src/Akka.CQRS.TradeProcessor.Service/Akka.CQRS.TradeProcessor.Service.csproj b/src/Akka.CQRS.TradeProcessor.Service/Akka.CQRS.TradeProcessor.Service.csproj index 7eb19719..c7d50ecb 100644 --- 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 @@ - bin\Release\$(NetCoreVersion)\ + bin\Release\ @@ -17,10 +17,10 @@ - - + + - + diff --git a/src/common.props b/src/common.props index ec4833ec..bd67cdca 100644 --- a/src/common.props +++ b/src/common.props @@ -15,13 +15,13 @@ 1.2.2 2.4.1 - 15.9.0 - 1.3.14 - 0.2.1 - 0.4.3 - 5.6.0 - 3.4.0 - 0.6.3 + 16.6.1 + 1.4.8 + 0.4.0 + 0.5.0 + 5.10.3 + 3.12.3 + 0.8.0 netcoreapp2.1