Merge pull request #38844 from nikhiljindal/fednewkubectlTests

Makefile

@@ -257,6 +257,7 @@ else
 test-cmd: generated_files
 	hack/make-rules/test-kubeadm-cmd.sh
 	hack/make-rules/test-cmd.sh
+	hack/make-rules/test-federation-cmd.sh
 endif
 
 define CLEAN_HELP_INFO

hack/lib/test.sh

@@ -23,7 +23,12 @@ readonly   red=$(tput setaf 1)
 readonly green=$(tput setaf 2)
 
 kube::test::clear_all() {
-  kubectl delete "${kube_flags[@]}" rc,pods --all --grace-period=0 --force
+  if kube::test::if_supports_resource "rc" ; then
+    kubectl delete "${kube_flags[@]}" rc --all --grace-period=0 --force
+  fi
+  if kube::test::if_supports_resource "pods" ; then
+    kubectl delete "${kube_flags[@]}" pods --all --grace-period=0 --force
+  fi
 }
 
 # Force exact match of a returned result for a object query.  Wrap this with || to support multiple
@@ -223,3 +228,21 @@ kube::test::if_has_string() {
     return 1
   fi
 }
+
+# Returns true if the required resource is part of supported resources.
+# Expects env vars:
+#   SUPPORTED_RESOURCES: Array of all resources supported by the apiserver. "*"
+#   means it supports all resources. For ex: ("*") or ("rc" "*") both mean that
+#   all resources are supported.
+#   $1: Name of the resource to be tested.
+kube::test::if_supports_resource() {
+  SUPPORTED_RESOURCES=${SUPPORTED_RESOURCES:-""}
+  REQUIRED_RESOURCE=${1:-""}
+
+  for r in "${SUPPORTED_RESOURCES[@]}"; do
+    if [[ "${r}" == "*" || "${r}" == "${REQUIRED_RESOURCE}" ]]; then
+      return 0
+    fi
+  done
+  return 1
+}

hack/make-rules/test-federation-cmd.sh

+#!/bin/bash
+
+# Copyright 2016 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 command checks that the built commands can function together for
+# simple scenarios.  It does not require Docker.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
+source "${KUBE_ROOT}/hack/make-rules/test-cmd-util.sh"
+
+function run_federation_apiserver() {
+  kube::log::status "Building federation-apiserver"
+  make -C "${KUBE_ROOT}" WHAT="federation/cmd/federation-apiserver"
+
+  # Start federation-apiserver
+  kube::log::status "Starting federation-apiserver"
+
+  # Admission Controllers to invoke prior to persisting objects in cluster
+  ADMISSION_CONTROL="NamespaceLifecycle"
+
+  "${KUBE_OUTPUT_HOSTBIN}/federation-apiserver" \
+    --insecure-port="${API_PORT}" \
+    --admission-control="${ADMISSION_CONTROL}" \
+    --etcd-servers="http://${ETCD_HOST}:${ETCD_PORT}" \
+    --storage-media-type="${KUBE_TEST_API_STORAGE_TYPE-}" \
+    --cert-dir="${TMPDIR:-/tmp/}" 1>&2 &
+  APISERVER_PID=$!
+
+  kube::util::wait_for_url "http://127.0.0.1:${API_PORT}/healthz" "apiserver"
+}
+
+function run_federation_controller_manager() {
+  kube::log::status "Building federation-controller-manager"
+  make -C "${KUBE_ROOT}" WHAT="federation/cmd/federation-controller-manager"
+
+  # Create a kubeconfig for federation apiserver.
+  local kubeconfig="${KUBE_TEMP}/kubeconfig"
+  touch "${kubeconfig}"
+  kubectl config set-cluster "apiserver" --server="http://127.0.0.1:${API_PORT}" --insecure-skip-tls-verify=true --kubeconfig="${kubeconfig}"
+  kubectl config set-context "context" --cluster="apiserver" --kubeconfig="${kubeconfig}"
+  kubectl config use-context "context" --kubeconfig="${kubeconfig}"
+
+  # Start controller manager
+  kube::log::status "Starting federation-controller-manager"
+  "${KUBE_OUTPUT_HOSTBIN}/federation-controller-manager" \
+    --port="${CTLRMGR_PORT}" \
+    --kubeconfig="${kubeconfig}" \
+    --kube-api-content-type="${KUBE_TEST_API_TYPE-}" \
+    --master="127.0.0.1:${API_PORT}" 1>&2 &
+  CTLRMGR_PID=$!
+
+  kube::util::wait_for_url "http://127.0.0.1:${CTLRMGR_PORT}/healthz" "controller-manager"
+}
+
+kube::log::status "Running kubectl tests for federation-apiserver"
+
+setup
+run_federation_apiserver
+run_federation_controller_manager
+# TODO: Fix for replicasets and deployments.
+SUPPORTED_RESOURCES=("configmaps" "daemonsets" "events" "ingress" "namespaces" "secrets" "services")
+output_message=$(runTests "SUPPORTED_RESOURCES=${SUPPORTED_RESOURCES[@]}")
+# Ensure that tests were run. We cannot check all resources here. We check a few
+# to catch bugs due to which no tests run.
+kube::test::if_has_string "${output_message}" "Testing kubectl(v1:namespaces)"
+kube::test::if_has_string "${output_message}" "Testing kubectl(v1:services)"
+
+kube::log::status "TESTS PASSED"

hack/testdata/kubernetes-service.yaml

+apiVersion: v1
+kind: Service
+metadata:
+  name: kubernetes
+  namespace: default
+spec:
+  clusterIP: 10.0.0.1
+  ports:
+  - name: https
+    port: 443
+    protocol: TCP
+    targetPort: 443