mirror of
https://github.com/wahyd4/cert-manager.git
synced 2026-08-28 14:36:45 +10:00
Merge pull request #2534 from munnerz/e3e-setup
Refactor e2e setup to be useful for local development and clean up e2e test addons
This commit is contained in:
jetstack-bot
@@ -50,6 +50,7 @@ filegroup(
|
||||
"//cmd/controller:all-srcs",
|
||||
"//cmd/webhook:all-srcs",
|
||||
"//deploy:all-srcs",
|
||||
"//devel:all-srcs",
|
||||
"//hack:all-srcs",
|
||||
"//pkg/acme:all-srcs",
|
||||
"//pkg/api:all-srcs",
|
||||
|
||||
@@ -86,24 +86,6 @@ $(CMDS):
|
||||
bazel build \
|
||||
//cmd/$@
|
||||
|
||||
e2e_test:
|
||||
mkdir -p "$$(pwd)/_artifacts"
|
||||
bazel build //hack/bin:helm //test/e2e:e2e.test
|
||||
# Run e2e tests
|
||||
KUBECONFIG=$(KUBECONFIG) \
|
||||
bazel run @com_github_onsi_ginkgo//ginkgo -- \
|
||||
-nodes 10 \
|
||||
-flakeAttempts $(FLAKE_ATTEMPTS) \
|
||||
$$(bazel info bazel-genfiles)/test/e2e/e2e.test \
|
||||
-- \
|
||||
--helm-binary-path=$$(bazel info bazel-genfiles)/hack/bin/helm \
|
||||
--repo-root="$$(pwd)" \
|
||||
--report-dir="$${ARTIFACTS:-./_artifacts}" \
|
||||
--ginkgo.skip="$(GINKGO_SKIP)" \
|
||||
--ginkgo.focus="$(GINKGO_FOCUS)" \
|
||||
--skip-globals=$(SKIP_GLOBALS) \
|
||||
--kubectl-path="$(KUBECTL)"
|
||||
|
||||
# Generate targets
|
||||
##################
|
||||
generate:
|
||||
|
||||
@@ -0,0 +1,20 @@
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [
|
||||
":package-srcs",
|
||||
"//devel/addon/certmanager:all-srcs",
|
||||
"//devel/addon/ingressnginx:all-srcs",
|
||||
"//devel/addon/pebble:all-srcs",
|
||||
"//devel/addon/samplewebhook:all-srcs",
|
||||
"//devel/addon/vault:all-srcs",
|
||||
],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
+100
@@ -0,0 +1,100 @@
|
||||
# Development tooling
|
||||
|
||||
This directory contains tools and scripts used to create development and
|
||||
testing environments for cert-manager.
|
||||
|
||||
## Tool dependencies
|
||||
|
||||
The scripts in this directory commonly require additional tooling, such as
|
||||
access to `kubectl`, `helm`, `kind` and a bunch of other things.
|
||||
|
||||
If you already have these tools available on your host system, the scripts
|
||||
should just work, so long as the versions you have installed are roughly
|
||||
compatible.
|
||||
|
||||
If you are running into issues with your host-installed tools, Bazel provides
|
||||
versioned access to all of the required tools for the e3e scripts.
|
||||
|
||||
To setup your shell to use the Bazel provided versions of these tools, run the
|
||||
following from the **root of the repository**:
|
||||
|
||||
```console
|
||||
export PATH="$(pwd)/devel/bin:$PATH"
|
||||
```
|
||||
|
||||
## Common usages
|
||||
|
||||
This section describes common usage patterns for development and testing.
|
||||
|
||||
### Creating a kind cluster
|
||||
|
||||
To create a kind cluster that can be used for both development and testing, run
|
||||
`./devel/cluster/create.sh` from the root of the cert-manager repository:
|
||||
|
||||
```console
|
||||
./devel/cluster/create.sh
|
||||
```
|
||||
|
||||
You can change the name of the kind cluster created by setting:
|
||||
|
||||
```console
|
||||
export KIND_CLUSTER_NAME=custom-cluster-name
|
||||
```
|
||||
|
||||
If a cluster with the same name already exists, it will **not** be recreated
|
||||
and instead will be reused.
|
||||
|
||||
### Installing a development build of cert-manager
|
||||
|
||||
Once you have a kind cluster running, you can install a development version of
|
||||
cert-manager by running:
|
||||
|
||||
```console
|
||||
./devel/addon/certmanager/install.sh
|
||||
```
|
||||
|
||||
This will build, load and install cert-manager from source into your kind
|
||||
development cluster.
|
||||
|
||||
Further invocations of the `install.sh` script will rebuild and upgrade the
|
||||
installed version of cert-manager, making it possible to iteratively work on
|
||||
the codebase and test changes.
|
||||
|
||||
### Running end-to-end tests
|
||||
|
||||
Before running the end-to-end tests, you must install some additional
|
||||
components used during the tests into your kind cluster.
|
||||
|
||||
Run the following to setup persistent test instances of Pebble, ingress-nginx,
|
||||
and a sample DNS01 webhook:
|
||||
|
||||
```console
|
||||
./devel/setup-e2e-deps.sh
|
||||
```
|
||||
|
||||
You only need to run this command once for the lifetime of your test cluster.
|
||||
|
||||
If you haven't already, deploy a new test build of cert-manager:
|
||||
|
||||
```console
|
||||
./devel/addon/certmanager/install.sh
|
||||
```
|
||||
|
||||
Finally, run the end-to-test tests using:
|
||||
|
||||
```console
|
||||
./devel/run-e2e.sh
|
||||
```
|
||||
|
||||
You can run this command multiple times against the same cluster without
|
||||
adverse effects.
|
||||
|
||||
### Deleting the test cluster
|
||||
|
||||
Once you have finished with your testing environment, or if you have
|
||||
encountered a strange state you cannot recover from, you can tear down the
|
||||
testing environment by using `kind` directly:
|
||||
|
||||
```console
|
||||
kind delete cluster [--name=$KIND_CLUSTER_NAME]
|
||||
```
|
||||
@@ -0,0 +1,11 @@
|
||||
# End-to-end test addons
|
||||
|
||||
This directory contains code for deploying instances of addons used during
|
||||
end-to-end tests and whilst developing.
|
||||
|
||||
This includes things like [Vault](https://www.vaultproject.io/),
|
||||
[ingress-nginx](https://github.com/kubernetes/ingress-nginx) and
|
||||
[Pebble](https://github.com/letsencrypt/pebble) amongst others.
|
||||
|
||||
These tools are designed to be easily reusable during tests or by developers
|
||||
when testing out new features or writing tests.
|
||||
@@ -0,0 +1,26 @@
|
||||
load("@io_bazel_rules_docker//container:bundle.bzl", "container_bundle")
|
||||
|
||||
container_bundle(
|
||||
name = "bundle",
|
||||
images = {
|
||||
"{STABLE_DOCKER_REPO}/cert-manager-controller:{STABLE_DOCKER_TAG}": "//cmd/controller:image",
|
||||
"{STABLE_DOCKER_REPO}/cert-manager-acmesolver:{STABLE_DOCKER_TAG}": "//cmd/acmesolver:image",
|
||||
"{STABLE_DOCKER_REPO}/cert-manager-webhook:{STABLE_DOCKER_TAG}": "//cmd/webhook:image",
|
||||
"{STABLE_DOCKER_REPO}/cert-manager-cainjector:{STABLE_DOCKER_TAG}": "//cmd/cainjector:image",
|
||||
},
|
||||
tags = ["manual"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [":package-srcs"],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
Executable
+63
@@ -0,0 +1,63 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
# Namespace to deploy into
|
||||
NAMESPACE="${NAMESPACE:-cert-manager}"
|
||||
# Release name to use with Helm
|
||||
RELEASE_NAME="${RELEASE_NAME:-cert-manager}"
|
||||
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
source "${SCRIPT_ROOT}/../../lib/lib.sh"
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
|
||||
# Require kubectl & helm available on PATH
|
||||
check_tool kubectl
|
||||
check_tool helm
|
||||
|
||||
# Use the current timestamp as the APP_VERSION so a rolling update will be
|
||||
# triggered on every call to this script.
|
||||
export APP_VERSION="$(date +"%s")"
|
||||
# Build a copy of the cert-manager release images using the :bazel image tag
|
||||
bazel run --stamp=true --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 "//devel/addon/certmanager:bundle"
|
||||
|
||||
# Load all images into the kind cluster
|
||||
kind load docker-image --name "$KIND_CLUSTER_NAME" "quay.io/jetstack/cert-manager-controller:${APP_VERSION}" &
|
||||
kind load docker-image --name "$KIND_CLUSTER_NAME" "quay.io/jetstack/cert-manager-acmesolver:${APP_VERSION}" &
|
||||
kind load docker-image --name "$KIND_CLUSTER_NAME" "quay.io/jetstack/cert-manager-cainjector:${APP_VERSION}" &
|
||||
kind load docker-image --name "$KIND_CLUSTER_NAME" "quay.io/jetstack/cert-manager-webhook:${APP_VERSION}" &
|
||||
|
||||
wait
|
||||
|
||||
# Ensure the pebble namespace exists
|
||||
kubectl get namespace "${NAMESPACE}" || kubectl create namespace "${NAMESPACE}"
|
||||
|
||||
# Install a copy of the CRDs
|
||||
kubectl apply -f "${REPO_ROOT}/deploy/charts/cert-manager/crds/"
|
||||
|
||||
# Upgrade or install Pebble
|
||||
helm upgrade \
|
||||
--install \
|
||||
--wait \
|
||||
--namespace "${NAMESPACE}" \
|
||||
--set image.tag="${APP_VERSION}" \
|
||||
--set cainjector.image.tag="${APP_VERSION}" \
|
||||
--set webhook.image.tag="${APP_VERSION}" \
|
||||
"$RELEASE_NAME" \
|
||||
"$REPO_ROOT/deploy/charts/cert-manager"
|
||||
@@ -0,0 +1,24 @@
|
||||
load("@io_bazel_rules_docker//container:bundle.bzl", "container_bundle")
|
||||
|
||||
container_bundle(
|
||||
name = "bundle",
|
||||
images = {
|
||||
"quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1": "@io_kubernetes_ingress-nginx//image",
|
||||
"k8s.gcr.io/defaultbackend-amd64:bazel": "@io_gcr_k8s_defaultbackend//image",
|
||||
},
|
||||
tags = ["manual"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [":package-srcs"],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
Executable
+61
@@ -0,0 +1,61 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
# Installs an instance of ingress-nginx using the 'stable' Helm chart.
|
||||
# Configure the cluster to target using the KUBECONFIG environment variable.
|
||||
# Additional parameters can be configured by overriding the variables below.
|
||||
|
||||
# Namespace to deploy into
|
||||
NAMESPACE="${NAMESPACE:-ingress-nginx}"
|
||||
# Release name to use with Helm
|
||||
RELEASE_NAME="${RELEASE_NAME:-ingress-nginx}"
|
||||
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
source "${SCRIPT_ROOT}/../../lib/lib.sh"
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
|
||||
# Require helm available on PATH
|
||||
check_tool kubectl
|
||||
check_tool helm
|
||||
require_image "quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1" "//devel/addon/ingressnginx:bundle"
|
||||
require_image "k8s.gcr.io/defaultbackend-amd64:bazel" "//devel/addon/ingressnginx:bundle"
|
||||
|
||||
# Ensure the pebble namespace exists
|
||||
kubectl get namespace "${NAMESPACE}" || kubectl create namespace "${NAMESPACE}"
|
||||
|
||||
helm repo add stable https://kubernetes-charts.storage.googleapis.com
|
||||
|
||||
helm repo update
|
||||
|
||||
# Upgrade or install Pebble
|
||||
helm upgrade \
|
||||
--install \
|
||||
--wait \
|
||||
--version 1.23.0 \
|
||||
--namespace "${NAMESPACE}" \
|
||||
--set controller.image.tag=0.26.1 \
|
||||
--set controller.image.pullPolicy=Never \
|
||||
--set defaultBackend.image.tag=bazel \
|
||||
--set defaultBackend.image.pullPolicy=Never \
|
||||
--set controller.service.clusterIP=10.0.0.15 \
|
||||
--set controller.service.type=ClusterIP \
|
||||
--set controller.config.no-tls-redirect-locations="" \
|
||||
"$RELEASE_NAME" \
|
||||
stable/nginx-ingress
|
||||
@@ -1,8 +1,17 @@
|
||||
load("@io_bazel_rules_go//go:def.bzl", "go_binary")
|
||||
load("@io_bazel_rules_docker//go:image.bzl", "go_image")
|
||||
load("@io_bazel_rules_docker//container:bundle.bzl", "container_bundle")
|
||||
|
||||
# gazelle:ignore
|
||||
|
||||
container_bundle(
|
||||
name = "bundle",
|
||||
images = {
|
||||
"pebble:bazel": ":image",
|
||||
},
|
||||
tags = ["manual"],
|
||||
)
|
||||
|
||||
go_image(
|
||||
name = "image",
|
||||
base = "@static_base//image",
|
||||
Executable
+50
@@ -0,0 +1,50 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
# Installs an instance of pebble using the Helm chart located in chart/
|
||||
# Configure the cluster to target using the KUBECONFIG environment variable.
|
||||
# Additional parameters can be configured by overriding the variables below.
|
||||
|
||||
# Namespace to deploy into
|
||||
NAMESPACE="${NAMESPACE:-pebble}"
|
||||
# Release name to use with Helm
|
||||
RELEASE_NAME="${RELEASE_NAME:-pebble}"
|
||||
# Image to use - by default uses a Bazel built image
|
||||
IMAGE="${IMAGE:-pebble:bazel}"
|
||||
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
source "${SCRIPT_ROOT}/../../lib/lib.sh"
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
|
||||
# Require helm available on PATH
|
||||
check_tool kubectl
|
||||
check_tool helm
|
||||
require_image "pebble:bazel" "//devel/addon/pebble:bundle"
|
||||
|
||||
# Ensure the pebble namespace exists
|
||||
kubectl get namespace "${NAMESPACE}" || kubectl create namespace "${NAMESPACE}"
|
||||
|
||||
# Upgrade or install Pebble
|
||||
helm upgrade \
|
||||
--install \
|
||||
--wait \
|
||||
--namespace "${NAMESPACE}" \
|
||||
"$RELEASE_NAME" \
|
||||
"$SCRIPT_ROOT/chart"
|
||||
@@ -0,0 +1,26 @@
|
||||
load("@io_bazel_rules_docker//container:bundle.bzl", "container_bundle")
|
||||
|
||||
container_bundle(
|
||||
name = "bundle",
|
||||
images = {
|
||||
"sample-webhook:bazel": "//devel/addon/samplewebhook/sample:image",
|
||||
},
|
||||
tags = ["manual"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [
|
||||
":package-srcs",
|
||||
"//devel/addon/samplewebhook/sample:all-srcs",
|
||||
],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
+4
-4
@@ -6,16 +6,16 @@
|
||||
# solve the DNS01 challenge.
|
||||
# This group name should be **unique**, hence using your own company's domain
|
||||
# here is recommended.
|
||||
groupName: acme.mycompany.com
|
||||
groupName: acme.testing.cert-manager.io
|
||||
|
||||
certManager:
|
||||
namespace: cert-manager
|
||||
serviceAccountName: cert-manager
|
||||
|
||||
image:
|
||||
repository: mycompany/webhook-image
|
||||
tag: latest
|
||||
pullPolicy: IfNotPresent
|
||||
repository: sample-webhook
|
||||
tag: bazel
|
||||
pullPolicy: Never
|
||||
|
||||
nameOverride: ""
|
||||
fullnameOverride: ""
|
||||
Executable
+49
@@ -0,0 +1,49 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
# Installs an instance of the sample-webhook using the Helm chart located in
|
||||
# chart/.
|
||||
# Configure the cluster to target using the KUBECONFIG environment variable.
|
||||
# Additional parameters can be configured by overriding the variables below.
|
||||
|
||||
# Namespace to deploy into
|
||||
NAMESPACE="${NAMESPACE:-sample-webhook}"
|
||||
# Release name to use with Helm
|
||||
RELEASE_NAME="${RELEASE_NAME:-sample-webhook}"
|
||||
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
source "${SCRIPT_ROOT}/../../lib/lib.sh"
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
|
||||
# Require helm available on PATH
|
||||
check_tool kubectl
|
||||
check_tool helm
|
||||
require_image "sample-webhook:bazel" "//devel/addon/samplewebhook:bundle"
|
||||
|
||||
# Ensure the pebble namespace exists
|
||||
kubectl get namespace "${NAMESPACE}" || kubectl create namespace "${NAMESPACE}"
|
||||
|
||||
# Upgrade or install Pebble
|
||||
helm upgrade \
|
||||
--install \
|
||||
--wait \
|
||||
--namespace "${NAMESPACE}" \
|
||||
"$RELEASE_NAME" \
|
||||
"$SCRIPT_ROOT/chart"
|
||||
+1
-1
@@ -11,7 +11,7 @@ go_image(
|
||||
go_library(
|
||||
name = "go_default_library",
|
||||
srcs = ["main.go"],
|
||||
importpath = "github.com/jetstack/cert-manager/test/e2e/framework/addon/samplewebhook/sample",
|
||||
importpath = "github.com/jetstack/cert-manager/devel/addon/samplewebhook/sample",
|
||||
visibility = ["//visibility:private"],
|
||||
deps = [
|
||||
"//pkg/acme/webhook/apis/acme/v1alpha1:go_default_library",
|
||||
@@ -0,0 +1,23 @@
|
||||
load("@io_bazel_rules_docker//container:bundle.bzl", "container_bundle")
|
||||
|
||||
container_bundle(
|
||||
name = "bundle",
|
||||
images = {
|
||||
"vault:bazel": "@com_hashicorp_vault//image",
|
||||
},
|
||||
tags = ["manual"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [":package-srcs"],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
Executable
+39
@@ -0,0 +1,39 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
# Installs an instance of Vault using the Helm chart located in chart/
|
||||
# Configure the cluster to target using the KUBECONFIG environment variable.
|
||||
# Additional parameters can be configured by overriding the variables below.
|
||||
|
||||
# Namespace to deploy into
|
||||
NAMESPACE="${NAMESPACE:-vault}"
|
||||
# Release name to use with Helm
|
||||
RELEASE_NAME="${RELEASE_NAME:-vault}"
|
||||
# Image to use - by default uses a Bazel built image
|
||||
IMAGE="${IMAGE:-vault:bazel}"
|
||||
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
source "${SCRIPT_ROOT}/../../lib/lib.sh"
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
|
||||
# Require helm available on PATH
|
||||
check_tool kubectl
|
||||
check_tool helm
|
||||
require_image "vault:bazel" "//devel/addon/vault:bundle"
|
||||
@@ -0,0 +1,21 @@
|
||||
genrule(
|
||||
name = "_ginkgo",
|
||||
srcs = ["@com_github_onsi_ginkgo//ginkgo"],
|
||||
outs = ["ginkgo"],
|
||||
cmd = "cp $(SRCS) $@",
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [":package-srcs"],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
Executable
+31
@@ -0,0 +1,31 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
if ! command -v bazel &>/dev/null; then
|
||||
echo "Install bazel at https://bazel.build" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "${GINKGO:-}" ]; then
|
||||
bazel build //devel/bin:ginkgo
|
||||
export GINKGO="$(bazel info bazel-genfiles)/devel/bin/ginkgo"
|
||||
fi
|
||||
|
||||
"${GINKGO}" "$@"
|
||||
@@ -1,6 +1,6 @@
|
||||
#!/bin/bash
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2019 The Jetstack cert-manager contributors.
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
@@ -14,11 +14,18 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
source "${SCRIPT_ROOT}/lib.sh"
|
||||
if ! command -v bazel &>/dev/null; then
|
||||
echo "Install bazel at https://bazel.build" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
"${KIND}" delete cluster --name="${KIND_CLUSTER_NAME}"
|
||||
if [ -z "${HELM:-}" ]; then
|
||||
bazel build //hack/bin:helm
|
||||
export HELM="$(bazel info bazel-genfiles)/hack/bin/helm"
|
||||
fi
|
||||
|
||||
"${HELM}" "$@"
|
||||
Executable
+31
@@ -0,0 +1,31 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
if ! command -v bazel &>/dev/null; then
|
||||
echo "Install bazel at https://bazel.build" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "${KIND:-}" ]; then
|
||||
bazel build //hack/bin:kind
|
||||
export KIND="$(bazel info bazel-genfiles)/hack/bin/kind"
|
||||
fi
|
||||
|
||||
"${KIND}" "$@"
|
||||
Executable
+31
@@ -0,0 +1,31 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
if ! command -v bazel &>/dev/null; then
|
||||
echo "Install bazel at https://bazel.build" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -z "${KUBECTL:-}" ]; then
|
||||
bazel build //hack/bin:kubectl
|
||||
export KUBECTL="$(bazel info bazel-genfiles)/hack/bin/kubectl"
|
||||
fi
|
||||
|
||||
"${KUBECTL}" "$@"
|
||||
Executable
+42
@@ -0,0 +1,42 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
# This script will build an entirely new testing environment using kind.
|
||||
# This is inteded to be run in a CI environment and *not* for development.
|
||||
# It is not optimised for quick, iterative development.
|
||||
|
||||
SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
|
||||
export REPO_ROOT="${SCRIPT_ROOT}/.."
|
||||
source "${SCRIPT_ROOT}/lib/lib.sh"
|
||||
|
||||
# Configure PATH to use bazel provided e2e tools
|
||||
setup_tools
|
||||
|
||||
echo "Ensuring a kind cluster exists..."
|
||||
"${SCRIPT_ROOT}/cluster/create.sh"
|
||||
|
||||
echo "Ensuring all e2e test dependencies are installed..."
|
||||
"${SCRIPT_ROOT}/setup-e2e-deps.sh"
|
||||
|
||||
echo "Running e2e test suite..."
|
||||
# Skip Venafi end-to-end tests in CI
|
||||
FLAKE_ATTEMPTS=2 "${SCRIPT_ROOT}/run-e2e.sh" \
|
||||
--ginkgo.skip=Venafi \
|
||||
"$@"
|
||||
@@ -0,0 +1,22 @@
|
||||
# this config file is similar to the default, except we set the cluster's
|
||||
# service cidr range to be 10.0.0.0/16.
|
||||
# we do this because we need a fixed/predictable clusterIP of 10.0.0.15 for the
|
||||
# nginx-ingress service, in order to perform HTTP01 validations during tests.
|
||||
|
||||
apiVersion: kind.sigs.k8s.io/v1alpha3
|
||||
kind: Cluster
|
||||
kubeadmConfigPatches:
|
||||
- |
|
||||
# config generated by kind
|
||||
apiVersion: kubeadm.k8s.io/v1alpha2
|
||||
kind: MasterConfiguration
|
||||
metadata:
|
||||
name: config
|
||||
networking:
|
||||
serviceSubnet: 10.0.0.0/16
|
||||
kubeletConfiguration:
|
||||
baseConfig:
|
||||
clusterDNS:
|
||||
- 10.0.0.10
|
||||
nodes:
|
||||
- role: control-plane
|
||||
@@ -0,0 +1,18 @@
|
||||
# this config file is similar to the default, except we set the cluster's
|
||||
# service cidr range to be 10.0.0.0/16.
|
||||
# we do this because we need a fixed/predictable clusterIP of 10.0.0.15 for the
|
||||
# nginx-ingress service, in order to perform HTTP01 validations during tests.
|
||||
|
||||
apiVersion: kind.sigs.k8s.io/v1alpha3
|
||||
kind: Cluster
|
||||
kubeadmConfigPatches:
|
||||
- |
|
||||
# config generated by kind
|
||||
apiVersion: kubeadm.k8s.io/v1alpha3
|
||||
kind: ClusterConfiguration
|
||||
metadata:
|
||||
name: config
|
||||
networking:
|
||||
serviceSubnet: 10.0.0.0/16
|
||||
nodes:
|
||||
- role: control-plane
|
||||
@@ -0,0 +1,18 @@
|
||||
# this config file is similar to the default, except we set the cluster's
|
||||
# service cidr range to be 10.0.0.0/16.
|
||||
# we do this because we need a fixed/predictable clusterIP of 10.0.0.15 for the
|
||||
# nginx-ingress service, in order to perform HTTP01 validations during tests.
|
||||
|
||||
apiVersion: kind.sigs.k8s.io/v1alpha3
|
||||
kind: Cluster
|
||||
kubeadmConfigPatches:
|
||||
- |
|
||||
# config generated by kind
|
||||
apiVersion: kubeadm.k8s.io/v1beta1
|
||||
kind: ClusterConfiguration
|
||||
metadata:
|
||||
name: config
|
||||
networking:
|
||||
serviceSubnet: 10.0.0.0/16
|
||||
nodes:
|
||||
- role: control-plane
|
||||
@@ -0,0 +1,18 @@
|
||||
# this config file is similar to the default, except we set the cluster's
|
||||
# service cidr range to be 10.0.0.0/16.
|
||||
# we do this because we need a fixed/predictable clusterIP of 10.0.0.15 for the
|
||||
# nginx-ingress service, in order to perform HTTP01 validations during tests.
|
||||
|
||||
apiVersion: kind.sigs.k8s.io/v1alpha3
|
||||
kind: Cluster
|
||||
kubeadmConfigPatches:
|
||||
- |
|
||||
# config generated by kind
|
||||
apiVersion: kubeadm.k8s.io/v1beta2
|
||||
kind: ClusterConfiguration
|
||||
metadata:
|
||||
name: config
|
||||
networking:
|
||||
serviceSubnet: 10.0.0.0/16
|
||||
nodes:
|
||||
- role: control-plane
|
||||
Executable
+83
@@ -0,0 +1,83 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
source "${SCRIPT_ROOT}/../lib/lib.sh"
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
|
||||
# Require helm available on PATH
|
||||
check_tool kind
|
||||
|
||||
export KIND_IMAGE_REPO="kindest/node"
|
||||
# Default Kubernetes version to use to 1.17
|
||||
export K8S_VERSION=${K8S_VERSION:-1.17}
|
||||
|
||||
# Compute the details of the kind image to use
|
||||
export KIND_IMAGE_SHA=""
|
||||
export KIND_IMAGE_CONFIG=""
|
||||
if [[ "$K8S_VERSION" =~ 1\.11 ]]; then
|
||||
# v1.11.10 @ sha256:e6f3dade95b7cb74081c5b9f3291aaaa6026a90a977e0b990778b6adc9ea6248
|
||||
KIND_IMAGE_SHA="sha256:e6f3dade95b7cb74081c5b9f3291aaaa6026a90a977e0b990778b6adc9ea6248"
|
||||
KIND_IMAGE_CONFIG="v1alpha2"
|
||||
elif [[ "$K8S_VERSION" =~ 1\.12 ]]; then
|
||||
# v1.12.10 @ sha256:68a6581f64b54994b824708286fafc37f1227b7b54cbb8865182ce1e036ed1cc
|
||||
KIND_IMAGE_SHA="sha256:68a6581f64b54994b824708286fafc37f1227b7b54cbb8865182ce1e036ed1cc"
|
||||
KIND_IMAGE_CONFIG="v1alpha3"
|
||||
elif [[ "$K8S_VERSION" =~ 1\.13 ]] ; then
|
||||
# v1.13.12 @sha256:5e8ae1a4e39f3d151d420ef912e18368745a2ede6d20ea87506920cd947a7e3a
|
||||
KIND_IMAGE_SHA="sha256:5e8ae1a4e39f3d151d420ef912e18368745a2ede6d20ea87506920cd947a7e3a"
|
||||
KIND_IMAGE_CONFIG="v1beta1"
|
||||
elif [[ "$K8S_VERSION" =~ 1\.14 ]] ; then
|
||||
# v1.14.10 @ sha256:81ae5a3237c779efc4dda43cc81c696f88a194abcc4f8fa34f86cf674aa14977
|
||||
KIND_IMAGE_SHA="sha256:81ae5a3237c779efc4dda43cc81c696f88a194abcc4f8fa34f86cf674aa14977"
|
||||
KIND_IMAGE_CONFIG="v1beta1"
|
||||
elif [[ "$K8S_VERSION" =~ 1\.15 ]] ; then
|
||||
# v1.15.7 @ sha256:e2df133f80ef633c53c0200114fce2ed5e1f6947477dbc83261a6a921169488d
|
||||
KIND_IMAGE_SHA="sha256:e2df133f80ef633c53c0200114fce2ed5e1f6947477dbc83261a6a921169488d"
|
||||
KIND_IMAGE_CONFIG="v1beta2"
|
||||
elif [[ "$K8S_VERSION" =~ 1\.16 ]] ; then
|
||||
# v1.16.4 @ sha256:b91a2c2317a000f3a783489dfb755064177dbc3a0b2f4147d50f04825d016f55
|
||||
KIND_IMAGE_SHA="sha256:b91a2c2317a000f3a783489dfb755064177dbc3a0b2f4147d50f04825d016f55"
|
||||
KIND_IMAGE_CONFIG="v1beta2"
|
||||
elif [[ "$K8S_VERSION" =~ 1\.17 ]] ; then
|
||||
# v1.17.0 @ sha256:9512edae126da271b66b990b6fff768fbb7cd786c7d39e86bdf55906352fdf62
|
||||
KIND_IMAGE_SHA="sha256:9512edae126da271b66b990b6fff768fbb7cd786c7d39e86bdf55906352fdf62"
|
||||
KIND_IMAGE_CONFIG="v1beta2"
|
||||
else
|
||||
echo "Unrecognised Kubernetes version '${K8S_VERSION}'! Aborting..."
|
||||
exit 1
|
||||
fi
|
||||
export KIND_IMAGE="${KIND_IMAGE_REPO}@${KIND_IMAGE_SHA}"
|
||||
echo "kind image details:"
|
||||
echo " repo: ${KIND_IMAGE_REPO}"
|
||||
echo " sha256: ${KIND_IMAGE_SHA}"
|
||||
echo " version: ${K8S_VERSION}"
|
||||
echo " config: ${KIND_IMAGE_CONFIG}"
|
||||
|
||||
if kind get clusters | grep "^$KIND_CLUSTER_NAME\$" &>/dev/null; then
|
||||
echo "Existing cluster '$KIND_CLUSTER_NAME' found, skipping creating cluster..."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Create the kind cluster
|
||||
kind create cluster \
|
||||
--config "${SCRIPT_ROOT}/config/${KIND_IMAGE_CONFIG}.yaml" \
|
||||
--image "${KIND_IMAGE}" \
|
||||
--name "${KIND_CLUSTER_NAME}"
|
||||
@@ -0,0 +1,82 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
LIB_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
|
||||
export REPO_ROOT="$LIB_ROOT/../.."
|
||||
|
||||
export SKIP_BUILD_ADDON_IMAGES="${SKIP_BUILD_ADDON_IMAGES:-}"
|
||||
export KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-kind}"
|
||||
|
||||
# setup_tools will build and set up the environment to use bazel-provided
|
||||
# versions of the tools required for development
|
||||
setup_tools() {
|
||||
check_bazel
|
||||
bazel build //hack/bin:helm //hack/bin:kind //hack/bin:kubectl //devel/bin:ginkgo
|
||||
local bindir="$(bazel info bazel-genfiles)"
|
||||
export HELM="${bindir}/hack/bin/helm"
|
||||
export KIND="${bindir}/hack/bin/kind"
|
||||
export KUBECTL="${bindir}/hack/bin/kubectl"
|
||||
export GINKGO="${bindir}/devel/bin/ginkgo"
|
||||
# Configure PATH to use bazel provided e2e tools
|
||||
export PATH="${SCRIPT_ROOT}/bin:$PATH"
|
||||
}
|
||||
|
||||
# check_tool ensures that the tool with the given name is available, or advises
|
||||
# users to setup their PATH for the test/e3e/bin directory if not.
|
||||
check_tool() {
|
||||
tool="$1"
|
||||
if ! command -v "$tool" &>/dev/null; then
|
||||
echo "Install $tool or run: export PATH=\"$REPO_ROOT/devel/bin:\$PATH\"" >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# check_bazel ensures that bazel is installed/available.
|
||||
check_bazel() {
|
||||
if ! command -v bazel &>/dev/null; then
|
||||
echo "Install bazel at https://bazel.build" >&2
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# require_image will attempt to ensure that the named docker image exists
|
||||
# within the kind cluster with name $KIND_CLUSTER_NAME.
|
||||
# If $SKIP_BUILD_ADDON_IMAGES is 'true', the image will not be built and a
|
||||
# warning message will be printed instead.
|
||||
require_image() {
|
||||
IMAGE_NAME="$1"
|
||||
BAZEL_TARGET="$2"
|
||||
# Skip building and loading the image if SKIP_BUILD_ADDON_IMAGES=true
|
||||
if [ "${SKIP_BUILD_ADDON_IMAGES:-}" == "true" ]; then
|
||||
echo "Skipping building and loading image '$IMAGE_NAME' because SKIP_BUILD_ADDON_IMAGES=true"
|
||||
return
|
||||
fi
|
||||
|
||||
# Ensure bazel is available
|
||||
check_bazel
|
||||
# Ensure kind is available
|
||||
check_tool kind
|
||||
|
||||
# Build and export the docker image
|
||||
bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 "${BAZEL_TARGET}"
|
||||
|
||||
# Load the image into the kind cluster
|
||||
kind load docker-image --name "$KIND_CLUSTER_NAME" "$IMAGE_NAME"
|
||||
}
|
||||
Executable
+47
@@ -0,0 +1,47 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
# This script will run the end-to-end test suite against an already configured
|
||||
# kind cluster.
|
||||
# If a cluster does not already exist, create one with 'cluster/create.sh'.
|
||||
|
||||
SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
|
||||
export REPO_ROOT="${SCRIPT_ROOT}/.."
|
||||
source "${SCRIPT_ROOT}/lib/lib.sh"
|
||||
|
||||
# Configure PATH to use bazel provided e2e tools
|
||||
setup_tools
|
||||
|
||||
# Ensure bazel is installed
|
||||
check_bazel
|
||||
|
||||
# Create output directory for JUnit output
|
||||
mkdir -p "${REPO_ROOT}/_artifacts"
|
||||
|
||||
# Build the e2e test binary
|
||||
bazel build //test/e2e:e2e.test
|
||||
|
||||
# Run e2e tests
|
||||
ginkgo -nodes 10 -flakeAttempts ${FLAKE_ATTEMPTS:-1} \
|
||||
$(bazel info bazel-genfiles)/test/e2e/e2e.test \
|
||||
-- \
|
||||
--repo-root="${REPO_ROOT}" \
|
||||
--report-dir="${ARTIFACTS:-$REPO_ROOT/_artifacts}" \
|
||||
"$@"
|
||||
Executable
+47
@@ -0,0 +1,47 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Copyright 2020 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o nounset
|
||||
set -o errexit
|
||||
set -o pipefail
|
||||
|
||||
# This script will load end-to-end test dependencies into the kind cluster, as
|
||||
# well as installing all 'global' components such as cert-manager itself,
|
||||
# pebble, ingress-nginx etc.
|
||||
# If you are running the *full* test suite, you should be sure to run this
|
||||
# script beforehand.
|
||||
|
||||
SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
|
||||
export REPO_ROOT="${SCRIPT_ROOT}/.."
|
||||
source "${SCRIPT_ROOT}/lib/lib.sh"
|
||||
|
||||
# Configure PATH to use bazel provided e2e tools
|
||||
setup_tools
|
||||
|
||||
echo "Installing cert-manager into the kind cluster..."
|
||||
"${SCRIPT_ROOT}/addon/certmanager/install.sh"
|
||||
|
||||
echo "Installing sample-webhook into the kind cluster..."
|
||||
"${SCRIPT_ROOT}/addon/samplewebhook/install.sh"
|
||||
|
||||
echo "Installing pebble into the kind cluster..."
|
||||
"${SCRIPT_ROOT}/addon/pebble/install.sh"
|
||||
|
||||
echo "Installing ingress-nginx into the kind cluster..."
|
||||
"${SCRIPT_ROOT}/addon/ingressnginx/install.sh"
|
||||
|
||||
echo "Loading vault into the kind cluster..."
|
||||
"${SCRIPT_ROOT}/addon/vault/install.sh"
|
||||
+8
-70
@@ -109,8 +109,8 @@ def install_helm():
|
||||
## the version numbers in these rules.
|
||||
http_archive(
|
||||
name = "helm_darwin",
|
||||
sha256 = "f51830036f746b7f758a40bf49e02527cc5a9f1b78c5809023e570d318eaff5c",
|
||||
urls = ["https://get.helm.sh/helm-v2.15.1-darwin-amd64.tar.gz"],
|
||||
sha256 = "05c7748da0ea8d5f85576491cd3c615f94063f20986fd82a0f5658ddc286cdb1",
|
||||
urls = ["https://get.helm.sh/helm-v3.0.2-darwin-amd64.tar.gz"],
|
||||
build_file_content =
|
||||
"""
|
||||
filegroup(
|
||||
@@ -125,8 +125,8 @@ filegroup(
|
||||
|
||||
http_archive(
|
||||
name = "helm_linux",
|
||||
sha256 = "b4d366bd6625477b2954941aeb7b601946aa4226af6728e3a84eac4e62a84042",
|
||||
urls = ["https://get.helm.sh/helm-v2.15.1-linux-amd64.tar.gz"],
|
||||
sha256 = "c6b7aa7e4ffc66e8abb4be328f71d48c643cb8f398d95c74d075cfb348710e1d",
|
||||
urls = ["https://get.helm.sh/helm-v3.0.2-linux-amd64.tar.gz"],
|
||||
build_file_content =
|
||||
"""
|
||||
filegroup(
|
||||
@@ -141,20 +141,6 @@ filegroup(
|
||||
|
||||
# Define rules for different kubectl versions
|
||||
def install_kubectl():
|
||||
http_file(
|
||||
name = "kubectl_1_11_darwin",
|
||||
executable = 1,
|
||||
sha256 = "cf1feeac2fdedfb069131e7d62735b99b49ec43bf0d7565a30379c35056906c4",
|
||||
urls = ["https://storage.googleapis.com/kubernetes-release/release/v1.11.3/bin/darwin/amd64/kubectl"],
|
||||
)
|
||||
|
||||
http_file(
|
||||
name = "kubectl_1_11_linux",
|
||||
executable = 1,
|
||||
sha256 = "0d4c70484e90d4310f03f997b4432e0a97a7f5b5be5c31d281f3d05919f8b46c",
|
||||
urls = ["https://storage.googleapis.com/kubernetes-release/release/v1.11.3/bin/linux/amd64/kubectl"],
|
||||
)
|
||||
|
||||
http_file(
|
||||
name = "kubectl_1_12_darwin",
|
||||
executable = 1,
|
||||
@@ -231,61 +217,13 @@ def install_kind():
|
||||
http_file(
|
||||
name = "kind_darwin",
|
||||
executable = 1,
|
||||
sha256 = "023f1886207132dcfc62139a86f09488a79210732b00c9ec6431d6f6b7e9d2d3",
|
||||
urls = ["https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-darwin-amd64"],
|
||||
sha256 = "11b8a7fda7c9d6230f0f28ffe57831a7227c0655dfb8d38e838e8f03db6612de",
|
||||
urls = ["https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-darwin-amd64"],
|
||||
)
|
||||
|
||||
http_file(
|
||||
name = "kind_linux",
|
||||
executable = 1,
|
||||
sha256 = "a97f7d6d97bc0e261ea85433ca564269f117baf0fae051f16b296d2d7541f8dd",
|
||||
urls = ["https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64"],
|
||||
)
|
||||
|
||||
container_pull(
|
||||
name = "kind-1.11",
|
||||
registry = "index.docker.io",
|
||||
repository = "kindest/node",
|
||||
tag = "v1.11.10",
|
||||
digest = "sha256:176845d919899daef63d0dbd1cf62f79902c38b8d2a86e5fa041e491ab795d33",
|
||||
)
|
||||
|
||||
container_pull(
|
||||
name = "kind-1.12",
|
||||
registry = "index.docker.io",
|
||||
repository = "kindest/node",
|
||||
tag = "v1.12.9",
|
||||
digest = "sha256:bcb79eb3cd6550c1ba9584ce57c832dcd6e442913678d2785307a7ad9addc029",
|
||||
)
|
||||
|
||||
container_pull(
|
||||
name = "kind-1.13",
|
||||
registry = "index.docker.io",
|
||||
repository = "kindest/node",
|
||||
tag = "v1.13.7",
|
||||
digest = "sha256:f3f1cfc2318d1eb88d91253a9c5fa45f6e9121b6b1e65aea6c7ef59f1549aaaf",
|
||||
)
|
||||
|
||||
container_pull(
|
||||
name = "kind-1.14",
|
||||
registry = "index.docker.io",
|
||||
repository = "kindest/node",
|
||||
tag = "v1.14.3",
|
||||
digest = "sha256:583166c121482848cd6509fbac525dd62d503c52a84ff45c338ee7e8b5cfe114",
|
||||
)
|
||||
|
||||
container_pull(
|
||||
name = "kind-1.15",
|
||||
registry = "index.docker.io",
|
||||
repository = "kindest/node",
|
||||
tag = "v1.15.0",
|
||||
digest = "sha256:b4d092fd2b507843dd096fe6c85d06a27a0cbd740a0b32a880fe61aba24bb478",
|
||||
)
|
||||
|
||||
container_pull(
|
||||
name = "kind-1.16",
|
||||
registry = "eu.gcr.io",
|
||||
repository = "jetstack-build-infra-images/kind-node",
|
||||
tag = "1.16.0-alpha.1",
|
||||
digest = "sha256:b9775b688fda2e6434cda1b9016baf876f381a8325961f59b9ae238166259885",
|
||||
sha256 = "0e07d5a9d5b8bf410a1ad8a7c8c9c2ea2a4b19eda50f1c629f1afadb7c80fae7",
|
||||
urls = ["https://github.com/kubernetes-sigs/kind/releases/download/v0.7.0/kind-linux-amd64"],
|
||||
)
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright 2019 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
# build_images will build Docker images for all of cert-manager's components.
|
||||
# It will transfer them to the 'kind' docker container so they are available
|
||||
# in a testing environment.
|
||||
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
source "${SCRIPT_ROOT}/lib.sh"
|
||||
|
||||
build_images() {
|
||||
# Build cert-manager binaries & docker image
|
||||
# Set --stamp=true when running a build to workaround issues introduced
|
||||
# in bazelbuild/rules_go#2110. For more information, see: https://github.com/bazelbuild/rules_go/pull/2110#issuecomment-508713878
|
||||
# We should be able to remove the `--stamp=true` arg once this has been fixed!
|
||||
APP_VERSION="${DOCKER_TAG}" \
|
||||
DOCKER_REPO="${DOCKER_REPO}" \
|
||||
DOCKER_TAG="${DOCKER_TAG}" \
|
||||
bazel run --platforms=@io_bazel_rules_go//go/toolchain:linux_amd64 --stamp=true //test/e2e:images
|
||||
|
||||
echo "All images built"
|
||||
|
||||
for IMG in \
|
||||
"${DOCKER_REPO}"/cert-manager-controller:"${DOCKER_TAG}" \
|
||||
"${DOCKER_REPO}"/cert-manager-cainjector:"${DOCKER_TAG}" \
|
||||
"${DOCKER_REPO}"/cert-manager-acmesolver:"${DOCKER_TAG}" \
|
||||
"${DOCKER_REPO}"/cert-manager-webhook:"${DOCKER_TAG}" \
|
||||
"pebble:bazel" \
|
||||
"quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1" \
|
||||
"k8s.gcr.io/defaultbackend-amd64:bazel" \
|
||||
"sample-webhook:bazel" \
|
||||
"vault:bazel" \
|
||||
"gcr.io/kubernetes-helm/tiller:bazel" \
|
||||
; do
|
||||
echo "Loading image ${IMG} into kind container"
|
||||
"${KIND}" load docker-image --name "${KIND_CLUSTER_NAME}" "${IMG}" &
|
||||
done
|
||||
echo "Waiting for all images to be loaded..."
|
||||
wait
|
||||
echo "All images loaded!"
|
||||
}
|
||||
|
||||
build_images
|
||||
@@ -1,62 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright 2019 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
source "${SCRIPT_ROOT}/lib.sh"
|
||||
|
||||
# deploy_kind will deploy a kubernetes-in-docker cluster
|
||||
deploy_kind() {
|
||||
echo "Exporting kind image to docker daemon..."
|
||||
bazel run "${KIND_IMAGE_TARGET}"
|
||||
|
||||
function kubeVersion() {
|
||||
echo $(docker run \
|
||||
--entrypoint="cat" \
|
||||
"${KIND_IMAGE}" \
|
||||
/kind/version)
|
||||
}
|
||||
|
||||
# default to v1beta2
|
||||
# - if 1.13.x or 1.14.x use v1beta1
|
||||
# - if 1.12.x then use v1alpha3
|
||||
# - if 1.11.x then use v1alpha2
|
||||
vers="$(kubeVersion)"
|
||||
config="v1beta2"
|
||||
if [[ "$vers" =~ v1\.11\..+ ]]; then
|
||||
config="v1alpha2"
|
||||
fi
|
||||
if [[ "$vers" =~ v1\.12\..+ ]]; then
|
||||
config="v1alpha3"
|
||||
fi
|
||||
if [[ "$vers" =~ v1\.1[3-4]\..+ ]] ; then
|
||||
config="v1beta1"
|
||||
fi
|
||||
|
||||
|
||||
echo "Booting Kubernetes version: $vers"
|
||||
echo "Using kubeadm config api version '$config'"
|
||||
# create the kind cluster
|
||||
"${KIND}" create cluster \
|
||||
--name="${KIND_CLUSTER_NAME}" \
|
||||
--image="${KIND_IMAGE}" \
|
||||
--config "${REPO_ROOT}"/test/fixtures/kind/config-"$config".yaml
|
||||
}
|
||||
|
||||
deploy_kind
|
||||
@@ -1,56 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright 2019 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
_SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
REPO_ROOT="${_SCRIPT_ROOT}/../../.."
|
||||
|
||||
# This file contains common definitions that are re-used in other scripts
|
||||
|
||||
export K8S_VERSION="${K8S_VERSION:-1.15}"
|
||||
KUBECTL_TARGET="${KUBECTL_TARGET:-//hack/bin:kubectl-${K8S_VERSION}}"
|
||||
KIND_IMAGE_TARGET="${KIND_IMAGE_TARGET:-@kind-${K8S_VERSION}//image}"
|
||||
|
||||
export KIND_CLUSTER_NAME="${KIND_CLUSTER_NAME:-cm-local-cluster}"
|
||||
export KIND_CONTAINER_NAME="kind-${KIND_CLUSTER_NAME}-control-plane"
|
||||
|
||||
# DOCKER_REPO is the docker repo to use for cert-manager images, either when
|
||||
# building or deploying cert-manager using these scripts.
|
||||
export DOCKER_REPO="quay.io/jetstack"
|
||||
|
||||
# DOCKER_TAG is the docker tag to use for the cert-manager images.
|
||||
# This defaults to 'build' so it doesn't conflict with images built for any
|
||||
# other purpose
|
||||
export DOCKER_TAG="build"
|
||||
|
||||
if [ ! "${CM_DEPS_LOADED:-}" = "1" ]; then
|
||||
# Build all e2e test dependencies
|
||||
bazel build \
|
||||
"${KUBECTL_TARGET}" \
|
||||
"${KIND_IMAGE_TARGET}" \
|
||||
//hack/bin:kind
|
||||
|
||||
genfiles="$(bazel info bazel-genfiles)"
|
||||
export KUBECTL="${genfiles}/hack/bin/kubectl-${K8S_VERSION}"
|
||||
# TODO: use a more unique name for the kind image
|
||||
export KIND_IMAGE="bazel/image:image"
|
||||
export KIND="${genfiles}/hack/bin/kind"
|
||||
|
||||
export CM_DEPS_LOADED="1"
|
||||
fi
|
||||
@@ -1,75 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright 2019 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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 will provision a development environment using kind on your local
|
||||
# machine.
|
||||
# The end result should be an environment that can pass e2e tests.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
source "${SCRIPT_ROOT}/lib/lib.sh"
|
||||
|
||||
echo "+++ Creating cluster using kind"
|
||||
"${SCRIPT_ROOT}/lib/cluster_create.sh"
|
||||
|
||||
echo "+++ Building cert-manager images from source and exporting them to the development cluster"
|
||||
"${SCRIPT_ROOT}/lib/build_images.sh"
|
||||
|
||||
echo ""
|
||||
echo ""
|
||||
echo "Your development environment is now ready."
|
||||
echo
|
||||
echo "A single node Kubernetes cluster has been provisioned in a Docker container"
|
||||
echo "on your machine."
|
||||
echo ""
|
||||
echo "You should now configure your shell to use the KUBECONFIG file that has"
|
||||
echo "been generated in order to access this cluster:"
|
||||
echo ""
|
||||
echo " export KUBECONFIG=\$HOME/.kube/kind-config-${KIND_CLUSTER_NAME}"
|
||||
echo ""
|
||||
echo ""
|
||||
echo "A freshly built copy of the cert-manager images have also been exported to"
|
||||
echo "the docker daemon in this single node Kubernetes cluster."
|
||||
echo ""
|
||||
echo "You can build and export a fresh copy of these images with:"
|
||||
echo ""
|
||||
echo " ./hack/ci/lib/build_images.sh"
|
||||
echo ""
|
||||
echo ""
|
||||
echo "You should now be able to run end-to-end tests using:"
|
||||
echo ""
|
||||
echo " make e2e_test"
|
||||
echo ""
|
||||
echo ""
|
||||
echo "We have \*\*not\*\* automatically deployed cert-manager into this cluster."
|
||||
echo "To deploy cert-manager into this cluster, run:"
|
||||
echo ""
|
||||
echo " bazel run //hack/bin:helm -- install \\"
|
||||
echo " --name cert-manager \\"
|
||||
echo " --namespace cert-manager \\"
|
||||
echo " --values ./test/fixtures/cert-manager-values.yaml \\"
|
||||
echo " ./deploy/charts/cert-manager"
|
||||
echo ""
|
||||
echo ""
|
||||
echo "Each time you make a change and run build_images.sh, you will need to manually"
|
||||
echo "delete the cert-manager pod that is deployed in the cert-manager namespace."
|
||||
echo ""
|
||||
echo "Thanks for contributing!"
|
||||
echo ""
|
||||
echo ""
|
||||
+2
-21
@@ -25,25 +25,6 @@ set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
SCRIPT_ROOT=$(dirname "${BASH_SOURCE}")
|
||||
source "${SCRIPT_ROOT}/lib/lib.sh"
|
||||
|
||||
cleanup() {
|
||||
# Ignore errors here
|
||||
"${SCRIPT_ROOT}/lib/cluster_destroy.sh" || true
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
"${SCRIPT_ROOT}/lib/cluster_create.sh"
|
||||
|
||||
export KUBECONFIG="${HOME}/.kube/kind-config-${KIND_CLUSTER_NAME}"
|
||||
|
||||
echo "Testing kind apiserver connectivity"
|
||||
# Ensure the apiserver is responding
|
||||
"${KUBECTL}" get nodes
|
||||
|
||||
"${SCRIPT_ROOT}/lib/build_images.sh"
|
||||
|
||||
make e2e_test \
|
||||
KUBECONFIG="${KUBECONFIG}" \
|
||||
KUBECTL="${KUBECTL}" \
|
||||
FLAKE_ATTEMPTS="${FLAKE_ATTEMPTS:-1}"
|
||||
echo "DEPRECATED: This script will be removed. Invoke './devel/ci-run-e2e.sh' directly instead."
|
||||
"${SCRIPT_ROOT}/../../devel/ci-run-e2e.sh"
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Copyright 2019 The Jetstack cert-manager contributors.
|
||||
#
|
||||
# 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 file is the entrypoint to our legacy minikube e2e testing environment
|
||||
# for cert-manager. It is currently used to run e2e test jobs against a
|
||||
# 1.9 or lower minikube built cluster.
|
||||
# This script should not be used for anything except for our CI process.
|
||||
|
||||
set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
# Build images while we wait for services to start
|
||||
make images APP_VERSION=build
|
||||
|
||||
# Wait for e2e service dependencies
|
||||
echo "Waiting for minikube cluster to be ready..."
|
||||
|
||||
while true; do if kubectl get nodes; then break; fi; echo "Waiting 5s for kubernetes to be ready..."; sleep 5; done
|
||||
|
||||
echo "Running e2e tests"
|
||||
# Skip RBAC tests as they do not pass on Kubernetes <1.9
|
||||
make e2e_test GINKGO_SKIP="RBAC"
|
||||
@@ -22,10 +22,7 @@ filegroup(
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [
|
||||
":package-srcs",
|
||||
"//test/e2e/charts/pebble:all-srcs",
|
||||
],
|
||||
srcs = [":package-srcs"],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
+5
-9
@@ -33,9 +33,7 @@ var (
|
||||
)
|
||||
|
||||
var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
|
||||
if !cfg.Addons.SkipGlobals {
|
||||
addon.InitGlobals(cfg)
|
||||
}
|
||||
addon.InitGlobals(cfg)
|
||||
|
||||
ginkgo.By("Provisioning shared cluster addons")
|
||||
|
||||
@@ -83,11 +81,9 @@ var _ = ginkgo.SynchronizedAfterSuite(func() {},
|
||||
}
|
||||
}
|
||||
|
||||
if !cfg.Addons.SkipGlobals {
|
||||
ginkgo.By("Cleaning up the provisioned globals")
|
||||
err = addon.DeprovisionGlobals(cfg)
|
||||
if err != nil {
|
||||
framework.Failf("Error deprovisioning global addons: %v", err)
|
||||
}
|
||||
ginkgo.By("Cleaning up the provisioned globals")
|
||||
err = addon.DeprovisionGlobals(cfg)
|
||||
if err != nil {
|
||||
framework.Failf("Error deprovisioning global addons: %v", err)
|
||||
}
|
||||
})
|
||||
|
||||
@@ -57,6 +57,7 @@ func TestE2E(t *testing.T) {
|
||||
t.Fail()
|
||||
}
|
||||
|
||||
gomega.NewWithT(t)
|
||||
gomega.RegisterFailHandler(ginkgo.Fail)
|
||||
|
||||
// TODO: properly make use of default SkipString
|
||||
|
||||
@@ -8,10 +8,6 @@ go_library(
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//test/e2e/framework/addon/base:go_default_library",
|
||||
"//test/e2e/framework/addon/certmanager:go_default_library",
|
||||
"//test/e2e/framework/addon/nginxingress:go_default_library",
|
||||
"//test/e2e/framework/addon/pebble:go_default_library",
|
||||
"//test/e2e/framework/addon/tiller:go_default_library",
|
||||
"//test/e2e/framework/config:go_default_library",
|
||||
"//test/e2e/framework/log:go_default_library",
|
||||
"@io_k8s_apimachinery//pkg/util/errors:go_default_library",
|
||||
@@ -30,12 +26,7 @@ filegroup(
|
||||
srcs = [
|
||||
":package-srcs",
|
||||
"//test/e2e/framework/addon/base:all-srcs",
|
||||
"//test/e2e/framework/addon/certmanager:all-srcs",
|
||||
"//test/e2e/framework/addon/chart:all-srcs",
|
||||
"//test/e2e/framework/addon/nginxingress:all-srcs",
|
||||
"//test/e2e/framework/addon/pebble:all-srcs",
|
||||
"//test/e2e/framework/addon/samplewebhook:all-srcs",
|
||||
"//test/e2e/framework/addon/tiller:all-srcs",
|
||||
"//test/e2e/framework/addon/vault:all-srcs",
|
||||
],
|
||||
tags = ["automanaged"],
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||
|
||||
go_library(
|
||||
name = "go_default_library",
|
||||
srcs = ["addon.go"],
|
||||
importpath = "github.com/jetstack/cert-manager/test/e2e/framework/addon/certmanager",
|
||||
tags = ["manual"],
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//test/e2e/framework/addon/chart:go_default_library",
|
||||
"//test/e2e/framework/addon/tiller:go_default_library",
|
||||
"//test/e2e/framework/config:go_default_library",
|
||||
"//test/e2e/framework/log:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [":package-srcs"],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
@@ -1,130 +0,0 @@
|
||||
/*
|
||||
Copyright 2019 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
package certmanager
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os/exec"
|
||||
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/chart"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/config"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/log"
|
||||
)
|
||||
|
||||
// Certmanager defines an addon that installs an instance of certmanager in the
|
||||
// target cluster.
|
||||
// Currently, only one instance of Certmanager can be deployed in a single
|
||||
// invocation of the test suite (i.e. it *must* be instantiated globally).
|
||||
// In future we can restrict Certmanager to a single namespace in order to enforce
|
||||
// isolation between tests.
|
||||
type Certmanager struct {
|
||||
config *config.Config
|
||||
chart *chart.Chart
|
||||
tillerDetails *tiller.Details
|
||||
|
||||
// Tiller is the tiller instance used to deploy the chart
|
||||
Tiller *tiller.Tiller
|
||||
|
||||
Name string
|
||||
|
||||
// Required namespace to deploy Certmanager into.
|
||||
Namespace string
|
||||
}
|
||||
|
||||
// Details return the details about the certmanager instance deployed
|
||||
type Details struct {
|
||||
ClusterResourceNamespace string
|
||||
ServiceAccountName string
|
||||
}
|
||||
|
||||
func (p *Certmanager) Setup(cfg *config.Config) error {
|
||||
p.config = cfg
|
||||
if p.Name == "" {
|
||||
return fmt.Errorf("Name field must be set on Certmanager addon")
|
||||
}
|
||||
if p.Namespace == "" {
|
||||
// TODO: in non-global instances, we could generate a new namespace just
|
||||
// for this addon to be used from.
|
||||
return fmt.Errorf("Namespace name must be specified")
|
||||
}
|
||||
if p.Tiller == nil {
|
||||
return fmt.Errorf("Tiller field must be set on Certmanager addon")
|
||||
}
|
||||
if p.config.Kubectl == "" {
|
||||
return fmt.Errorf("path to kubectl must be provided")
|
||||
}
|
||||
var err error
|
||||
p.tillerDetails, err = p.Tiller.Details()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
p.chart = &chart.Chart{
|
||||
Tiller: p.Tiller,
|
||||
ReleaseName: "chart-certmanager-" + p.Name,
|
||||
Namespace: p.Namespace,
|
||||
ChartName: cfg.RepoRoot + "/deploy/charts/cert-manager",
|
||||
// TODO: move resource requests/limits into Vars so they are always set
|
||||
Values: []string{cfg.RepoRoot + "/test/fixtures/cert-manager-values.yaml"},
|
||||
Vars: []chart.StringTuple{
|
||||
{Key: "serviceAccount.name", Value: "chart-certmanager-cert-manager"},
|
||||
},
|
||||
// doesn't matter when installing from disk
|
||||
ChartVersion: "0",
|
||||
UpdateDeps: true,
|
||||
}
|
||||
err = p.chart.Setup(cfg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Provision will actually deploy this instance of Pebble-ingress to the cluster.
|
||||
func (p *Certmanager) Provision() error {
|
||||
cmd := exec.Command(p.config.Kubectl, "apply", "--validate=false", "-f", p.config.RepoRoot+"/deploy/manifests/00-crds.yaml")
|
||||
cmd.Stdout = log.Writer
|
||||
cmd.Stderr = log.Writer
|
||||
if err := cmd.Run(); err != nil {
|
||||
return fmt.Errorf("error install cert-manager CRD manifests: %v", err)
|
||||
}
|
||||
|
||||
return p.chart.Provision()
|
||||
}
|
||||
|
||||
// Details returns details that can be used to utilise the instance of Pebble.
|
||||
func (p *Certmanager) Details() *Details {
|
||||
return &Details{
|
||||
ClusterResourceNamespace: p.Namespace,
|
||||
ServiceAccountName: "chart-certmanager-cert-manager",
|
||||
}
|
||||
}
|
||||
|
||||
// Deprovision will destroy this instance of Pebble
|
||||
func (p *Certmanager) Deprovision() error {
|
||||
return p.chart.Deprovision()
|
||||
}
|
||||
|
||||
func (p *Certmanager) SupportsGlobal() bool {
|
||||
// Pebble does support a global configuration, as the 'usage details' for
|
||||
// it are deterministic (i.e. not a result of the call to helm install).
|
||||
return true
|
||||
}
|
||||
|
||||
func (p *Certmanager) Logs() (map[string]string, error) {
|
||||
return p.chart.Logs()
|
||||
}
|
||||
@@ -7,9 +7,8 @@ go_library(
|
||||
tags = ["manual"],
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//test/e2e/framework/addon/tiller:go_default_library",
|
||||
"//test/e2e/framework/addon/base:go_default_library",
|
||||
"//test/e2e/framework/config:go_default_library",
|
||||
"//test/e2e/framework/log:go_default_library",
|
||||
"@io_k8s_api//core/v1:go_default_library",
|
||||
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
|
||||
],
|
||||
|
||||
@@ -26,21 +26,19 @@ import (
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/base"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/config"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/log"
|
||||
)
|
||||
|
||||
// Chart is a generic Helm chart addon for the test environment
|
||||
type Chart struct {
|
||||
config *config.Config
|
||||
tillerDetails *tiller.Details
|
||||
Base *base.Base
|
||||
|
||||
config *config.Config
|
||||
|
||||
// temporary directory used as the --home flag to Helm
|
||||
home string
|
||||
|
||||
// Tiller is the tiller instance to submit the release to
|
||||
Tiller *tiller.Tiller
|
||||
|
||||
// ReleaseName for this Helm release
|
||||
// `helm install --name {{ReleaseName}}`
|
||||
ReleaseName string
|
||||
@@ -93,13 +91,6 @@ func (c *Chart) Setup(cfg *config.Config) error {
|
||||
if c.config.Addons.Helm.Path == "" {
|
||||
return fmt.Errorf("--helm-binary-path must be set")
|
||||
}
|
||||
if c.Tiller == nil {
|
||||
return fmt.Errorf("tiller base addon must be provided")
|
||||
}
|
||||
c.tillerDetails, err = c.Tiller.Details()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
c.home, err = ioutil.TempDir("", "helm-chart-install")
|
||||
if err != nil {
|
||||
@@ -111,11 +102,6 @@ func (c *Chart) Setup(cfg *config.Config) error {
|
||||
|
||||
// Provision an instance of tiller-deploy
|
||||
func (c *Chart) Provision() error {
|
||||
err := c.runHelmClientInit()
|
||||
if err != nil {
|
||||
return fmt.Errorf("error running 'helm init': %v", err)
|
||||
}
|
||||
|
||||
if c.UpdateDeps {
|
||||
err := c.runDepUpdate()
|
||||
if err != nil {
|
||||
@@ -123,12 +109,12 @@ func (c *Chart) Provision() error {
|
||||
}
|
||||
}
|
||||
|
||||
err = c.runInstall()
|
||||
err := c.runInstall()
|
||||
if err != nil {
|
||||
return fmt.Errorf("error install helm chart: %v", err)
|
||||
}
|
||||
|
||||
err = c.Tiller.Base.Details().Helper().WaitForAllPodsRunningInNamespace(c.Namespace)
|
||||
err = c.Base.Details().Helper().WaitForAllPodsRunningInNamespace(c.Namespace)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -136,14 +122,6 @@ func (c *Chart) Provision() error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Chart) runHelmClientInit() error {
|
||||
err := c.buildHelmCmd("init", "--client-only").Run()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *Chart) runDepUpdate() error {
|
||||
err := c.buildHelmCmd("dep", "update", c.ChartName).Run()
|
||||
if err != nil {
|
||||
@@ -153,10 +131,9 @@ func (c *Chart) runDepUpdate() error {
|
||||
}
|
||||
|
||||
func (c *Chart) runInstall() error {
|
||||
args := []string{"install", c.ChartName,
|
||||
args := []string{"install", c.ReleaseName, c.ChartName,
|
||||
"--wait",
|
||||
"--namespace", c.Namespace,
|
||||
"--name", c.ReleaseName,
|
||||
"--version", c.ChartVersion}
|
||||
|
||||
for _, v := range c.Values {
|
||||
@@ -178,14 +155,12 @@ func (c *Chart) runInstall() error {
|
||||
|
||||
func (c *Chart) buildHelmCmd(args ...string) *exec.Cmd {
|
||||
args = append([]string{
|
||||
"--home", c.home,
|
||||
"--kubeconfig", c.tillerDetails.KubeConfig,
|
||||
"--kube-context", c.tillerDetails.KubeContext,
|
||||
"--tiller-namespace", c.tillerDetails.Namespace,
|
||||
"--kubeconfig", c.config.KubeConfig,
|
||||
"--kube-context", c.config.KubeContext,
|
||||
}, args...)
|
||||
cmd := exec.Command(c.config.Addons.Helm.Path, args...)
|
||||
cmd.Stdout = log.Writer
|
||||
cmd.Stderr = log.Writer
|
||||
cmd.Stdout = os.Stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
return cmd
|
||||
}
|
||||
|
||||
@@ -213,7 +188,7 @@ func (c *Chart) getHelmVersion() (string, error) {
|
||||
|
||||
// Deprovision the deployed instance of tiller-deploy
|
||||
func (c *Chart) Deprovision() error {
|
||||
err := c.buildHelmCmd("delete", "--purge", c.ReleaseName).Run()
|
||||
err := c.buildHelmCmd("delete", "--namespace", c.Namespace, c.ReleaseName).Run()
|
||||
if err != nil {
|
||||
// Ignore deprovisioning errors
|
||||
// TODO: only ignore failed to delete because it doesn't exist errors
|
||||
@@ -250,7 +225,7 @@ func (c *Chart) SupportsGlobal() bool {
|
||||
}
|
||||
|
||||
func (c *Chart) Logs() (map[string]string, error) {
|
||||
kc := c.Tiller.Base.Details().KubeClient
|
||||
kc := c.Base.Details().KubeClient
|
||||
oldLabelPods, err := kc.CoreV1().Pods(c.Namespace).List(metav1.ListOptions{LabelSelector: "release=" + c.ReleaseName})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
||||
@@ -22,10 +22,6 @@ import (
|
||||
utilerrors "k8s.io/apimachinery/pkg/util/errors"
|
||||
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/base"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/certmanager"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/nginxingress"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/pebble"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/config"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/log"
|
||||
)
|
||||
@@ -45,14 +41,6 @@ type Addon interface {
|
||||
var (
|
||||
// Base is a base addon containing Kubernetes clients
|
||||
Base = &base.Base{}
|
||||
// Tiller is a shared tiller addon
|
||||
Tiller = &tiller.Tiller{}
|
||||
// NginxIngress installs nginx-ingress as a helm chart
|
||||
NginxIngress = &nginxingress.Nginx{}
|
||||
// Certmanager install cert-manager as a helm chart
|
||||
CertManager = &certmanager.Certmanager{}
|
||||
// Pebble is a global deployment of the Pebble acme server
|
||||
Pebble = &pebble.Pebble{}
|
||||
|
||||
// allAddons is populated by InitGlobals and defines the order in which
|
||||
// addons will be provisioned
|
||||
@@ -73,35 +61,8 @@ func InitGlobals(cfg *config.Config) {
|
||||
}
|
||||
globalsInited = true
|
||||
*Base = base.Base{}
|
||||
*Tiller = tiller.Tiller{
|
||||
Base: Base,
|
||||
Name: "tiller-deploy",
|
||||
Namespace: "cm-e2e-global-tiller-deploy",
|
||||
ClusterPermissions: true,
|
||||
}
|
||||
*NginxIngress = nginxingress.Nginx{
|
||||
Tiller: Tiller,
|
||||
Name: "nginx-ingress",
|
||||
Namespace: "cm-e2e-global-nginx-ingress",
|
||||
IPAddress: cfg.Addons.Nginx.Global.IPAddress,
|
||||
Domain: cfg.Addons.Nginx.Global.Domain,
|
||||
}
|
||||
*CertManager = certmanager.Certmanager{
|
||||
Tiller: Tiller,
|
||||
Name: "cert-manager",
|
||||
Namespace: "cm-e2e-global-cert-manager",
|
||||
}
|
||||
*Pebble = pebble.Pebble{
|
||||
Tiller: Tiller,
|
||||
Name: "pebble",
|
||||
Namespace: "cm-e2e-global-pebble",
|
||||
}
|
||||
allAddons = []Addon{
|
||||
Base,
|
||||
Tiller,
|
||||
CertManager,
|
||||
NginxIngress,
|
||||
Pebble,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||
|
||||
go_library(
|
||||
name = "go_default_library",
|
||||
srcs = ["nginx.go"],
|
||||
importpath = "github.com/jetstack/cert-manager/test/e2e/framework/addon/nginxingress",
|
||||
tags = ["manual"],
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//pkg/util:go_default_library",
|
||||
"//test/e2e/framework/addon/chart:go_default_library",
|
||||
"//test/e2e/framework/addon/tiller:go_default_library",
|
||||
"//test/e2e/framework/config:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [":package-srcs"],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
@@ -1,175 +0,0 @@
|
||||
/*
|
||||
Copyright 2019 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
// package nginx contains an addon that installs nginx-ingress
|
||||
package nginxingress
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
cmutil "github.com/jetstack/cert-manager/pkg/util"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/chart"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/config"
|
||||
)
|
||||
|
||||
// Nginx describes the configuration details for an instance of nginx-ingress
|
||||
// deployed to a cluster.
|
||||
type Nginx struct {
|
||||
config *config.Config
|
||||
chart *chart.Chart
|
||||
tillerDetails *tiller.Details
|
||||
|
||||
// Name is a unique name for this nginx-ingress deployment
|
||||
Name string
|
||||
|
||||
// Namespace is the namespace to deploy nginx into
|
||||
Namespace string
|
||||
|
||||
// Tiller is the tiller instance used to deploy the chart
|
||||
Tiller *tiller.Tiller
|
||||
|
||||
// IPAddress is the IP address that the nginx-ingress service will be
|
||||
// exposed on.
|
||||
// This must be a part of the service CIDR, and must not already be allocated
|
||||
// else provisioning will fail.
|
||||
IPAddress string
|
||||
|
||||
// Domain is a domain name that can be used during e2e tests.
|
||||
// This domain should have records for *.example.com and example.com pointing
|
||||
// to the IP listed above.
|
||||
Domain string
|
||||
}
|
||||
|
||||
type Details struct {
|
||||
// BaseDomain is a domain name that can be used during e2e tests.
|
||||
// This domain should have records for *.example.com and example.com pointing
|
||||
// to the IP listed above.
|
||||
BaseDomain string
|
||||
|
||||
// IngressClass configured for this controller
|
||||
IngressClass string
|
||||
}
|
||||
|
||||
func (n *Nginx) Setup(cfg *config.Config) error {
|
||||
if n.Name == "" {
|
||||
return fmt.Errorf("Name field must be set on nginx addon")
|
||||
}
|
||||
if n.Namespace == "" {
|
||||
// TODO: in non-global instances, we could generate a new namespace just
|
||||
// for this addon to be used from.
|
||||
return fmt.Errorf("Namespace name must be specified")
|
||||
}
|
||||
if n.Tiller == nil {
|
||||
return fmt.Errorf("Tiller field must be set on nginx addon")
|
||||
}
|
||||
if n.IPAddress == "" {
|
||||
return fmt.Errorf("Nginx service IP address must be provided")
|
||||
}
|
||||
if n.Domain == "" {
|
||||
return fmt.Errorf("Nginx service domain must be provided")
|
||||
}
|
||||
var err error
|
||||
n.tillerDetails, err = n.Tiller.Details()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
n.chart = &chart.Chart{
|
||||
Tiller: n.Tiller,
|
||||
ReleaseName: "chart-nginx-" + n.Name,
|
||||
Namespace: n.Namespace,
|
||||
ChartName: "stable/nginx-ingress",
|
||||
ChartVersion: cfg.Addons.Nginx.ChartVersion,
|
||||
Vars: []chart.StringTuple{
|
||||
{
|
||||
Key: "controller.image.pullPolicy",
|
||||
Value: "Never",
|
||||
},
|
||||
{
|
||||
Key: "controller.image.tag",
|
||||
Value: "0.26.1",
|
||||
},
|
||||
{
|
||||
Key: "defaultBackend.image.pullPolicy",
|
||||
Value: "Never",
|
||||
},
|
||||
{
|
||||
Key: "defaultBackend.image.tag",
|
||||
Value: "bazel",
|
||||
},
|
||||
{
|
||||
Key: "controller.service.clusterIP",
|
||||
Value: n.IPAddress,
|
||||
},
|
||||
{
|
||||
Key: "controller.service.type",
|
||||
Value: "ClusterIP",
|
||||
},
|
||||
// nginx-ingress will by default not redirect http to https if
|
||||
// the url is ".well-known"
|
||||
{
|
||||
Key: "controller.config.no-tls-redirect-locations",
|
||||
Value: "",
|
||||
},
|
||||
},
|
||||
}
|
||||
err = n.chart.Setup(cfg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Provision will actually deploy this instance of nginx-ingress to the cluster.
|
||||
func (n *Nginx) Provision() error {
|
||||
return n.chart.Provision()
|
||||
}
|
||||
|
||||
// Details returns details that can be used to utilise the instance of nginx ingress.
|
||||
func (n *Nginx) Details() *Details {
|
||||
return &Details{
|
||||
BaseDomain: n.Domain,
|
||||
IngressClass: "nginx",
|
||||
}
|
||||
}
|
||||
|
||||
// Deprovision will destroy this instance of nginx-ingress
|
||||
func (n *Nginx) Deprovision() error {
|
||||
return n.chart.Deprovision()
|
||||
}
|
||||
|
||||
// SupportsGlobal will return whether this addon supports having a global,
|
||||
// shared instance deployed.
|
||||
// In order for an addon to support 'global mode', the Config() *must* be able
|
||||
// to be derived from the inputs to the addon only, i.e. there must be no state
|
||||
// created by Provision that is required for the output of Config().
|
||||
// This is because multiple test processes are started in order to run tests
|
||||
// in parallel, and only one invocation (the 'root') will actually call the
|
||||
// Provision function.
|
||||
// Tests themselves will only call the Details() function.
|
||||
func (n *Nginx) SupportsGlobal() bool {
|
||||
// nginx does support a global configuration, as the 'usage details' for
|
||||
// it are deterministic (i.e. not a result of the call to helm install).
|
||||
return true
|
||||
}
|
||||
|
||||
func (n *Nginx) Logs() (map[string]string, error) {
|
||||
return n.chart.Logs()
|
||||
}
|
||||
|
||||
func (d *Details) NewTestDomain() string {
|
||||
return fmt.Sprintf("%s.%s", cmutil.RandStringRunes(5), d.BaseDomain)
|
||||
}
|
||||
@@ -1,28 +0,0 @@
|
||||
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||
|
||||
go_library(
|
||||
name = "go_default_library",
|
||||
srcs = ["pebble.go"],
|
||||
importpath = "github.com/jetstack/cert-manager/test/e2e/framework/addon/pebble",
|
||||
tags = ["manual"],
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//test/e2e/framework/addon/chart:go_default_library",
|
||||
"//test/e2e/framework/addon/tiller:go_default_library",
|
||||
"//test/e2e/framework/config:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [":package-srcs"],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
@@ -1,113 +0,0 @@
|
||||
/*
|
||||
Copyright 2019 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
// package Pebble contains an addon that installs Pebble
|
||||
package pebble
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/chart"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/config"
|
||||
)
|
||||
|
||||
// Pebble describes the configuration details for an instance of Pebble
|
||||
// deployed to the test cluster
|
||||
type Pebble struct {
|
||||
config *config.Config
|
||||
chart *chart.Chart
|
||||
tillerDetails *tiller.Details
|
||||
|
||||
// Tiller is the tiller instance used to deploy the chart
|
||||
Tiller *tiller.Tiller
|
||||
|
||||
// Name is a unique name for this Pebble deployment
|
||||
Name string
|
||||
|
||||
// Namespace is the namespace to deploy Pebble into
|
||||
Namespace string
|
||||
}
|
||||
|
||||
type Details struct {
|
||||
// Host is the hostname that can be used to connect to Pebble
|
||||
Host string
|
||||
}
|
||||
|
||||
func (p *Pebble) Setup(cfg *config.Config) error {
|
||||
if p.Name == "" {
|
||||
return fmt.Errorf("Name field must be set on Pebble addon")
|
||||
}
|
||||
if p.Namespace == "" {
|
||||
// TODO: in non-global instances, we could generate a new namespace just
|
||||
// for this addon to be used from.
|
||||
return fmt.Errorf("Namespace name must be specified")
|
||||
}
|
||||
if p.Tiller == nil {
|
||||
return fmt.Errorf("Tiller field must be set on Pebble addon")
|
||||
}
|
||||
var err error
|
||||
p.tillerDetails, err = p.Tiller.Details()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
p.chart = &chart.Chart{
|
||||
Tiller: p.Tiller,
|
||||
ReleaseName: "chart-pebble-" + p.Name,
|
||||
Namespace: p.Namespace,
|
||||
ChartName: cfg.RepoRoot + "/test/e2e/charts/pebble",
|
||||
Vars: []chart.StringTuple{
|
||||
{
|
||||
Key: "strict",
|
||||
Value: fmt.Sprintf("%t", cfg.Addons.Pebble.Strict),
|
||||
},
|
||||
},
|
||||
// doesn't matter when installing from disk
|
||||
ChartVersion: "0",
|
||||
}
|
||||
err = p.chart.Setup(cfg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Provision will actually deploy this instance of Pebble to the cluster.
|
||||
func (p *Pebble) Provision() error {
|
||||
return p.chart.Provision()
|
||||
}
|
||||
|
||||
// Details returns details that can be used to utilise the instance of Pebble.
|
||||
func (p *Pebble) Details() *Details {
|
||||
return &Details{
|
||||
Host: fmt.Sprintf("https://pebble.%s.svc.cluster.local/dir", p.Namespace),
|
||||
}
|
||||
}
|
||||
|
||||
// Deprovision will destroy this instance of Pebble
|
||||
func (p *Pebble) Deprovision() error {
|
||||
return p.chart.Deprovision()
|
||||
}
|
||||
|
||||
func (p *Pebble) SupportsGlobal() bool {
|
||||
// Pebble does support a global configuration, as the 'usage details' for
|
||||
// it are deterministic (i.e. not a result of the call to helm install).
|
||||
return true
|
||||
}
|
||||
|
||||
func (p *Pebble) Logs() (map[string]string, error) {
|
||||
return p.chart.Logs()
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||
|
||||
go_library(
|
||||
name = "go_default_library",
|
||||
srcs = ["addon.go"],
|
||||
importpath = "github.com/jetstack/cert-manager/test/e2e/framework/addon/samplewebhook",
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//test/e2e/framework/addon/certmanager:go_default_library",
|
||||
"//test/e2e/framework/addon/chart:go_default_library",
|
||||
"//test/e2e/framework/addon/tiller:go_default_library",
|
||||
"//test/e2e/framework/config:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [
|
||||
":package-srcs",
|
||||
"//test/e2e/framework/addon/samplewebhook/sample:all-srcs",
|
||||
],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
@@ -1,127 +0,0 @@
|
||||
/*
|
||||
Copyright 2019 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
package samplewebhook
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/certmanager"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/chart"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/config"
|
||||
)
|
||||
|
||||
// CertmanagerWebhook defines an addon that installs a cert-manager DNS01
|
||||
// webhook
|
||||
type CertmanagerWebhook struct {
|
||||
config *config.Config
|
||||
chart *chart.Chart
|
||||
tillerDetails *tiller.Details
|
||||
|
||||
// Tiller is the tiller instance used to deploy the chart
|
||||
Tiller *tiller.Tiller
|
||||
|
||||
Certmanager *certmanager.Certmanager
|
||||
|
||||
Name string
|
||||
|
||||
// Required namespace to deploy the webhook into.
|
||||
Namespace string
|
||||
|
||||
// Optional override for the group name to use for the webhook
|
||||
GroupName string
|
||||
}
|
||||
|
||||
// Details return the details about the webhook instance deployed
|
||||
type Details struct {
|
||||
GroupName string
|
||||
SolverName string
|
||||
}
|
||||
|
||||
func (p *CertmanagerWebhook) Setup(cfg *config.Config) error {
|
||||
p.config = cfg
|
||||
if p.Name == "" {
|
||||
return fmt.Errorf("name field must be set")
|
||||
}
|
||||
if p.Namespace == "" {
|
||||
return fmt.Errorf("namespace name must be specified")
|
||||
}
|
||||
if p.Tiller == nil {
|
||||
return fmt.Errorf("tiller field must be set")
|
||||
}
|
||||
if p.Certmanager == nil {
|
||||
return fmt.Errorf("certmanager field must be set")
|
||||
}
|
||||
if p.config.Kubectl == "" {
|
||||
return fmt.Errorf("path to kubectl must be provided")
|
||||
}
|
||||
if p.GroupName == "" {
|
||||
p.GroupName = p.Name + ".acme.example.com"
|
||||
}
|
||||
var err error
|
||||
p.tillerDetails, err = p.Tiller.Details()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
p.chart = &chart.Chart{
|
||||
Tiller: p.Tiller,
|
||||
ReleaseName: "wh-" + p.Name,
|
||||
Namespace: p.Namespace,
|
||||
ChartName: cfg.RepoRoot + "/test/e2e/framework/addon/samplewebhook/sample/chart/example-webhook",
|
||||
Vars: []chart.StringTuple{
|
||||
{Key: "certManager.namespace", Value: p.Certmanager.Namespace},
|
||||
{Key: "certManager.serviceAccountName", Value: p.Certmanager.Details().ServiceAccountName},
|
||||
{Key: "image.repository", Value: "sample-webhook"},
|
||||
{Key: "image.tag", Value: "bazel"},
|
||||
{Key: "groupName", Value: p.GroupName},
|
||||
},
|
||||
Values: []string{cfg.RepoRoot + "/test/fixtures/example-webhook-values.yaml"},
|
||||
// doesn't matter when installing from disk
|
||||
ChartVersion: "0",
|
||||
UpdateDeps: true,
|
||||
}
|
||||
err = p.chart.Setup(cfg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// Provision will actually deploy this instance of Pebble-ingress to the cluster.
|
||||
func (p *CertmanagerWebhook) Provision() error {
|
||||
return p.chart.Provision()
|
||||
}
|
||||
|
||||
// Details returns details that can be used to utilise the instance of Pebble.
|
||||
func (p *CertmanagerWebhook) Details() *Details {
|
||||
return &Details{
|
||||
GroupName: p.GroupName,
|
||||
SolverName: "my-custom-solver",
|
||||
}
|
||||
}
|
||||
|
||||
// Deprovision will destroy this instance of Pebble
|
||||
func (p *CertmanagerWebhook) Deprovision() error {
|
||||
return p.chart.Deprovision()
|
||||
}
|
||||
|
||||
func (p *CertmanagerWebhook) SupportsGlobal() bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func (p *CertmanagerWebhook) Logs() (map[string]string, error) {
|
||||
return p.chart.Logs()
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||
|
||||
go_library(
|
||||
name = "go_default_library",
|
||||
srcs = ["addon.go"],
|
||||
importpath = "github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller",
|
||||
tags = ["manual"],
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//test/e2e/framework/addon/base:go_default_library",
|
||||
"//test/e2e/framework/config:go_default_library",
|
||||
"@io_k8s_api//apps/v1:go_default_library",
|
||||
"@io_k8s_api//core/v1:go_default_library",
|
||||
"@io_k8s_api//rbac/v1:go_default_library",
|
||||
"@io_k8s_apimachinery//pkg/api/errors:go_default_library",
|
||||
"@io_k8s_apimachinery//pkg/api/resource:go_default_library",
|
||||
"@io_k8s_apimachinery//pkg/apis/meta/v1:go_default_library",
|
||||
"@io_k8s_apimachinery//pkg/util/errors:go_default_library",
|
||||
"@io_k8s_apimachinery//pkg/util/intstr:go_default_library",
|
||||
],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "package-srcs",
|
||||
srcs = glob(["**"]),
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
filegroup(
|
||||
name = "all-srcs",
|
||||
srcs = [":package-srcs"],
|
||||
tags = ["automanaged"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
@@ -1,397 +0,0 @@
|
||||
/*
|
||||
Copyright 2019 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
package tiller
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
appsv1 "k8s.io/api/apps/v1"
|
||||
corev1 "k8s.io/api/core/v1"
|
||||
rbacv1 "k8s.io/api/rbac/v1"
|
||||
apierrors "k8s.io/apimachinery/pkg/api/errors"
|
||||
"k8s.io/apimachinery/pkg/api/resource"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
utilerrors "k8s.io/apimachinery/pkg/util/errors"
|
||||
"k8s.io/apimachinery/pkg/util/intstr"
|
||||
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/base"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/config"
|
||||
)
|
||||
|
||||
var (
|
||||
// all permissions on everything
|
||||
tillerClusterRole = rbacv1.ClusterRole{
|
||||
Rules: []rbacv1.PolicyRule{
|
||||
{
|
||||
Verbs: []string{"*"},
|
||||
APIGroups: []string{"*"},
|
||||
Resources: []string{"*"},
|
||||
},
|
||||
},
|
||||
}
|
||||
tillerDeployment = appsv1.Deployment{
|
||||
ObjectMeta: metav1.ObjectMeta{},
|
||||
Spec: appsv1.DeploymentSpec{
|
||||
Selector: &metav1.LabelSelector{
|
||||
MatchLabels: map[string]string{
|
||||
"app": "helm",
|
||||
"name": "tiller",
|
||||
},
|
||||
},
|
||||
Template: corev1.PodTemplateSpec{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Labels: map[string]string{
|
||||
"app": "helm",
|
||||
"name": "tiller",
|
||||
},
|
||||
},
|
||||
Spec: corev1.PodSpec{
|
||||
Containers: []corev1.Container{
|
||||
{
|
||||
Name: "tiller-deploy",
|
||||
Args: []string{"/tiller", "--listen=localhost:44134"},
|
||||
Ports: []corev1.ContainerPort{
|
||||
{
|
||||
Name: "tiller",
|
||||
ContainerPort: 44134,
|
||||
Protocol: corev1.ProtocolTCP,
|
||||
},
|
||||
},
|
||||
Resources: corev1.ResourceRequirements{
|
||||
Limits: corev1.ResourceList{
|
||||
corev1.ResourceCPU: resource.MustParse("100m"),
|
||||
corev1.ResourceMemory: resource.MustParse("100Mi"),
|
||||
},
|
||||
Requests: corev1.ResourceList{
|
||||
corev1.ResourceCPU: resource.MustParse("10m"),
|
||||
corev1.ResourceMemory: resource.MustParse("10Mi"),
|
||||
},
|
||||
},
|
||||
LivenessProbe: buildProbe("/liveness"),
|
||||
ReadinessProbe: buildProbe("/readiness"),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
func buildProbe(path string) *corev1.Probe {
|
||||
return &corev1.Probe{
|
||||
Handler: corev1.Handler{
|
||||
HTTPGet: &corev1.HTTPGetAction{
|
||||
Path: path,
|
||||
Port: intstr.FromInt(44135),
|
||||
Scheme: corev1.URISchemeHTTP,
|
||||
},
|
||||
},
|
||||
FailureThreshold: 3,
|
||||
InitialDelaySeconds: 1,
|
||||
PeriodSeconds: 10,
|
||||
SuccessThreshold: 1,
|
||||
TimeoutSeconds: 1,
|
||||
}
|
||||
}
|
||||
|
||||
// Tiller defines an addon that installs an instance of tiller in the target cluster.
|
||||
type Tiller struct {
|
||||
config *config.Config
|
||||
baseDetails *base.Details
|
||||
|
||||
// Base is the base addon to use for Kubernetes API interactions
|
||||
Base *base.Base
|
||||
|
||||
// Optional name to use for the tiller deployment.
|
||||
// If not specified, 'tiller-deploy' will be used.
|
||||
Name string
|
||||
|
||||
// Optional namespace to deploy Tiller into.
|
||||
// If not specified, the 'kube-system' namespace will be used.
|
||||
Namespace string
|
||||
|
||||
// ImageRepo is the image repo to use for Tiller.
|
||||
// If not set, the global tiller image repo set in the config will be used.
|
||||
ImageRepo string
|
||||
|
||||
// ImageTag is the image tag to use for Tiller.
|
||||
// If not set, the global tiller image tag set in the config will be used.
|
||||
ImageTag string
|
||||
|
||||
// ClusterPermissions will cause the addon to give this tiller instance
|
||||
// global permissions over the cluster.
|
||||
ClusterPermissions bool
|
||||
|
||||
// provisionedDeployment contains a reference to a copy of the instance of
|
||||
// tiller that has been deployed.
|
||||
// Use of this field must be guarded, as when tiller is deployed as a shared
|
||||
// test resource and tests are run in parallel, only one instance of this
|
||||
// structure will actually have the field set.
|
||||
// We only store this field so that Deprovision can be called after Provision.
|
||||
provisionedNamespace *corev1.Namespace
|
||||
provisionedServiceAccount *corev1.ServiceAccount
|
||||
provisionedClusterRole *rbacv1.ClusterRole
|
||||
provisionedClusterRoleBinding *rbacv1.ClusterRoleBinding
|
||||
provisionedRoleBinding *rbacv1.RoleBinding
|
||||
provisionedDeployment *appsv1.Deployment
|
||||
|
||||
createdNs bool
|
||||
}
|
||||
|
||||
// Details return the details about the Tiller instance deployed
|
||||
type Details struct {
|
||||
// Name of the deployment created for Tiller
|
||||
Name string
|
||||
|
||||
// Namespace that Tiller has been deployed into
|
||||
Namespace string
|
||||
|
||||
// KubeConfig is the path to a kubeconfig file that can be used to speak
|
||||
// to the tiller instance
|
||||
KubeConfig string
|
||||
|
||||
// KubeContext is the name of the kubeconfig context to use to speak to the
|
||||
// tiller instance
|
||||
KubeContext string
|
||||
}
|
||||
|
||||
// Setup will configure this addon but not provision it
|
||||
func (t *Tiller) Setup(c *config.Config) error {
|
||||
t.config = c
|
||||
|
||||
if t.Base == nil {
|
||||
t.Base = &base.Base{}
|
||||
if err := t.Base.Setup(c); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
t.baseDetails = t.Base.Details()
|
||||
|
||||
if t.Name == "" {
|
||||
return fmt.Errorf("name of the tiller instance must be specified")
|
||||
}
|
||||
|
||||
if t.Namespace == "" {
|
||||
return fmt.Errorf("namespace for the tiller instance must be specified")
|
||||
}
|
||||
|
||||
if t.ImageRepo == "" {
|
||||
t.ImageRepo = t.config.Addons.Tiller.ImageRepo
|
||||
}
|
||||
|
||||
if t.ImageTag == "" {
|
||||
t.ImageTag = t.config.Addons.Tiller.ImageTag
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Provision an instance of tiller-deploy
|
||||
func (t *Tiller) Provision() error {
|
||||
var err error
|
||||
|
||||
ns := t.buildNamespace()
|
||||
sa := t.buildServiceAccount()
|
||||
clusterRole := t.buildClusterRole()
|
||||
depl := t.buildDeployment()
|
||||
|
||||
t.provisionedNamespace, err = t.baseDetails.KubeClient.CoreV1().Namespaces().Create(ns)
|
||||
t.createdNs = true
|
||||
if err != nil {
|
||||
if !apierrors.IsAlreadyExists(err) {
|
||||
return err
|
||||
} else {
|
||||
t.createdNs = false
|
||||
}
|
||||
}
|
||||
|
||||
t.provisionedServiceAccount, err = t.baseDetails.KubeClient.CoreV1().ServiceAccounts(sa.Namespace).Create(sa)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
t.provisionedClusterRole, err = t.baseDetails.KubeClient.RbacV1().ClusterRoles().Create(clusterRole)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if t.ClusterPermissions {
|
||||
crb := t.buildClusterRoleBinding()
|
||||
t.provisionedClusterRoleBinding, err = t.baseDetails.KubeClient.RbacV1().ClusterRoleBindings().Create(crb)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
rb := t.buildRoleBinding()
|
||||
t.provisionedRoleBinding, err = t.baseDetails.KubeClient.RbacV1().RoleBindings(rb.Namespace).Create(rb)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
t.provisionedDeployment, err = t.baseDetails.KubeClient.AppsV1().Deployments(depl.Namespace).Create(depl)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// otherwise lookup the newly created pods name
|
||||
err = t.Base.Details().Helper().WaitForAllPodsRunningInNamespace(t.Namespace)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// Deprovision the deployed instance of tiller-deploy
|
||||
func (t *Tiller) Deprovision() error {
|
||||
var errs []error
|
||||
|
||||
if t.provisionedDeployment != nil {
|
||||
err := t.baseDetails.KubeClient.AppsV1().Deployments(t.provisionedDeployment.Namespace).Delete(t.provisionedDeployment.Name, nil)
|
||||
if !apierrors.IsNotFound(err) {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
}
|
||||
|
||||
if t.provisionedClusterRoleBinding != nil {
|
||||
err := t.baseDetails.KubeClient.RbacV1().ClusterRoleBindings().Delete(t.provisionedClusterRoleBinding.Name, nil)
|
||||
if !apierrors.IsNotFound(err) {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
}
|
||||
|
||||
if t.provisionedRoleBinding != nil {
|
||||
err := t.baseDetails.KubeClient.RbacV1().RoleBindings(t.provisionedRoleBinding.Namespace).Delete(t.provisionedRoleBinding.Name, nil)
|
||||
if !apierrors.IsNotFound(err) {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
}
|
||||
|
||||
if t.provisionedClusterRole != nil {
|
||||
err := t.baseDetails.KubeClient.RbacV1().ClusterRoles().Delete(t.provisionedClusterRole.Name, nil)
|
||||
if !apierrors.IsNotFound(err) {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
}
|
||||
|
||||
if t.provisionedServiceAccount != nil {
|
||||
err := t.baseDetails.KubeClient.CoreV1().ServiceAccounts(t.provisionedServiceAccount.Namespace).Delete(t.provisionedServiceAccount.Name, nil)
|
||||
if !apierrors.IsNotFound(err) {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
}
|
||||
|
||||
if t.createdNs {
|
||||
// TODO: wait for namespace to be deleted
|
||||
err := t.baseDetails.KubeClient.CoreV1().Namespaces().Delete(t.Namespace, nil)
|
||||
if !apierrors.IsNotFound(err) {
|
||||
errs = append(errs, err)
|
||||
}
|
||||
}
|
||||
|
||||
return utilerrors.NewAggregate(errs)
|
||||
}
|
||||
|
||||
// Details must be possible to compute without Provision being called if we want
|
||||
// to be able to provision global/shared instances of Tiller.
|
||||
func (t *Tiller) Details() (*Details, error) {
|
||||
d := &Details{
|
||||
Name: t.Name,
|
||||
Namespace: t.Namespace,
|
||||
}
|
||||
|
||||
return d, nil
|
||||
}
|
||||
|
||||
func (t *Tiller) SupportsGlobal() bool {
|
||||
return true
|
||||
}
|
||||
|
||||
func (t *Tiller) buildNamespace() *corev1.Namespace {
|
||||
return &corev1.Namespace{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: t.Namespace,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func (t *Tiller) buildServiceAccount() *corev1.ServiceAccount {
|
||||
return &corev1.ServiceAccount{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: t.Name,
|
||||
Namespace: t.Namespace,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func (t *Tiller) buildClusterRole() *rbacv1.ClusterRole {
|
||||
role := tillerClusterRole.DeepCopy()
|
||||
role.GenerateName = t.Name
|
||||
return role
|
||||
}
|
||||
|
||||
func (t *Tiller) buildRoleBinding() *rbacv1.RoleBinding {
|
||||
crb := t.buildClusterRoleBinding()
|
||||
return &rbacv1.RoleBinding{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
Name: t.Name,
|
||||
Namespace: t.Namespace,
|
||||
},
|
||||
Subjects: crb.Subjects,
|
||||
RoleRef: crb.RoleRef,
|
||||
}
|
||||
}
|
||||
|
||||
func (t *Tiller) buildClusterRoleBinding() *rbacv1.ClusterRoleBinding {
|
||||
return &rbacv1.ClusterRoleBinding{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
GenerateName: t.Name + "-",
|
||||
},
|
||||
Subjects: []rbacv1.Subject{
|
||||
{
|
||||
Name: t.Name,
|
||||
Namespace: t.Namespace,
|
||||
Kind: "ServiceAccount",
|
||||
},
|
||||
},
|
||||
RoleRef: rbacv1.RoleRef{
|
||||
APIGroup: "rbac.authorization.k8s.io",
|
||||
Kind: "ClusterRole",
|
||||
Name: t.provisionedClusterRole.Name,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func (t *Tiller) buildDeployment() *appsv1.Deployment {
|
||||
depl := tillerDeployment.DeepCopy()
|
||||
|
||||
depl.Name = t.Name
|
||||
depl.Namespace = t.Namespace
|
||||
|
||||
// we add the name of the tiller instance as a label to prevent clashes
|
||||
// if more than one tiller gets deployed to a single namespace
|
||||
depl.Spec.Selector.MatchLabels["tiller-name"] = t.Name
|
||||
depl.Spec.Template.ObjectMeta.Labels["tiller-name"] = t.Name
|
||||
|
||||
// Set the image repo and tag
|
||||
depl.Spec.Template.Spec.Containers[0].Image = t.config.Addons.Tiller.ImageRepo + ":" + t.config.Addons.Tiller.ImageTag
|
||||
depl.Spec.Template.Spec.ServiceAccountName = t.Name
|
||||
// TODO: set the TILLER_NAMESPACE environment variable
|
||||
|
||||
return depl
|
||||
}
|
||||
@@ -11,8 +11,8 @@ go_library(
|
||||
tags = ["manual"],
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//test/e2e/framework/addon/base:go_default_library",
|
||||
"//test/e2e/framework/addon/chart:go_default_library",
|
||||
"//test/e2e/framework/addon/tiller:go_default_library",
|
||||
"//test/e2e/framework/config:go_default_library",
|
||||
"//test/e2e/framework/log:go_default_library",
|
||||
"@com_github_hashicorp_vault_api//:go_default_library",
|
||||
|
||||
@@ -32,20 +32,18 @@ import (
|
||||
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/base"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/chart"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/config"
|
||||
)
|
||||
|
||||
// Vault describes the configuration details for an instance of Vault
|
||||
// deployed to the test cluster
|
||||
type Vault struct {
|
||||
config *config.Config
|
||||
chart *chart.Chart
|
||||
tillerDetails *tiller.Details
|
||||
config *config.Config
|
||||
chart *chart.Chart
|
||||
|
||||
// Tiller is the tiller instance used to deploy the chart
|
||||
Tiller *tiller.Tiller
|
||||
Base *base.Base
|
||||
|
||||
// Name is a unique name for this Vault deployment
|
||||
Name string
|
||||
@@ -87,8 +85,8 @@ func (v *Vault) Setup(cfg *config.Config) error {
|
||||
// for this addon to be used from.
|
||||
return fmt.Errorf("Namespace name must be specified")
|
||||
}
|
||||
if v.Tiller == nil {
|
||||
return fmt.Errorf("Tiller field must be set on Vault addon")
|
||||
if v.Base == nil {
|
||||
return fmt.Errorf("Base field must be set on Vault addon")
|
||||
}
|
||||
|
||||
var err error
|
||||
@@ -105,12 +103,8 @@ func (v *Vault) Setup(cfg *config.Config) error {
|
||||
return fmt.Errorf("path to kubectl must be set")
|
||||
}
|
||||
v.details.Kubectl = cfg.Kubectl
|
||||
v.tillerDetails, err = v.Tiller.Details()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
v.chart = &chart.Chart{
|
||||
Tiller: v.Tiller,
|
||||
Base: v.Base,
|
||||
ReleaseName: "chart-vault-" + v.Name,
|
||||
Namespace: v.Namespace,
|
||||
ChartName: cfg.RepoRoot + "/test/e2e/charts/vault",
|
||||
@@ -142,7 +136,7 @@ func (v *Vault) Provision() error {
|
||||
}
|
||||
|
||||
// otherwise lookup the newly created pods name
|
||||
kubeClient := v.Tiller.Base.Details().KubeClient
|
||||
kubeClient := v.Base.Details().KubeClient
|
||||
|
||||
retries := 5
|
||||
for {
|
||||
|
||||
@@ -3,13 +3,15 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||
go_library(
|
||||
name = "go_default_library",
|
||||
srcs = [
|
||||
"acme.go",
|
||||
"addons.go",
|
||||
"certmanager.go",
|
||||
"config.go",
|
||||
"framework.go",
|
||||
"ginkgo.go",
|
||||
"helm.go",
|
||||
"nginx.go",
|
||||
"pebble.go",
|
||||
"ingress_controller.go",
|
||||
"samplewebhook.go",
|
||||
"suite.go",
|
||||
"tiller.go",
|
||||
"venafi.go",
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
/*
|
||||
Copyright 2019 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
package config
|
||||
|
||||
import (
|
||||
"flag"
|
||||
)
|
||||
|
||||
type ACMEServer struct {
|
||||
URL string
|
||||
}
|
||||
|
||||
func (p *ACMEServer) AddFlags(fs *flag.FlagSet) {
|
||||
fs.StringVar(&p.URL, "acme-server-url", "https://pebble.pebble.svc.cluster.local/dir", "URL for the ACME server used during end-to-end tests")
|
||||
}
|
||||
|
||||
func (p *ACMEServer) Validate() []error {
|
||||
return nil
|
||||
}
|
||||
@@ -28,41 +28,43 @@ type Addons struct {
|
||||
// Helm describes the global configuration values for helm
|
||||
Helm Helm
|
||||
|
||||
// Pebble describes the global configuration values for the pebble addon
|
||||
Pebble Pebble
|
||||
// Connection details for the ACME server used during ACME end-to-end
|
||||
// tests.
|
||||
ACMEServer ACMEServer
|
||||
|
||||
// Nginx describes global configuration variables for the nginx addon.
|
||||
// Because we currently can only run one instance of nginx per cluster due
|
||||
// to the way we provision DNS, this structure currently also describes
|
||||
// the runtime configuration for a global shared Nginx instance as well.
|
||||
Nginx Nginx
|
||||
// IngressController contains configuration for the ingress controller
|
||||
// being used during ACME HTTP01 tests.
|
||||
IngressController IngressController
|
||||
|
||||
// Venafi describes global configuration variables for the Venafi tests.
|
||||
// This includes credentials for the Venafi TPP server to use during runs.
|
||||
Venafi Venafi
|
||||
|
||||
// If true, global addons will not be provisioned before running tests.
|
||||
// This is useful when developing locally.
|
||||
SkipGlobals bool
|
||||
// CertManager contains configuration options for the cert-manager
|
||||
// deployment under test.
|
||||
CertManager CertManager
|
||||
|
||||
DNS01Webhook DNS01Webhook
|
||||
}
|
||||
|
||||
func (a *Addons) AddFlags(fs *flag.FlagSet) {
|
||||
a.Tiller.AddFlags(fs)
|
||||
a.Helm.AddFlags(fs)
|
||||
a.Pebble.AddFlags(fs)
|
||||
a.Nginx.AddFlags(fs)
|
||||
a.ACMEServer.AddFlags(fs)
|
||||
a.IngressController.AddFlags(fs)
|
||||
a.Venafi.AddFlags(fs)
|
||||
|
||||
fs.BoolVar(&a.SkipGlobals, "skip-globals", false, "If true, global addons will not be "+
|
||||
"provisioned before running tests")
|
||||
a.CertManager.AddFlags(fs)
|
||||
a.DNS01Webhook.AddFlags(fs)
|
||||
}
|
||||
|
||||
func (c *Addons) Validate() []error {
|
||||
var errs []error
|
||||
errs = append(errs, c.Tiller.Validate()...)
|
||||
errs = append(errs, c.Helm.Validate()...)
|
||||
errs = append(errs, c.Pebble.Validate()...)
|
||||
errs = append(errs, c.Nginx.Validate()...)
|
||||
errs = append(errs, c.ACMEServer.Validate()...)
|
||||
errs = append(errs, c.IngressController.Validate()...)
|
||||
errs = append(errs, c.Venafi.Validate()...)
|
||||
errs = append(errs, c.CertManager.Validate()...)
|
||||
errs = append(errs, c.DNS01Webhook.Validate()...)
|
||||
return errs
|
||||
}
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
/*
|
||||
Copyright 2020 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
package config
|
||||
|
||||
import (
|
||||
"flag"
|
||||
)
|
||||
|
||||
type CertManager struct {
|
||||
// The --cluster-resource-namespace configured for the cert-manager
|
||||
// installation
|
||||
ClusterResourceNamespace string
|
||||
|
||||
// ServiceAccountName is the name of the Kubernetes ServiceAccount that the
|
||||
// cert-manager-controller deployment is using.
|
||||
ServiceAccountName string
|
||||
}
|
||||
|
||||
func (c *CertManager) AddFlags(fs *flag.FlagSet) {
|
||||
fs.StringVar(&c.ClusterResourceNamespace, "cluster-resource-namespace", "cert-manager", "The --cluster-resource-namespace configured for the cert-manager installation")
|
||||
fs.StringVar(&c.ServiceAccountName, "cert-manager-service-account-name", "chart-certmanager-cert-manager", "ServiceAccountName is the name of the Kubernetes ServiceAccount that the cert-manager-controller deployment is using")
|
||||
}
|
||||
|
||||
func (c *CertManager) Validate() []error {
|
||||
return nil
|
||||
}
|
||||
@@ -20,6 +20,7 @@ import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
utilerrors "k8s.io/apimachinery/pkg/util/errors"
|
||||
"k8s.io/client-go/tools/clientcmd"
|
||||
@@ -62,8 +63,16 @@ func (c *Config) Validate() error {
|
||||
|
||||
// Register flags common to all e2e test suites.
|
||||
func (c *Config) AddFlags(fs *flag.FlagSet) {
|
||||
kubeConfigFile := os.Getenv(clientcmd.RecommendedConfigPathEnvVar)
|
||||
if kubeConfigFile == "" {
|
||||
homeDir, err := os.UserHomeDir()
|
||||
if err != nil {
|
||||
panic("Failed to get user home directory: " + err.Error())
|
||||
}
|
||||
kubeConfigFile = filepath.Join(homeDir, clientcmd.RecommendedHomeDir, clientcmd.RecommendedFileName)
|
||||
}
|
||||
// Kubernetes API server config
|
||||
fs.StringVar(&c.KubeConfig, "kubernetes-config", os.Getenv(clientcmd.RecommendedConfigPathEnvVar), "Path to config containing embedded authinfo for kubernetes. Default value is from environment variable "+clientcmd.RecommendedConfigPathEnvVar)
|
||||
fs.StringVar(&c.KubeConfig, "kubernetes-config", kubeConfigFile, "Path to config containing embedded authinfo for kubernetes. Default value is from environment variable "+clientcmd.RecommendedConfigPathEnvVar)
|
||||
fs.StringVar(&c.KubeContext, "kubernetes-context", "", "config context to use for kuberentes. If unset, will use value from 'current-context'")
|
||||
fs.StringVar(&c.Kubectl, "kubectl-path", "kubectl", "path to the kubectl binary to use during e2e tests.")
|
||||
fs.BoolVar(&c.Cleanup, "cleanup", true, "If true, addons will be cleaned up both before and after provisioning")
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
/*
|
||||
Copyright 2019 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
package config
|
||||
|
||||
import (
|
||||
"flag"
|
||||
)
|
||||
|
||||
type IngressController struct {
|
||||
// Domain is a domain name that can be used during e2e tests.
|
||||
// This domain should have records for *.example.com and example.com pointing
|
||||
// to the IP of the ingress controller's Service resource.
|
||||
Domain string
|
||||
|
||||
// IngressClass of the ingress controller under test, used for the HTTP01
|
||||
// ACME validation tests.
|
||||
IngressClass string
|
||||
}
|
||||
|
||||
func (n *IngressController) AddFlags(fs *flag.FlagSet) {
|
||||
fs.StringVar(&n.Domain, "ingress-controller-domain", "certmanager.kubernetes.network", "The domain name used during ACME DNS01 validation tests. "+
|
||||
"All subdomains of this domain must also resolve to the IP of the ingress controller's Service.")
|
||||
fs.StringVar(&n.IngressClass, "ingress-controller-class", "nginx", "Ingress class of the ingress controller under test, used for the HTTP01 ACME validation tests.")
|
||||
}
|
||||
|
||||
func (n *IngressController) Validate() []error {
|
||||
return nil
|
||||
}
|
||||
@@ -1,79 +0,0 @@
|
||||
/*
|
||||
Copyright 2019 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
package config
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"flag"
|
||||
)
|
||||
|
||||
type Nginx struct {
|
||||
// Helm chart version to deploy during tests
|
||||
ChartVersion string
|
||||
|
||||
Global NginxRuntimeConfig
|
||||
}
|
||||
|
||||
// NginxRuntimeConfig is a copy of the runtime configuration for an instance of
|
||||
// the nginx addon.
|
||||
// It is copied to avoid dependency cycle issues, as the nginx addon depends
|
||||
// upon this package for global configuration.
|
||||
type NginxRuntimeConfig struct {
|
||||
// IPAddress is the IP address that the nginx-ingress service will be
|
||||
// exposed on.
|
||||
// This must be a part of the service CIDR, and must not already be allocated
|
||||
// else provisioning will fail.
|
||||
IPAddress string
|
||||
|
||||
// Domain is a domain name that can be used during e2e tests.
|
||||
// This domain should have records for *.example.com and example.com pointing
|
||||
// to the IP listed above.
|
||||
Domain string
|
||||
}
|
||||
|
||||
func (n *Nginx) AddFlags(fs *flag.FlagSet) {
|
||||
fs.StringVar(&n.ChartVersion, "nginx-ingress-chart-version", "1.23.0", "nginx-ingress chart version to use during tests")
|
||||
|
||||
n.Global.AddFlags(fs)
|
||||
}
|
||||
|
||||
func (n *Nginx) Validate() []error {
|
||||
var errs []error
|
||||
if n.ChartVersion == "" {
|
||||
errs = append(errs, fmt.Errorf("--nginx-ingress-chart-version must be specified"))
|
||||
}
|
||||
errs = append(errs, n.Global.Validate()...)
|
||||
return errs
|
||||
}
|
||||
|
||||
func (n *NginxRuntimeConfig) AddFlags(fs *flag.FlagSet) {
|
||||
fs.StringVar(&n.IPAddress, "global-nginx-ingress-ip-address", "10.0.0.15", "The IP address to expose the shared nginx-ingress used during tests on.")
|
||||
fs.StringVar(&n.Domain, "global-nginx-ingress-domain", "certmanager.kubernetes.network", "The domain name that points to the global-nginx-ingress-ip-address. "+
|
||||
"All subdomains of this domain must also point to the IP as well.")
|
||||
}
|
||||
|
||||
func (n *NginxRuntimeConfig) Validate() []error {
|
||||
var errs []error
|
||||
if n.Domain == "" {
|
||||
errs = append(errs, fmt.Errorf("--global-nginx-ingress-domain must be specified"))
|
||||
}
|
||||
if n.IPAddress == "" {
|
||||
errs = append(errs, fmt.Errorf("--global-nginx-ingress-ip-address must be specified"))
|
||||
}
|
||||
return errs
|
||||
}
|
||||
@@ -1,44 +0,0 @@
|
||||
/*
|
||||
Copyright 2019 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
package config
|
||||
|
||||
import (
|
||||
"flag"
|
||||
)
|
||||
|
||||
// Pebble global configuration for new Pebble instances
|
||||
type Pebble struct {
|
||||
// Not currently exposed in Pebble addon
|
||||
// // ImageRepo for Pebble
|
||||
// ImageRepo string
|
||||
|
||||
// // ImageTag for Pebble
|
||||
// ImageTag string
|
||||
|
||||
// Strict enables Pebble's 'strict mode'
|
||||
Strict bool
|
||||
}
|
||||
|
||||
func (p *Pebble) AddFlags(fs *flag.FlagSet) {
|
||||
fs.BoolVar(&p.Strict, "pebble-strict", true, "If true, tests using Pebble will have strict mode enabled")
|
||||
// fs.StringVar(&p.ImageRepo, "pebble-image-repo", "", "The container image repository for pebble to use in e2e tests")
|
||||
// fs.StringVar(&p.ImageTag, "pebble-image-tag", "", "The container image tag for pebble to use in e2e tests")
|
||||
}
|
||||
|
||||
func (p *Pebble) Validate() []error {
|
||||
return nil
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
/*
|
||||
Copyright 2019 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
package config
|
||||
|
||||
import (
|
||||
"flag"
|
||||
)
|
||||
|
||||
type DNS01Webhook struct {
|
||||
// GroupName of the deployed DNS01 webhook
|
||||
GroupName string
|
||||
|
||||
// SolverName to use with the DNS01 webhook
|
||||
SolverName string
|
||||
}
|
||||
|
||||
func (d *DNS01Webhook) AddFlags(fs *flag.FlagSet) {
|
||||
fs.StringVar(&d.GroupName, "dns01-webhook-group-name", "acme.testing.cert-manager.io", "GroupName of the deployed DNS01 webhook.")
|
||||
fs.StringVar(&d.SolverName, "dns01-webhook-solver-name", "my-custom-solver", "SolverName to use with the DNS01 webhook.")
|
||||
}
|
||||
|
||||
func (n *DNS01Webhook) Validate() []error {
|
||||
return nil
|
||||
}
|
||||
@@ -2,11 +2,15 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
|
||||
|
||||
go_library(
|
||||
name = "go_default_library",
|
||||
srcs = ["config.go"],
|
||||
srcs = [
|
||||
"config.go",
|
||||
"domains.go",
|
||||
],
|
||||
importpath = "github.com/jetstack/cert-manager/test/e2e/framework/util",
|
||||
tags = ["manual"],
|
||||
visibility = ["//visibility:public"],
|
||||
deps = [
|
||||
"//pkg/util:go_default_library",
|
||||
"@io_k8s_client_go//rest:go_default_library",
|
||||
"@io_k8s_client_go//tools/clientcmd:go_default_library",
|
||||
"@io_k8s_client_go//tools/clientcmd/api:go_default_library",
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
/*
|
||||
Copyright 2020 The Jetstack cert-manager contributors.
|
||||
|
||||
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.
|
||||
*/
|
||||
|
||||
package util
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
cmutil "github.com/jetstack/cert-manager/pkg/util"
|
||||
)
|
||||
|
||||
func RandomSubdomain(domain string) string {
|
||||
return fmt.Sprintf("%s.%s", cmutil.RandStringRunes(5), domain)
|
||||
}
|
||||
@@ -17,14 +17,6 @@ load("@bazel_gazelle//:deps.bzl", "go_repository")
|
||||
|
||||
# Defines Bazel WORKSPACE targets that are used during e2e tests
|
||||
def install():
|
||||
container_pull(
|
||||
name = "io_gcr_helm_tiller",
|
||||
registry = "gcr.io",
|
||||
repository = "kubernetes-helm/tiller",
|
||||
tag = "v2.15.1",
|
||||
digest = "sha256:39bb81aa9299390ef1d9e472531da24e98234db46664e431001a5fd6d0611114",
|
||||
)
|
||||
|
||||
## Fetch pebble for use during e2e tests
|
||||
## You can change the version of Pebble used for tests by changing the 'commit'
|
||||
## field in this rule
|
||||
|
||||
@@ -10,9 +10,7 @@ go_library(
|
||||
"//pkg/apis/certmanager/v1alpha2:go_default_library",
|
||||
"//pkg/apis/meta/v1:go_default_library",
|
||||
"//test/e2e/framework:go_default_library",
|
||||
"//test/e2e/framework/addon:go_default_library",
|
||||
"//test/e2e/framework/addon/pebble:go_default_library",
|
||||
"//test/e2e/framework/addon/tiller:go_default_library",
|
||||
"//test/e2e/framework/util/errors:go_default_library",
|
||||
"//test/e2e/suite/conformance/certificates:go_default_library",
|
||||
"//test/e2e/suite/issuers/acme/dnsproviders:go_default_library",
|
||||
"@com_github_onsi_ginkgo//:go_default_library",
|
||||
|
||||
@@ -29,9 +29,7 @@ import (
|
||||
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2"
|
||||
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/pebble"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/util/errors"
|
||||
"github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates"
|
||||
"github.com/jetstack/cert-manager/test/e2e/suite/issuers/acme/dnsproviders"
|
||||
)
|
||||
@@ -106,8 +104,6 @@ func runACMEIssuerTests(eab *cmacme.ACMEExternalAccountBinding) {
|
||||
}
|
||||
|
||||
type acmeIssuerProvisioner struct {
|
||||
tiller *tiller.Tiller
|
||||
pebble *pebble.Pebble
|
||||
cloudflare *dnsproviders.Cloudflare
|
||||
|
||||
eab *cmacme.ACMEExternalAccountBinding
|
||||
@@ -120,13 +116,9 @@ func (a *acmeIssuerProvisioner) delete(f *framework.Framework, ref cmmeta.Object
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
}
|
||||
|
||||
if a.pebble != nil {
|
||||
Expect(a.pebble.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision pebble")
|
||||
}
|
||||
if a.cloudflare != nil {
|
||||
Expect(a.cloudflare.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision cloudflare")
|
||||
}
|
||||
Expect(a.tiller.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision tiller")
|
||||
|
||||
if ref.Kind == "ClusterIssuer" {
|
||||
err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Delete(ref.Name, nil)
|
||||
@@ -141,16 +133,14 @@ func (a *acmeIssuerProvisioner) delete(f *framework.Framework, ref cmmeta.Object
|
||||
// - a properly configured Issuer resource
|
||||
|
||||
func (a *acmeIssuerProvisioner) createHTTP01Issuer(f *framework.Framework) cmmeta.ObjectReference {
|
||||
a.deployTiller(f, "http01")
|
||||
|
||||
a.ensureEABSecret(f, f.Namespace.Name)
|
||||
a.ensureEABSecret(f, "")
|
||||
|
||||
By("Creating an ACME HTTP01 Issuer")
|
||||
issuer := &cmapi.Issuer{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
GenerateName: "acme-issuer-http01-",
|
||||
},
|
||||
Spec: a.createHTTP01IssuerSpec(),
|
||||
Spec: a.createHTTP01IssuerSpec(f.Config.Addons.ACMEServer.URL),
|
||||
}
|
||||
|
||||
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(issuer)
|
||||
@@ -164,16 +154,14 @@ func (a *acmeIssuerProvisioner) createHTTP01Issuer(f *framework.Framework) cmmet
|
||||
}
|
||||
|
||||
func (a *acmeIssuerProvisioner) createHTTP01ClusterIssuer(f *framework.Framework) cmmeta.ObjectReference {
|
||||
a.deployTiller(f, "http01")
|
||||
|
||||
a.ensureEABSecret(f, addon.CertManager.Namespace)
|
||||
a.ensureEABSecret(f, f.Config.Addons.CertManager.ClusterResourceNamespace)
|
||||
|
||||
By("Creating an ACME HTTP01 ClusterIssuer")
|
||||
issuer := &cmapi.ClusterIssuer{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
GenerateName: "acme-cluster-issuer-http01-",
|
||||
},
|
||||
Spec: a.createHTTP01IssuerSpec(),
|
||||
Spec: a.createHTTP01IssuerSpec(f.Config.Addons.ACMEServer.URL),
|
||||
}
|
||||
|
||||
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Create(issuer)
|
||||
@@ -186,11 +174,11 @@ func (a *acmeIssuerProvisioner) createHTTP01ClusterIssuer(f *framework.Framework
|
||||
}
|
||||
}
|
||||
|
||||
func (a *acmeIssuerProvisioner) createHTTP01IssuerSpec() cmapi.IssuerSpec {
|
||||
func (a *acmeIssuerProvisioner) createHTTP01IssuerSpec(serverURL string) cmapi.IssuerSpec {
|
||||
return cmapi.IssuerSpec{
|
||||
IssuerConfig: cmapi.IssuerConfig{
|
||||
ACME: &cmacme.ACMEIssuer{
|
||||
Server: addon.Pebble.Details().Host,
|
||||
Server: serverURL,
|
||||
SkipTLSVerify: true,
|
||||
PrivateKey: cmmeta.SecretKeySelector{
|
||||
LocalObjectReference: cmmeta.LocalObjectReference{
|
||||
@@ -214,14 +202,18 @@ func (a *acmeIssuerProvisioner) createHTTP01IssuerSpec() cmapi.IssuerSpec {
|
||||
}
|
||||
|
||||
func (a *acmeIssuerProvisioner) createDNS01Issuer(f *framework.Framework) cmmeta.ObjectReference {
|
||||
a.deployTiller(f, "dns01")
|
||||
|
||||
a.ensureEABSecret(f, f.Namespace.Name)
|
||||
|
||||
a.cloudflare = &dnsproviders.Cloudflare{
|
||||
Namespace: f.Namespace.Name,
|
||||
}
|
||||
Expect(a.cloudflare.Setup(f.Config)).NotTo(HaveOccurred(), "failed to setup cloudflare")
|
||||
err := a.cloudflare.Setup(f.Config)
|
||||
if errors.IsSkip(err) {
|
||||
framework.Skipf("Cannot setup DNS01 provider addon, skipping: %v", err)
|
||||
return cmmeta.ObjectReference{}
|
||||
} else {
|
||||
Expect(a.cloudflare.Setup(f.Config)).NotTo(HaveOccurred(), "failed to setup cloudflare")
|
||||
}
|
||||
Expect(a.cloudflare.Provision()).NotTo(HaveOccurred(), "failed to provision cloudflare")
|
||||
|
||||
By("Creating an ACME DNS01 Issuer")
|
||||
@@ -231,7 +223,7 @@ func (a *acmeIssuerProvisioner) createDNS01Issuer(f *framework.Framework) cmmeta
|
||||
},
|
||||
Spec: a.createDNS01IssuerSpec(),
|
||||
}
|
||||
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(issuer)
|
||||
issuer, err = f.CertManagerClientSet.CertmanagerV1alpha2().Issuers(f.Namespace.Name).Create(issuer)
|
||||
Expect(err).NotTo(HaveOccurred(), "failed to create acme DNS01 Issuer")
|
||||
|
||||
return cmmeta.ObjectReference{
|
||||
@@ -242,14 +234,18 @@ func (a *acmeIssuerProvisioner) createDNS01Issuer(f *framework.Framework) cmmeta
|
||||
}
|
||||
|
||||
func (a *acmeIssuerProvisioner) createDNS01ClusterIssuer(f *framework.Framework) cmmeta.ObjectReference {
|
||||
a.deployTiller(f, "dns01")
|
||||
|
||||
a.ensureEABSecret(f, addon.CertManager.Namespace)
|
||||
a.ensureEABSecret(f, f.Config.Addons.CertManager.ClusterResourceNamespace)
|
||||
|
||||
a.cloudflare = &dnsproviders.Cloudflare{
|
||||
Namespace: addon.CertManager.Namespace,
|
||||
Namespace: f.Config.Addons.CertManager.ClusterResourceNamespace,
|
||||
}
|
||||
err := a.cloudflare.Setup(f.Config)
|
||||
if errors.IsSkip(err) {
|
||||
framework.Skipf("Cannot setup DNS01 provider addon, skipping: %v", err)
|
||||
return cmmeta.ObjectReference{}
|
||||
} else {
|
||||
Expect(a.cloudflare.Setup(f.Config)).NotTo(HaveOccurred(), "failed to setup cloudflare")
|
||||
}
|
||||
Expect(a.cloudflare.Setup(f.Config)).NotTo(HaveOccurred(), "failed to setup cloudflare")
|
||||
Expect(a.cloudflare.Provision()).NotTo(HaveOccurred(), "failed to provision cloudflare")
|
||||
|
||||
By("Creating an ACME DNS01 ClusterIssuer")
|
||||
@@ -259,7 +255,7 @@ func (a *acmeIssuerProvisioner) createDNS01ClusterIssuer(f *framework.Framework)
|
||||
},
|
||||
Spec: a.createDNS01IssuerSpec(),
|
||||
}
|
||||
issuer, err := f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Create(issuer)
|
||||
issuer, err = f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Create(issuer)
|
||||
Expect(err).NotTo(HaveOccurred(), "failed to create acme DNS01 ClusterIssuer")
|
||||
|
||||
return cmmeta.ObjectReference{
|
||||
@@ -292,21 +288,14 @@ func (a *acmeIssuerProvisioner) createDNS01IssuerSpec() cmapi.IssuerSpec {
|
||||
}
|
||||
}
|
||||
|
||||
func (a *acmeIssuerProvisioner) deployTiller(f *framework.Framework, solverType string) {
|
||||
a.tiller = &tiller.Tiller{
|
||||
Name: "tiller-deploy-" + solverType,
|
||||
ClusterPermissions: false,
|
||||
Namespace: f.Namespace.Name,
|
||||
}
|
||||
Expect(a.tiller.Setup(f.Config)).NotTo(HaveOccurred(), "failed to setup tiller")
|
||||
Expect(a.tiller.Provision()).NotTo(HaveOccurred(), "failed to provision tiller")
|
||||
}
|
||||
|
||||
func (a *acmeIssuerProvisioner) ensureEABSecret(f *framework.Framework, ns string) {
|
||||
if a.eab == nil {
|
||||
return
|
||||
}
|
||||
|
||||
if ns == "" {
|
||||
ns = f.Namespace.Name
|
||||
}
|
||||
sec, err := f.KubeClientSet.CoreV1().Secrets(ns).Create(&corev1.Secret{
|
||||
ObjectMeta: metav1.ObjectMeta{
|
||||
GenerateName: "external-account-binding-",
|
||||
|
||||
@@ -9,7 +9,6 @@ go_library(
|
||||
"//pkg/apis/certmanager/v1alpha2:go_default_library",
|
||||
"//pkg/apis/meta/v1:go_default_library",
|
||||
"//test/e2e/framework:go_default_library",
|
||||
"//test/e2e/framework/addon:go_default_library",
|
||||
"//test/e2e/suite/conformance/certificates:go_default_library",
|
||||
"@com_github_onsi_ginkgo//:go_default_library",
|
||||
"@com_github_onsi_gomega//:go_default_library",
|
||||
|
||||
@@ -25,7 +25,6 @@ import (
|
||||
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2"
|
||||
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
|
||||
"github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates"
|
||||
)
|
||||
|
||||
@@ -75,7 +74,7 @@ func (c *ca) createCAIssuer(f *framework.Framework) cmmeta.ObjectReference {
|
||||
func (c *ca) createCAClusterIssuer(f *framework.Framework) cmmeta.ObjectReference {
|
||||
By("Creating a CA ClusterIssuer")
|
||||
|
||||
rootCertSecret, err := f.KubeClientSet.CoreV1().Secrets(addon.CertManager.Namespace).Create(newSigningKeypairSecret("root-ca-cert-"))
|
||||
rootCertSecret, err := f.KubeClientSet.CoreV1().Secrets(f.Config.Addons.CertManager.ClusterResourceNamespace).Create(newSigningKeypairSecret("root-ca-cert-"))
|
||||
Expect(err).NotTo(HaveOccurred(), "failed to create root signing keypair secret")
|
||||
|
||||
c.secretName = rootCertSecret.Name
|
||||
@@ -99,7 +98,7 @@ func (c *ca) createCAClusterIssuer(f *framework.Framework) cmmeta.ObjectReferenc
|
||||
func (c *ca) deleteCAClusterIssuer(f *framework.Framework, issuer cmmeta.ObjectReference) {
|
||||
By("Deleting CA ClusterIssuer")
|
||||
|
||||
err := f.KubeClientSet.CoreV1().Secrets(addon.CertManager.Namespace).Delete(c.secretName, nil)
|
||||
err := f.KubeClientSet.CoreV1().Secrets(f.Config.Addons.CertManager.ClusterResourceNamespace).Delete(c.secretName, nil)
|
||||
Expect(err).NotTo(HaveOccurred(), "failed to delete root signing keypair secret")
|
||||
|
||||
err = f.CertManagerClientSet.CertmanagerV1alpha2().ClusterIssuers().Delete(issuer.Name, nil)
|
||||
|
||||
@@ -80,7 +80,7 @@ func (s *Suite) complete(f *framework.Framework) {
|
||||
//Expect(s.CreateIssuerFunc).NotTo(BeNil(), "CreateIssuerFunc must be set")
|
||||
|
||||
if s.DomainSuffix == "" {
|
||||
s.DomainSuffix = f.Config.Addons.Nginx.Global.Domain
|
||||
s.DomainSuffix = f.Config.Addons.IngressController.Domain
|
||||
}
|
||||
|
||||
if s.UnsupportedFeatures == nil {
|
||||
|
||||
@@ -10,7 +10,6 @@ go_library(
|
||||
"//pkg/apis/meta/v1:go_default_library",
|
||||
"//test/e2e/framework:go_default_library",
|
||||
"//test/e2e/framework/addon:go_default_library",
|
||||
"//test/e2e/framework/addon/tiller:go_default_library",
|
||||
"//test/e2e/framework/addon/vault:go_default_library",
|
||||
"//test/e2e/suite/conformance/certificates:go_default_library",
|
||||
"@com_github_onsi_ginkgo//:go_default_library",
|
||||
|
||||
@@ -27,8 +27,7 @@ import (
|
||||
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
|
||||
vault "github.com/jetstack/cert-manager/test/e2e/framework/addon/vault"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/vault"
|
||||
"github.com/jetstack/cert-manager/test/e2e/suite/conformance/certificates"
|
||||
)
|
||||
|
||||
@@ -62,7 +61,6 @@ var _ = framework.ConformanceDescribe("Certificates", func() {
|
||||
})
|
||||
|
||||
type vaultAppRoleProvisioner struct {
|
||||
tiller *tiller.Tiller
|
||||
vault *vault.Vault
|
||||
vaultInit *vault.VaultInitializer
|
||||
|
||||
@@ -80,7 +78,6 @@ type vaultSecrets struct {
|
||||
func (v *vaultAppRoleProvisioner) delete(f *framework.Framework, ref cmmeta.ObjectReference) {
|
||||
Expect(v.vaultInit.Clean()).NotTo(HaveOccurred(), "failed to deprovision vault initializer")
|
||||
Expect(v.vault.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision vault")
|
||||
Expect(v.tiller.Deprovision()).NotTo(HaveOccurred(), "failed to deprovision tiller")
|
||||
|
||||
err := f.KubeClientSet.CoreV1().Secrets(v.secretNamespace).Delete(v.secretName, nil)
|
||||
Expect(err).NotTo(HaveOccurred())
|
||||
@@ -122,7 +119,7 @@ func (v *vaultAppRoleProvisioner) createClusterIssuer(f *framework.Framework) cm
|
||||
|
||||
v.vaultSecrets = v.initVault(f)
|
||||
|
||||
sec, err := f.KubeClientSet.CoreV1().Secrets(addon.CertManager.Namespace).Create(vault.NewVaultAppRoleSecret(vaultSecretAppRoleName, v.secretID))
|
||||
sec, err := f.KubeClientSet.CoreV1().Secrets(f.Config.Addons.CertManager.ClusterResourceNamespace).Create(vault.NewVaultAppRoleSecret(vaultSecretAppRoleName, v.secretID))
|
||||
Expect(err).NotTo(HaveOccurred(), "vault to store app role secret from vault")
|
||||
|
||||
v.secretName = sec.Name
|
||||
@@ -144,16 +141,8 @@ func (v *vaultAppRoleProvisioner) createClusterIssuer(f *framework.Framework) cm
|
||||
}
|
||||
|
||||
func (v *vaultAppRoleProvisioner) initVault(f *framework.Framework) *vaultSecrets {
|
||||
v.tiller = &tiller.Tiller{
|
||||
Name: "tiller-deploy",
|
||||
Namespace: f.Namespace.Name,
|
||||
ClusterPermissions: false,
|
||||
}
|
||||
Expect(v.tiller.Setup(f.Config)).NotTo(HaveOccurred(), "failed to setup tiller")
|
||||
Expect(v.tiller.Provision()).NotTo(HaveOccurred(), "failed to provision tiller")
|
||||
|
||||
v.vault = &vault.Vault{
|
||||
Tiller: v.tiller,
|
||||
Base: addon.Base,
|
||||
Namespace: f.Namespace.Name,
|
||||
Name: "cm-e2e-create-vault-issuer",
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@ go_library(
|
||||
"//pkg/apis/certmanager/v1alpha2:go_default_library",
|
||||
"//pkg/apis/meta/v1:go_default_library",
|
||||
"//test/e2e/framework:go_default_library",
|
||||
"//test/e2e/framework/addon:go_default_library",
|
||||
"//test/e2e/framework/util/errors:go_default_library",
|
||||
"//test/e2e/suite/issuers/venafi/addon:go_default_library",
|
||||
"@com_github_onsi_ginkgo//:go_default_library",
|
||||
|
||||
@@ -23,7 +23,6 @@ import (
|
||||
cmapi "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2"
|
||||
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/util/errors"
|
||||
vaddon "github.com/jetstack/cert-manager/test/e2e/suite/issuers/venafi/addon"
|
||||
)
|
||||
@@ -99,7 +98,7 @@ func (v *venafiProvisioner) createClusterIssuer(f *framework.Framework) cmmeta.O
|
||||
By("Creating a Venafi ClusterIssuer")
|
||||
|
||||
v.tpp = &vaddon.VenafiTPP{
|
||||
Namespace: addon.CertManager.Namespace,
|
||||
Namespace: f.Config.Addons.CertManager.ClusterResourceNamespace,
|
||||
}
|
||||
|
||||
err := v.tpp.Setup(f.Config)
|
||||
|
||||
@@ -13,9 +13,6 @@ go_library(
|
||||
"//pkg/apis/certmanager/v1alpha2:go_default_library",
|
||||
"//pkg/apis/meta/v1:go_default_library",
|
||||
"//test/e2e/framework:go_default_library",
|
||||
"//test/e2e/framework/addon:go_default_library",
|
||||
"//test/e2e/framework/addon/pebble:go_default_library",
|
||||
"//test/e2e/framework/addon/tiller:go_default_library",
|
||||
"//test/e2e/suite/issuers/acme/certificate:go_default_library",
|
||||
"//test/e2e/suite/issuers/acme/certificaterequest:go_default_library",
|
||||
"//test/e2e/util:go_default_library",
|
||||
|
||||
@@ -18,10 +18,9 @@ go_library(
|
||||
"//pkg/util:go_default_library",
|
||||
"//test/e2e/framework:go_default_library",
|
||||
"//test/e2e/framework/addon:go_default_library",
|
||||
"//test/e2e/framework/addon/samplewebhook:go_default_library",
|
||||
"//test/e2e/framework/addon/tiller:go_default_library",
|
||||
"//test/e2e/framework/log:go_default_library",
|
||||
"//test/e2e/framework/matcher:go_default_library",
|
||||
"//test/e2e/framework/util:go_default_library",
|
||||
"//test/e2e/suite/issuers/acme/dnsproviders:go_default_library",
|
||||
"//test/e2e/util:go_default_library",
|
||||
"//test/unit/gen:go_default_library",
|
||||
|
||||
@@ -34,9 +34,9 @@ import (
|
||||
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
|
||||
cmutil "github.com/jetstack/cert-manager/pkg/util"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/log"
|
||||
. "github.com/jetstack/cert-manager/test/e2e/framework/matcher"
|
||||
frameworkutil "github.com/jetstack/cert-manager/test/e2e/framework/util"
|
||||
"github.com/jetstack/cert-manager/test/e2e/util"
|
||||
"github.com/jetstack/cert-manager/test/unit/gen"
|
||||
)
|
||||
@@ -49,9 +49,6 @@ var _ = framework.CertManagerDescribe("ACME Certificate (HTTP01)", func() {
|
||||
f := framework.NewDefaultFramework("create-acme-certificate-http01")
|
||||
h := f.Helper()
|
||||
|
||||
f.RequireGlobalAddon(addon.NginxIngress)
|
||||
f.RequireGlobalAddon(addon.Pebble)
|
||||
|
||||
var acmeIngressDomain string
|
||||
issuerName := "test-acme-issuer"
|
||||
certificateName := "test-acme-certificate"
|
||||
@@ -62,13 +59,12 @@ var _ = framework.CertManagerDescribe("ACME Certificate (HTTP01)", func() {
|
||||
fixedIngressName := "testingress"
|
||||
|
||||
BeforeEach(func() {
|
||||
acmeURL := addon.Pebble.Details().Host
|
||||
acmeIssuer := util.NewCertManagerACMEIssuer(issuerName, acmeURL, testingACMEEmail, testingACMEPrivateKey)
|
||||
acmeIssuer := util.NewCertManagerACMEIssuer(issuerName, f.Config.Addons.ACMEServer.URL, testingACMEEmail, testingACMEPrivateKey)
|
||||
acmeIssuer.Spec.ACME.Solvers = []cmacme.ACMEChallengeSolver{
|
||||
{
|
||||
HTTP01: &cmacme.ACMEChallengeSolverHTTP01{
|
||||
Ingress: &cmacme.ACMEChallengeSolverHTTP01Ingress{
|
||||
Class: &addon.NginxIngress.Details().IngressClass,
|
||||
Class: &f.Config.Addons.IngressController.IngressClass,
|
||||
},
|
||||
},
|
||||
},
|
||||
@@ -115,7 +111,7 @@ var _ = framework.CertManagerDescribe("ACME Certificate (HTTP01)", func() {
|
||||
})
|
||||
|
||||
JustBeforeEach(func() {
|
||||
acmeIngressDomain = addon.NginxIngress.Details().NewTestDomain()
|
||||
acmeIngressDomain = frameworkutil.RandomSubdomain(f.Config.Addons.IngressController.Domain)
|
||||
})
|
||||
|
||||
AfterEach(func() {
|
||||
|
||||
@@ -30,9 +30,6 @@ import (
|
||||
cmmeta "github.com/jetstack/cert-manager/pkg/apis/meta/v1"
|
||||
"github.com/jetstack/cert-manager/pkg/client/clientset/versioned"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/samplewebhook"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/addon/tiller"
|
||||
"github.com/jetstack/cert-manager/test/e2e/framework/log"
|
||||
"github.com/jetstack/cert-manager/test/e2e/util"
|
||||
"github.com/jetstack/cert-manager/test/unit/gen"
|
||||
@@ -43,28 +40,6 @@ var _ = framework.CertManagerDescribe("ACME webhook DNS provider", func() {
|
||||
//h := f.Helper()
|
||||
|
||||
Context("with the sample webhook solver deployed", func() {
|
||||
var (
|
||||
tiller = &tiller.Tiller{
|
||||
Name: "tiller-deploy-sample-webhook",
|
||||
ClusterPermissions: true,
|
||||
}
|
||||
webhook = &samplewebhook.CertmanagerWebhook{
|
||||
Name: "cm-e2e-acme-dns01-sample-webhook",
|
||||
Tiller: tiller,
|
||||
Certmanager: addon.CertManager,
|
||||
}
|
||||
)
|
||||
|
||||
BeforeEach(func() {
|
||||
tiller.Namespace = f.Namespace.Name
|
||||
webhook.Namespace = f.Namespace.Name
|
||||
})
|
||||
|
||||
f.RequireGlobalAddon(addon.CertManager)
|
||||
f.RequireGlobalAddon(addon.Pebble)
|
||||
f.RequireAddon(tiller)
|
||||
f.RequireAddon(webhook)
|
||||
|
||||
issuerName := "test-acme-issuer"
|
||||
certificateName := "test-acme-certificate"
|
||||
certificateSecretName := "test-acme-certificate"
|
||||
@@ -77,7 +52,7 @@ var _ = framework.CertManagerDescribe("ACME webhook DNS provider", func() {
|
||||
issuer := gen.Issuer(issuerName,
|
||||
gen.SetIssuerACME(cmacme.ACMEIssuer{
|
||||
SkipTLSVerify: true,
|
||||
Server: addon.Pebble.Details().Host,
|
||||
Server: f.Config.Addons.ACMEServer.URL,
|
||||
Email: testingACMEEmail,
|
||||
PrivateKey: cmmeta.SecretKeySelector{
|
||||
LocalObjectReference: cmmeta.LocalObjectReference{
|
||||
@@ -88,8 +63,8 @@ var _ = framework.CertManagerDescribe("ACME webhook DNS provider", func() {
|
||||
{
|
||||
DNS01: &cmacme.ACMEChallengeSolverDNS01{
|
||||
Webhook: &cmacme.ACMEIssuerDNS01ProviderWebhook{
|
||||
GroupName: webhook.Details().GroupName,
|
||||
SolverName: webhook.Details().SolverName,
|
||||
GroupName: f.Config.Addons.DNS01Webhook.GroupName,
|
||||
SolverName: f.Config.Addons.DNS01Webhook.SolverName,
|
||||
Config: &v1beta1.JSON{
|
||||
Raw: []byte(`{}`),
|
||||
},
|
||||
|
||||
@@ -17,6 +17,7 @@ go_library(
|
||||
"//test/e2e/framework/addon:go_default_library",
|
||||
"//test/e2e/framework/log:go_default_library",
|
||||
"//test/e2e/framework/matcher:go_default_library",
|
||||
"//test/e2e/framework/util:go_default_library",
|
||||
"//test/e2e/suite/issuers/acme/dnsproviders:go_default_library",
|
||||
"//test/e2e/util:go_default_library",
|
||||
"//test/unit/gen:go_default_library",
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user