Merge pull request #1 from OctopusSamples/main

Merging from parent fork

Readme.md

@@ -36,7 +36,7 @@ Using your cloud instance of choice do the following:
 - Ensure you have the following environments: "Development", "Test", "Staging", "Production"
 - Install a tentacle to connect to Octopus Deploy
     - Option A: Install a polling tentacle directly on your machine (preferred and easiest).
-    - Option B: Run the tentacle as a docker container.  Run `docker run --env ServerApiKey=YOUR_API_KEY --env ServerUrl=YOUR_SERVER_URL --env Space=Default --env TargetWorkerPool="Local K8s Worker Pool" --env ACCEPT_EULA=Y --env DISABLE_DIND=N --env ServerPort=10943 --env TargetName="Docker Worker" --platform linux/amd64 --privileged octopusdeploy/tentacle:8.1.563` 
+    - Option B: Run the tentacle as a docker container.  A custom image with kubectl has been pre-created.  Run `docker run --env ServerApiKey=YOUR_API_KEY --env ServerUrl=YOUR_SERVER_URL --env Space=Default --env TargetWorkerPool="Local K8s Worker Pool" --env ACCEPT_EULA=Y --env DISABLE_DIND=N --env ServerPort=10943 --env TargetName="Docker Worker" --platform linux/amd64 mcasperson/tentacle` 
     - Option C: Run the tentacle from Kubernetes.  
         - In a file explorer, go to `octopus-tentacle.yaml` file and replace `YOUR_API_KEY` and `YOUR_SERVER_URL` with your API key and server URL.
         - Run `kubectl apply -f octopus-tentacle.yaml`
@@ -204,7 +204,7 @@ This activity will happen only if we have enough time.  We will install and conf
 - Configure first application 
     - Click the `New App` button
     - Application Name: `randomquotes-dev`
-    - Project Name: `Default`
+    - Project Name: `default`
     - Repository URL: `https://github.com/OctopusSamples/RandomQuotes-K8s.git`    
     - Paths: `k8s/overlays/dev`
     - Cluster Url: `https://kubernetes.default.svc`

k8s/base/randomquotes-deployment.yaml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: randomquotes-web
-          image: octopussamples/randomquotes-k8s:0.1.5
+          image: octopussamples/randomquotes-k8s:0.1.32
           resources:
             requests:
               memory: "64Mi"

k8s/overlays/dev/kustomization.yaml

@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: development
+namespace: dev
 resources:
 - ../../base
 
@@ -12,7 +12,7 @@ secretGenerator:
 images:
  - name: octopussamples/randomquotes-k8s
    newName: octopussamples/randomquotes-k8s
-   newTag: "0.1.5"
+   newTag: "0.1.33"
 
 patches:
  - target:

k8s/overlays/test/kustomization.yaml

@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: test
+namespace: testing
 resources:
 - ../../base
 

k8s/provision/namespaces.yaml

@@ -1,12 +1,12 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: dev
+  name: development
 ---
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: testing
+  name: test
 ---
 apiVersion: v1
 kind: Namespace

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

@@ -1,8 +1,8 @@
 @{
-    ViewData["Title"] = "Random Quotes";
+    ViewData["Title"] = "Random Quotes - Running on Kubernetes!";
 }
 
-<h2>Quotes as a Service</h2>
+<h2>Quotes as a Service - Running on Kubernetes</h2>
 
 <div class="panel panel-default">
     <div class="panel-body">
@@ -16,5 +16,5 @@
 </div>
 
 <form method="post" asp-action="ReloadPage">
-    <input type="submit" class="btn btn-success btn-lg text-center" style="background-color: blue" value="Refresh" />
+    <input type="submit" class="btn btn-success btn-lg text-center" style="background-color: blue" value="Give me a quote" />
 </form>