From ce9985dcc3b1b9964805d959162e4f8138bde829 Mon Sep 17 00:00:00 2001 From: Ryan Miller Date: Fri, 10 Jan 2020 15:44:50 -0800 Subject: [PATCH 1/2] Clean up unused files --- deploy/docker/setup/setup.sh | 224 ----------------------------------- deploy/helm/tiller-rbac.yaml | 18 --- 2 files changed, 242 deletions(-) delete mode 100755 deploy/docker/setup/setup.sh delete mode 100644 deploy/helm/tiller-rbac.yaml diff --git a/deploy/docker/setup/setup.sh b/deploy/docker/setup/setup.sh deleted file mode 100755 index 031fa1a289..0000000000 --- a/deploy/docker/setup/setup.sh +++ /dev/null @@ -1,224 +0,0 @@ -#!/bin/bash -set -e - -usage() { - echo - echo 'Usage:' - echo ' setup.sh [-c collector-name] [-k cluster-name] [-n namespace] [-a use-alpha] [-d deploy] [-y download-yaml] ' - echo -} - -timestamp() { - date +"%s" -} - -create_host_collector() -{ - _P='{"collector":{"collectorType":"Hosted","name":"' - _M='","fields":{"cluster":"' - _S='"}}}' - JSON="$_P$1$_M$2$_S" - COMMAND="curl -s -u $ACC_ID:$ACC_KEY -X POST -H Content-Type:application/json -d $JSON $SUMO_ENDPOINT/collectors" - RESULT=$($COMMAND) - set +e - COLLECTOR_ID=$(echo $RESULT | jq -r '.collector.id') - COLLECTOR_NAME=$(echo $RESULT | jq -r '.collector.name') - set -e - if [ ! -n "$COLLECTOR_ID" -o "null" == "$COLLECTOR_ID" ]; then - echo 'Failed to create collector:'; - echo $RESULT - exit -3; - fi - echo "Collector was created(id=$COLLECTOR_ID, name=$COLLECTOR_NAME)." -} - -create_http_source() -{ - _P='{"source":{"sourceType":"HTTP","name":"' - _C='","category":"' - _S='","messagePerRequest":false,"multilineProcessingEnabled":false}}' - JSON="$_P$1$_C$3/$1$_S" - COMMAND="curl -s -u $ACC_ID:$ACC_KEY -X POST -H Content-Type:application/json -d $JSON $SUMO_ENDPOINT/collectors/$2/sources" - RESULT=$($COMMAND) - set +e - SOURCE_URL=$(echo $RESULT | jq -r '.source.url') - SOURCE_ID=$(echo $RESULT | jq -r '.source.id') - SOURCE_NAME=$(echo $RESULT | jq -r '.source.name') - set -e - if [ ! -n "$SOURCE_URL" -o "null" == "$SOURCE_URL" ]; then - echo 'Failed to create source:'; - echo $RESULT - exit -4; - fi - echo "Source was created(id=$SOURCE_ID, name=$SOURCE_NAME)." -} - -# Check for required software before proceeding -verify_requirements() -{ - command -v wget >/dev/null 2>&1 || { echo >&2 "Please install wget before executing this script."; exit -1; } - command -v jq >/dev/null 2>&1 || { echo >&2 "Please install jq before executing this script"; exit -1; } - command -v kubectl >/dev/null 2>&1 || { echo >&2 "Please install kubectl before executing this script"; exit -1; } -} - -verify_requirements; - -DEPLOY=true; -DOWNLOAD_YAML=true; - -while getopts c:k:n:a:d:y: option -do - case "${option}" - in - c) COLLECTOR_NAME=${OPTARG};; - k) CLUSTER_NAME=${OPTARG};; - n) NAMESPACE=${OPTARG};; - a) ALPHA=${OPTARG};; - d) DEPLOY=${OPTARG};; - y) DOWNLOAD_YAML=${OPTARG};; - esac -done -shift "$(($OPTIND -1))" - -TIME=`timestamp`; - -if [ -z $COLLECTOR_NAME ]; then - if [ -z $SUMO_COLLECTOR_NAME ]; - then - COLLECTOR_NAME="kubernetes-$TIME"; - else - COLLECTOR_NAME=$SUMO_COLLECTOR_NAME; - fi -fi - -if [ -z $CLUSTER_NAME ]; then - if [ -z $KUBERNETES_CLUSTER_NAME ] - then - CLUSTER_NAME="kubernetes-$TIME"; - else - CLUSTER_NAME=$KUBERNETES_CLUSTER_NAME - fi -fi - -if [ -z $NAMESPACE ]; then - if [ -z $SUMO_NAMESPACE ] - then - NAMESPACE="sumologic" - else - NAMESPACE=$SUMO_NAMESPACE - fi -fi - -if [ "$ALPHA" == "true" ] -then - release=`wget -q https://registry.hub.docker.com/v1/repositories/sumologic/kubernetes-fluentd/tags -O - | jq -r .[].name | grep alpha | sed 's/-alpha//g' | sort --version-sort --field-separator=. | tail -1`-alpha -else - release=`wget -q https://registry.hub.docker.com/v1/repositories/sumologic/kubernetes-fluentd/tags -O - | jq -r .[].name | grep -v alpha | grep -v latest | sort --version-sort --field-separator=. | tail -1` -fi - -if [ -n "$1" ]; then - SUMO_ENDPOINT=${1%/}; -else - echo ' is missing.'; - usage; - exit -1; -fi - -if [ -n "$2" ]; then - ACC_ID=$2; -else - echo ' is missing.'; - usage; - exit -1; -fi - -if [ -n "$3" ]; then - ACC_KEY=$3; -else - echo ' is missing.'; - usage; - exit -1; -fi - -set +e -kubectl get namespace $NAMESPACE &>/dev/null -retVal=$? -set -e -if [ $retVal -ne 0 ]; then - echo "Creating namespace '$NAMESPACE'..." - kubectl create namespace $NAMESPACE -else - echo "Namespace '$NAMESPACE' exists, skip creating." -fi - -set +e -echo "Checking for secret 'sumologic'..." -kubectl -n $NAMESPACE describe secret/sumologic &>/dev/null -retVal=$? -set -e -if [ $retVal -eq 0 ]; then - echo "Secret '${NAMESPACE}::sumologic' exists, abort." - exit -2; -fi - -echo "Creating collector '$COLLECTOR_NAME' for cluster $CLUSTER_NAME..." -COLLECTOR_ID= -create_host_collector $COLLECTOR_NAME $CLUSTER_NAME - -echo "Creating sources in '$COLLECTOR_NAME'..." -SOURCE_URL= -create_http_source '(default-metrics)' $COLLECTOR_ID $CLUSTER_NAME -ENDPOINT_METRICS="$SOURCE_URL" -SOURCE_URL= -create_http_source apiserver-metrics $COLLECTOR_ID $CLUSTER_NAME -ENDPOINT_METRICS_APISERVER="$SOURCE_URL" -SOURCE_URL= -create_http_source kube-controller-manager-metrics $COLLECTOR_ID $CLUSTER_NAME -ENDPOINT_METRICS_KUBE_CONTROLLER_MANAGER="$SOURCE_URL" -SOURCE_URL= -create_http_source kube-scheduler-metrics $COLLECTOR_ID $CLUSTER_NAME -ENDPOINT_METRICS_KUBE_SCHEDULER="$SOURCE_URL" -SOURCE_URL= -create_http_source kube-state-metrics $COLLECTOR_ID $CLUSTER_NAME -ENDPOINT_METRICS_KUBE_STATE="$SOURCE_URL" -SOURCE_URL= -create_http_source kubelet-metrics $COLLECTOR_ID $CLUSTER_NAME -ENDPOINT_METRICS_KUBELET="$SOURCE_URL" -SOURCE_URL= -create_http_source node-exporter-metrics $COLLECTOR_ID $CLUSTER_NAME -ENDPOINT_METRICS_NODE_EXPORTER="$SOURCE_URL" -SOURCE_URL= -create_http_source logs $COLLECTOR_ID $CLUSTER_NAME -ENDPOINT_LOGS="$SOURCE_URL" -SOURCE_URL= -create_http_source events $COLLECTOR_ID $CLUSTER_NAME -ENDPOINT_EVENTS="$SOURCE_URL" - -kubectl -n $NAMESPACE create secret generic sumologic \ - --from-literal=endpoint-metrics=$ENDPOINT_METRICS \ - --from-literal=endpoint-metrics-apiserver=$ENDPOINT_METRICS_APISERVER \ - --from-literal=endpoint-metrics-kube-controller-manager=$ENDPOINT_METRICS_KUBE_CONTROLLER_MANAGER \ - --from-literal=endpoint-metrics-kube-scheduler=$ENDPOINT_METRICS_KUBE_SCHEDULER \ - --from-literal=endpoint-metrics-kube-state=$ENDPOINT_METRICS_KUBE_STATE \ - --from-literal=endpoint-metrics-kubelet=$ENDPOINT_METRICS_KUBELET \ - --from-literal=endpoint-metrics-node-exporter=$ENDPOINT_METRICS_NODE_EXPORTER \ - --from-literal=endpoint-logs=$ENDPOINT_LOGS \ - --from-literal=endpoint-events=$ENDPOINT_EVENTS - - -if [ "$DEPLOY" = true ]; then - echo "Applying deployment 'fluentd' $release ... " - curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v$release/deploy/kubernetes/fluentd-sumologic.yaml.tmpl | \ - sed 's/\$NAMESPACE'"/$NAMESPACE/g" | \ - sed "s|image: sumologic/kubernetes-fluentd:.*|image: sumologic/kubernetes-fluentd:$release|g" | \ - tee fluentd-sumologic.yaml | \ - kubectl -n $NAMESPACE apply -f - -elif [ "$DOWNLOAD_YAML" = true ]; then - echo "Downloading 'fluentd-sumologic.yaml' $release ..." - curl https://raw.githubusercontent.com/SumoLogic/sumologic-kubernetes-collection/v$release/deploy/kubernetes/fluentd-sumologic.yaml.tmpl | \ - sed 's/\$NAMESPACE'"/$NAMESPACE/g" | \ - sed "s|image: sumologic/kubernetes-fluentd:.*|image: sumologic/kubernetes-fluentd:$release|g" \ - >> fluentd-sumologic.yaml -fi - -echo "Done." diff --git a/deploy/helm/tiller-rbac.yaml b/deploy/helm/tiller-rbac.yaml deleted file mode 100644 index 1fcf47dca7..0000000000 --- a/deploy/helm/tiller-rbac.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: ServiceAccount -metadata: - name: tiller - namespace: kube-system ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: tiller -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: cluster-admin -subjects: - - kind: ServiceAccount - name: tiller - namespace: kube-system From 062be9da0f6791af899c4633f176da852ab88edd Mon Sep 17 00:00:00 2001 From: Ryan Miller Date: Fri, 10 Jan 2020 15:50:59 -0800 Subject: [PATCH 2/2] Update Dockerfile to remove setup.sh --- deploy/docker/Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 97ee77de8e..b731a1b8bc 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -56,11 +56,6 @@ RUN runDeps="sudo libsnappy-dev" \ && apt-get install -y wget \ && apt-get install -y unzip - # Install kubectl (to be removed once we switch to Terraform) -ADD https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/amd64/kubectl /usr/local/bin/kubectl -RUN chmod +x /usr/local/bin/kubectl -COPY setup/setup.sh /usr/bin/ - # Install Terraform ENV TERRAFORM_VERSION 0.12.12 RUN mkdir /tmp/terraform && \