diff --git a/README.md b/README.md index ed361e5..0098a86 100644 --- a/README.md +++ b/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. \ No newline at end of file diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index f7e0976..f2d2b46 100644 --- a/RELEASE_NOTES.md +++ b/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. \ No newline at end of file +#### 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. \ No newline at end of file diff --git a/build.fsx b/build.fsx index 3d2726f..68364f6 100644 --- a/build.fsx +++ b/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" \ No newline at end of file diff --git a/src/WebCrawler.Web/Controllers/HomeController.cs b/src/WebCrawler.Web/Controllers/HomeController.cs index 55209a8..7590663 100644 --- a/src/WebCrawler.Web/Controllers/HomeController.cs +++ b/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(); } } diff --git a/src/WebCrawler.Web/Views/Home/Index.cshtml b/src/WebCrawler.Web/Views/Home/Index.cshtml index 30c1779..bdde615 100644 --- a/src/WebCrawler.Web/Views/Home/Index.cshtml +++ b/src/WebCrawler.Web/Views/Home/Index.cshtml @@ -5,7 +5,7 @@

Web Crawler of Doom

-

Akka.NET on Gorilla Steroids

+

Akka.NET on Gorilla Steroids - Version (@ViewBag.AppVersion)

Learn more »

diff --git a/src/common.props b/src/common.props index 6f94ad9..b3aacb8 100644 --- a/src/common.props +++ b/src/common.props @@ -2,9 +2,8 @@ Copyright © 2015-2019 Petabridge, LLC Petabridge - 0.2.3 - Made it possible to tag all WebCrawler docker images more easily via `build.fsx`. -Made `build.sh` executable. + 0.2.4 + 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. @@ -18,7 +17,7 @@ Made `build.sh` executable. 1.3.11 0.2.0 0.1.0 - 0.4.1 + 0.5.0 netcoreapp2.1 \ No newline at end of file diff --git a/yaml/infrastructure/helm-tiller-rbac.yaml b/yaml/infrastructure/helm-tiller-rbac.yaml new file mode 100644 index 0000000..e76e587 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/yaml/k8s-azure-web-loadbalancer.yaml b/yaml/k8s-azure-web-loadbalancer.yaml new file mode 100644 index 0000000..b6846d9 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/yaml/k8s-crawler-service.yaml b/yaml/k8s-crawler-service.yaml index 0bc8bbf..90836b6 100644 --- a/yaml/k8s-crawler-service.yaml +++ b/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: diff --git a/yaml/k8s-lighthouse-service.yaml b/yaml/k8s-lighthouse-service.yaml index 5e6b006..9354426 100644 --- a/yaml/k8s-lighthouse-service.yaml +++ b/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: diff --git a/yaml/k8s-tracker-service.yaml b/yaml/k8s-tracker-service.yaml index 625024c..68da564 100644 --- a/yaml/k8s-tracker-service.yaml +++ b/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: diff --git a/yaml/k8s-web-service.yaml b/yaml/k8s-web-service.yaml index c5451f3..1877477 100644 --- a/yaml/k8s-web-service.yaml +++ b/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: