From 940c328f5450a597c7df0d3b33eb6cfea558d241 Mon Sep 17 00:00:00 2001 From: David Eliahu Date: Thu, 10 Oct 2019 21:22:58 -0700 Subject: [PATCH 1/9] Check for small instance types --- cortex.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cortex.sh b/cortex.sh index e283e433aa..cece4e760f 100755 --- a/cortex.sh +++ b/cortex.sh @@ -179,7 +179,16 @@ if [ "$arg2" != "cli" ]; then set_aws_credentials fi +function validate_install() { + if [[ $CORTEX_NODE_TYPE == *nano ]] || [[ $CORTEX_NODE_TYPE == *micro ]] || [[ $CORTEX_NODE_TYPE == *small ]] || [[ $CORTEX_NODE_TYPE == *medium ]]; then + echo -e "\nCortex may not work correcly on nano, micro, small, or medium instances - please specify a larger instance type" + exit 1 + fi +} + if [ "$arg1" = "install" ] && [ "$arg2" = "" ] && [ "$arg3" = "" ]; then + validate_install + echo echo "￮ cluster name: $CORTEX_CLUSTER" echo "￮ region: $CORTEX_REGION" From 6548d47028f297c1adea45675a2df855e1ca40a6 Mon Sep 17 00:00:00 2001 From: David Eliahu Date: Thu, 10 Oct 2019 21:23:18 -0700 Subject: [PATCH 2/9] Wait for daemonsets --- manager/install_cortex.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/manager/install_cortex.sh b/manager/install_cortex.sh index 0324330b4a..26770b08dc 100755 --- a/manager/install_cortex.sh +++ b/manager/install_cortex.sh @@ -91,7 +91,10 @@ function setup_istio() { echo -n "." helm template istio-manifests/istio-cni --name istio-cni --namespace kube-system | kubectl apply -f - >/dev/null - echo -n "." + until [ "$(kubectl get daemonset istio-cni-node -n kube-system -o 'jsonpath={.status.updatedNumberScheduled}')" == "$(kubectl get daemonset istio-cni-node -n kube-system -o 'jsonpath={.status.desiredNumberScheduled}')" ]; do + echo -n "." + sleep 5 + done envsubst < manifests/istio-values.yaml | helm template istio-manifests/istio --values - --name istio --namespace istio-system | kubectl apply -f - >/dev/null } @@ -172,9 +175,6 @@ function validate_cortex() { eksctl utils write-kubeconfig --name=$CORTEX_CLUSTER --region=$CORTEX_REGION | grep -v "saved kubeconfig as" | grep -v "using region" || true -# https://docs.aws.amazon.com/eks/latest/userguide/cni-upgrades.html -kubectl apply -f https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/v1.5.3/config/v1.5/aws-k8s-cni.yaml >/dev/null - setup_bucket setup_cloudwatch_logs @@ -185,6 +185,12 @@ setup_secrets echo "✓ Updated cluster configuration" echo -en "￮ Configuring networking " +# https://docs.aws.amazon.com/eks/latest/userguide/cni-upgrades.html +kubectl apply -f https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/v1.5.4/config/v1.5/aws-k8s-cni.yaml >/dev/null +until [ "$(kubectl get daemonset aws-node -n kube-system -o 'jsonpath={.status.updatedNumberScheduled}')" == "$(kubectl get daemonset aws-node -n kube-system -o 'jsonpath={.status.desiredNumberScheduled}')" ]; do + echo -n "." + sleep 5 +done setup_istio envsubst < manifests/apis.yaml | kubectl apply -f - >/dev/null echo -e "\n✓ Configured networking" From d4bd3a05629e1bded37bee4e5c698eb35d9dc260 Mon Sep 17 00:00:00 2001 From: David Eliahu Date: Thu, 10 Oct 2019 21:24:20 -0700 Subject: [PATCH 3/9] Update uninstall_cortex.sh --- dev/uninstall_cortex.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dev/uninstall_cortex.sh b/dev/uninstall_cortex.sh index 0634a72d58..d4db8bb724 100755 --- a/dev/uninstall_cortex.sh +++ b/dev/uninstall_cortex.sh @@ -25,5 +25,12 @@ echo "Uninstalling Cortex ..." kubectl delete --ignore-not-found=true namespace istio-system kubectl delete --ignore-not-found=true namespace $CORTEX_NAMESPACE +kubectl delete --ignore-not-found=true -n kube-system deployment cluster-autoscaler +kubectl delete --ignore-not-found=true apiservice v1beta1.metrics.k8s.io +kubectl delete --ignore-not-found=true -n kube-system deployment metrics-server +kubectl delete --ignore-not-found=true -n kube-system service metrics-server +kubectl delete --ignore-not-found=true -n kube-system daemonset istio-cni-node +kubectl delete --ignore-not-found=true -n kube-system daemonset aws-node +kubectl delete --all crds echo "✓ Uninstalled Cortex" From e2ef617293548171d96f6bb790b7f6003a1377f1 Mon Sep 17 00:00:00 2001 From: David Eliahu Date: Thu, 10 Oct 2019 21:24:59 -0700 Subject: [PATCH 4/9] Update istio to 1.3.2 --- images/istio-citadel/Dockerfile | 2 +- images/istio-galley/Dockerfile | 2 +- images/istio-pilot/Dockerfile | 2 +- images/istio-proxy/Dockerfile | 2 +- images/manager/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/images/istio-citadel/Dockerfile b/images/istio-citadel/Dockerfile index 1b80668054..a9545dafd7 100644 --- a/images/istio-citadel/Dockerfile +++ b/images/istio-citadel/Dockerfile @@ -1 +1 @@ -FROM docker.io/istio/citadel:1.3.0 +FROM docker.io/istio/citadel:1.3.2 diff --git a/images/istio-galley/Dockerfile b/images/istio-galley/Dockerfile index bfa7fcb396..cd6472ecd8 100644 --- a/images/istio-galley/Dockerfile +++ b/images/istio-galley/Dockerfile @@ -1 +1 @@ -FROM docker.io/istio/galley:1.3.0 +FROM docker.io/istio/galley:1.3.2 diff --git a/images/istio-pilot/Dockerfile b/images/istio-pilot/Dockerfile index 6afc16f13f..a873e7bc1e 100644 --- a/images/istio-pilot/Dockerfile +++ b/images/istio-pilot/Dockerfile @@ -1 +1 @@ -FROM docker.io/istio/pilot:1.3.0 +FROM docker.io/istio/pilot:1.3.2 diff --git a/images/istio-proxy/Dockerfile b/images/istio-proxy/Dockerfile index f025390674..f401ecca13 100644 --- a/images/istio-proxy/Dockerfile +++ b/images/istio-proxy/Dockerfile @@ -1 +1 @@ -FROM docker.io/istio/proxyv2:1.3.0 +FROM docker.io/istio/proxyv2:1.3.2 diff --git a/images/manager/Dockerfile b/images/manager/Dockerfile index 86181ec481..5482ca82d6 100644 --- a/images/manager/Dockerfile +++ b/images/manager/Dockerfile @@ -27,7 +27,7 @@ RUN curl -LO https://get.helm.sh/helm-v2.14.3-linux-amd64.tar.gz && \ rm -rf linux-amd64 && \ rm helm-v2.14.3-linux-amd64.tar.gz -RUN ISTIO_VERSION=1.3.0 && \ +RUN ISTIO_VERSION=1.3.2 && \ curl -L "https://github.com/istio/istio/releases/download/${ISTIO_VERSION}/istio-${ISTIO_VERSION}-linux.tar.gz" | tar xz && \ mkdir ./istio-manifests && \ mv ./istio-${ISTIO_VERSION}/install/kubernetes/helm/* ./istio-manifests/ && \ From 608ff4d9abb2dfb67f8dd4d2857e38a688d3969c Mon Sep 17 00:00:00 2001 From: David Eliahu Date: Fri, 11 Oct 2019 09:44:50 -0700 Subject: [PATCH 5/9] Fix typo --- cortex.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cortex.sh b/cortex.sh index cece4e760f..39afda0b59 100755 --- a/cortex.sh +++ b/cortex.sh @@ -181,7 +181,7 @@ fi function validate_install() { if [[ $CORTEX_NODE_TYPE == *nano ]] || [[ $CORTEX_NODE_TYPE == *micro ]] || [[ $CORTEX_NODE_TYPE == *small ]] || [[ $CORTEX_NODE_TYPE == *medium ]]; then - echo -e "\nCortex may not work correcly on nano, micro, small, or medium instances - please specify a larger instance type" + echo -e "\nCortex may not work correctly on nano, micro, small, or medium instances - please specify a larger instance type" exit 1 fi } From 674dde337e3c298f8f90fc8d1a24a905187ede3e Mon Sep 17 00:00:00 2001 From: David Eliahu Date: Fri, 11 Oct 2019 10:24:29 -0700 Subject: [PATCH 6/9] Update istio CNI wait --- manager/install_cortex.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manager/install_cortex.sh b/manager/install_cortex.sh index 26770b08dc..f93706c055 100755 --- a/manager/install_cortex.sh +++ b/manager/install_cortex.sh @@ -91,7 +91,7 @@ function setup_istio() { echo -n "." helm template istio-manifests/istio-cni --name istio-cni --namespace kube-system | kubectl apply -f - >/dev/null - until [ "$(kubectl get daemonset istio-cni-node -n kube-system -o 'jsonpath={.status.updatedNumberScheduled}')" == "$(kubectl get daemonset istio-cni-node -n kube-system -o 'jsonpath={.status.desiredNumberScheduled}')" ]; do + until [ "$(kubectl get daemonset istio-cni-node -n kube-system -o 'jsonpath={.status.numberReady}')" == "$(kubectl get daemonset istio-cni-node -n kube-system -o 'jsonpath={.status.desiredNumberScheduled}')" ]; do echo -n "." sleep 5 done From b2c4652146c01ec6ed8275a5365f12219249f070 Mon Sep 17 00:00:00 2001 From: David Eliahu Date: Fri, 11 Oct 2019 12:36:41 -0700 Subject: [PATCH 7/9] Add metrics server config --- manager/manifests/metrics-server.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/manager/manifests/metrics-server.yaml b/manager/manifests/metrics-server.yaml index 2b64d1dd37..8cb437a5ef 100644 --- a/manager/manifests/metrics-server.yaml +++ b/manager/manifests/metrics-server.yaml @@ -108,9 +108,14 @@ spec: - name: metrics-server image: $CORTEX_IMAGE_METRICS_SERVER imagePullPolicy: Always + command: + - /metrics-server + - --kubelet-insecure-tls + - --kubelet-preferred-address-types=InternalIP volumeMounts: - name: tmp-dir mountPath: /tmp + hostNetwork: true --- From 5e15af823089e57b37ea5758643cad1d1af6dcee Mon Sep 17 00:00:00 2001 From: David Eliahu Date: Fri, 11 Oct 2019 12:37:07 -0700 Subject: [PATCH 8/9] Remove metrics server config --- manager/manifests/metrics-server.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/manager/manifests/metrics-server.yaml b/manager/manifests/metrics-server.yaml index 8cb437a5ef..2b64d1dd37 100644 --- a/manager/manifests/metrics-server.yaml +++ b/manager/manifests/metrics-server.yaml @@ -108,14 +108,9 @@ spec: - name: metrics-server image: $CORTEX_IMAGE_METRICS_SERVER imagePullPolicy: Always - command: - - /metrics-server - - --kubelet-insecure-tls - - --kubelet-preferred-address-types=InternalIP volumeMounts: - name: tmp-dir mountPath: /tmp - hostNetwork: true --- From 5a6480a9b0c5a7f1e6ce9554fdc1c6250b93b411 Mon Sep 17 00:00:00 2001 From: David Eliahu Date: Fri, 11 Oct 2019 12:38:49 -0700 Subject: [PATCH 9/9] Update cortex.sh --- cortex.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cortex.sh b/cortex.sh index 39afda0b59..b94c21711a 100755 --- a/cortex.sh +++ b/cortex.sh @@ -181,7 +181,7 @@ fi function validate_install() { if [[ $CORTEX_NODE_TYPE == *nano ]] || [[ $CORTEX_NODE_TYPE == *micro ]] || [[ $CORTEX_NODE_TYPE == *small ]] || [[ $CORTEX_NODE_TYPE == *medium ]]; then - echo -e "\nCortex may not work correctly on nano, micro, small, or medium instances - please specify a larger instance type" + echo -e "\nCortex does not support nano, micro, small, or medium instances - please specify a larger instance type" exit 1 fi }