chore: restructure local dev to use metallb and certmanager

docs/contributing-to-lagoon/developing-lagoon.md

@@ -41,23 +41,44 @@ We have provided a number of routines in the [Makefile](https://github.com/usela
 make -j8 build
 ```
 
+### Deploy a local Lagoon development stack without test suites
+
+The make file offers a command that allows you to spin up Lagoon inside of a k3d cluster locally and explore its functionality.
+
+Using the following make command will create a k3d cluster, install Lagoon and all of the necessary components to get you up and running and ready to explore.
+
+```bash title="Deploy local stack"
+make k3d/local-stack
+```
+
+!!! warning
+    This can take some time to complete as it will install a lot of components necessary to make Lagoon work. This includes things like ingress-nginx, harbor, and all the additional services to make exploring Lagoon easy.
+
+At the end of the process, the command will provide some useful information that will get you up and running and able to log in to the UI or using the API with tools like the Lagoon CLI.
+
+### Run the Lagoon test-suite
+
+If you're developing new functionality in Lagoon and want to make sure the tests complete, you can run the entire test suite using the following options
+
 1. Start Lagoon test routine using the defaults in the Makefile \(all tests\).
 
 ```bash title="Start tests"
-make kind/test
+make k3d/test
+# or use retest if you already have a local stack running
+make k3d/retest
 ```
 
 !!! warning
     There are a lot of tests configured to run by default - please consider only testing locally the minimum that you need to ensure functionality. This can be done by specifying or removing tests from the `TESTS` variable in the Makefile.
 
 This process will:
 
-1. Download the correct versions of the local development tools if not installed - `kind`, `kubectl`, `helm`, `jq`.
+1. Download the correct versions of the local development tools if not installed - `k3d`, `kubectl`, `helm`, `jq`.
 2. Update the necessary Helm repositories for Lagoon to function.
 3. Ensure all of the correct images have been built in the previous step.
-4. Create a local [KinD](https://kind.sigs.k8s.io/) cluster, which provisions an entire running Kubernetes cluster in a local Docker container. This cluster has been configured to talk to a provisioned image registry that we will be pushing the built Lagoon images to. It has also been configured to allow access to the host filesystem for local development.
+4. Create a local K3D cluster, which provisions an entire running Kubernetes cluster in a local Docker container. This cluster has been configured to talk to a provisioned image registry that we will be pushing the built Lagoon images to. It has also been configured to allow access to the host filesystem for local development.
 5. Clone Lagoon from [https://github.com/uselagoon/lagoon-charts](https://github.com/uselagoon/lagoon-charts) \(use the `CHARTS_TREEISH` variable in the Makefile to control which branch if needed\).
-6. Install the Harbor Image registry into the KinD cluster and configure its ingress and access properly.
+6. Install the Harbor Image registry into the K3D cluster and configure its ingress and access properly.
 7. Docker will push the built images for Lagoon into the Harbor image registry.
 8. It then uses the [Makefile from lagoon-charts](https://github.com/uselagoon/lagoon-charts/blob/main/Makefile) to perform the rest of the setup steps.
 9. A suitable ingress controller is installed - we use the [NGINX Ingress Controller](https://kubernetes.github.io/ingress-nginx/).
@@ -72,83 +93,101 @@ Ideally, all of the tests pass and it's all done!
 
 ### View the test progress and your local cluster
 
-The test routine creates a local Kubeconfig file \(called `kubeconfig.kind.lagoon` in the root of the project, that can be used with a Kubernetes dashboard, viewer or CLI tool to access the local cluster. We use tools like [Lens](https://k8slens.dev/), [Octant](https://octant.dev/), [kubectl](https://kubernetes.io/docs/reference/kubectl/cheatsheet/) or [Portainer](https://www.portainer.io/) in our workflows. Lagoon Core, Remote and Tests all build in the `Lagoon` namespace, and each environment creates its own namespace to run, so make sure to use the correct context when inspecting.
+The test routine creates a local Kubeconfig file \(called `kubeconfig.k3d.lagoon` in the root of the project, that can be used with a Kubernetes dashboard, viewer or CLI tool to access the local cluster. We use tools like [Lens](https://k8slens.dev/), [Octant](https://octant.dev/), [kubectl](https://kubernetes.io/docs/reference/kubectl/cheatsheet/) or [Portainer](https://www.portainer.io/) in our workflows. Lagoon Core and the tests build in the `lagoon-core` namespace, Remote is installed in the `Lagoon` namespace. Each lagoon test environment creates its own namespace to run, so make sure to use the correct context when inspecting.
 
 In order to use kubectl with the local cluster, you will need to use the correct Kubeconfig. This can be done for every command or it can be added to your preferred tool:
 
-```bash title="kubeconfig.kind.lagoon"
-KUBECONFIG=./kubeconfig.kind.lagoon kubectl get pods -n lagoon
+```bash title="kubeconfig.k3d.lagoon"
+KUBECONFIG=./kubeconfig.k3d.lagoon kubectl get pods -n lagoon
 ```
 
-The Helm charts used to build the local Lagoon are cloned into a local folder and symlinked to `lagoon-charts.kind.lagoon` where you can see the configuration. We'll cover how to make easy modifications later in this documentation.
+The Helm charts used to build the local Lagoon are cloned into a local folder and symlinked to `lagoon-charts.k3d.lagoon` where you can see the configuration. We'll cover how to make easy modifications later in this documentation.
 
 ### Interact with your local Lagoon cluster
 
 The Makefile includes a few simple routines that will make interacting with the installed Lagoon simpler:
 
+#### Port forwarding
+
+Clusters deployed by this makefile will provide loadbalancers and individual IPs, but if you choose to you can port-forward some services using the following
+
 ```bash title="Create local ports"
-make kind/port-forwards
+make k3d/port-forwards
 ```
 
 This will create local ports to expose the UI \(6060\), API \(7070\) and Keycloak \(8080\). Note that this logs to `stdout`, so it should be performed in a secondary terminal/window.
 
-```bash title="Retrieve admin creds"
-make kind/get-admin-creds
-```
+#### Lagoon credentials/information
 
 This will retrieve the necessary credentials to interact with the Lagoon.
 
+```bash title="Retrieve admin creds"
+make k3d/get-lagoon-details
+```
+
 * The JWT is an admin-scoped token for use as a bearer token with your local GraphQL client. [See more in our GraphQL documentation](../interacting/graphql.md).
 * There is a token for use with the "admin" user in Keycloak, who can access all users, groups, roles, etc.
-* There is also a token for use with the "lagoonadmin" user in Lagoon, which can be allocated default groups, permissions, etc.
+
+#### Rebuild Lagoon core and push images
+
+This will re-push the images listed in `KIND_SERVICES` with the correct tag, and redeploy the lagoon-core chart. This is useful for testing small changes to Lagoon services, but does not support "live" development. You will need to rebuild these images locally first, e.g `rm build/api && make build/api`.
 
 ```bash title="Re-push images"
-make kind/dev
+make k3d/dev
 ```
 
-This will re-push the images listed in `KIND_SERVICES` with the correct tag, and redeploy the lagoon-core chart. This is useful for testing small changes to Lagoon services, but does not support "live" development. You will need to rebuild these images locally first, e.g `rm build/api && make build/api`.
+#### Patch with local node.js
+
+This will build the typescript services, using your locally installed Node.js \(it should be >16.0\). It will then:
 
 ```bash title="Build typescript services"
-make kind/local-dev-patch
+make k3d/local-dev-patch
 ```
 
-This will build the typescript services, using your locally installed Node.js \(it should be >16.0\). It will then:
 
 * Mount the "dist" folders from the Lagoon services into the correct lagoon-core pods in Kubernetes
 * Redeploy the lagoon-core chart with the services running with `nodemon`watching the code for changes
 * This will facilitate "live" development on Lagoon.
 * Note that occasionally the pod in Kubernetes may require redeployment for a change to show. Clean any build artifacts from those services if you're rebuilding different branches with `git clean -dfx` as the dist folders are ignored by Git.
 
+#### Install simple Logging support
+
+This will create a standalone OpenDistro for Elasticsearch cluster in your local Docker, and configure Lagoon to dispatch all logs \(Lagoon and project\) to it, using the configuration in [lagoon-logging](https://github.com/uselagoon/lagoon-charts/tree/main/charts/lagoon-logging).
+
 ```bash title="Initiate logging"
-make kind/local-dev-logging
+make k3d/local-dev-logging
 ```
 
-This will create a standalone OpenDistro for Elasticsearch cluster in your local Docker, and configure Lagoon to dispatch all logs \(Lagoon and project\) to it, using the configuration in [lagoon-logging](https://github.com/uselagoon/lagoon-charts/tree/main/charts/lagoon-logging).
+#### Re run specific tests
+
+This will re-run a suite of tests \(defined in the `TESTS` variable\) against the existing cluster. It will re-push the images needed for tests \(tests, local-git, and the data-watcher-pusher\). You can specify tests to run by passing the TESTS variable inline.
 
 ```bash title="Re-run tests."
-make kind/retest
+make k3d/retest
 # OR
-make kind/retest TESTS='[features-kubernetes]'
+make k3d/retest TESTS='[features-kubernetes]'
 ```
 
-This will re-run a suite of tests \(defined in the `TESTS` variable\) against the existing cluster. It will re-push the images needed for tests \(tests, local-git, and the data-watcher-pusher\). You can specify tests to run by passing the TESTS variable inline.
+If updating a test configuration, the tests image will need to be rebuilt and pushed, e.g `rm build/tests && make build/tests && make k3d/push-images IMAGES='tests' && make k3d/retest TESTS='[api]'`
+
+#### Push images
 
-If updating a test configuration, the tests image will need to be rebuilt and pushed, e.g `rm build/tests && make build/tests && make kind/push-images IMAGES='tests' && make kind/retest TESTS='[api]'`
+This will push all the images up to the image registry. Specifying `IMAGES` will tag and push specific images.
 
 ```bash title="Push all images"
-make kind/push-images
+make k3d/push-images
 # OR
-make kind/push-images IMAGES='tests local-git'
+make k3d/push-images IMAGES='tests local-git'
 ```
 
-This will push all the images up to the image registry. Specifying `IMAGES` will tag and push specific images.
+#### Tear down
+
+This will remove the K3D Lagoon cluster from your local Docker.
 
 ```bash title="Remove cluster"
-make kind/clean
+make k3d/clean
 ```
 
-This will remove the KinD Lagoon cluster from your local Docker.
-
 ### Ansible
 
 The Lagoon test uses Ansible to run the test suite. Each range of tests for a specific function has been split into its own routine. If you are performing development work locally, select which tests to run, and update the `$TESTS` variable in the Makefile to reduce the concurrent tests running.
@@ -212,7 +251,14 @@ Here are some development scenarios and useful workflows for getting things done
 
 ### Add tests
 
-1. Repeat the first step above.
+An example
+
+1. Deploy the lagoon and run the test you're modifying.
+
+```bash title="Deploy Lagoon"
+make k3d/test TESTS=[features-variables]
+```
+
 2. Edit `tests/tests/features-variables.yaml` and add a test case.
 3. Rebuild the `tests` image.
 
@@ -224,11 +270,11 @@ make -j8 build/tests
 1. Push the new `tests` image into the cluster registry.
 
 ```bash title="Push test image"
-make kind/push-images IMAGES=tests
+make k3d/push-images IMAGES=tests
 ```
 
 1. Rerun the tests.
 
 ```bash title="Re-run tests"
-make kind/retest TESTS='[features-variables]'
+make k3d/retest TESTS=[features-variables]
 ```

k3d-calico.config.yaml.tpl

@@ -14,19 +14,22 @@ registries:
       docker.io:
         endpoint:
         - "https://imagecache.amazeeio.cloud"
-      "registry.${K3D_NODE_IP}.nip.io:32080":
+      "registry.${LAGOON_K3D_NETWORK}.nip.io":
         endpoint:
-          - http://registry.${K3D_NODE_IP}.nip.io:32080
+          - https://registry.${LAGOON_K3D_NETWORK}.nip.io
     configs:
-        "registry.${K3D_NODE_IP}.nip.io:32080":
-            tls:
-            insecure_skip_verify: true
+      "registry.${LAGOON_K3D_NETWORK}.nip.io":
+        tls:
+          insecure_skip_verify: true
 options:
   k3s: # options passed on to K3s itself
     extraArgs: # additional arguments passed to the `k3s server|agent` command; same as `--k3s-arg`
       - arg: --disable=traefik
         nodeFilters:
           - server:*
+      - arg: --disable=servicelb
+        nodeFilters:
+          - server:*
       - arg: --flannel-backend=none
         nodeFilters:
           - server:*

k3d.config.yaml.tpl

@@ -13,11 +13,11 @@ registries:
       docker.io:
         endpoint:
         - "https://imagecache.amazeeio.cloud"
-      "registry.${K3D_NODE_IP}.nip.io:32080":
+      "registry.${LAGOON_K3D_NETWORK}.nip.io":
         endpoint:
-          - http://registry.${K3D_NODE_IP}.nip.io:32080
+          - https://registry.${LAGOON_K3D_NETWORK}.nip.io
     configs:
-        "registry.${K3D_NODE_IP}.nip.io:32080":
+        "registry.${LAGOON_K3D_NETWORK}.nip.io":
             tls:
               insecure_skip_verify: true
 options:
@@ -26,6 +26,9 @@ options:
       - arg: --disable=traefik
         nodeFilters:
           - server:*
+      - arg: --disable=servicelb
+        nodeFilters:
+          - server:*
       - arg: --disable-network-policy
         nodeFilters:
           - server:*