diff --git a/recipes/newrelic/infrastructure/kubernetes.yml b/recipes/newrelic/infrastructure/kubernetes.yml index 57e69673..46501261 100644 --- a/recipes/newrelic/infrastructure/kubernetes.yml +++ b/recipes/newrelic/infrastructure/kubernetes.yml @@ -311,7 +311,7 @@ install: echo -e "\033[0;31mTurning off Pixie for this installation\033[0m" >&2 PIXIE_SUPPORTED=false elif [[ "$MEMORY" -ge 3906250 ]] && [[ "$MEMORY" -lt 7812500 ]]; then - echo "Detected ${MEMORY} Ki.." >&2 + echo "Detected ${MEMORY} Ki.." >&2 echo -e "\033[0;31mSetting Pixie memory limit to 1Gi.\033[0m" >&2 PIXIE_MEM="1Gi" PIXIE_SUPPORTED=true @@ -385,18 +385,16 @@ install: if echo ${K8S_VERSION} | grep "\-gke\." >/dev/null; then PIXIE_SUPPORTED=true - fi - - if echo ${K8S_VERSION} | grep "\-eks\-" >/dev/null; then + elif echo ${K8S_VERSION} | grep "\-eks\-" >/dev/null; then PIXIE_SUPPORTED=true - fi - - if echo ${K8S_VERSION} | grep "\+k[0,3]s.*" > /dev/null; then + elif echo ${K8S_VERSION} | grep "\+k[0,3]s.*" > /dev/null; then + PIXIE_SUPPORTED=true + elif $SUDO $KUBECTL get nodes --show-labels | grep "kops.k8s.io" > /dev/null; then PIXIE_SUPPORTED=true fi if [[ "$PIXIE_SUPPORTED" != "true" ]]; then - echo "This type of Kubernetes cluster is not supported by Pixie: GKE, EKS, AKS, Minikube, k3s, and k0s are supported." >&2 + echo "This type of Kubernetes cluster is not supported by Pixie: GKE, EKS, AKS, Minikube, k3s, k0s and kOps are supported." >&2 echo -e "\033[0;31mTurning off Pixie for this installation\033[0m" >&2 DEBUG_MESSAGE="Pixie is unsupported due to k8s version - ${K8S_VERSION}; ${DEBUG_MESSAGE}" fi