First pass at custom script and template for E2E

.gitignore

@@ -1 +1,9 @@
-*.exe
+*.exe
+**/_artifacts
+**/kubernetes
+**/.sshkey
+**/.sshkey.pub
+**/*.kubeconfig
+**/kubernetes-test-linux-amd64.tar.gz
+**/kube-proxy-windows.yaml
+**/capz-conf-*.yaml

azure/run-capz-e2e.sh

@@ -0,0 +1,189 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")
+export CAPZ_DIR="${CAPZ_DIR:-"${GOPATH}/src/sigs.k8s.io/cluster-api-provider-azure"}"
+: "${CAPZ_DIR:?Environment variable empty or not defined.}"
+if [[ ! -d $CAPZ_DIR ]]; then
+    echo "Must have capz repo present"
+fi
+
+main() {
+    # defaults
+    export KUBERNETES_VERSION="${KUBERNETES_VERSION:-"latest"}"
+    export CONTROL_PLANE_MACHINE_COUNT="${AZURE_CONTROL_PLANE_MACHINE_COUNT:-"1"}"
+    export WINDOWS_WORKER_MACHINE_COUNT="${WINDOWS_WORKER_MACHINE_COUNT:-"2"}"
+    export WINDOWS_SERVER_VERSION="${WINDOWS_SERVER_VERSION:-"windows-2019"}"
+    export WINDOWS_CONTAINERD_URL="${WINDOWS_CONTAINERD_URL:-"https://github.com/containerd/containerd/releases/download/v1.6.4/containerd-1.6.4-windows-amd64.tar.gz"}"
+
+    # other config
+    export ARTIFACTS="${ARTIFACTS:-${PWD}/_artifacts}"
+    export CLUSTER_NAME="${CLUSTER_NAME:-capz-conf-$(head /dev/urandom | LC_ALL=C tr -dc a-z0-9 | head -c 6 ; echo '')}"
+    export CAPI_EXTENSION_SOURCE="${CAPI_EXTENSION_SOURCE:-"https://github.com/Azure/azure-capi-cli-extension/releases/download/v0.0.5/capi-0.0.5-py2.py3-none-any.whl"}"
+    export IMAGE_SKU="${IMAGE_SKU:-"k8s-1dot23dot3-${WINDOWS_SERVER_VERSION}-containerd"}"
+
+    # TODO if GMSA do additional set up
+
+    set_azure_envs
+    set_ci_version
+    create_cluster
+    apply_workload_configuraiton
+    wait_for_nodes
+    run_e2e_test
+}
+
+cleanup() {
+    # currently set KUBECONFIG is the workload cluster so reset to the management cluster
+    # also make sure the log collector can find the sshkey file
+    unset KUBECONFIG
+    export AZURE_SSH_PUBLIC_KEY_FILE="${AZURE_SSH_PUBLIC_KEY_FILE:-"${PWD}/.sshkey.pub"}"
+    echo "Key file $AZURE_SSH_PUBLIC_KEY_FILE"
+    ls
+
+    pushd ${CAPZ_DIR}
+    # don't stop on errors here, so we always cleanup
+    go run -tags e2e "${CAPZ_DIR}/test/logger.go" --clustername "${CLUSTER_NAME}" --namespace default --artifacts-folder "${ARTIFACTS}" || true
+    popd
+
+    "${CAPZ_DIR}/hack/log/redact.sh" || true
+    if [[ -z "${SKIP_CLEANUP:-}" ]]; then
+        timeout 1800 kubectl delete cluster "${CLUSTER_NAME}" --wait=false || true
+        az group delete --name "$CLUSTER_NAME" --no-wait -y --force-deletion-types=Microsoft.Compute/virtualMachines,Microsoft.Compute/virtualMachineScaleSets
+    else
+        echo "skipping clean up"
+    fi
+}
+
+create_cluster(){
+    export SKIP_CREATE="${SKIP_CREATE:-"false"}"
+    if [[ ! "$SKIP_CREATE" == "true" ]]; then
+        ## create cluster
+        az extension add -y --upgrade --source $CAPI_EXTENSION_SOURCE || true
+        az capi create -mg "${CLUSTER_NAME}" -y -w -n "${CLUSTER_NAME}" -l "$AZURE_LOCATION" --template "$SCRIPT_ROOT"/templates/windows-base.yaml
+
+        # put a date on the rg to ensure it is deleted if failure to clean up
+        az group update --resource-group "${CLUSTER_NAME}" --tags creationTimestamp="$(date -u '+%Y-%m-%dT%H:%M:%SZ')"
+    fi
+    export KUBECONFIG="$PWD"/"${CLUSTER_NAME}".kubeconfig
+}
+
+apply_workload_configuraiton(){
+    # A patch is needed to tell kube-proxy to use CI binaries.  This could go away once we have build scripts for kubeproxy HostProcess image.
+    kubectl apply -f "${CAPZ_DIR}"/templates/test/ci/patches/windows-kubeproxy-ci.yaml
+    kubectl rollout restart ds -n kube-system kube-proxy-windows
+
+    # apply additional helper manifests (logger etc)
+    kubectl apply -f "${CAPZ_DIR}"/templates/addons/windows/containerd-logging/containerd-logger.yaml
+    kubectl apply -f "${CAPZ_DIR}"/templates/addons/windows/csi-proxy/csi-proxy.yaml
+    kubectl apply -f "${CAPZ_DIR}"/templates/addons/metrics-server/metrics-server.yaml
+}
+
+run_e2e_test() {
+    export SKIP_TEST="${SKIP_TEST:-"false"}"
+    if [[ ! "$SKIP_TEST" == "true" ]]; then
+        ## get and run e2e test 
+        ## https://github.com/kubernetes/sig-release/blob/master/release-engineering/artifacts.md#content-of-kubernetes-test-system-archtargz-on-example-of-kubernetes-test-linux-amd64targz-directories-removed-from-list
+        curl -L -o /tmp/kubernetes-test-linux-amd64.tar.gz https://storage.googleapis.com/k8s-release-dev/ci/${CI_VERSION}/kubernetes-test-linux-amd64.tar.gz
+        tar -xzvf /tmp/kubernetes-test-linux-amd64.tar.gz
+
+        export GINKGO_FOCUS=${GINKGO_FOCUS:-"\[Conformance\]|\[NodeConformance\]|\[sig-windows\]|\[sig-apps\].CronJob|\[sig-api-machinery\].ResourceQuota|\[sig-scheduling\].SchedulerPreemption"}
+        export GINKGO_SKIP=${GINKGO_SKIP:-"\[LinuxOnly\]|\[Serial\]|\[Slow\]|\[Excluded:WindowsDocker\]|Networking.Granular.Checks(.*)node-pod.communication|Guestbook.application.should.create.and.stop.a.working.application|device.plugin.for.Windows|Container.Lifecycle.Hook.when.create.a.pod.with.lifecycle.hook.should.execute(.*)http.hook.properly|\[sig-api-machinery\].Garbage.collector"}
+
+        export GINKGO_NODES="${GINKGO_NODES:-"4"}"
+
+        # CI is an environment variable set by a prow job: https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md#job-environment-variables
+        ADDITIONAL_E2E_ARGS=()
+        CI="${CI:-""}"
+        if [[ "$CI" == "true" ]]; then
+            # private image repository doesn't have a way to promote images: https://github.com/kubernetes/k8s.io/pull/1929
+            # So we are using a cusotmer repository for the test "Container Runtime blackbox test when running a container with a new image should be able to pull from private registry with secret [NodeConformance]"
+            # Must also set label preset-windows-private-registry-cred: "true" on the job
+            ADDITIONAL_E2E_ARGS+="--docker-config-file=${DOCKER_CONFIG_FILE}"
+        fi
+
+        set -x
+        "$PWD"/kubernetes/test/bin/ginkgo --nodes="${GINKGO_NODES}" "$SCRIPT_ROOT"/kubernetes/test/bin/e2e.test -- \
+            --provider=skeleton \
+            --ginkgo.noColor \
+            --ginkgo.focus="$GINKGO_FOCUS" \
+            --ginkgo.skip="$GINKGO_SKIP" \
+            --node-os-distro="windows" \
+            --disable-log-dump \
+            --ginkgo.progress=true \
+            --ginkgo.slowSpecThreshold=120.0 \
+            --ginkgo.flakeAttempts=0 \
+            --ginkgo.trace=true \
+            --num-nodes="$WINDOWS_WORKER_MACHINE_COUNT" \
+            --ginkgo.v=true \
+            --dump-logs-on-failure=true \
+            --report-dir="${ARTIFACTS}" \
+            --prepull-images=true \
+            --v=5 "${ADDITIONAL_E2E_ARGS[@]}"
+        set +x
+    fi
+}
+
+wait_for_nodes() {
+    echo "Waiting for ${CONTROL_PLANE_MACHINE_COUNT} control plane machine(s) and ${WINDOWS_WORKER_MACHINE_COUNT} windows machine(s) to become Ready"
+
+    # Ensure that all nodes are registered with the API server before checking for readiness
+    local total_nodes="$((CONTROL_PLANE_MACHINE_COUNT + WINDOWS_WORKER_MACHINE_COUNT))"
+    while [[ $(kubectl get nodes -ojson | jq '.items | length') -ne "${total_nodes}" ]]; do
+        kubectl get nodes -o wide
+        kubectl get pods -A -o wide
+        sleep 10
+    done
+
+    kubectl wait --for=condition=Ready node --all --timeout=5m
+    kubectl get nodes -owide
+}
+
+set_azure_envs() {
+    # shellcheck source=hack/ensure-tags.sh
+    source "${CAPZ_DIR}/hack/ensure-tags.sh"
+    # shellcheck source=hack/parse-prow-creds.sh
+    source "${CAPZ_DIR}/hack/parse-prow-creds.sh"
+    # shellcheck source=hack/util.sh
+    source "${CAPZ_DIR}/hack/util.sh"
+    # shellcheck source=hack/ensure-azcli.sh
+    source "${CAPZ_DIR}/hack/ensure-azcli.sh"
+
+    # Verify the required Environment Variables are present.
+    capz::util::ensure_azure_envs
+
+    # Generate SSH key.
+    capz::util::generate_ssh_key
+
+    export AZURE_LOCATION="${AZURE_LOCATION:-$(capz::util::get_random_region)}"
+}
+
+set_ci_version() {
+    # select correct windows version for tests
+    if [[ "$(capz::util::should_build_kubernetes)" == "true" ]]; then
+        #todo - test this
+        : "${REGISTRY:?Environment variable empty or not defined.}"
+        "${CAPZ_DIR}"/hack/ensure-acr-login.sh
+
+        export E2E_ARGS="-kubetest.use-pr-artifacts"
+        export KUBE_BUILD_CONFORMANCE="y"
+        source "${CAPZ_DIR}/scripts/ci-build-kubernetes.sh"
+    else
+        if [[ "${KUBERNETES_VERSION:-}" =~ "latest" ]]; then
+            CI_VERSION_URL="https://dl.k8s.io/ci/${KUBERNETES_VERSION}.txt"
+        else
+            CI_VERSION_URL="https://dl.k8s.io/ci/latest.txt"
+        fi
+        export CI_VERSION="${CI_VERSION:-$(curl -sSL ${CI_VERSION_URL})}"
+        export KUBERNETES_VERSION="${CI_VERSION}"
+
+        echo "Selected Kubernetes version:"
+        echo $CI_VERSION
+        echo $KUBERNETES_VERSION
+    fi
+}
+
+trap cleanup EXIT
+main