From 4198c4aa9139a4fc02a69fc68c4008a0f3278cd5 Mon Sep 17 00:00:00 2001 From: Hannah Ramadan Date: Fri, 17 Jan 2025 12:22:23 -0800 Subject: [PATCH 1/2] Update test instructions - Cert manager no longer relevant step. Removed from Makefile in PR#117 - Key changed from tag -> version --- README.md | 12 ++++-------- tests/Makefile | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1408c629..1d896323 100644 --- a/README.md +++ b/README.md @@ -71,23 +71,19 @@ export NEW_RELIC_LICENSE_KEY=*** ```bash make -f tests/Makefile minikube ``` -3. Install [cert-manager](https://cert-manager.io/). -```bash -make -f tests/Makefile cert-manager -``` -4. Install the New Relic [Kubernetes Agents Operator](https://github.com/newrelic/k8s-agents-operator/) +3. Install the New Relic [Kubernetes Agents Operator](https://github.com/newrelic/k8s-agents-operator/) ```bash make -f tests/Makefile operator ``` -5. Build a local copy of the init container in minikube. +4. Build a local copy of the init container in minikube. ```bash make -f tests/Makefile build-initcontainer ``` -6. Build a local copy of the test app in minikube. +5. Build a local copy of the test app in minikube. ```bash make -f tests/Makefile build-testapp ``` -7. Deploy the test app instrumented with the init container. A browser window will open if the deployment succeeds. +6. Deploy the test app instrumented with the init container. A browser window will open if the deployment succeeds. ```bash make -f tests/Makefile test ``` diff --git a/tests/Makefile b/tests/Makefile index 995169b1..a0fa8795 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -45,7 +45,7 @@ operator-local: --set=newRelicHost=${NEW_RELIC_HOST} \ --set=controllerManager.manager.image.pullPolicy=Never \ --set=controllerManager.manager.image.repository=e2e/k8s-agents-operator \ - --set=controllerManager.manager.image.tag=e2e + --set=controllerManager.manager.image.version=e2e sleep 5 kubectl wait --for=condition=Ready pods $$(kubectl get pods | grep k8s-agents-operator | cut -d" " -f1) From 1f4b5c0da992b8f7fe7e8b9f17b552452066b400 Mon Sep 17 00:00:00 2001 From: Tim Pansino Date: Thu, 23 Jan 2025 13:42:58 -0800 Subject: [PATCH 2/2] Fix all instances of controllerManager.manager.image.tag --- .github/workflows/test.yml | 2 +- tests/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b601c742..c7b363ef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -79,7 +79,7 @@ jobs: helm upgrade --install k8s-agents-operator k8s-agents-operator/k8s-agents-operator \ --namespace=default \ --set=licenseKey=${{ secrets.NEW_RELIC_LICENSE_KEY }} \ - --set=controllerManager.manager.image.tag=${{ inputs.K8S_OPERATOR_IMAGE_TAG }} + --set=controllerManager.manager.image.version=${{ inputs.K8S_OPERATOR_IMAGE_TAG }} sleep 5 kubectl wait --for=condition=Ready -n default --all pods diff --git a/tests/Makefile b/tests/Makefile index a0fa8795..ede44ad5 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -29,7 +29,7 @@ operator: helm repo add k8s-agents-operator https://newrelic.github.io/k8s-agents-operator helm upgrade --install k8s-agents-operator k8s-agents-operator/k8s-agents-operator \ --set=licenseKey=${NEW_RELIC_LICENSE_KEY} \ - --set=controllerManager.manager.image.tag=edge + --set=controllerManager.manager.image.version=edge sleep 5 kubectl wait --for=condition=Ready pods $$(kubectl get pods | grep k8s-agents-operator | cut -d" " -f1)