Add helm command to upgrade the canaries (#1023)

Author: alvarocabanas

Makefile

@@ -21,7 +21,7 @@ $(addsuffix -clean,$(TARGETS)):
 ##########################################
 # 		     Static targets 			 #
 ##########################################
-#include build/embedded/Makefile
+include test/k8s-canaries/Makefile
 
 help:
 	@echo "## Available targets:"

test/k8s-canaries/Makefile

@@ -1,10 +1,42 @@
 TERRAFORM_DIR := ./terraform
+HELM_DIR := ./helm
+.DEFAULT_GOAL := all
 
-.PHONY: sync
-sync:
+# Generate a random key to add to the helm deployment annotation
+# This way, whenever there is a helm upgrade the pod will be recreated and its image pulled, even if the tag didn't change
+DEPLOYMENT_KEY := $(shell openssl rand -base64 32 | tr -dc A-Za-z0-9 | head -c 16)
+
+.PHONY: all
+all:
+	@echo "No default target"
+
+.PHONY: test/k8s-canaries/sync
+test/k8s-canaries/sync:
 ifndef CANARY_DIR
 	@echo "CANARY_DIR variable must be provided to know which canary to sync"
 	exit 1
 endif
 	terraform -chdir=$(TERRAFORM_DIR)/$(CANARY_DIR) init && \
 	terraform -chdir=$(TERRAFORM_DIR)/$(CANARY_DIR) apply -auto-approve
+
+.PHONY: test/k8s-canaries/helm
+test/k8s-canaries/helm:
+ifndef NR_LICENSE_KEY
+	@echo "NR_LICENSE_KEY variable must be provided for k8s-canaries/helm"
+	exit 1
+endif
+ifndef CLUSTER_NAME
+	@echo "CLUSTER_NAME variable must be provided for k8s-canaries/helm"
+	exit 1
+endif
+ifndef IMAGE_TAG
+	@echo "IMAGE_TAG variable must be provided for k8s-canaries/helm"
+	exit 1
+endif
+	@helm repo add newrelic https://helm-charts.newrelic.com
+	@helm upgrade --install ac newrelic/agent-control --devel -f $(HELM_DIR)/agent-control.yml \
+    -n newrelic --create-namespace \
+    --set global.licenseKey=$(NR_LICENSE_KEY) \
+    --set global.cluster=$(CLUSTER_NAME) \
+    --set agent-control-deployment.image.tag=$(IMAGE_TAG) \
+    --set agent-control-deployment.podAnnotations.deploymentKey="${DEPLOYMENT_KEY}"

test/k8s-canaries/README.md

@@ -11,8 +11,38 @@ The purpose of this tool is to create the EKS Clusters to run our canaries.
 
 ## Usage on pipelines
 
-There is a Make target to run the terraform init and apply in our pipelines. The idea is to call it any time there are changes in the tf files.
+### Terraform init and apply
 
+The idea is to call this target any time there are changes in the tf files and will apply the changes if correct.
+There are 2 clusters created and when calling the target the CANARY_DIR needs to be provided, the canary dirs are:
+- staging
+- production
+
+The default terraform dir for where the terraform modules are taken from is:
+`TERRAFORM_DIR := ./terraform`
+
+```bash
+$ make CANARY_DIR=staging test/k8s-canaries/sync
+```
+
+If this target is called from the root of this repository, the TERRAFORM_DIR should be overwritten to point to the relative path:
+```bash
+$ make TERRAFORM_DIR=test/k8s-canaries/terraform CANARY_DIR=staging test/k8s-canaries/sync
+```
+
+### Helm Upgrade for nightlies and prereleases
+
+This target will add the helm repo if not present and upgrade (or install) the helm repo with the agent-control.yml values present on this folder.
+The agent-control pod will always pull the image on every upgrade because there is a random deployment-key annotation added each time.
+
+The default helm dir where there is the default values file to apply is:
+`HELM_DIR := ./helm`
+
+```bash
+$ make NR_LICENSE_KEY=xxx CLUSTER_NAME=my-cluster IMAGE_TAG=nightly test/k8s-canaries/helm
+```
+
+If this target is called from the root of this repository, the HELM_DIR should be overwritten to point to the relative path:
 ```bash
-$ make CANARY_DIR=staging sync
+$ make HELM_DIR=test/k8s-canaries/helm NR_LICENSE_KEY=xxx CLUSTER_NAME=my-cluster IMAGE_TAG=nightly test/k8s-canaries/helm
 ```

test/k8s-canaries/helm/agent-control.yml

@@ -0,0 +1,29 @@
+# Cluster and License info is set with "--set" in the e2e-spec file
+agent-control-deployment:
+  image:
+    imagePullPolicy: Always
+  config:
+    fleet_control:
+      enabled: false
+    agentControl:
+      content:
+        log:
+          level: info
+    subAgents:
+      infra:
+        type: newrelic/com.newrelic.infrastructure:0.1.0
+        content:
+          chart_version: "*" # Use latest
+          chart_values:
+            nri-metadata-injection:
+              # TODO we are currently disabling the metadata injection since if enabled it breaks when installed
+              # together with the gatewayRESE
+              enabled: false
+      prometheus:
+        type: newrelic/com.newrelic.prometheus:0.1.0
+        content:
+          chart_version: "*" # Use latest
+      logs:
+        type: newrelic/io.fluentbit:0.1.0
+        content:
+          chart_version: "*" # Use latest