From 4a31021f0db116e8da3ea8a5fb4cd9537e0d7f87 Mon Sep 17 00:00:00 2001 From: bobjwalker Date: Wed, 17 Jan 2024 14:54:21 -0600 Subject: [PATCH 1/6] lower-casing --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index bba3a1e..63811e5 100644 --- a/Readme.md +++ b/Readme.md @@ -202,7 +202,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` From 3d80d2dacead391c9f79c9d1fe7452087a04b092 Mon Sep 17 00:00:00 2001 From: Bob Walker <38642825+BobJWalker@users.noreply.github.com> Date: Fri, 19 Jan 2024 07:57:34 -0600 Subject: [PATCH 2/6] Update Readme.md --- Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 63811e5..fda677d 100644 --- a/Readme.md +++ b/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` From 479978bcead7b5ae50f097f6a960196a5a485fbe Mon Sep 17 00:00:00 2001 From: Bob Walker <38642825+BobJWalker@users.noreply.github.com> Date: Wed, 24 Jan 2024 13:59:58 +0100 Subject: [PATCH 3/6] Update Index.cshtml --- src/RandomQuotes.Web/Views/Home/Index.cshtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/RandomQuotes.Web/Views/Home/Index.cshtml b/src/RandomQuotes.Web/Views/Home/Index.cshtml index 4bdb3ac..90875ed 100644 --- a/src/RandomQuotes.Web/Views/Home/Index.cshtml +++ b/src/RandomQuotes.Web/Views/Home/Index.cshtml @@ -1,8 +1,8 @@ @{ - ViewData["Title"] = "Random Quotes"; + ViewData["Title"] = "Random Quotes - Running on Kubernetes!"; } -

Quotes as a Service

+

Quotes as a Service - Running on Kubernetes

From 0151824553ceb8a5b301f315161aa9873bf7faf7 Mon Sep 17 00:00:00 2001 From: Bob Walker <38642825+BobJWalker@users.noreply.github.com> Date: Wed, 24 Jan 2024 14:17:32 +0100 Subject: [PATCH 4/6] Update Index.cshtml --- src/RandomQuotes.Web/Views/Home/Index.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RandomQuotes.Web/Views/Home/Index.cshtml b/src/RandomQuotes.Web/Views/Home/Index.cshtml index 90875ed..3e9d037 100644 --- a/src/RandomQuotes.Web/Views/Home/Index.cshtml +++ b/src/RandomQuotes.Web/Views/Home/Index.cshtml @@ -16,5 +16,5 @@
- +
From 38aac0e114472a0f7b47bbe9fc928175a29015dc Mon Sep 17 00:00:00 2001 From: bobjwalker Date: Wed, 24 Jan 2024 14:42:08 +0100 Subject: [PATCH 5/6] Getting it working now! --- k8s/base/randomquotes-deployment.yaml | 2 +- k8s/overlays/dev/kustomization.yaml | 4 ++-- k8s/overlays/test/kustomization.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/k8s/base/randomquotes-deployment.yaml b/k8s/base/randomquotes-deployment.yaml index 4ad7631..6c4bab6 100644 --- a/k8s/base/randomquotes-deployment.yaml +++ b/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" diff --git a/k8s/overlays/dev/kustomization.yaml b/k8s/overlays/dev/kustomization.yaml index d2770b9..ee143ec 100644 --- a/k8s/overlays/dev/kustomization.yaml +++ b/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: diff --git a/k8s/overlays/test/kustomization.yaml b/k8s/overlays/test/kustomization.yaml index 817cd8b..1d917b2 100644 --- a/k8s/overlays/test/kustomization.yaml +++ b/k8s/overlays/test/kustomization.yaml @@ -1,6 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: test +namespace: testing resources: - ../../base From 775861a88e19acc8a54d1d2d315e549d879a6164 Mon Sep 17 00:00:00 2001 From: bobjwalker Date: Wed, 24 Jan 2024 14:58:03 +0100 Subject: [PATCH 6/6] updating namespaces --- k8s/provision/namespaces.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/provision/namespaces.yaml b/k8s/provision/namespaces.yaml index bd007f7..be909f4 100644 --- a/k8s/provision/namespaces.yaml +++ b/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