Merge pull request #26 from petabridge/dev

v0.2.4 Release

README.md

@@ -1,2 +1,2 @@
 # Cluster.WebCrawler
-K8s, DevOps-ified version of the Akka.Cluster WebCrawler code sample
+K8s, DevOps-ified version of the Akka.Cluster WebCrawler code sample.

RELEASE_NOTES.md

@@ -1,3 +1,2 @@
-#### 0.2.3 Feb 08 2019 ####
-* Made it possible to tag all WebCrawler docker images more easily via `build.fsx`.
-* Made `build.sh` executable.
+#### 0.2.4 April 14 2019 ####
+* Upgraded to [Petabridge.Cmd v0.5.0](https://cmd.petabridge.com/articles/RELEASE_NOTES.html#v050-march-05-2019) so we could take advantage of the `cluster tail` command.

build.fsx

@@ -69,11 +69,21 @@ Target "AssemblyInfo" (fun _ ->
 )
 
 Target "RestorePackages" (fun _ ->
-    DotNetCli.Restore
-        (fun p -> 
-            { p with
-                Project = solutionFile
-                NoCache = false })
+    let customSource = getBuildParamOrDefault "customNuGetSource" ""
+
+    if(hasBuildParam "customNuGetSource") then
+        DotNetCli.Restore
+            (fun p -> 
+                { p with
+                    Project = solutionFile
+                    NoCache = false
+                    AdditionalArgs = [sprintf "-s %s -s https://api.nuget.org/v3/index.json" customSource]})
+    else
+        DotNetCli.Restore
+            (fun p -> 
+                { p with
+                    Project = solutionFile
+                    NoCache = false })
 )
 
 Target "Build" (fun _ ->          
@@ -405,7 +415,7 @@ Target "PrepareDeploy" DoNothing
 "Clean" ==> "RestorePackages" ==> "BuildRelease" ==> "Docfx"
 
 // Docker
-"Clean" ==> "PublishCode" ==> "BuildDockerImages" ==> "Docker"
+"BuildRelease" ==> "PublishCode" ==> "BuildDockerImages" ==> "Docker"
 
 // all
 "BuildRelease" ==> "All"
@@ -414,6 +424,6 @@ Target "PrepareDeploy" DoNothing
 "Nuget" ==> "All"
 
 // Deploy
-"BuildRelease" ==> "Docker" ==> "PrepareDeploy"
+"Docker" ==> "PrepareDeploy"
 
 RunTargetOrDefault "Help"

src/WebCrawler.Web/Controllers/HomeController.cs

@@ -8,8 +8,11 @@ namespace WebCrawler.Web.Controllers
 {
     public class HomeController : Controller
     {
+        public static readonly string Version = typeof(HomeController).Assembly.GetName().Version.ToString();
+
         public IActionResult Index()
         {
+            ViewBag.AppVersion = Version;
             return View();
         }
     }

src/WebCrawler.Web/Views/Home/Index.cshtml

@@ -5,7 +5,7 @@
 
 <div class="jumbotron">
     <h1>Web Crawler of Doom</h1>
-    <p class="lead">Akka.NET on Gorilla Steroids</p>
+    <p class="lead">Akka.NET on Gorilla Steroids - Version (@ViewBag.AppVersion)</p>
     <p><a href="http://getakka.net" class="btn btn-primary btn-lg">Learn more &raquo;</a></p>
 </div>
 

src/common.props

@@ -2,9 +2,8 @@
   <PropertyGroup>
     <Copyright>Copyright © 2015-2019 Petabridge, LLC</Copyright>
     <Authors>Petabridge</Authors>
-    <VersionPrefix>0.2.3</VersionPrefix>
-    <PackageReleaseNotes>Made it possible to tag all WebCrawler docker images more easily via `build.fsx`.
-Made `build.sh` executable.</PackageReleaseNotes>
+    <VersionPrefix>0.2.4</VersionPrefix>
+    <PackageReleaseNotes>Upgraded to [Petabridge.Cmd v0.5.0](https://cmd.petabridge.com/articles/RELEASE_NOTES.html#v050-march-05-2019) so we could take advantage of the `cluster tail` command.</PackageReleaseNotes>
     <PackageIconUrl>
     </PackageIconUrl>
     <PackageProjectUrl>
@@ -18,7 +17,7 @@ Made `build.sh` executable.</PackageReleaseNotes>
     <AkkaVersion>1.3.11</AkkaVersion>
     <AkkaBootstrapVersion>0.2.0</AkkaBootstrapVersion>
     <AkkaHealthCheckVersion>0.1.0</AkkaHealthCheckVersion>
-    <PetabridgeCmdVersion>0.4.1</PetabridgeCmdVersion>
+    <PetabridgeCmdVersion>0.5.0</PetabridgeCmdVersion>
     <NetCoreVersion>netcoreapp2.1</NetCoreVersion>
   </PropertyGroup>
 </Project>

yaml/infrastructure/helm-tiller-rbac.yaml

@@ -0,0 +1,19 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: tiller
+  namespace: kube-system
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: tiller
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+  - kind: ServiceAccount
+    name: tiller
+    namespace: kube-system

yaml/k8s-azure-web-loadbalancer.yaml

@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: web-cluster-http
+  labels:
+    app: web-cluster
+spec:
+  type: LoadBalancer
+  ports:
+  - protocol: TCP
+    port: 80
+  selector:
+    app: web-cluster

yaml/k8s-crawler-service.yaml

@@ -31,7 +31,7 @@ spec:
       terminationGracePeriodSeconds: 35
       containers:
       - name: crawler
-        image: webcrawler.crawlservice:0.2.2
+        image: webcrawler.crawlservice:0.2.4
         lifecycle:
           preStop:
             exec:

yaml/k8s-lighthouse-service.yaml

@@ -31,7 +31,7 @@ spec:
       terminationGracePeriodSeconds: 35
       containers:
       - name: lighthouse
-        image: webcrawler.lighthouse:0.2.2
+        image: webcrawler.lighthouse:0.2.4
         lifecycle:
           preStop:
             exec:

yaml/k8s-tracker-service.yaml

@@ -31,7 +31,7 @@ spec:
       terminationGracePeriodSeconds: 35
       containers:
       - name: tracker
-        image: webcrawler.trackerservice:0.2.2
+        image: webcrawler.trackerservice:0.2.4
         lifecycle:
           preStop:
             exec:

yaml/k8s-web-service.yaml

@@ -31,7 +31,7 @@ spec:
       terminationGracePeriodSeconds: 35
       containers:
       - name: web-cluster
-        image: webcrawler.web:0.2.2
+        image: webcrawler.web:0.2.4
         lifecycle:
           preStop:
             exec: