Merge pull request #40352 from kubernetes/revert-39033-provider-independent-kubemark

cluster/kubemark/gce/config-default.sh → cluster/kubemark/config-default.sh

 #!/bin/bash
 
-# Copyright 2017 The Kubernetes Authors.
+# Copyright 2015 The Kubernetes Authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

cluster/kubemark/util.sh

@@ -15,6 +15,5 @@
 # limitations under the License.
 
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
-source ${KUBE_ROOT}/test/kubemark/cloud-provider-config.sh
-source ${KUBE_ROOT}/cluster/${CLOUD_PROVIDER}/util.sh
-source ${KUBE_ROOT}/cluster/kubemark/${CLOUD_PROVIDER}/config-default.sh
+source ${KUBE_ROOT}/cluster/gce/util.sh
+source ${KUBE_ROOT}/cluster/kubemark/config-default.sh

test/kubemark/cloud-provider-config.sh

-#!/bin/bash
-
-# Copyright 2017 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-CLOUD_PROVIDER="${CLOUD_PROVIDER:-gce}"

test/kubemark/common.sh

+#!/bin/bash
+
+# Copyright 2015 The Kubernetes Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+source "${KUBE_ROOT}/cluster/kubemark/config-default.sh"
+source "${KUBE_ROOT}/cluster/kubemark/util.sh"
+source "${KUBE_ROOT}/cluster/lib/util.sh"
+
+# hack/lib/init.sh will ovewrite ETCD_VERSION if this is unset
+# what what is default in hack/lib/etcd.sh
+# To avoid it, if it is empty, we set it to 'avoid-overwrite' and
+# clean it after that.
+if [ -z "${ETCD_VERSION:-}" ]; then
+  ETCD_VERSION="avoid-overwrite"
+fi
+source "${KUBE_ROOT}/hack/lib/init.sh"
+if [ "${ETCD_VERSION:-}" == "avoid-overwrite" ]; then
+  ETCD_VERSION=""
+fi
+
+detect-project &> /dev/null
+export PROJECT
+find-release-tars
+
+MASTER_NAME="${INSTANCE_PREFIX}-kubemark-master"
+MASTER_TAG="kubemark-master"
+EVENT_STORE_NAME="${INSTANCE_PREFIX}-event-store"
+
+RETRIES=3
+
+export KUBECTL="${KUBE_ROOT}/cluster/kubectl.sh"
+export KUBEMARK_DIRECTORY="${KUBE_ROOT}/test/kubemark"
+export RESOURCE_DIRECTORY="${KUBEMARK_DIRECTORY}/resources"
+
+# Runs gcloud compute command with the given parameters. Up to $RETRIES will be made
+# to execute the command.
+# arguments:
+# $@: all stuff that goes after 'gcloud compute '
+function run-gcloud-compute-with-retries {
+  echo "" > /tmp/gcloud_retries
+  for attempt in $(seq 1 ${RETRIES}); do
+    if ! gcloud compute $@ &> /tmp/gcloud_retries; then
+      if [[ $(grep -c "already exists" /tmp/gcloud_retries) -gt 0 ]]; then
+        if [[ "${attempt}" == 1 ]]; then
+          echo -e "${color_red} Failed to $1 $2 $3 as the resource hasn't been deleted from a previous run.${color_norm}" >& 2
+          exit 1
+        fi
+        echo -e "${color_yellow}Succeeded to $1 $2 $3 in the previous attempt, but status response wasn't received.${color_norm}"
+        return 0
+      fi
+      echo -e "${color_yellow}Attempt $(($attempt+1)) failed to $1 $2 $3. Retrying.${color_norm}" >& 2
+      sleep $(($attempt * 5))
+    else
+      return 0
+    fi
+  done
+  echo -e "${color_red} Failed to $1 $2 $3.${color_norm}" >& 2
+  exit 1
+}

test/kubemark/configure-kubectl.sh

@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This script assumes that kubectl binary is present in PATH.
+curl https://sdk.cloud.google.com 2> /dev/null | bash
+sudo gcloud components update kubectl -q
+sudo ln -s /usr/local/share/google/google-cloud-sdk/bin/kubectl /bin/
 kubectl config set-cluster hollow-cluster --server=http://localhost:8080 --insecure-skip-tls-verify=true
 kubectl config set-credentials $(whoami)
 kubectl config set-context hollow-context --cluster=hollow-cluster --user=$(whoami)

test/kubemark/gce/util.sh

-#!/bin/bash
-
-# Copyright 2017 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source "${KUBE_ROOT}/cluster/gce/util.sh"
-
-detect-project &> /dev/null
-export PROJECT
-
-RETRIES=3
-# Runs gcloud compute command with the given parameters. Up to $RETRIES will be made
-# to execute the command.
-# arguments:
-# $@: all stuff that goes after 'gcloud compute'
-function run-gcloud-compute-with-retries {
-  for attempt in $(seq 1 ${RETRIES}); do
-    local -r gcloud_cmd_hash=`echo "gcloud compute $@" | md5sum | cut -f1 -d" "`
-    local -r gcloud_logfile="/tmp/gcloud_${gcloud_cmd_hash}.log"
-    echo "" > ${gcloud_logfile}
-    if ! gcloud compute "$@" |& tee ${gcloud_logfile}; then
-      if [[ $(grep -c "already exists" ${gcloud_logfile}) -gt 0 ]]; then
-        if [[ "${attempt}" == 1 ]]; then
-          echo -e "${color_red} Failed to $1 $2 $3 as the resource hasn't been deleted from a previous run.${color_norm}" >& 2
-          exit 1
-        fi
-        echo -e "${color_yellow}Succeeded to $1 $2 $3 in the previous attempt, but status response wasn't received.${color_norm}"
-        return 0
-      fi
-      echo -e "${color_yellow}Attempt $attempt failed to $1 $2 $3. Retrying.${color_norm}" >& 2
-      sleep $(($attempt * 5))
-    else
-      echo -e "${color_green}Succeeded to gcloud compute $1 $2 $3.${color_norm}"
-      return 0
-    fi
-  done
-  echo -e "${color_red} Failed to $1 $2 $3.${color_norm}" >& 2
-  exit 1
-}
-
-function create-master-instance-with-resources {
-  GCLOUD_COMMON_ARGS="--project ${PROJECT} --zone ${ZONE}"
-
-  run-gcloud-compute-with-retries disks create "${MASTER_NAME}-pd" \
-    ${GCLOUD_COMMON_ARGS} \
-    --type "${MASTER_DISK_TYPE}" \
-    --size "${MASTER_DISK_SIZE}"
-  
-  if [ "${EVENT_PD:-false}" == "true" ]; then
-    run-gcloud-compute-with-retries disks create "${MASTER_NAME}-event-pd" \
-      ${GCLOUD_COMMON_ARGS} \
-      --type "${MASTER_DISK_TYPE}" \
-      --size "${MASTER_DISK_SIZE}"
-  fi
-  
-  run-gcloud-compute-with-retries addresses create "${MASTER_NAME}-ip" \
-    --project "${PROJECT}" \
-    --region "${REGION}" -q
-  
-  MASTER_IP=$(gcloud compute addresses describe "${MASTER_NAME}-ip" \
-    --project "${PROJECT}" --region "${REGION}" -q --format='value(address)')
-  
-  run-gcloud-compute-with-retries instances create "${MASTER_NAME}" \
-    ${GCLOUD_COMMON_ARGS} \
-    --address "${MASTER_IP}" \
-    --machine-type "${MASTER_SIZE}" \
-    --image-project="${MASTER_IMAGE_PROJECT}" \
-    --image "${MASTER_IMAGE}" \
-    --tags "${MASTER_TAG}" \
-    --network "${NETWORK}" \
-    --scopes "storage-ro,compute-rw,logging-write" \
-    --boot-disk-size "${MASTER_ROOT_DISK_SIZE}" \
-    --disk "name=${MASTER_NAME}-pd,device-name=master-pd,mode=rw,boot=no,auto-delete=no"
-  
-  if [ "${EVENT_PD:-false}" == "true" ]; then
-    echo "Attaching ${MASTER_NAME}-event-pd to ${MASTER_NAME}"
-    run-gcloud-compute-with-retries instances attach-disk "${MASTER_NAME}" \
-    ${GCLOUD_COMMON_ARGS} \
-    --disk "${MASTER_NAME}-event-pd" \
-    --device-name="master-event-pd"
-  fi
-  
-  run-gcloud-compute-with-retries firewall-rules create "${MASTER_NAME}-https" \
-    --project "${PROJECT}" \
-    --network "${NETWORK}" \
-    --source-ranges "0.0.0.0/0" \
-    --target-tags "${MASTER_TAG}" \
-    --allow "tcp:443"
-}
-
-# Command to be executed is '$1'.
-# No. of retries is '$2' (if provided) or 1 (default).
-function execute-cmd-on-master-with-retries() {
-  RETRIES="${2:-1}" run-gcloud-compute-with-retries ssh "${MASTER_NAME}" --zone="${ZONE}" --project="${PROJECT}" --command="$1"
-}
-
-function copy-files() {
-	run-gcloud-compute-with-retries copy-files --zone="${ZONE}" --project="${PROJECT}" $@
-}
-
-function delete-master-instance-and-resources {
-  GCLOUD_COMMON_ARGS="--project ${PROJECT} --zone ${ZONE} --quiet"
-
-  gcloud compute instances delete "${MASTER_NAME}" \
-      ${GCLOUD_COMMON_ARGS} || true
-  
-  gcloud compute disks delete "${MASTER_NAME}-pd" \
-      ${GCLOUD_COMMON_ARGS} || true
-  
-  gcloud compute disks delete "${MASTER_NAME}-event-pd" \
-      ${GCLOUD_COMMON_ARGS} &> /dev/null || true
-  
-  gcloud compute addresses delete "${MASTER_NAME}-ip" \
-      --project "${PROJECT}" \
-      --region "${REGION}" \
-      --quiet || true
-  
-  gcloud compute firewall-rules delete "${MASTER_NAME}-https" \
-	  --project "${PROJECT}" \
-	  --quiet || true
-  
-  if [ "${SEPARATE_EVENT_MACHINE:-false}" == "true" ]; then
-	  gcloud compute instances delete "${EVENT_STORE_NAME}" \
-    	  ${GCLOUD_COMMON_ARGS} || true
-  
-	  gcloud compute disks delete "${EVENT_STORE_NAME}-pd" \
-    	  ${GCLOUD_COMMON_ARGS} || true
-  fi
-}

test/kubemark/resources/heapster_template.json

@@ -66,7 +66,7 @@
 						"/eventer"
 					],
 					"args": [
-						"--source=kubernetes:https://{{MASTER_IP}}:443?inClusterConfig=0&useServiceAccount=0&auth=/kubeconfig/heapster.kubeconfig"
+						"--source=kubernetes:https://104.197.233.84:443?inClusterConfig=0&useServiceAccount=0&auth=/kubeconfig/heapster.kubeconfig"
 					],
 					"volumeMounts": [
 						{

test/kubemark/resources/hollow-node_template.json

@@ -80,7 +80,7 @@
 					"command": [
 						"/bin/sh",
 						"-c",
-						"./kubemark.sh --morph=kubelet --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubelet.kubeconfig $(CONTENT_TYPE) --v=2 1>>/var/logs/kubelet_$(NODE_NAME).log 2>&1"
+						"./kubemark.sh --morph=kubelet --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubelet.kubeconfig $(CONTENT_TYPE) --v=2 1>>/var/logs/kubelet_$(MY_POD_NAME).log 2>&1"
 					],
 					"volumeMounts": [
 						{
@@ -129,7 +129,7 @@
 					"command": [
 						"/bin/sh",
 						"-c",
-						"./kubemark.sh --morph=proxy --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubeproxy.kubeconfig $(CONTENT_TYPE) --v=2 1>>/var/logs/kubeproxy_$(NODE_NAME).log 2>&1"
+						"./kubemark.sh --morph=proxy --name=$(NODE_NAME) --kubeconfig=/kubeconfig/kubeproxy.kubeconfig $(CONTENT_TYPE) --v=2 1>>/var/logs/kube_proxy_$(MY_POD_NAME).log 2>&1"
 					],
 					"volumeMounts": [
 						{

test/kubemark/run-e2e-tests.sh

@@ -14,18 +14,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
-
-source "${KUBE_ROOT}/test/kubemark/cloud-provider-config.sh"
-source "${KUBE_ROOT}/test/kubemark/${CLOUD_PROVIDER}/util.sh"
-source "${KUBE_ROOT}/cluster/kubemark/${CLOUD_PROVIDER}/config-default.sh"
-
 export KUBERNETES_PROVIDER="kubemark"
 export KUBE_CONFIG_FILE="config-default.sh"
 
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+
 # We need an absolute path to KUBE_ROOT
 ABSOLUTE_ROOT=$(readlink -f ${KUBE_ROOT})
 
+source ${KUBE_ROOT}/cluster/kubemark/util.sh
+source ${KUBE_ROOT}/cluster/kubemark/config-default.sh
+
 echo "Kubemark master name: ${MASTER_NAME}"
 
 detect-master

test/kubemark/skeleton/util.sh

-#!/bin/bash
-
-# Copyright 2017 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This script contains the helper functions that each provider hosting
-# Kubermark must implement to use test/kubemark/start-kubemark.sh and
-# test/kubemark/stop-kubemark.sh scripts.
-
-
-# This function should create a machine instance for the master along
-# with any/all of the following resources:
-# - Attach a PD to the master (optionally 1 more for storing events)
-# - A public IP address for the master ($MASTER_IP)
-# - A network firewall rule allowing all TCP traffic on port 443 in master
-#   Note: This step is compulsory in order for kubemark to work
-#
-# ENV vars that should be defined by the end of this function:
-# 1. MASTER_IP
-# 2. MASTER_NAME
-#
-# Recommended for this function to include retrying logic for the above
-# operations in case of failures.
-function create-master-instance-with-resources {
-	echo "MASTER_IP: $MASTER_IP" 1>&2
-	echo "MASTER_NAME: $MASTER_NAME" 1>&2
-}
-
-# This function should execute the command('$1') on the master machine
-# (possibly through SSH), retrying in case of failure. The allowed number of
-# retries would be '$2' (if not provided, default to single try).
-function execute-cmd-on-master-with-retries() {
-	echo "Executing command on the master" 1>&2
-}
-
-# This function should act as an scp for the kubemark cluster, which copies
-# the files given by the first n-1 arguments to the remote location given
-# by the n^th argument.
-#
-# Recommended for this function to include retrying logic in case of failures.
-function copy-files() {
-	echo "Copying files" 1>&2
-}
-
-# This function should delete the master instance along with all the
-# resources that have been allocated inside the function
-# 'create-master-instance-with-resources' above.
-#
-# Recommended for this function to include retrying logic in case of failures.
-function delete-master-instance-and-resources {
-	echo "Deleting master instance and its allocated resources" 1>&2
-}

test/kubemark/stop-kubemark.sh

@@ -14,25 +14,47 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Script that destroys Kubemark cluster and deletes all master resources.
-
+# Script that destroys Kubemark clusters and deletes all GCE resources created for Master
 KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
 
-source "${KUBE_ROOT}/test/kubemark/skeleton/util.sh"
-source "${KUBE_ROOT}/test/kubemark/cloud-provider-config.sh"
-source "${KUBE_ROOT}/test/kubemark/${CLOUD_PROVIDER}/util.sh"
-source "${KUBE_ROOT}/cluster/kubemark/${CLOUD_PROVIDER}/config-default.sh"
-
-KUBECTL="${KUBE_ROOT}/cluster/kubectl.sh"
-RESOURCE_DIRECTORY="${KUBE_ROOT}/test/kubemark/resources"
+source "${KUBE_ROOT}/test/kubemark/common.sh"
 
+"${KUBECTL}" delete -f "${RESOURCE_DIRECTORY}/hollow-kubelet.json" &> /dev/null || true
 "${KUBECTL}" delete -f "${RESOURCE_DIRECTORY}/addons" &> /dev/null || true
-"${KUBECTL}" delete -f "${RESOURCE_DIRECTORY}/hollow-node.json" &> /dev/null || true
 "${KUBECTL}" delete -f "${RESOURCE_DIRECTORY}/kubemark-ns.json" &> /dev/null || true
+rm -rf "${RESOURCE_DIRECTORY}/addons"
+
+GCLOUD_COMMON_ARGS="--project ${PROJECT} --zone ${ZONE} --quiet"
+
+gcloud compute instances delete "${MASTER_NAME}" \
+    ${GCLOUD_COMMON_ARGS} || true
+
+gcloud compute disks delete "${MASTER_NAME}-pd" \
+    ${GCLOUD_COMMON_ARGS} || true
+
+gcloud compute disks delete "${MASTER_NAME}-event-pd" \
+    ${GCLOUD_COMMON_ARGS} &> /dev/null || true
 
-rm -rf "${RESOURCE_DIRECTORY}/addons" \
-	"${RESOURCE_DIRECTORY}/kubeconfig.kubemark" \
+gcloud compute addresses delete "${MASTER_NAME}-ip" \
+    --project "${PROJECT}" \
+    --region "${REGION}" \
+    --quiet || true
+
+gcloud compute firewall-rules delete "${INSTANCE_PREFIX}-kubemark-master-https" \
+	--project "${PROJECT}" \
+	--quiet || true
+
+if [ "${SEPARATE_EVENT_MACHINE:-false}" == "true" ]; then
+	gcloud compute instances delete "${EVENT_STORE_NAME}" \
+    	${GCLOUD_COMMON_ARGS} || true
+
+	gcloud compute disks delete "${EVENT_STORE_NAME}-pd" \
+    	${GCLOUD_COMMON_ARGS} || true
+fi
+
+rm -rf "${RESOURCE_DIRECTORY}/addons" "${RESOURCE_DIRECTORY}/kubeconfig.kubemark" &> /dev/null || true
+rm "${RESOURCE_DIRECTORY}/ca.crt" \
+	"${RESOURCE_DIRECTORY}/kubecfg.crt" \
+	"${RESOURCE_DIRECTORY}/kubecfg.key" \
 	"${RESOURCE_DIRECTORY}/hollow-node.json" \
 	"${RESOURCE_DIRECTORY}/kubemark-master-env.sh"  &> /dev/null || true
-
-delete-master-instance-and-resources