From f4b022be5c5aa17ae901abe6f849455ddbd5d42b Mon Sep 17 00:00:00 2001 From: Daniel Budziwojski Date: Tue, 5 Nov 2024 06:22:07 -0800 Subject: [PATCH] feat: Add k8s auto attach support (#1130) * Add k8s auto attach * Allow setting of false values --- recipes/newrelic/infrastructure/kubernetes.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/recipes/newrelic/infrastructure/kubernetes.yml b/recipes/newrelic/infrastructure/kubernetes.yml index adf1bb9a..e1fbac0f 100644 --- a/recipes/newrelic/infrastructure/kubernetes.yml +++ b/recipes/newrelic/infrastructure/kubernetes.yml @@ -79,6 +79,7 @@ install: NR_CLI_KUBE_EVENTS="{{.NR_CLI_KUBE_EVENTS}}" NR_CLI_LOGGING="{{.NR_CLI_LOGGING}}" NR_CLI_LOGGING_LOW_DATA_MODE="{{.NR_CLI_LOGGING_LOW_DATA_MODE}}" + NR_CLI_AGENT_OPERATOR="{{.NR_CLI_AGENT_OPERATOR}}" # Prometheus integrations @@ -275,6 +276,7 @@ install: NR_CLI_LOGGING_PERSISTENCE=${NR_CLI_LOGGING_PERSISTENCE:-""} NR_CLI_LOGGING_PERSISTENCE_STORAGE_CLASS=${NR_CLI_LOGGING_PERSISTENCE_STORAGE_CLASS:-""} NR_CLI_LOGGING_LINUX_MOUNT_PATH=${NR_CLI_LOGGING_LINUX_MOUNT_PATH:-""} + NR_CLI_AGENT_OPERATOR=${NR_CLI_AGENT_OPERATOR:-false} # Prometheus integrations @@ -576,6 +578,7 @@ install: ARGS="${ARGS} --devel" fi ARGS="${ARGS} --set ksm.enabled=${NR_CLI_KSM}" + ARGS="${ARGS} --set k8s-agents-operator.enabled=${NR_CLI_AGENT_OPERATOR}" # if installing in GKE Autopilot, we need to turn off controlPlane and pixie and set kubelet scheme and port if [[ "{{.NR_CLI_GKE_AUTOPILOT}}" == "true" ]]; then @@ -619,7 +622,7 @@ install: if [[ -n "${NR_CLI_LOGGING_LINUX_MOUNT_PATH}" ]]; then ARGS="${ARGS} --set newrelic-logging.fluentBit.linuxMountPath=${NR_CLI_LOGGING_LINUX_MOUNT_PATH}" fi - + if [[ "${NEW_RELIC_REGION}" == "STAGING" ]]; then ARGS="${ARGS} --set global.nrStaging=true" fi @@ -691,6 +694,7 @@ install: BODY="${BODY},\"newrelic-infrastructure.privileged\":\"${NR_CLI_PRIVILEGED}\"" BODY="${BODY},\"global.lowDataMode\":\"${NR_CLI_LOW_DATA_MODE}\"" BODY="${BODY},\"ksm.enabled\":\"${NR_CLI_KSM}\"" + BODY="${BODY},\"k8s-agents-operator.enabled\":\"${NR_CLI_AGENT_OPERATOR}\"" # if installing in GKE Autopilot, turn off controlPlane and set kubelet scheme and port if [[ "{{.NR_CLI_GKE_AUTOPILOT}}" == "true" ]]; then