Remove cortex namespace configuration option

Author: deliahu

Makefile

@@ -26,7 +26,7 @@ devstart:
 
 kubectl:
 	@source ./dev/config/cortex.sh && eksctl utils write-kubeconfig --name="$$CORTEX_CLUSTER" | grep -v "saved kubeconfig as" | grep -v "using region" || true
-	@source ./dev/config/cortex.sh && kubectl config set-context --current --namespace="$$CORTEX_NAMESPACE" >/dev/null
+	@source ./dev/config/cortex.sh && kubectl config set-context --current --namespace=cortex >/dev/null
 
 cortex-up:
 	@$(MAKE) registry-all
@@ -74,7 +74,7 @@ operator-update:
 
 operator-stop:
 	@$(MAKE) kubectl
-	@source ./dev/config/cortex.sh && kubectl delete --namespace="$$CORTEX_NAMESPACE" --ignore-not-found=true deployment operator
+	@source ./dev/config/cortex.sh && kubectl delete --namespace=cortex --ignore-not-found=true deployment operator
 
 # Docker images
 

cortex.sh

@@ -108,7 +108,6 @@ export CORTEX_CLUSTER="${CORTEX_CLUSTER:-cortex}"
 export CORTEX_NODE_TYPE="${CORTEX_NODE_TYPE:-m5.large}"
 export CORTEX_NODES_MIN="${CORTEX_NODES_MIN:-2}"
 export CORTEX_NODES_MAX="${CORTEX_NODES_MAX:-5}"
-export CORTEX_NAMESPACE="${CORTEX_NAMESPACE:-cortex}"
 
 export CORTEX_IMAGE_MANAGER="${CORTEX_IMAGE_MANAGER:-cortexlabs/manager:$CORTEX_VERSION_BRANCH_STABLE}"
 export CORTEX_IMAGE_FLUENTD="${CORTEX_IMAGE_FLUENTD:-cortexlabs/fluentd:$CORTEX_VERSION_BRANCH_STABLE}"
@@ -252,7 +251,6 @@ function install_cortex() {
     -e CORTEX_AWS_SECRET_ACCESS_KEY=$CORTEX_AWS_SECRET_ACCESS_KEY \
     -e CORTEX_CLUSTER=$CORTEX_CLUSTER \
     -e CORTEX_REGION=$CORTEX_REGION \
-    -e CORTEX_NAMESPACE=$CORTEX_NAMESPACE \
     -e CORTEX_NODE_TYPE=$CORTEX_NODE_TYPE \
     -e CORTEX_LOG_GROUP=$CORTEX_LOG_GROUP \
     -e CORTEX_BUCKET=$CORTEX_BUCKET \
@@ -283,7 +281,6 @@ function uninstall_operator() {
     -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \
     -e CORTEX_CLUSTER=$CORTEX_CLUSTER \
     -e CORTEX_REGION=$CORTEX_REGION \
-    -e CORTEX_NAMESPACE=$CORTEX_NAMESPACE \
     $CORTEX_IMAGE_MANAGER
 }
 
@@ -294,7 +291,6 @@ function info() {
     -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \
     -e CORTEX_CLUSTER=$CORTEX_CLUSTER \
     -e CORTEX_REGION=$CORTEX_REGION \
-    -e CORTEX_NAMESPACE=$CORTEX_NAMESPACE \
     $CORTEX_IMAGE_MANAGER
 }
 

dev/uninstall_cortex.sh

@@ -24,7 +24,7 @@ eksctl utils write-kubeconfig --name=$CORTEX_CLUSTER --region=$CORTEX_REGION | g
 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 namespace cortex
 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

docs/cluster/config.md

@@ -36,9 +36,6 @@ export CORTEX_NODES_MIN=2
 # Maximum number of nodes in the cluster
 export CORTEX_NODES_MAX=5
 
-# The name of the Kubernetes namespace Cortex will use
-export CORTEX_NAMESPACE="cortex"
-
 # Image paths
 export CORTEX_IMAGE_MANAGER="cortexlabs/manager:master"
 export CORTEX_IMAGE_FLUENTD="cortexlabs/fluentd:master"

docs/development.md

@@ -59,7 +59,6 @@ export CORTEX_CLUSTER="cortex"
 export CORTEX_NODE_TYPE="t3.medium"
 export CORTEX_NODES_MIN="2"
 export CORTEX_NODES_MAX="5"
-export CORTEX_NAMESPACE="cortex"
 
 export CORTEX_IMAGE_MANAGER="XXXXXXXX.dkr.ecr.us-west-2.amazonaws.com/cortexlabs/manager:latest"
 export CORTEX_IMAGE_FLUENTD="XXXXXXXX.dkr.ecr.us-west-2.amazonaws.com/cortexlabs/fluentd:latest"

manager/install_cortex.sh

@@ -50,11 +50,11 @@ function setup_cloudwatch_logs() {
 }
 
 function setup_configmap() {
-  kubectl -n=$CORTEX_NAMESPACE create configmap 'cortex-config' \
+  kubectl -n=cortex create configmap 'cortex-config' \
     --from-literal='LOG_GROUP'=$CORTEX_LOG_GROUP \
     --from-literal='BUCKET'=$CORTEX_BUCKET \
     --from-literal='REGION'=$CORTEX_REGION \
-    --from-literal='NAMESPACE'=$CORTEX_NAMESPACE \
+    --from-literal='NAMESPACE'=cortex \
     --from-literal='IMAGE_OPERATOR'=$CORTEX_IMAGE_OPERATOR \
     --from-literal='IMAGE_TF_SERVE'=$CORTEX_IMAGE_TF_SERVE \
     --from-literal='IMAGE_ONNX_SERVE'=$CORTEX_IMAGE_ONNX_SERVE \
@@ -67,7 +67,7 @@ function setup_configmap() {
 }
 
 function setup_secrets() {
-  kubectl -n=$CORTEX_NAMESPACE create secret generic 'aws-credentials' \
+  kubectl -n=cortex create secret generic 'aws-credentials' \
     --from-literal='AWS_ACCESS_KEY_ID'=$CORTEX_AWS_ACCESS_KEY_ID \
     --from-literal='AWS_SECRET_ACCESS_KEY'=$CORTEX_AWS_SECRET_ACCESS_KEY \
     -o yaml --dry-run | kubectl apply -f - >/dev/null
@@ -114,11 +114,11 @@ function validate_cortex() {
     echo -n "."
     sleep 5
 
-    operator_pod_name=$(kubectl -n=$CORTEX_NAMESPACE get pods -o=name --sort-by=.metadata.creationTimestamp | grep "^pod/operator-" | tail -1)
+    operator_pod_name=$(kubectl -n=cortex get pods -o=name --sort-by=.metadata.creationTimestamp | grep "^pod/operator-" | tail -1)
     if [ "$operator_pod_name" == "" ]; then
       operator_pod_ready_cycles=0
     else
-      is_ready=$(kubectl -n=$CORTEX_NAMESPACE get "$operator_pod_name" -o jsonpath='{.status.containerStatuses[0].ready}')
+      is_ready=$(kubectl -n=cortex get "$operator_pod_name" -o jsonpath='{.status.containerStatuses[0].ready}')
       if [ "$is_ready" == "true" ]; then
         ((operator_pod_ready_cycles++))
       else
@@ -154,10 +154,10 @@ function validate_cortex() {
     fi
 
     if [ "$operator_pod_ready_cycles" == "0" ] && [ "$operator_pod_name" != "" ]; then
-      num_restart=$(kubectl -n=$CORTEX_NAMESPACE get "$operator_pod_name" -o jsonpath='{.status.containerStatuses[0].restartCount}')
+      num_restart=$(kubectl -n=cortex get "$operator_pod_name" -o jsonpath='{.status.containerStatuses[0].restartCount}')
       if [[ $num_restart -ge 2 ]]; then
         echo -e "\n\nAn error occurred when starting the Cortex operator. View the logs with:"
-        echo "  kubectl logs $operator_pod_name --namespace=$CORTEX_NAMESPACE"
+        echo "  kubectl logs $operator_pod_name --namespace=cortex"
         exit 1
       fi
       continue

manager/manifests/apis.yaml

@@ -16,7 +16,7 @@ apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:
   name: apis-gateway
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
 spec:
   selector:
     istio: apis-ingressgateway

manager/manifests/fluentd.yaml

@@ -16,15 +16,15 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: fluentd
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
   labels:
     app: fluentd
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRole
 metadata:
   name: fluentd
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
 rules:
 - apiGroups: [""]
   resources:
@@ -37,11 +37,11 @@ apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
   name: fluentd
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
 subjects:
 - kind: ServiceAccount
   name: fluentd
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
 roleRef:
   kind: ClusterRole
   name: fluentd
@@ -52,7 +52,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: fluentd
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
 data:
   fluent.conf: |
     @include containers.conf
@@ -65,7 +65,7 @@ data:
       @type tail
       @id in_tail_container_logs
       @label @containers
-      path /var/log/containers/**_${CORTEX_NAMESPACE}_**.log
+      path /var/log/containers/**_cortex_**.log
       pos_file /var/log/fluentd-containers.log.pos
       tag *
       read_from_head true
@@ -113,7 +113,7 @@ apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
   name: fluentd
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
 spec:
   template:
     metadata:

manager/manifests/namespace.yaml

@@ -15,4 +15,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: $CORTEX_NAMESPACE
+  name: cortex

manager/manifests/operator.yaml

@@ -16,19 +16,19 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: operator
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
 
 ---
 
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: operator
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
 subjects:
 - kind: ServiceAccount
   name: operator
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
 roleRef:
   kind: ClusterRole
   name: cluster-admin
@@ -40,7 +40,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: operator
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
   labels:
     workloadType: operator
     workloadID: operator
@@ -93,7 +93,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
   name: operator
   labels:
     workloadType: operator
@@ -112,7 +112,7 @@ apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:
   name: operator-gateway
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
 spec:
   selector:
     istio: operator-ingressgateway
@@ -140,7 +140,7 @@ apiVersion: networking.istio.io/v1alpha3
 kind: VirtualService
 metadata:
   name: operator
-  namespace: $CORTEX_NAMESPACE
+  namespace: cortex
 spec:
   hosts:
   - "*"