Skip to content

Commit ff1de40

Browse files
feat(kubernetes): Add PIXIE support for kops in guided install (#1126)
* feat(kubernetes): Added PIXIE support with kOps distribution as well
1 parent 4d0310d commit ff1de40

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

recipes/newrelic/infrastructure/kubernetes.yml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ install:
311311
echo -e "\033[0;31mTurning off Pixie for this installation\033[0m" >&2
312312
PIXIE_SUPPORTED=false
313313
elif [[ "$MEMORY" -ge 3906250 ]] && [[ "$MEMORY" -lt 7812500 ]]; then
314-
echo "Detected ${MEMORY} Ki.." >&2
314+
echo "Detected ${MEMORY} Ki.." >&2
315315
echo -e "\033[0;31mSetting Pixie memory limit to 1Gi.\033[0m" >&2
316316
PIXIE_MEM="1Gi"
317317
PIXIE_SUPPORTED=true
@@ -385,18 +385,16 @@ install:
385385
386386
if echo ${K8S_VERSION} | grep "\-gke\." >/dev/null; then
387387
PIXIE_SUPPORTED=true
388-
fi
389-
390-
if echo ${K8S_VERSION} | grep "\-eks\-" >/dev/null; then
388+
elif echo ${K8S_VERSION} | grep "\-eks\-" >/dev/null; then
391389
PIXIE_SUPPORTED=true
392-
fi
393-
394-
if echo ${K8S_VERSION} | grep "\+k[0,3]s.*" > /dev/null; then
390+
elif echo ${K8S_VERSION} | grep "\+k[0,3]s.*" > /dev/null; then
391+
PIXIE_SUPPORTED=true
392+
elif $SUDO $KUBECTL get nodes --show-labels | grep "kops.k8s.io" > /dev/null; then
395393
PIXIE_SUPPORTED=true
396394
fi
397395
398396
if [[ "$PIXIE_SUPPORTED" != "true" ]]; then
399-
echo "This type of Kubernetes cluster is not supported by Pixie: GKE, EKS, AKS, Minikube, k3s, and k0s are supported." >&2
397+
echo "This type of Kubernetes cluster is not supported by Pixie: GKE, EKS, AKS, Minikube, k3s, k0s and kOps are supported." >&2
400398
echo -e "\033[0;31mTurning off Pixie for this installation\033[0m" >&2
401399
DEBUG_MESSAGE="Pixie is unsupported due to k8s version - ${K8S_VERSION}; ${DEBUG_MESSAGE}"
402400
fi

0 commit comments

Comments
 (0)