From b5e7554fef2652c608f56cf1f1b7b3dc2460436f Mon Sep 17 00:00:00 2001 From: Steve Wagner Date: Wed, 10 May 2023 10:17:28 -0700 Subject: [PATCH] - Update image to GHCR - Rename deployment manifests --- README.md | 10 +++++----- .../deployment/{nkl-configmap.yaml => configmap.yaml} | 0 .../{nkl-deployment.yaml => deployment.yaml} | 2 +- .../deployment/{nkl-namespace.yaml => namespace.yaml} | 0 docs/http/http-installation-guide.md | 4 ++-- docs/tcp/tcp-installation-guide.md | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) rename deployments/deployment/{nkl-configmap.yaml => configmap.yaml} (100%) rename deployments/deployment/{nkl-deployment.yaml => deployment.yaml} (92%) rename deployments/deployment/{nkl-namespace.yaml => namespace.yaml} (100%) diff --git a/README.md b/README.md index 569d4f9..8623274 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ The Services and ConfigMap are restricted to a specific namespace (default: "nkl #### Configuration -NKL is configured via a ConfigMap, the default settings are found in `deployment/nkl-configmap.yaml`. Presently there is a single configuration value exposed in the ConfigMap, `nginx-hosts`. +NKL is configured via a ConfigMap, the default settings are found in `deployment/configmap.yaml`. Presently there is a single configuration value exposed in the ConfigMap, `nginx-hosts`. This contains a comma-separated list of NGINX Plus hosts that NKL will maintain. You will need to update this ConfigMap to reflect the NGINX Plus hosts you wish to manage. @@ -99,7 +99,7 @@ There is a much more detailed [Installation Reference](docs/README.md) available 2. Apply the Namespace -```kubectl apply -f deployments/nkl-namespace.yaml``` +```kubectl apply -f deployments/namespace.yaml``` 3. Apply the RBAC resources @@ -107,15 +107,15 @@ There is a much more detailed [Installation Reference](docs/README.md) available 4. Update / Apply the ConfigMap (For best results update the `nginx-hosts` values first) -```kubectl apply -f deployments/nkl-configmap.yaml``` +```kubectl apply -f deployments/configmap.yaml``` 5. Apply the Deployment -```kubectl apply -f deployments/nkl-deployment.yaml``` +```kubectl apply -f deployments/deployment.yaml``` 6. Check the logs -```kubectl -n nkl get pods | grep nkl-deployment | cut -f1 -d" " | xargs kubectl logs -n nkl --follow $1``` +```kubectl -n nkl get pods | grep deployment | cut -f1 -d" " | xargs kubectl logs -n nkl --follow $1``` At this point NKL should be up and running. Now would be a great time to go over to the [Installation Reference](docs/README.md) and follow the instructions to deploy a demo application. diff --git a/deployments/deployment/nkl-configmap.yaml b/deployments/deployment/configmap.yaml similarity index 100% rename from deployments/deployment/nkl-configmap.yaml rename to deployments/deployment/configmap.yaml diff --git a/deployments/deployment/nkl-deployment.yaml b/deployments/deployment/deployment.yaml similarity index 92% rename from deployments/deployment/nkl-deployment.yaml rename to deployments/deployment/deployment.yaml index ce80b72..fdd7358 100644 --- a/deployments/deployment/nkl-deployment.yaml +++ b/deployments/deployment/deployment.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: nginx-k8s-loadbalancer - image: ciroque/nginx-k8s-loadbalancer:latest + image: ghcr.io/nginxinc/nginx-k8s-loadbalancer:latest imagePullPolicy: Always ports: - name: http diff --git a/deployments/deployment/nkl-namespace.yaml b/deployments/deployment/namespace.yaml similarity index 100% rename from deployments/deployment/nkl-namespace.yaml rename to deployments/deployment/namespace.yaml diff --git a/docs/http/http-installation-guide.md b/docs/http/http-installation-guide.md index b8a7b5b..8c8164e 100644 --- a/docs/http/http-installation-guide.md +++ b/docs/http/http-installation-guide.md @@ -581,13 +581,13 @@ After a new installation of NGINX Plus, make the following configuration changes 1. Apply the updated ConfigMap: ```bash - kubectl apply -f nkl-configmap.yaml + kubectl apply -f configmap.yaml ``` 1. Deploy the NKL Controller: ```bash - kubectl apply -f nkl-deployment.yaml + kubectl apply -f deployment.yaml ``` 1. Check to see if the NKL Controller is running, with the updated ConfigMap: diff --git a/docs/tcp/tcp-installation-guide.md b/docs/tcp/tcp-installation-guide.md index 66b3ceb..8f31503 100644 --- a/docs/tcp/tcp-installation-guide.md +++ b/docs/tcp/tcp-installation-guide.md @@ -386,13 +386,13 @@ After the new installation of NGINX Plus, make the following configuration chang 1. Apply the updated ConfigMap: ```bash - kubectl apply -f nkl-configmap.yaml + kubectl apply -f configmap.yaml ``` 1. Deploy the NKL Controller: ```bash - kubectl apply -f nkl-deployment.yaml + kubectl apply -f deployment.yaml ``` 1. Check to see if the NKL Controller is running, with the updated ConfigMap: