From 5a17c58c033c7ba3d178083446a3cc54560dbb83 Mon Sep 17 00:00:00 2001 From: James Munnelly Date: Tue, 4 Dec 2018 16:14:31 +0000 Subject: [PATCH] Rearrange Helm charts into deploy/ and test/e2e/charts directories Signed-off-by: James Munnelly --- BUILD.bazel | 2 +- {contrib => deploy}/BUILD.bazel | 0 .../cert-manager => deploy/chart}/.helmignore | 0 .../charts/cert-manager => deploy/chart}/Chart.yaml | 0 .../charts/cert-manager => deploy/chart}/OWNERS | 0 .../charts/cert-manager => deploy/chart}/README.md | 0 .../cert-manager => deploy/chart}/requirements.lock | 0 .../cert-manager => deploy/chart}/requirements.yaml | 0 .../chart}/templates/00-namespace.yaml | 0 .../chart}/templates/NOTES.txt | 0 .../chart}/templates/_helpers.tpl | 0 .../chart}/templates/certificate-crd.yaml | 0 .../chart}/templates/challenge-crd.yaml | 0 .../chart}/templates/clusterissuer-crd.yaml | 0 .../chart}/templates/deployment.yaml | 0 .../chart}/templates/issuer-crd.yaml | 0 .../chart}/templates/order-crd.yaml | 0 .../chart}/templates/rbac.yaml | 0 .../chart}/templates/serviceaccount.yaml | 0 .../cert-manager => deploy/chart}/values.yaml | 0 .../chart}/webhook/.helmignore | 0 .../chart}/webhook/Chart.yaml | 0 .../chart}/webhook/templates/NOTES.txt | 0 .../chart}/webhook/templates/_helpers.tpl | 0 .../chart}/webhook/templates/apiservice.yaml | 0 .../chart}/webhook/templates/ca-sync.yaml | 0 .../chart}/webhook/templates/deployment.yaml | 0 .../chart}/webhook/templates/pki.yaml | 0 .../chart}/webhook/templates/rbac.yaml | 0 .../chart}/webhook/templates/service.yaml | 0 .../chart}/webhook/templates/serviceaccount.yaml | 0 .../webhook/templates/validating-webhook.yaml | 0 .../chart}/webhook/values.yaml | 0 .../cert-manager => deploy/manifests}/README.md | 2 +- .../manifests}/with-rbac-webhook.yaml | 0 .../manifests}/with-rbac.yaml | 0 .../manifests}/without-rbac-webhook.yaml | 0 .../manifests}/without-rbac.yaml | 0 hack/BUILD.bazel | 2 +- hack/update-deploy-gen.sh | 10 +++++----- hack/verify-deploy-gen.sh | 2 +- {contrib => test/e2e}/charts/pebble/.helmignore | 0 {contrib => test/e2e}/charts/pebble/Chart.yaml | 0 .../e2e}/charts/pebble/templates/_helpers.tpl | 0 .../e2e}/charts/pebble/templates/deployment.yaml | 0 .../e2e}/charts/pebble/templates/service.yaml | 0 {contrib => test/e2e}/charts/pebble/values.yaml | 0 {contrib => test/e2e}/charts/vault/Chart.yaml | 0 .../e2e}/charts/vault/templates/_helpers.tpl | 0 .../e2e}/charts/vault/templates/vault-config.yaml | 0 .../charts/vault/templates/vault-deployment.yaml | 0 .../e2e}/charts/vault/templates/vault-secret.yaml | 0 .../e2e}/charts/vault/templates/vault-service.yaml | 0 {contrib => test/e2e}/charts/vault/values.yaml | 0 test/e2e/framework/addon/certmanager/addon.go | 13 +++++++------ test/e2e/framework/addon/pebble/pebble.go | 2 +- test/e2e/framework/addon/vault/vault.go | 2 +- 57 files changed, 18 insertions(+), 17 deletions(-) rename {contrib => deploy}/BUILD.bazel (100%) rename {contrib/charts/cert-manager => deploy/chart}/.helmignore (100%) rename {contrib/charts/cert-manager => deploy/chart}/Chart.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/OWNERS (100%) rename {contrib/charts/cert-manager => deploy/chart}/README.md (100%) rename {contrib/charts/cert-manager => deploy/chart}/requirements.lock (100%) rename {contrib/charts/cert-manager => deploy/chart}/requirements.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/templates/00-namespace.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/templates/NOTES.txt (100%) rename {contrib/charts/cert-manager => deploy/chart}/templates/_helpers.tpl (100%) rename {contrib/charts/cert-manager => deploy/chart}/templates/certificate-crd.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/templates/challenge-crd.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/templates/clusterissuer-crd.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/templates/deployment.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/templates/issuer-crd.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/templates/order-crd.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/templates/rbac.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/templates/serviceaccount.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/values.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/.helmignore (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/Chart.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/templates/NOTES.txt (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/templates/_helpers.tpl (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/templates/apiservice.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/templates/ca-sync.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/templates/deployment.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/templates/pki.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/templates/rbac.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/templates/service.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/templates/serviceaccount.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/templates/validating-webhook.yaml (100%) rename {contrib/charts/cert-manager => deploy/chart}/webhook/values.yaml (100%) rename {contrib/manifests/cert-manager => deploy/manifests}/README.md (92%) rename {contrib/manifests/cert-manager => deploy/manifests}/with-rbac-webhook.yaml (100%) rename {contrib/manifests/cert-manager => deploy/manifests}/with-rbac.yaml (100%) rename {contrib/manifests/cert-manager => deploy/manifests}/without-rbac-webhook.yaml (100%) rename {contrib/manifests/cert-manager => deploy/manifests}/without-rbac.yaml (100%) rename {contrib => test/e2e}/charts/pebble/.helmignore (100%) rename {contrib => test/e2e}/charts/pebble/Chart.yaml (100%) rename {contrib => test/e2e}/charts/pebble/templates/_helpers.tpl (100%) rename {contrib => test/e2e}/charts/pebble/templates/deployment.yaml (100%) rename {contrib => test/e2e}/charts/pebble/templates/service.yaml (100%) rename {contrib => test/e2e}/charts/pebble/values.yaml (100%) rename {contrib => test/e2e}/charts/vault/Chart.yaml (100%) rename {contrib => test/e2e}/charts/vault/templates/_helpers.tpl (100%) rename {contrib => test/e2e}/charts/vault/templates/vault-config.yaml (100%) rename {contrib => test/e2e}/charts/vault/templates/vault-deployment.yaml (100%) rename {contrib => test/e2e}/charts/vault/templates/vault-secret.yaml (100%) rename {contrib => test/e2e}/charts/vault/templates/vault-service.yaml (100%) rename {contrib => test/e2e}/charts/vault/values.yaml (100%) diff --git a/BUILD.bazel b/BUILD.bazel index 33ec88db4..432ffc5a0 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -37,7 +37,7 @@ filegroup( "//cmd/acmesolver:all-srcs", "//cmd/controller:all-srcs", "//cmd/webhook:all-srcs", - "//contrib:all-srcs", + "//deploy:all-srcs", "//docs/generated/reference:all-srcs", "//hack:all-srcs", "//pkg/acme:all-srcs", diff --git a/contrib/BUILD.bazel b/deploy/BUILD.bazel similarity index 100% rename from contrib/BUILD.bazel rename to deploy/BUILD.bazel diff --git a/contrib/charts/cert-manager/.helmignore b/deploy/chart/.helmignore similarity index 100% rename from contrib/charts/cert-manager/.helmignore rename to deploy/chart/.helmignore diff --git a/contrib/charts/cert-manager/Chart.yaml b/deploy/chart/Chart.yaml similarity index 100% rename from contrib/charts/cert-manager/Chart.yaml rename to deploy/chart/Chart.yaml diff --git a/contrib/charts/cert-manager/OWNERS b/deploy/chart/OWNERS similarity index 100% rename from contrib/charts/cert-manager/OWNERS rename to deploy/chart/OWNERS diff --git a/contrib/charts/cert-manager/README.md b/deploy/chart/README.md similarity index 100% rename from contrib/charts/cert-manager/README.md rename to deploy/chart/README.md diff --git a/contrib/charts/cert-manager/requirements.lock b/deploy/chart/requirements.lock similarity index 100% rename from contrib/charts/cert-manager/requirements.lock rename to deploy/chart/requirements.lock diff --git a/contrib/charts/cert-manager/requirements.yaml b/deploy/chart/requirements.yaml similarity index 100% rename from contrib/charts/cert-manager/requirements.yaml rename to deploy/chart/requirements.yaml diff --git a/contrib/charts/cert-manager/templates/00-namespace.yaml b/deploy/chart/templates/00-namespace.yaml similarity index 100% rename from contrib/charts/cert-manager/templates/00-namespace.yaml rename to deploy/chart/templates/00-namespace.yaml diff --git a/contrib/charts/cert-manager/templates/NOTES.txt b/deploy/chart/templates/NOTES.txt similarity index 100% rename from contrib/charts/cert-manager/templates/NOTES.txt rename to deploy/chart/templates/NOTES.txt diff --git a/contrib/charts/cert-manager/templates/_helpers.tpl b/deploy/chart/templates/_helpers.tpl similarity index 100% rename from contrib/charts/cert-manager/templates/_helpers.tpl rename to deploy/chart/templates/_helpers.tpl diff --git a/contrib/charts/cert-manager/templates/certificate-crd.yaml b/deploy/chart/templates/certificate-crd.yaml similarity index 100% rename from contrib/charts/cert-manager/templates/certificate-crd.yaml rename to deploy/chart/templates/certificate-crd.yaml diff --git a/contrib/charts/cert-manager/templates/challenge-crd.yaml b/deploy/chart/templates/challenge-crd.yaml similarity index 100% rename from contrib/charts/cert-manager/templates/challenge-crd.yaml rename to deploy/chart/templates/challenge-crd.yaml diff --git a/contrib/charts/cert-manager/templates/clusterissuer-crd.yaml b/deploy/chart/templates/clusterissuer-crd.yaml similarity index 100% rename from contrib/charts/cert-manager/templates/clusterissuer-crd.yaml rename to deploy/chart/templates/clusterissuer-crd.yaml diff --git a/contrib/charts/cert-manager/templates/deployment.yaml b/deploy/chart/templates/deployment.yaml similarity index 100% rename from contrib/charts/cert-manager/templates/deployment.yaml rename to deploy/chart/templates/deployment.yaml diff --git a/contrib/charts/cert-manager/templates/issuer-crd.yaml b/deploy/chart/templates/issuer-crd.yaml similarity index 100% rename from contrib/charts/cert-manager/templates/issuer-crd.yaml rename to deploy/chart/templates/issuer-crd.yaml diff --git a/contrib/charts/cert-manager/templates/order-crd.yaml b/deploy/chart/templates/order-crd.yaml similarity index 100% rename from contrib/charts/cert-manager/templates/order-crd.yaml rename to deploy/chart/templates/order-crd.yaml diff --git a/contrib/charts/cert-manager/templates/rbac.yaml b/deploy/chart/templates/rbac.yaml similarity index 100% rename from contrib/charts/cert-manager/templates/rbac.yaml rename to deploy/chart/templates/rbac.yaml diff --git a/contrib/charts/cert-manager/templates/serviceaccount.yaml b/deploy/chart/templates/serviceaccount.yaml similarity index 100% rename from contrib/charts/cert-manager/templates/serviceaccount.yaml rename to deploy/chart/templates/serviceaccount.yaml diff --git a/contrib/charts/cert-manager/values.yaml b/deploy/chart/values.yaml similarity index 100% rename from contrib/charts/cert-manager/values.yaml rename to deploy/chart/values.yaml diff --git a/contrib/charts/cert-manager/webhook/.helmignore b/deploy/chart/webhook/.helmignore similarity index 100% rename from contrib/charts/cert-manager/webhook/.helmignore rename to deploy/chart/webhook/.helmignore diff --git a/contrib/charts/cert-manager/webhook/Chart.yaml b/deploy/chart/webhook/Chart.yaml similarity index 100% rename from contrib/charts/cert-manager/webhook/Chart.yaml rename to deploy/chart/webhook/Chart.yaml diff --git a/contrib/charts/cert-manager/webhook/templates/NOTES.txt b/deploy/chart/webhook/templates/NOTES.txt similarity index 100% rename from contrib/charts/cert-manager/webhook/templates/NOTES.txt rename to deploy/chart/webhook/templates/NOTES.txt diff --git a/contrib/charts/cert-manager/webhook/templates/_helpers.tpl b/deploy/chart/webhook/templates/_helpers.tpl similarity index 100% rename from contrib/charts/cert-manager/webhook/templates/_helpers.tpl rename to deploy/chart/webhook/templates/_helpers.tpl diff --git a/contrib/charts/cert-manager/webhook/templates/apiservice.yaml b/deploy/chart/webhook/templates/apiservice.yaml similarity index 100% rename from contrib/charts/cert-manager/webhook/templates/apiservice.yaml rename to deploy/chart/webhook/templates/apiservice.yaml diff --git a/contrib/charts/cert-manager/webhook/templates/ca-sync.yaml b/deploy/chart/webhook/templates/ca-sync.yaml similarity index 100% rename from contrib/charts/cert-manager/webhook/templates/ca-sync.yaml rename to deploy/chart/webhook/templates/ca-sync.yaml diff --git a/contrib/charts/cert-manager/webhook/templates/deployment.yaml b/deploy/chart/webhook/templates/deployment.yaml similarity index 100% rename from contrib/charts/cert-manager/webhook/templates/deployment.yaml rename to deploy/chart/webhook/templates/deployment.yaml diff --git a/contrib/charts/cert-manager/webhook/templates/pki.yaml b/deploy/chart/webhook/templates/pki.yaml similarity index 100% rename from contrib/charts/cert-manager/webhook/templates/pki.yaml rename to deploy/chart/webhook/templates/pki.yaml diff --git a/contrib/charts/cert-manager/webhook/templates/rbac.yaml b/deploy/chart/webhook/templates/rbac.yaml similarity index 100% rename from contrib/charts/cert-manager/webhook/templates/rbac.yaml rename to deploy/chart/webhook/templates/rbac.yaml diff --git a/contrib/charts/cert-manager/webhook/templates/service.yaml b/deploy/chart/webhook/templates/service.yaml similarity index 100% rename from contrib/charts/cert-manager/webhook/templates/service.yaml rename to deploy/chart/webhook/templates/service.yaml diff --git a/contrib/charts/cert-manager/webhook/templates/serviceaccount.yaml b/deploy/chart/webhook/templates/serviceaccount.yaml similarity index 100% rename from contrib/charts/cert-manager/webhook/templates/serviceaccount.yaml rename to deploy/chart/webhook/templates/serviceaccount.yaml diff --git a/contrib/charts/cert-manager/webhook/templates/validating-webhook.yaml b/deploy/chart/webhook/templates/validating-webhook.yaml similarity index 100% rename from contrib/charts/cert-manager/webhook/templates/validating-webhook.yaml rename to deploy/chart/webhook/templates/validating-webhook.yaml diff --git a/contrib/charts/cert-manager/webhook/values.yaml b/deploy/chart/webhook/values.yaml similarity index 100% rename from contrib/charts/cert-manager/webhook/values.yaml rename to deploy/chart/webhook/values.yaml diff --git a/contrib/manifests/cert-manager/README.md b/deploy/manifests/README.md similarity index 92% rename from contrib/manifests/cert-manager/README.md rename to deploy/manifests/README.md index c9c27c6ef..3c4f104f9 100644 --- a/contrib/manifests/cert-manager/README.md +++ b/deploy/manifests/README.md @@ -10,6 +10,6 @@ Helm, or want to inspect a 'bare minimum' deployment. The manifests in this are generated from the Helm chart automatically. The `values.yaml` files used to configure cert-manager can be found in -[`hack/deploy`](../../../hack/deploy/). +[`hack/deploy`](../../hack/deploy/). They are automatically generated by running `./hack/update-deploy-gen.sh`. diff --git a/contrib/manifests/cert-manager/with-rbac-webhook.yaml b/deploy/manifests/with-rbac-webhook.yaml similarity index 100% rename from contrib/manifests/cert-manager/with-rbac-webhook.yaml rename to deploy/manifests/with-rbac-webhook.yaml diff --git a/contrib/manifests/cert-manager/with-rbac.yaml b/deploy/manifests/with-rbac.yaml similarity index 100% rename from contrib/manifests/cert-manager/with-rbac.yaml rename to deploy/manifests/with-rbac.yaml diff --git a/contrib/manifests/cert-manager/without-rbac-webhook.yaml b/deploy/manifests/without-rbac-webhook.yaml similarity index 100% rename from contrib/manifests/cert-manager/without-rbac-webhook.yaml rename to deploy/manifests/without-rbac-webhook.yaml diff --git a/contrib/manifests/cert-manager/without-rbac.yaml b/deploy/manifests/without-rbac.yaml similarity index 100% rename from contrib/manifests/cert-manager/without-rbac.yaml rename to deploy/manifests/without-rbac.yaml diff --git a/hack/BUILD.bazel b/hack/BUILD.bazel index c2f400f35..40d95b79d 100644 --- a/hack/BUILD.bazel +++ b/hack/BUILD.bazel @@ -108,7 +108,7 @@ sh_test( srcs = ["verify-deploy-gen.sh"], data = [ ":update-deploy-gen", - "//contrib:all-srcs", + "//deploy:all-srcs", "//hack/deploy:all-srcs", ], ) diff --git a/hack/update-deploy-gen.sh b/hack/update-deploy-gen.sh index 9484549dd..789043ba4 100755 --- a/hack/update-deploy-gen.sh +++ b/hack/update-deploy-gen.sh @@ -34,7 +34,7 @@ gen() { TMP_OUTPUT_WEBHOOK=$(mktemp) mkdir -p "$(dirname ${OUTPUT})" helm template \ - "${REPO_ROOT}/contrib/charts/cert-manager" \ + "${REPO_ROOT}/deploy/chart" \ --values "${REPO_ROOT}/hack/deploy/${VALUES}.yaml" \ --kube-version "${KUBE_VERSION}" \ --namespace "cert-manager" \ @@ -42,7 +42,7 @@ gen() { --set "fullnameOverride=cert-manager" \ --set "createNamespaceResource=true" > "${TMP_OUTPUT}" helm template \ - "${REPO_ROOT}/contrib/charts/cert-manager/webhook" \ + "${REPO_ROOT}/deploy/chart/webhook" \ --values "${REPO_ROOT}/hack/deploy/${VALUES}.yaml" \ --kube-version "${KUBE_VERSION}" \ --namespace "cert-manager" \ @@ -53,6 +53,6 @@ gen() { export HELM_HOME="$(mktemp -d)" helm init --client-only -helm dep update "${REPO_ROOT}/contrib/charts/cert-manager" -gen rbac-values "${REPO_ROOT}/contrib/manifests/cert-manager/with-rbac" -gen without-rbac-values "${REPO_ROOT}/contrib/manifests/cert-manager/without-rbac" +helm dep update "${REPO_ROOT}/deploy/chart" +gen rbac-values "${REPO_ROOT}/deploy/manifests/with-rbac" +gen without-rbac-values "${REPO_ROOT}/deploy/manifests/without-rbac" diff --git a/hack/verify-deploy-gen.sh b/hack/verify-deploy-gen.sh index de242ba7f..742f4e3ae 100755 --- a/hack/verify-deploy-gen.sh +++ b/hack/verify-deploy-gen.sh @@ -45,7 +45,7 @@ export BUILD_WORKSPACE_DIRECTORY="$(pwd)" echo "diffing ${DIFFROOT} against freshly generated deploy-gen" ret=0 -diff --exclude=__main__ -Naupr "${DIFFROOT}/contrib/manifests" "${TMP_DIFFROOT}/contrib/manifests" || ret=$? +diff --exclude=__main__ -Naupr "${DIFFROOT}/deploy/manifests" "${TMP_DIFFROOT}/deploy/manifests" || ret=$? if [[ $ret -eq 0 ]] then echo "${DIFFROOT} up to date." diff --git a/contrib/charts/pebble/.helmignore b/test/e2e/charts/pebble/.helmignore similarity index 100% rename from contrib/charts/pebble/.helmignore rename to test/e2e/charts/pebble/.helmignore diff --git a/contrib/charts/pebble/Chart.yaml b/test/e2e/charts/pebble/Chart.yaml similarity index 100% rename from contrib/charts/pebble/Chart.yaml rename to test/e2e/charts/pebble/Chart.yaml diff --git a/contrib/charts/pebble/templates/_helpers.tpl b/test/e2e/charts/pebble/templates/_helpers.tpl similarity index 100% rename from contrib/charts/pebble/templates/_helpers.tpl rename to test/e2e/charts/pebble/templates/_helpers.tpl diff --git a/contrib/charts/pebble/templates/deployment.yaml b/test/e2e/charts/pebble/templates/deployment.yaml similarity index 100% rename from contrib/charts/pebble/templates/deployment.yaml rename to test/e2e/charts/pebble/templates/deployment.yaml diff --git a/contrib/charts/pebble/templates/service.yaml b/test/e2e/charts/pebble/templates/service.yaml similarity index 100% rename from contrib/charts/pebble/templates/service.yaml rename to test/e2e/charts/pebble/templates/service.yaml diff --git a/contrib/charts/pebble/values.yaml b/test/e2e/charts/pebble/values.yaml similarity index 100% rename from contrib/charts/pebble/values.yaml rename to test/e2e/charts/pebble/values.yaml diff --git a/contrib/charts/vault/Chart.yaml b/test/e2e/charts/vault/Chart.yaml similarity index 100% rename from contrib/charts/vault/Chart.yaml rename to test/e2e/charts/vault/Chart.yaml diff --git a/contrib/charts/vault/templates/_helpers.tpl b/test/e2e/charts/vault/templates/_helpers.tpl similarity index 100% rename from contrib/charts/vault/templates/_helpers.tpl rename to test/e2e/charts/vault/templates/_helpers.tpl diff --git a/contrib/charts/vault/templates/vault-config.yaml b/test/e2e/charts/vault/templates/vault-config.yaml similarity index 100% rename from contrib/charts/vault/templates/vault-config.yaml rename to test/e2e/charts/vault/templates/vault-config.yaml diff --git a/contrib/charts/vault/templates/vault-deployment.yaml b/test/e2e/charts/vault/templates/vault-deployment.yaml similarity index 100% rename from contrib/charts/vault/templates/vault-deployment.yaml rename to test/e2e/charts/vault/templates/vault-deployment.yaml diff --git a/contrib/charts/vault/templates/vault-secret.yaml b/test/e2e/charts/vault/templates/vault-secret.yaml similarity index 100% rename from contrib/charts/vault/templates/vault-secret.yaml rename to test/e2e/charts/vault/templates/vault-secret.yaml diff --git a/contrib/charts/vault/templates/vault-service.yaml b/test/e2e/charts/vault/templates/vault-service.yaml similarity index 100% rename from contrib/charts/vault/templates/vault-service.yaml rename to test/e2e/charts/vault/templates/vault-service.yaml diff --git a/contrib/charts/vault/values.yaml b/test/e2e/charts/vault/values.yaml similarity index 100% rename from contrib/charts/vault/values.yaml rename to test/e2e/charts/vault/values.yaml diff --git a/test/e2e/framework/addon/certmanager/addon.go b/test/e2e/framework/addon/certmanager/addon.go index 59a942a1f..4cbe0734d 100644 --- a/test/e2e/framework/addon/certmanager/addon.go +++ b/test/e2e/framework/addon/certmanager/addon.go @@ -18,6 +18,7 @@ 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" @@ -42,11 +43,6 @@ type Certmanager struct { // Required namespace to deploy Certmanager into. Namespace string - - // Config is a reference to the overall test config structure with flags - // parsed from the CLI. - // This is used for global configuration settings. - Config *config.Config } // Details return the details about the certmanager instance deployed @@ -71,11 +67,12 @@ func (p *Certmanager) Setup(cfg *config.Config) error { if err != nil { return err } + p.config = cfg p.chart = &chart.Chart{ Tiller: p.Tiller, ReleaseName: "chart-certmanager-" + p.Name, Namespace: p.Namespace, - ChartName: cfg.RepoRoot + "/contrib/charts/cert-manager", + ChartName: cfg.RepoRoot + "/deploy/chart", // TODO: move resource requests/limits into Vars so they are always set Values: []string{cfg.RepoRoot + "/test/fixtures/cert-manager-values.yaml"}, // doesn't matter when installing from disk @@ -91,6 +88,10 @@ func (p *Certmanager) Setup(cfg *config.Config) error { // Provision will actually deploy this instance of Pebble-ingress to the cluster. func (p *Certmanager) Provision() error { + if err := exec.Command("kubectl", "apply", "-f", p.config.RepoRoot+"/deploy/manifests/00-crds.yaml").Run(); err != nil { + return fmt.Errorf("Error install cert-manager CRD manifests: %v", err) + } + return p.chart.Provision() } diff --git a/test/e2e/framework/addon/pebble/pebble.go b/test/e2e/framework/addon/pebble/pebble.go index 0fbbd1caf..5693db920 100644 --- a/test/e2e/framework/addon/pebble/pebble.go +++ b/test/e2e/framework/addon/pebble/pebble.go @@ -68,7 +68,7 @@ func (p *Pebble) Setup(cfg *config.Config) error { Tiller: p.Tiller, ReleaseName: "chart-pebble-" + p.Name, Namespace: p.Namespace, - ChartName: cfg.RepoRoot + "/contrib/charts/pebble", + ChartName: cfg.RepoRoot + "/test/e2e/charts/pebble", // doesn't matter when installing from disk ChartVersion: "0", } diff --git a/test/e2e/framework/addon/vault/vault.go b/test/e2e/framework/addon/vault/vault.go index 148850a9b..f20159695 100644 --- a/test/e2e/framework/addon/vault/vault.go +++ b/test/e2e/framework/addon/vault/vault.go @@ -107,7 +107,7 @@ func (v *Vault) Setup(cfg *config.Config) error { Tiller: v.Tiller, ReleaseName: "chart-vault-" + v.Name, Namespace: v.Namespace, - ChartName: cfg.RepoRoot + "/contrib/charts/vault", + ChartName: cfg.RepoRoot + "/test/e2e/charts/vault", // doesn't matter when installing from disk ChartVersion: "0", Vars: []chart.StringTuple{