diff --git a/.github/workflows/test-e2e-samples.yml b/.github/workflows/test-e2e-samples.yml index 8137407e814..27c12e6ff6c 100644 --- a/.github/workflows/test-e2e-samples.yml +++ b/.github/workflows/test-e2e-samples.yml @@ -1,17 +1,20 @@ -name: Testing E2E Sample +name: E2E Testdata Sample on: push: - paths-ignore: - - '**/*.md' + paths: + - 'testdata/**' + - '.github/workflows/test-e2e-samples.yml' pull_request: - paths-ignore: - - '**/*.md' + paths: + - 'testdata/**' + - '.github/workflows/test-e2e-samples.yml' jobs: - e2e-tests: + e2e-tests-project-v4: runs-on: ubuntu-latest - # Pull requests from the same repository won't trigger this checks as they were already triggered by the push + strategy: + fail-fast: true if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository steps: - name: Checkout repository @@ -48,8 +51,28 @@ jobs: run: | make test-e2e - - name: Teardown kind cluster - run: kind delete cluster + e2e-tests-project-v4-with-plugins: + runs-on: ubuntu-latest + strategy: + fail-fast: true + if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: '~1.22' + + - name: Install the latest version of kind + run: | + curl -Lo ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-amd64 + chmod +x ./kind + sudo mv ./kind /usr/local/bin/kind + + - name: Verify kind installation + run: kind version - name: Create kind cluster run: kind create cluster @@ -62,7 +85,6 @@ jobs: # Uncomment only ValidatingWebhookConfiguration # from cert-manager replaces sed -i '55,70s/^#//' $KUSTOMIZATION_FILE_PATH - sed -i '55,70s/^#//' $KUSTOMIZATION_FILE_PATH sed -i '79,101s/^#//' $KUSTOMIZATION_FILE_PATH sed -i '110,151s/^#//' $KUSTOMIZATION_FILE_PATH # Comment the injection for MutatingWebhookConfiguration @@ -74,6 +96,46 @@ jobs: go mod tidy - name: Testing make test-e2e for project-v4-with-plugins - working-directory: testdata/project-v4-with-plugins + working-directory: testdata/project-v4-with-plugins/ run: | make test-e2e + + e2e-tests-project-v4-multigroup: + runs-on: ubuntu-latest + strategy: + fail-fast: true + if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: '~1.22' + + - name: Install the latest version of kind + run: | + curl -Lo ./kind https://kind.sigs.k8s.io/dl/latest/kind-linux-amd64 + chmod +x ./kind + sudo mv ./kind /usr/local/bin/kind + + - name: Verify kind installation + run: kind version + + - name: Create kind cluster + run: kind create cluster + + - name: Prepare project-v4-multigroup + run: | + KUSTOMIZATION_FILE_PATH="testdata/project-v4-multigroup/config/default/kustomization.yaml" + sed -i '25s/^#//' $KUSTOMIZATION_FILE_PATH + sed -i '51s/^#//' $KUSTOMIZATION_FILE_PATH + sed -i '55,151s/^#//' $KUSTOMIZATION_FILE_PATH + cd testdata/project-v4-multigroup + go mod tidy + + - name: Testing make test-e2e for project-v4-multigroup + working-directory: testdata/project-v4-multigroup/ + run: | + make test-e2e diff --git a/test/testdata/generate.sh b/test/testdata/generate.sh index 0d2c103f9ec..bc16751b992 100755 --- a/test/testdata/generate.sh +++ b/test/testdata/generate.sh @@ -80,7 +80,9 @@ function scaffold_test_project { $kb edit --plugins=grafana.kubebuilder.io/v1-alpha fi + make all make build-installer + # To avoid conflicts rm -f go.sum go mod tidy popd @@ -89,5 +91,5 @@ function scaffold_test_project { build_kb scaffold_test_project project-v4 --plugins="go/v4" -scaffold_test_project project-v4-multigroup-with-plugins --plugins="go/v4" +scaffold_test_project project-v4-multigroup --plugins="go/v4" scaffold_test_project project-v4-with-plugins --plugins="go/v4" diff --git a/test/testdata/test.sh b/test/testdata/test.sh index ba1b4c1bb2b..f07d3159e6e 100755 --- a/test/testdata/test.sh +++ b/test/testdata/test.sh @@ -32,5 +32,5 @@ build_kb # Project version v4-alpha test_project project-v4 -test_project project-v4-multigroup-with-plugins +test_project project-v4-multigroup test_project project-v4-with-plugins diff --git a/testdata/project-v4-multigroup-with-plugins/.devcontainer/devcontainer.json b/testdata/project-v4-multigroup/.devcontainer/devcontainer.json similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/.devcontainer/devcontainer.json rename to testdata/project-v4-multigroup/.devcontainer/devcontainer.json diff --git a/testdata/project-v4-multigroup-with-plugins/.devcontainer/post-install.sh b/testdata/project-v4-multigroup/.devcontainer/post-install.sh similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/.devcontainer/post-install.sh rename to testdata/project-v4-multigroup/.devcontainer/post-install.sh diff --git a/testdata/project-v4-multigroup-with-plugins/.dockerignore b/testdata/project-v4-multigroup/.dockerignore similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/.dockerignore rename to testdata/project-v4-multigroup/.dockerignore diff --git a/testdata/project-v4-multigroup-with-plugins/.gitignore b/testdata/project-v4-multigroup/.gitignore similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/.gitignore rename to testdata/project-v4-multigroup/.gitignore diff --git a/testdata/project-v4-multigroup-with-plugins/.golangci.yml b/testdata/project-v4-multigroup/.golangci.yml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/.golangci.yml rename to testdata/project-v4-multigroup/.golangci.yml diff --git a/testdata/project-v4-multigroup-with-plugins/Dockerfile b/testdata/project-v4-multigroup/Dockerfile similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/Dockerfile rename to testdata/project-v4-multigroup/Dockerfile diff --git a/testdata/project-v4-multigroup-with-plugins/Makefile b/testdata/project-v4-multigroup/Makefile similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/Makefile rename to testdata/project-v4-multigroup/Makefile index 18fc8fa1240..03cb580d51b 100644 --- a/testdata/project-v4-multigroup-with-plugins/Makefile +++ b/testdata/project-v4-multigroup/Makefile @@ -120,10 +120,10 @@ PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le docker-buildx: ## Build and push docker image for the manager for cross-platform support # copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross - - $(CONTAINER_TOOL) buildx create --name project-v4-multigroup-with-plugins-builder - $(CONTAINER_TOOL) buildx use project-v4-multigroup-with-plugins-builder + - $(CONTAINER_TOOL) buildx create --name project-v4-multigroup-builder + $(CONTAINER_TOOL) buildx use project-v4-multigroup-builder - $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . - - $(CONTAINER_TOOL) buildx rm project-v4-multigroup-with-plugins-builder + - $(CONTAINER_TOOL) buildx rm project-v4-multigroup-builder rm Dockerfile.cross .PHONY: build-installer diff --git a/testdata/project-v4-multigroup-with-plugins/PROJECT b/testdata/project-v4-multigroup/PROJECT similarity index 70% rename from testdata/project-v4-multigroup-with-plugins/PROJECT rename to testdata/project-v4-multigroup/PROJECT index 5163eee9e9b..ea5536b0583 100644 --- a/testdata/project-v4-multigroup-with-plugins/PROJECT +++ b/testdata/project-v4-multigroup/PROJECT @@ -25,8 +25,8 @@ plugins: image: busybox:1.36.1 version: v1alpha1 grafana.kubebuilder.io/v1-alpha: {} -projectName: project-v4-multigroup-with-plugins -repo: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins +projectName: project-v4-multigroup +repo: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup resources: - api: crdVersion: v1 @@ -35,7 +35,7 @@ resources: domain: testproject.org group: crew kind: Captain - path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/crew/v1 + path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/crew/v1 version: v1 webhooks: defaulting: true @@ -48,7 +48,7 @@ resources: domain: testproject.org group: ship kind: Frigate - path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1 + path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v1beta1 version: v1beta1 webhooks: conversion: true @@ -59,7 +59,7 @@ resources: domain: testproject.org group: ship kind: Destroyer - path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v1 + path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v1 version: v1 webhooks: defaulting: true @@ -70,7 +70,7 @@ resources: domain: testproject.org group: ship kind: Cruiser - path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1 + path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v2alpha1 version: v2alpha1 webhooks: validation: true @@ -82,7 +82,7 @@ resources: domain: testproject.org group: sea-creatures kind: Kraken - path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta1 + path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/sea-creatures/v1beta1 version: v1beta1 - api: crdVersion: v1 @@ -91,7 +91,7 @@ resources: domain: testproject.org group: sea-creatures kind: Leviathan - path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta2 + path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/sea-creatures/v1beta2 version: v1beta2 - api: crdVersion: v1 @@ -100,7 +100,7 @@ resources: domain: testproject.org group: foo.policy kind: HealthCheckPolicy - path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/foo.policy/v1 + path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/foo.policy/v1 version: v1 - controller: true group: apps @@ -114,7 +114,7 @@ resources: domain: testproject.org group: foo kind: Bar - path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/foo/v1 + path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/foo/v1 version: v1 - api: crdVersion: v1 @@ -123,7 +123,7 @@ resources: domain: testproject.org group: fiz kind: Bar - path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/fiz/v1 + path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/fiz/v1 version: v1 - api: crdVersion: v1 @@ -132,7 +132,7 @@ resources: domain: testproject.org group: example.com kind: Memcached - path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1 + path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/example.com/v1alpha1 version: v1alpha1 webhooks: validation: true @@ -144,6 +144,6 @@ resources: domain: testproject.org group: example.com kind: Busybox - path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1 + path: sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/example.com/v1alpha1 version: v1alpha1 version: "3" diff --git a/testdata/project-v4-multigroup-with-plugins/README.md b/testdata/project-v4-multigroup/README.md similarity index 91% rename from testdata/project-v4-multigroup-with-plugins/README.md rename to testdata/project-v4-multigroup/README.md index ccf8dfda123..be36750a352 100644 --- a/testdata/project-v4-multigroup-with-plugins/README.md +++ b/testdata/project-v4-multigroup/README.md @@ -1,4 +1,4 @@ -# project-v4-multigroup-with-plugins +# project-v4-multigroup // TODO(user): Add simple overview of use/purpose ## Description @@ -16,7 +16,7 @@ **Build and push your image to the location specified by `IMG`:** ```sh -make docker-build docker-push IMG=/project-v4-multigroup-with-plugins:tag +make docker-build docker-push IMG=/project-v4-multigroup:tag ``` **NOTE:** This image ought to be published in the personal registry you specified. @@ -32,7 +32,7 @@ make install **Deploy the Manager to the cluster with the image specified by `IMG`:** ```sh -make deploy IMG=/project-v4-multigroup-with-plugins:tag +make deploy IMG=/project-v4-multigroup:tag ``` > **NOTE**: If you encounter RBAC errors, you may need to grant yourself cluster-admin @@ -73,7 +73,7 @@ Following are the steps to build the installer and distribute this project to us 1. Build the installer for the image built and published in the registry: ```sh -make build-installer IMG=/project-v4-multigroup-with-plugins:tag +make build-installer IMG=/project-v4-multigroup:tag ``` NOTE: The makefile target mentioned above generates an 'install.yaml' @@ -86,7 +86,7 @@ its dependencies. Users can just run kubectl apply -f to install the project, i.e.: ```sh -kubectl apply -f https://raw.githubusercontent.com//project-v4-multigroup-with-plugins//dist/install.yaml +kubectl apply -f https://raw.githubusercontent.com//project-v4-multigroup//dist/install.yaml ``` ## Contributing diff --git a/testdata/project-v4-multigroup-with-plugins/api/crew/v1/captain_types.go b/testdata/project-v4-multigroup/api/crew/v1/captain_types.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/crew/v1/captain_types.go rename to testdata/project-v4-multigroup/api/crew/v1/captain_types.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/crew/v1/captain_webhook.go b/testdata/project-v4-multigroup/api/crew/v1/captain_webhook.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/crew/v1/captain_webhook.go rename to testdata/project-v4-multigroup/api/crew/v1/captain_webhook.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/crew/v1/captain_webhook_test.go b/testdata/project-v4-multigroup/api/crew/v1/captain_webhook_test.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/crew/v1/captain_webhook_test.go rename to testdata/project-v4-multigroup/api/crew/v1/captain_webhook_test.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/crew/v1/groupversion_info.go b/testdata/project-v4-multigroup/api/crew/v1/groupversion_info.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/crew/v1/groupversion_info.go rename to testdata/project-v4-multigroup/api/crew/v1/groupversion_info.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/crew/v1/webhook_suite_test.go b/testdata/project-v4-multigroup/api/crew/v1/webhook_suite_test.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/crew/v1/webhook_suite_test.go rename to testdata/project-v4-multigroup/api/crew/v1/webhook_suite_test.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/crew/v1/zz_generated.deepcopy.go b/testdata/project-v4-multigroup/api/crew/v1/zz_generated.deepcopy.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/crew/v1/zz_generated.deepcopy.go rename to testdata/project-v4-multigroup/api/crew/v1/zz_generated.deepcopy.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/busybox_types.go b/testdata/project-v4-multigroup/api/example.com/v1alpha1/busybox_types.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/busybox_types.go rename to testdata/project-v4-multigroup/api/example.com/v1alpha1/busybox_types.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/groupversion_info.go b/testdata/project-v4-multigroup/api/example.com/v1alpha1/groupversion_info.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/groupversion_info.go rename to testdata/project-v4-multigroup/api/example.com/v1alpha1/groupversion_info.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/memcached_types.go b/testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_types.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/memcached_types.go rename to testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_types.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/memcached_webhook.go b/testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_webhook.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/memcached_webhook.go rename to testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_webhook.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/memcached_webhook_test.go b/testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_webhook_test.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/memcached_webhook_test.go rename to testdata/project-v4-multigroup/api/example.com/v1alpha1/memcached_webhook_test.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/webhook_suite_test.go b/testdata/project-v4-multigroup/api/example.com/v1alpha1/webhook_suite_test.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/webhook_suite_test.go rename to testdata/project-v4-multigroup/api/example.com/v1alpha1/webhook_suite_test.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/zz_generated.deepcopy.go b/testdata/project-v4-multigroup/api/example.com/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1/zz_generated.deepcopy.go rename to testdata/project-v4-multigroup/api/example.com/v1alpha1/zz_generated.deepcopy.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/fiz/v1/bar_types.go b/testdata/project-v4-multigroup/api/fiz/v1/bar_types.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/fiz/v1/bar_types.go rename to testdata/project-v4-multigroup/api/fiz/v1/bar_types.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/fiz/v1/groupversion_info.go b/testdata/project-v4-multigroup/api/fiz/v1/groupversion_info.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/fiz/v1/groupversion_info.go rename to testdata/project-v4-multigroup/api/fiz/v1/groupversion_info.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/fiz/v1/zz_generated.deepcopy.go b/testdata/project-v4-multigroup/api/fiz/v1/zz_generated.deepcopy.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/fiz/v1/zz_generated.deepcopy.go rename to testdata/project-v4-multigroup/api/fiz/v1/zz_generated.deepcopy.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/foo.policy/v1/groupversion_info.go b/testdata/project-v4-multigroup/api/foo.policy/v1/groupversion_info.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/foo.policy/v1/groupversion_info.go rename to testdata/project-v4-multigroup/api/foo.policy/v1/groupversion_info.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/foo.policy/v1/healthcheckpolicy_types.go b/testdata/project-v4-multigroup/api/foo.policy/v1/healthcheckpolicy_types.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/foo.policy/v1/healthcheckpolicy_types.go rename to testdata/project-v4-multigroup/api/foo.policy/v1/healthcheckpolicy_types.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/foo.policy/v1/zz_generated.deepcopy.go b/testdata/project-v4-multigroup/api/foo.policy/v1/zz_generated.deepcopy.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/foo.policy/v1/zz_generated.deepcopy.go rename to testdata/project-v4-multigroup/api/foo.policy/v1/zz_generated.deepcopy.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/foo/v1/bar_types.go b/testdata/project-v4-multigroup/api/foo/v1/bar_types.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/foo/v1/bar_types.go rename to testdata/project-v4-multigroup/api/foo/v1/bar_types.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/foo/v1/groupversion_info.go b/testdata/project-v4-multigroup/api/foo/v1/groupversion_info.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/foo/v1/groupversion_info.go rename to testdata/project-v4-multigroup/api/foo/v1/groupversion_info.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/foo/v1/zz_generated.deepcopy.go b/testdata/project-v4-multigroup/api/foo/v1/zz_generated.deepcopy.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/foo/v1/zz_generated.deepcopy.go rename to testdata/project-v4-multigroup/api/foo/v1/zz_generated.deepcopy.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta1/groupversion_info.go b/testdata/project-v4-multigroup/api/sea-creatures/v1beta1/groupversion_info.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta1/groupversion_info.go rename to testdata/project-v4-multigroup/api/sea-creatures/v1beta1/groupversion_info.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta1/kraken_types.go b/testdata/project-v4-multigroup/api/sea-creatures/v1beta1/kraken_types.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta1/kraken_types.go rename to testdata/project-v4-multigroup/api/sea-creatures/v1beta1/kraken_types.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta1/zz_generated.deepcopy.go b/testdata/project-v4-multigroup/api/sea-creatures/v1beta1/zz_generated.deepcopy.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta1/zz_generated.deepcopy.go rename to testdata/project-v4-multigroup/api/sea-creatures/v1beta1/zz_generated.deepcopy.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta2/groupversion_info.go b/testdata/project-v4-multigroup/api/sea-creatures/v1beta2/groupversion_info.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta2/groupversion_info.go rename to testdata/project-v4-multigroup/api/sea-creatures/v1beta2/groupversion_info.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta2/leviathan_types.go b/testdata/project-v4-multigroup/api/sea-creatures/v1beta2/leviathan_types.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta2/leviathan_types.go rename to testdata/project-v4-multigroup/api/sea-creatures/v1beta2/leviathan_types.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta2/zz_generated.deepcopy.go b/testdata/project-v4-multigroup/api/sea-creatures/v1beta2/zz_generated.deepcopy.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta2/zz_generated.deepcopy.go rename to testdata/project-v4-multigroup/api/sea-creatures/v1beta2/zz_generated.deepcopy.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v1/destroyer_types.go b/testdata/project-v4-multigroup/api/ship/v1/destroyer_types.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v1/destroyer_types.go rename to testdata/project-v4-multigroup/api/ship/v1/destroyer_types.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v1/destroyer_webhook.go b/testdata/project-v4-multigroup/api/ship/v1/destroyer_webhook.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v1/destroyer_webhook.go rename to testdata/project-v4-multigroup/api/ship/v1/destroyer_webhook.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v1/destroyer_webhook_test.go b/testdata/project-v4-multigroup/api/ship/v1/destroyer_webhook_test.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v1/destroyer_webhook_test.go rename to testdata/project-v4-multigroup/api/ship/v1/destroyer_webhook_test.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v1/groupversion_info.go b/testdata/project-v4-multigroup/api/ship/v1/groupversion_info.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v1/groupversion_info.go rename to testdata/project-v4-multigroup/api/ship/v1/groupversion_info.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v1/webhook_suite_test.go b/testdata/project-v4-multigroup/api/ship/v1/webhook_suite_test.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v1/webhook_suite_test.go rename to testdata/project-v4-multigroup/api/ship/v1/webhook_suite_test.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v1/zz_generated.deepcopy.go b/testdata/project-v4-multigroup/api/ship/v1/zz_generated.deepcopy.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v1/zz_generated.deepcopy.go rename to testdata/project-v4-multigroup/api/ship/v1/zz_generated.deepcopy.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1/frigate_types.go b/testdata/project-v4-multigroup/api/ship/v1beta1/frigate_types.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1/frigate_types.go rename to testdata/project-v4-multigroup/api/ship/v1beta1/frigate_types.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1/frigate_webhook.go b/testdata/project-v4-multigroup/api/ship/v1beta1/frigate_webhook.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1/frigate_webhook.go rename to testdata/project-v4-multigroup/api/ship/v1beta1/frigate_webhook.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1/frigate_webhook_test.go b/testdata/project-v4-multigroup/api/ship/v1beta1/frigate_webhook_test.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1/frigate_webhook_test.go rename to testdata/project-v4-multigroup/api/ship/v1beta1/frigate_webhook_test.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1/groupversion_info.go b/testdata/project-v4-multigroup/api/ship/v1beta1/groupversion_info.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1/groupversion_info.go rename to testdata/project-v4-multigroup/api/ship/v1beta1/groupversion_info.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1/zz_generated.deepcopy.go b/testdata/project-v4-multigroup/api/ship/v1beta1/zz_generated.deepcopy.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1/zz_generated.deepcopy.go rename to testdata/project-v4-multigroup/api/ship/v1beta1/zz_generated.deepcopy.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/cruiser_types.go b/testdata/project-v4-multigroup/api/ship/v2alpha1/cruiser_types.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/cruiser_types.go rename to testdata/project-v4-multigroup/api/ship/v2alpha1/cruiser_types.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/cruiser_webhook.go b/testdata/project-v4-multigroup/api/ship/v2alpha1/cruiser_webhook.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/cruiser_webhook.go rename to testdata/project-v4-multigroup/api/ship/v2alpha1/cruiser_webhook.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/cruiser_webhook_test.go b/testdata/project-v4-multigroup/api/ship/v2alpha1/cruiser_webhook_test.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/cruiser_webhook_test.go rename to testdata/project-v4-multigroup/api/ship/v2alpha1/cruiser_webhook_test.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/groupversion_info.go b/testdata/project-v4-multigroup/api/ship/v2alpha1/groupversion_info.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/groupversion_info.go rename to testdata/project-v4-multigroup/api/ship/v2alpha1/groupversion_info.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/webhook_suite_test.go b/testdata/project-v4-multigroup/api/ship/v2alpha1/webhook_suite_test.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/webhook_suite_test.go rename to testdata/project-v4-multigroup/api/ship/v2alpha1/webhook_suite_test.go diff --git a/testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/zz_generated.deepcopy.go b/testdata/project-v4-multigroup/api/ship/v2alpha1/zz_generated.deepcopy.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1/zz_generated.deepcopy.go rename to testdata/project-v4-multigroup/api/ship/v2alpha1/zz_generated.deepcopy.go diff --git a/testdata/project-v4-multigroup-with-plugins/cmd/main.go b/testdata/project-v4-multigroup/cmd/main.go similarity index 91% rename from testdata/project-v4-multigroup-with-plugins/cmd/main.go rename to testdata/project-v4-multigroup/cmd/main.go index 39c84eda9b9..e7dc7e0a55e 100644 --- a/testdata/project-v4-multigroup-with-plugins/cmd/main.go +++ b/testdata/project-v4-multigroup/cmd/main.go @@ -35,24 +35,24 @@ import ( metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" "sigs.k8s.io/controller-runtime/pkg/webhook" - crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/crew/v1" - examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1" - fizv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/fiz/v1" - foopolicyv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/foo.policy/v1" - foov1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/foo/v1" - seacreaturesv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta1" - seacreaturesv1beta2 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta2" - shipv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v1" - shipv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1" - shipv2alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1" - appscontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/internal/controller/apps" - crewcontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/internal/controller/crew" - examplecomcontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/internal/controller/example.com" - fizcontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/internal/controller/fiz" - foocontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/internal/controller/foo" - foopolicycontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/internal/controller/foo.policy" - seacreaturescontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures" - shipcontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/internal/controller/ship" + crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/crew/v1" + examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/example.com/v1alpha1" + fizv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/fiz/v1" + foopolicyv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/foo.policy/v1" + foov1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/foo/v1" + seacreaturesv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/sea-creatures/v1beta1" + seacreaturesv1beta2 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/sea-creatures/v1beta2" + shipv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v1" + shipv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v1beta1" + shipv2alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v2alpha1" + appscontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/internal/controller/apps" + crewcontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/internal/controller/crew" + examplecomcontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/internal/controller/example.com" + fizcontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/internal/controller/fiz" + foocontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/internal/controller/foo" + foopolicycontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/internal/controller/foo.policy" + seacreaturescontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/internal/controller/sea-creatures" + shipcontroller "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/internal/controller/ship" // +kubebuilder:scaffold:imports ) @@ -151,7 +151,7 @@ func main() { WebhookServer: webhookServer, HealthProbeBindAddress: probeAddr, LeaderElection: enableLeaderElection, - LeaderElectionID: "f0637429.testproject.org", + LeaderElectionID: "3e9f67a9.testproject.org", // LeaderElectionReleaseOnCancel defines if the leader should step down voluntarily // when the Manager ends. This requires the binary to immediately end when the // Manager is stopped, otherwise, this setting is unsafe. Setting this significantly diff --git a/testdata/project-v4-multigroup-with-plugins/config/certmanager/certificate.yaml b/testdata/project-v4-multigroup/config/certmanager/certificate.yaml similarity index 85% rename from testdata/project-v4-multigroup-with-plugins/config/certmanager/certificate.yaml rename to testdata/project-v4-multigroup/config/certmanager/certificate.yaml index 4863e8cb944..d6bd556f1b4 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/certmanager/certificate.yaml +++ b/testdata/project-v4-multigroup/config/certmanager/certificate.yaml @@ -5,7 +5,7 @@ apiVersion: cert-manager.io/v1 kind: Issuer metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: selfsigned-issuer namespace: system @@ -19,8 +19,8 @@ metadata: app.kubernetes.io/name: certificate app.kubernetes.io/instance: serving-cert app.kubernetes.io/component: certificate - app.kubernetes.io/created-by: project-v4-multigroup-with-plugins - app.kubernetes.io/part-of: project-v4-multigroup-with-plugins + app.kubernetes.io/created-by: project-v4-multigroup + app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: serving-cert # this name should match the one appeared in kustomizeconfig.yaml namespace: system diff --git a/testdata/project-v4-multigroup-with-plugins/config/certmanager/kustomization.yaml b/testdata/project-v4-multigroup/config/certmanager/kustomization.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/certmanager/kustomization.yaml rename to testdata/project-v4-multigroup/config/certmanager/kustomization.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/certmanager/kustomizeconfig.yaml b/testdata/project-v4-multigroup/config/certmanager/kustomizeconfig.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/certmanager/kustomizeconfig.yaml rename to testdata/project-v4-multigroup/config/certmanager/kustomizeconfig.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/bases/crew.testproject.org_captains.yaml b/testdata/project-v4-multigroup/config/crd/bases/crew.testproject.org_captains.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/bases/crew.testproject.org_captains.yaml rename to testdata/project-v4-multigroup/config/crd/bases/crew.testproject.org_captains.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/bases/example.com.testproject.org_busyboxes.yaml b/testdata/project-v4-multigroup/config/crd/bases/example.com.testproject.org_busyboxes.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/bases/example.com.testproject.org_busyboxes.yaml rename to testdata/project-v4-multigroup/config/crd/bases/example.com.testproject.org_busyboxes.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/bases/example.com.testproject.org_memcacheds.yaml b/testdata/project-v4-multigroup/config/crd/bases/example.com.testproject.org_memcacheds.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/bases/example.com.testproject.org_memcacheds.yaml rename to testdata/project-v4-multigroup/config/crd/bases/example.com.testproject.org_memcacheds.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/bases/fiz.testproject.org_bars.yaml b/testdata/project-v4-multigroup/config/crd/bases/fiz.testproject.org_bars.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/bases/fiz.testproject.org_bars.yaml rename to testdata/project-v4-multigroup/config/crd/bases/fiz.testproject.org_bars.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/bases/foo.policy.testproject.org_healthcheckpolicies.yaml b/testdata/project-v4-multigroup/config/crd/bases/foo.policy.testproject.org_healthcheckpolicies.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/bases/foo.policy.testproject.org_healthcheckpolicies.yaml rename to testdata/project-v4-multigroup/config/crd/bases/foo.policy.testproject.org_healthcheckpolicies.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/bases/foo.testproject.org_bars.yaml b/testdata/project-v4-multigroup/config/crd/bases/foo.testproject.org_bars.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/bases/foo.testproject.org_bars.yaml rename to testdata/project-v4-multigroup/config/crd/bases/foo.testproject.org_bars.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/bases/sea-creatures.testproject.org_krakens.yaml b/testdata/project-v4-multigroup/config/crd/bases/sea-creatures.testproject.org_krakens.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/bases/sea-creatures.testproject.org_krakens.yaml rename to testdata/project-v4-multigroup/config/crd/bases/sea-creatures.testproject.org_krakens.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/bases/sea-creatures.testproject.org_leviathans.yaml b/testdata/project-v4-multigroup/config/crd/bases/sea-creatures.testproject.org_leviathans.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/bases/sea-creatures.testproject.org_leviathans.yaml rename to testdata/project-v4-multigroup/config/crd/bases/sea-creatures.testproject.org_leviathans.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/bases/ship.testproject.org_cruisers.yaml b/testdata/project-v4-multigroup/config/crd/bases/ship.testproject.org_cruisers.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/bases/ship.testproject.org_cruisers.yaml rename to testdata/project-v4-multigroup/config/crd/bases/ship.testproject.org_cruisers.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/bases/ship.testproject.org_destroyers.yaml b/testdata/project-v4-multigroup/config/crd/bases/ship.testproject.org_destroyers.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/bases/ship.testproject.org_destroyers.yaml rename to testdata/project-v4-multigroup/config/crd/bases/ship.testproject.org_destroyers.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/bases/ship.testproject.org_frigates.yaml b/testdata/project-v4-multigroup/config/crd/bases/ship.testproject.org_frigates.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/bases/ship.testproject.org_frigates.yaml rename to testdata/project-v4-multigroup/config/crd/bases/ship.testproject.org_frigates.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/kustomization.yaml b/testdata/project-v4-multigroup/config/crd/kustomization.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/kustomization.yaml rename to testdata/project-v4-multigroup/config/crd/kustomization.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/kustomizeconfig.yaml b/testdata/project-v4-multigroup/config/crd/kustomizeconfig.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/kustomizeconfig.yaml rename to testdata/project-v4-multigroup/config/crd/kustomizeconfig.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/patches/cainjection_in_crew_captains.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_crew_captains.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/patches/cainjection_in_crew_captains.yaml rename to testdata/project-v4-multigroup/config/crd/patches/cainjection_in_crew_captains.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/patches/cainjection_in_example.com_memcacheds.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_example.com_memcacheds.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/patches/cainjection_in_example.com_memcacheds.yaml rename to testdata/project-v4-multigroup/config/crd/patches/cainjection_in_example.com_memcacheds.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/patches/cainjection_in_ship_cruisers.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_cruisers.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/patches/cainjection_in_ship_cruisers.yaml rename to testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_cruisers.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/patches/cainjection_in_ship_destroyers.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_destroyers.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/patches/cainjection_in_ship_destroyers.yaml rename to testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_destroyers.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/patches/cainjection_in_ship_frigates.yaml b/testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_frigates.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/patches/cainjection_in_ship_frigates.yaml rename to testdata/project-v4-multigroup/config/crd/patches/cainjection_in_ship_frigates.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/patches/webhook_in_crew_captains.yaml b/testdata/project-v4-multigroup/config/crd/patches/webhook_in_crew_captains.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/patches/webhook_in_crew_captains.yaml rename to testdata/project-v4-multigroup/config/crd/patches/webhook_in_crew_captains.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/patches/webhook_in_example.com_memcacheds.yaml b/testdata/project-v4-multigroup/config/crd/patches/webhook_in_example.com_memcacheds.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/patches/webhook_in_example.com_memcacheds.yaml rename to testdata/project-v4-multigroup/config/crd/patches/webhook_in_example.com_memcacheds.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/patches/webhook_in_ship_cruisers.yaml b/testdata/project-v4-multigroup/config/crd/patches/webhook_in_ship_cruisers.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/patches/webhook_in_ship_cruisers.yaml rename to testdata/project-v4-multigroup/config/crd/patches/webhook_in_ship_cruisers.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/patches/webhook_in_ship_destroyers.yaml b/testdata/project-v4-multigroup/config/crd/patches/webhook_in_ship_destroyers.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/patches/webhook_in_ship_destroyers.yaml rename to testdata/project-v4-multigroup/config/crd/patches/webhook_in_ship_destroyers.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/crd/patches/webhook_in_ship_frigates.yaml b/testdata/project-v4-multigroup/config/crd/patches/webhook_in_ship_frigates.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/crd/patches/webhook_in_ship_frigates.yaml rename to testdata/project-v4-multigroup/config/crd/patches/webhook_in_ship_frigates.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/default/kustomization.yaml b/testdata/project-v4-multigroup/config/default/kustomization.yaml similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/config/default/kustomization.yaml rename to testdata/project-v4-multigroup/config/default/kustomization.yaml index 27944e9bb67..32e0e86801e 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/default/kustomization.yaml +++ b/testdata/project-v4-multigroup/config/default/kustomization.yaml @@ -1,12 +1,12 @@ # Adds namespace to all resources. -namespace: project-v4-multigroup-with-plugins-system +namespace: project-v4-multigroup-system # Value of this field is prepended to the # names of all resources, e.g. a deployment named # "wordpress" becomes "alices-wordpress". # Note that it should also match with the prefix (text before '-') of the namespace # field above. -namePrefix: project-v4-multigroup-with-plugins- +namePrefix: project-v4-multigroup- # Labels to add to all resources and selectors. #labels: diff --git a/testdata/project-v4-multigroup-with-plugins/config/default/manager_metrics_patch.yaml b/testdata/project-v4-multigroup/config/default/manager_metrics_patch.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/default/manager_metrics_patch.yaml rename to testdata/project-v4-multigroup/config/default/manager_metrics_patch.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/default/manager_webhook_patch.yaml b/testdata/project-v4-multigroup/config/default/manager_webhook_patch.yaml similarity index 89% rename from testdata/project-v4-multigroup-with-plugins/config/default/manager_webhook_patch.yaml rename to testdata/project-v4-multigroup/config/default/manager_webhook_patch.yaml index 0c62bd808e3..9fd690c819f 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/default/manager_webhook_patch.yaml +++ b/testdata/project-v4-multigroup/config/default/manager_webhook_patch.yaml @@ -4,7 +4,7 @@ metadata: name: controller-manager namespace: system labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize spec: template: diff --git a/testdata/project-v4-multigroup-with-plugins/config/default/metrics_service.yaml b/testdata/project-v4-multigroup/config/default/metrics_service.yaml similarity index 83% rename from testdata/project-v4-multigroup-with-plugins/config/default/metrics_service.yaml rename to testdata/project-v4-multigroup/config/default/metrics_service.yaml index 704d659ba50..afd67bb43af 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/default/metrics_service.yaml +++ b/testdata/project-v4-multigroup/config/default/metrics_service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: labels: control-plane: controller-manager - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: controller-manager-metrics-service namespace: system diff --git a/testdata/project-v4-multigroup-with-plugins/config/default/webhookcainjection_patch.yaml b/testdata/project-v4-multigroup/config/default/webhookcainjection_patch.yaml similarity index 81% rename from testdata/project-v4-multigroup-with-plugins/config/default/webhookcainjection_patch.yaml rename to testdata/project-v4-multigroup/config/default/webhookcainjection_patch.yaml index 2dc7f8c6c0e..5a278ed6e95 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/default/webhookcainjection_patch.yaml +++ b/testdata/project-v4-multigroup/config/default/webhookcainjection_patch.yaml @@ -4,7 +4,7 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: mutating-webhook-configuration annotations: @@ -17,8 +17,8 @@ metadata: app.kubernetes.io/name: validatingwebhookconfiguration app.kubernetes.io/instance: validating-webhook-configuration app.kubernetes.io/component: webhook - app.kubernetes.io/created-by: project-v4-multigroup-with-plugins - app.kubernetes.io/part-of: project-v4-multigroup-with-plugins + app.kubernetes.io/created-by: project-v4-multigroup + app.kubernetes.io/part-of: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: validating-webhook-configuration annotations: diff --git a/testdata/project-v4-multigroup-with-plugins/config/manager/kustomization.yaml b/testdata/project-v4-multigroup/config/manager/kustomization.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/manager/kustomization.yaml rename to testdata/project-v4-multigroup/config/manager/kustomization.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/manager/manager.yaml b/testdata/project-v4-multigroup/config/manager/manager.yaml similarity index 96% rename from testdata/project-v4-multigroup-with-plugins/config/manager/manager.yaml rename to testdata/project-v4-multigroup/config/manager/manager.yaml index f1e76e514e8..dc23b608705 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/manager/manager.yaml +++ b/testdata/project-v4-multigroup/config/manager/manager.yaml @@ -3,7 +3,7 @@ kind: Namespace metadata: labels: control-plane: controller-manager - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: system --- @@ -14,7 +14,7 @@ metadata: namespace: system labels: control-plane: controller-manager - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize spec: selector: diff --git a/testdata/project-v4-multigroup-with-plugins/config/network-policy/allow-metrics-traffic.yaml b/testdata/project-v4-multigroup/config/network-policy/allow-metrics-traffic.yaml similarity index 92% rename from testdata/project-v4-multigroup-with-plugins/config/network-policy/allow-metrics-traffic.yaml rename to testdata/project-v4-multigroup/config/network-policy/allow-metrics-traffic.yaml index 3ecfbaef9b4..3f144fb140e 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/network-policy/allow-metrics-traffic.yaml +++ b/testdata/project-v4-multigroup/config/network-policy/allow-metrics-traffic.yaml @@ -5,7 +5,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: allow-metrics-traffic namespace: system diff --git a/testdata/project-v4-multigroup-with-plugins/config/network-policy/allow-webhook-traffic.yaml b/testdata/project-v4-multigroup/config/network-policy/allow-webhook-traffic.yaml similarity index 92% rename from testdata/project-v4-multigroup-with-plugins/config/network-policy/allow-webhook-traffic.yaml rename to testdata/project-v4-multigroup/config/network-policy/allow-webhook-traffic.yaml index dfddc609676..ec32d71710c 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/network-policy/allow-webhook-traffic.yaml +++ b/testdata/project-v4-multigroup/config/network-policy/allow-webhook-traffic.yaml @@ -5,7 +5,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: allow-webhook-traffic namespace: system diff --git a/testdata/project-v4-multigroup-with-plugins/config/network-policy/kustomization.yaml b/testdata/project-v4-multigroup/config/network-policy/kustomization.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/network-policy/kustomization.yaml rename to testdata/project-v4-multigroup/config/network-policy/kustomization.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/prometheus/kustomization.yaml b/testdata/project-v4-multigroup/config/prometheus/kustomization.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/prometheus/kustomization.yaml rename to testdata/project-v4-multigroup/config/prometheus/kustomization.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/prometheus/monitor.yaml b/testdata/project-v4-multigroup/config/prometheus/monitor.yaml similarity index 95% rename from testdata/project-v4-multigroup-with-plugins/config/prometheus/monitor.yaml rename to testdata/project-v4-multigroup/config/prometheus/monitor.yaml index 59401d3eb91..89d2f351f5b 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/prometheus/monitor.yaml +++ b/testdata/project-v4-multigroup/config/prometheus/monitor.yaml @@ -4,7 +4,7 @@ kind: ServiceMonitor metadata: labels: control-plane: controller-manager - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: controller-manager-metrics-monitor namespace: system diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/crew_captain_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/crew_captain_editor_role.yaml similarity index 87% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/crew_captain_editor_role.yaml rename to testdata/project-v4-multigroup/config/rbac/crew_captain_editor_role.yaml index 796bc0dd587..c6a33cbfbda 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/crew_captain_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/crew_captain_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: crew-captain-editor-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/crew_captain_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/crew_captain_viewer_role.yaml similarity index 86% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/crew_captain_viewer_role.yaml rename to testdata/project-v4-multigroup/config/rbac/crew_captain_viewer_role.yaml index 6efc6d4b280..7d723490e56 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/crew_captain_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/crew_captain_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: crew-captain-viewer-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_busybox_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/example.com_busybox_editor_role.yaml similarity index 88% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_busybox_editor_role.yaml rename to testdata/project-v4-multigroup/config/rbac/example.com_busybox_editor_role.yaml index 16229fc8a76..bcaffc621e4 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_busybox_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/example.com_busybox_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: example.com-busybox-editor-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_busybox_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/example.com_busybox_viewer_role.yaml similarity index 86% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_busybox_viewer_role.yaml rename to testdata/project-v4-multigroup/config/rbac/example.com_busybox_viewer_role.yaml index e1af6615259..c4121f22e51 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_busybox_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/example.com_busybox_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: example.com-busybox-viewer-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_memcached_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/example.com_memcached_editor_role.yaml similarity index 88% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_memcached_editor_role.yaml rename to testdata/project-v4-multigroup/config/rbac/example.com_memcached_editor_role.yaml index 88f94b2461d..e5e1036db95 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_memcached_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/example.com_memcached_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: example.com-memcached-editor-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_memcached_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/example.com_memcached_viewer_role.yaml similarity index 87% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_memcached_viewer_role.yaml rename to testdata/project-v4-multigroup/config/rbac/example.com_memcached_viewer_role.yaml index 7096a6a6d2f..0bd3312686d 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/example.com_memcached_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/example.com_memcached_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: example.com-memcached-viewer-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/fiz_bar_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/fiz_bar_editor_role.yaml similarity index 86% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/fiz_bar_editor_role.yaml rename to testdata/project-v4-multigroup/config/rbac/fiz_bar_editor_role.yaml index 13411ba8b7e..6ce5d8f2ef9 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/fiz_bar_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/fiz_bar_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: fiz-bar-editor-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/fiz_bar_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/fiz_bar_viewer_role.yaml similarity index 85% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/fiz_bar_viewer_role.yaml rename to testdata/project-v4-multigroup/config/rbac/fiz_bar_viewer_role.yaml index f1e648ef097..744a0a955c0 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/fiz_bar_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/fiz_bar_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: fiz-bar-viewer-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml similarity index 88% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml rename to testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml index 1b24df8bc53..66fa7944f70 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: foo.policy-healthcheckpolicy-editor-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml similarity index 87% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml rename to testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml index 3dead6f26e3..dff3ea7abc0 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/foo.policy_healthcheckpolicy_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: foo.policy-healthcheckpolicy-viewer-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/foo_bar_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/foo_bar_editor_role.yaml similarity index 86% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/foo_bar_editor_role.yaml rename to testdata/project-v4-multigroup/config/rbac/foo_bar_editor_role.yaml index 85879eecbcf..f05089941a4 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/foo_bar_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/foo_bar_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: foo-bar-editor-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/foo_bar_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/foo_bar_viewer_role.yaml similarity index 85% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/foo_bar_viewer_role.yaml rename to testdata/project-v4-multigroup/config/rbac/foo_bar_viewer_role.yaml index a3413719636..eabf9ee517b 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/foo_bar_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/foo_bar_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: foo-bar-viewer-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/kustomization.yaml b/testdata/project-v4-multigroup/config/rbac/kustomization.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/kustomization.yaml rename to testdata/project-v4-multigroup/config/rbac/kustomization.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/leader_election_role.yaml b/testdata/project-v4-multigroup/config/rbac/leader_election_role.yaml similarity index 89% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/leader_election_role.yaml rename to testdata/project-v4-multigroup/config/rbac/leader_election_role.yaml index 9549e9e8afc..14015b3499d 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/leader_election_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/leader_election_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: leader-election-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/leader_election_role_binding.yaml b/testdata/project-v4-multigroup/config/rbac/leader_election_role_binding.yaml similarity index 83% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/leader_election_role_binding.yaml rename to testdata/project-v4-multigroup/config/rbac/leader_election_role_binding.yaml index 05f0dbe0941..7af36fa2d81 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/leader_election_role_binding.yaml +++ b/testdata/project-v4-multigroup/config/rbac/leader_election_role_binding.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: leader-election-rolebinding roleRef: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/metrics_auth_role.yaml b/testdata/project-v4-multigroup/config/rbac/metrics_auth_role.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/metrics_auth_role.yaml rename to testdata/project-v4-multigroup/config/rbac/metrics_auth_role.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/metrics_auth_role_binding.yaml b/testdata/project-v4-multigroup/config/rbac/metrics_auth_role_binding.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/metrics_auth_role_binding.yaml rename to testdata/project-v4-multigroup/config/rbac/metrics_auth_role_binding.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/metrics_reader_role.yaml b/testdata/project-v4-multigroup/config/rbac/metrics_reader_role.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/metrics_reader_role.yaml rename to testdata/project-v4-multigroup/config/rbac/metrics_reader_role.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/role.yaml b/testdata/project-v4-multigroup/config/rbac/role.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/role.yaml rename to testdata/project-v4-multigroup/config/rbac/role.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/role_binding.yaml b/testdata/project-v4-multigroup/config/rbac/role_binding.yaml similarity index 83% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/role_binding.yaml rename to testdata/project-v4-multigroup/config/rbac/role_binding.yaml index 4dc562e9d2c..ae53b6529da 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/role_binding.yaml +++ b/testdata/project-v4-multigroup/config/rbac/role_binding.yaml @@ -2,7 +2,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: manager-rolebinding roleRef: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_kraken_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_editor_role.yaml similarity index 88% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_kraken_editor_role.yaml rename to testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_editor_role.yaml index 179ef7c2f00..1d372dccf66 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_kraken_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: sea-creatures-kraken-editor-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_kraken_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_viewer_role.yaml similarity index 86% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_kraken_viewer_role.yaml rename to testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_viewer_role.yaml index ba1ca466c85..a65c4916546 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_kraken_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/sea-creatures_kraken_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: sea-creatures-kraken-viewer-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_leviathan_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_editor_role.yaml similarity index 88% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_leviathan_editor_role.yaml rename to testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_editor_role.yaml index 24d146e561e..77d2ff19c22 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_leviathan_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: sea-creatures-leviathan-editor-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_leviathan_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_viewer_role.yaml similarity index 87% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_leviathan_viewer_role.yaml rename to testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_viewer_role.yaml index 01b698ed8bf..e0344e4699b 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/sea-creatures_leviathan_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/sea-creatures_leviathan_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: sea-creatures-leviathan-viewer-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/service_account.yaml b/testdata/project-v4-multigroup/config/rbac/service_account.yaml similarity index 70% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/service_account.yaml rename to testdata/project-v4-multigroup/config/rbac/service_account.yaml index 1bf80cdd862..25d4288f404 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/service_account.yaml +++ b/testdata/project-v4-multigroup/config/rbac/service_account.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_cruiser_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_cruiser_editor_role.yaml similarity index 87% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/ship_cruiser_editor_role.yaml rename to testdata/project-v4-multigroup/config/rbac/ship_cruiser_editor_role.yaml index 7f761bbe29a..32a0bcaf91e 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_cruiser_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_cruiser_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: ship-cruiser-editor-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_cruiser_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_cruiser_viewer_role.yaml similarity index 86% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/ship_cruiser_viewer_role.yaml rename to testdata/project-v4-multigroup/config/rbac/ship_cruiser_viewer_role.yaml index 173adf61c78..287ffcc397a 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_cruiser_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_cruiser_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: ship-cruiser-viewer-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_destroyer_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_destroyer_editor_role.yaml similarity index 87% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/ship_destroyer_editor_role.yaml rename to testdata/project-v4-multigroup/config/rbac/ship_destroyer_editor_role.yaml index 07891024559..8b0aa1da540 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_destroyer_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_destroyer_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: ship-destroyer-editor-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_destroyer_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_destroyer_viewer_role.yaml similarity index 86% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/ship_destroyer_viewer_role.yaml rename to testdata/project-v4-multigroup/config/rbac/ship_destroyer_viewer_role.yaml index 9ddd515d49b..027ff57455a 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_destroyer_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_destroyer_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: ship-destroyer-viewer-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_frigate_editor_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_frigate_editor_role.yaml similarity index 87% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/ship_frigate_editor_role.yaml rename to testdata/project-v4-multigroup/config/rbac/ship_frigate_editor_role.yaml index 29da45db91a..d0b243c8886 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_frigate_editor_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_frigate_editor_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: ship-frigate-editor-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_frigate_viewer_role.yaml b/testdata/project-v4-multigroup/config/rbac/ship_frigate_viewer_role.yaml similarity index 86% rename from testdata/project-v4-multigroup-with-plugins/config/rbac/ship_frigate_viewer_role.yaml rename to testdata/project-v4-multigroup/config/rbac/ship_frigate_viewer_role.yaml index 25ae44f07ea..f8d54802480 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/rbac/ship_frigate_viewer_role.yaml +++ b/testdata/project-v4-multigroup/config/rbac/ship_frigate_viewer_role.yaml @@ -3,7 +3,7 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: ship-frigate-viewer-role rules: diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/crew_v1_captain.yaml b/testdata/project-v4-multigroup/config/samples/crew_v1_captain.yaml similarity index 73% rename from testdata/project-v4-multigroup-with-plugins/config/samples/crew_v1_captain.yaml rename to testdata/project-v4-multigroup/config/samples/crew_v1_captain.yaml index 4b48232fa8c..0eed664c7cb 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/samples/crew_v1_captain.yaml +++ b/testdata/project-v4-multigroup/config/samples/crew_v1_captain.yaml @@ -2,7 +2,7 @@ apiVersion: crew.testproject.org/v1 kind: Captain metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: captain-sample spec: diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/example.com_v1alpha1_busybox.yaml b/testdata/project-v4-multigroup/config/samples/example.com_v1alpha1_busybox.yaml similarity index 81% rename from testdata/project-v4-multigroup-with-plugins/config/samples/example.com_v1alpha1_busybox.yaml rename to testdata/project-v4-multigroup/config/samples/example.com_v1alpha1_busybox.yaml index 546f0da8c70..506d43a6f30 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/samples/example.com_v1alpha1_busybox.yaml +++ b/testdata/project-v4-multigroup/config/samples/example.com_v1alpha1_busybox.yaml @@ -2,7 +2,7 @@ apiVersion: example.com.testproject.org/v1alpha1 kind: Busybox metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: busybox-sample spec: diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/example.com_v1alpha1_memcached.yaml b/testdata/project-v4-multigroup/config/samples/example.com_v1alpha1_memcached.yaml similarity index 86% rename from testdata/project-v4-multigroup-with-plugins/config/samples/example.com_v1alpha1_memcached.yaml rename to testdata/project-v4-multigroup/config/samples/example.com_v1alpha1_memcached.yaml index f4e11b26f96..13b8e3cecb5 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/samples/example.com_v1alpha1_memcached.yaml +++ b/testdata/project-v4-multigroup/config/samples/example.com_v1alpha1_memcached.yaml @@ -2,7 +2,7 @@ apiVersion: example.com.testproject.org/v1alpha1 kind: Memcached metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: memcached-sample spec: diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/fiz_v1_bar.yaml b/testdata/project-v4-multigroup/config/samples/fiz_v1_bar.yaml similarity index 72% rename from testdata/project-v4-multigroup-with-plugins/config/samples/fiz_v1_bar.yaml rename to testdata/project-v4-multigroup/config/samples/fiz_v1_bar.yaml index c39b3f20bcb..ded18d76876 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/samples/fiz_v1_bar.yaml +++ b/testdata/project-v4-multigroup/config/samples/fiz_v1_bar.yaml @@ -2,7 +2,7 @@ apiVersion: fiz.testproject.org/v1 kind: Bar metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: bar-sample spec: diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/foo.policy_v1_healthcheckpolicy.yaml b/testdata/project-v4-multigroup/config/samples/foo.policy_v1_healthcheckpolicy.yaml similarity index 76% rename from testdata/project-v4-multigroup-with-plugins/config/samples/foo.policy_v1_healthcheckpolicy.yaml rename to testdata/project-v4-multigroup/config/samples/foo.policy_v1_healthcheckpolicy.yaml index 2e04bd8b357..945fe8b48ad 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/samples/foo.policy_v1_healthcheckpolicy.yaml +++ b/testdata/project-v4-multigroup/config/samples/foo.policy_v1_healthcheckpolicy.yaml @@ -2,7 +2,7 @@ apiVersion: foo.policy.testproject.org/v1 kind: HealthCheckPolicy metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: healthcheckpolicy-sample spec: diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/foo_v1_bar.yaml b/testdata/project-v4-multigroup/config/samples/foo_v1_bar.yaml similarity index 72% rename from testdata/project-v4-multigroup-with-plugins/config/samples/foo_v1_bar.yaml rename to testdata/project-v4-multigroup/config/samples/foo_v1_bar.yaml index 9f5017b6397..6de418e33d7 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/samples/foo_v1_bar.yaml +++ b/testdata/project-v4-multigroup/config/samples/foo_v1_bar.yaml @@ -2,7 +2,7 @@ apiVersion: foo.testproject.org/v1 kind: Bar metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: bar-sample spec: diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/kustomization.yaml b/testdata/project-v4-multigroup/config/samples/kustomization.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/samples/kustomization.yaml rename to testdata/project-v4-multigroup/config/samples/kustomization.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/sea-creatures_v1beta1_kraken.yaml b/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta1_kraken.yaml similarity index 74% rename from testdata/project-v4-multigroup-with-plugins/config/samples/sea-creatures_v1beta1_kraken.yaml rename to testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta1_kraken.yaml index a8b96f8693a..0e0453d7c80 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/samples/sea-creatures_v1beta1_kraken.yaml +++ b/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta1_kraken.yaml @@ -2,7 +2,7 @@ apiVersion: sea-creatures.testproject.org/v1beta1 kind: Kraken metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: kraken-sample spec: diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/sea-creatures_v1beta2_leviathan.yaml b/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta2_leviathan.yaml similarity index 75% rename from testdata/project-v4-multigroup-with-plugins/config/samples/sea-creatures_v1beta2_leviathan.yaml rename to testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta2_leviathan.yaml index d7fc5483410..5d2125ed9b7 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/samples/sea-creatures_v1beta2_leviathan.yaml +++ b/testdata/project-v4-multigroup/config/samples/sea-creatures_v1beta2_leviathan.yaml @@ -2,7 +2,7 @@ apiVersion: sea-creatures.testproject.org/v1beta2 kind: Leviathan metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: leviathan-sample spec: diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/ship_v1_destroyer.yaml b/testdata/project-v4-multigroup/config/samples/ship_v1_destroyer.yaml similarity index 73% rename from testdata/project-v4-multigroup-with-plugins/config/samples/ship_v1_destroyer.yaml rename to testdata/project-v4-multigroup/config/samples/ship_v1_destroyer.yaml index f886969d458..946dee59890 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/samples/ship_v1_destroyer.yaml +++ b/testdata/project-v4-multigroup/config/samples/ship_v1_destroyer.yaml @@ -2,7 +2,7 @@ apiVersion: ship.testproject.org/v1 kind: Destroyer metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: destroyer-sample spec: diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/ship_v1beta1_frigate.yaml b/testdata/project-v4-multigroup/config/samples/ship_v1beta1_frigate.yaml similarity index 74% rename from testdata/project-v4-multigroup-with-plugins/config/samples/ship_v1beta1_frigate.yaml rename to testdata/project-v4-multigroup/config/samples/ship_v1beta1_frigate.yaml index ab9a3d0bf59..b758b075bcf 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/samples/ship_v1beta1_frigate.yaml +++ b/testdata/project-v4-multigroup/config/samples/ship_v1beta1_frigate.yaml @@ -2,7 +2,7 @@ apiVersion: ship.testproject.org/v1beta1 kind: Frigate metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: frigate-sample spec: diff --git a/testdata/project-v4-multigroup-with-plugins/config/samples/ship_v2alpha1_cruiser.yaml b/testdata/project-v4-multigroup/config/samples/ship_v2alpha1_cruiser.yaml similarity index 74% rename from testdata/project-v4-multigroup-with-plugins/config/samples/ship_v2alpha1_cruiser.yaml rename to testdata/project-v4-multigroup/config/samples/ship_v2alpha1_cruiser.yaml index d0fffb70ad3..58d0c89226b 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/samples/ship_v2alpha1_cruiser.yaml +++ b/testdata/project-v4-multigroup/config/samples/ship_v2alpha1_cruiser.yaml @@ -2,7 +2,7 @@ apiVersion: ship.testproject.org/v2alpha1 kind: Cruiser metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: cruiser-sample spec: diff --git a/testdata/project-v4-multigroup-with-plugins/config/webhook/kustomization.yaml b/testdata/project-v4-multigroup/config/webhook/kustomization.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/webhook/kustomization.yaml rename to testdata/project-v4-multigroup/config/webhook/kustomization.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/webhook/kustomizeconfig.yaml b/testdata/project-v4-multigroup/config/webhook/kustomizeconfig.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/webhook/kustomizeconfig.yaml rename to testdata/project-v4-multigroup/config/webhook/kustomizeconfig.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/webhook/manifests.yaml b/testdata/project-v4-multigroup/config/webhook/manifests.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/config/webhook/manifests.yaml rename to testdata/project-v4-multigroup/config/webhook/manifests.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/config/webhook/service.yaml b/testdata/project-v4-multigroup/config/webhook/service.yaml similarity index 80% rename from testdata/project-v4-multigroup-with-plugins/config/webhook/service.yaml rename to testdata/project-v4-multigroup/config/webhook/service.yaml index 1204bff3b6d..0ba1f669758 100644 --- a/testdata/project-v4-multigroup-with-plugins/config/webhook/service.yaml +++ b/testdata/project-v4-multigroup/config/webhook/service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: labels: - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup app.kubernetes.io/managed-by: kustomize name: webhook-service namespace: system diff --git a/testdata/project-v4-multigroup-with-plugins/dist/install.yaml b/testdata/project-v4-multigroup/dist/install.yaml similarity index 87% rename from testdata/project-v4-multigroup-with-plugins/dist/install.yaml rename to testdata/project-v4-multigroup/dist/install.yaml index 91b7479303f..05a31522eeb 100644 --- a/testdata/project-v4-multigroup-with-plugins/dist/install.yaml +++ b/testdata/project-v4-multigroup/dist/install.yaml @@ -3,9 +3,9 @@ kind: Namespace metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup control-plane: controller-manager - name: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-system --- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition @@ -243,8 +243,8 @@ spec: webhook: clientConfig: service: - name: project-v4-multigroup-with-plugins-webhook-service - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-webhook-service + namespace: project-v4-multigroup-system path: /convert conversionReviewVersions: - v1 @@ -307,8 +307,8 @@ spec: webhook: clientConfig: service: - name: project-v4-multigroup-with-plugins-webhook-service - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-webhook-service + namespace: project-v4-multigroup-system path: /convert conversionReviewVersions: - v1 @@ -371,8 +371,8 @@ spec: webhook: clientConfig: service: - name: project-v4-multigroup-with-plugins-webhook-service - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-webhook-service + namespace: project-v4-multigroup-system path: /convert conversionReviewVersions: - v1 @@ -435,8 +435,8 @@ spec: webhook: clientConfig: service: - name: project-v4-multigroup-with-plugins-webhook-service - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-webhook-service + namespace: project-v4-multigroup-system path: /convert conversionReviewVersions: - v1 @@ -661,8 +661,8 @@ spec: webhook: clientConfig: service: - name: project-v4-multigroup-with-plugins-webhook-service - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-webhook-service + namespace: project-v4-multigroup-system path: /convert conversionReviewVersions: - v1 @@ -785,18 +785,18 @@ kind: ServiceAccount metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-controller-manager - namespace: project-v4-multigroup-with-plugins-system + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-controller-manager + namespace: project-v4-multigroup-system --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-leader-election-role - namespace: project-v4-multigroup-with-plugins-system + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-leader-election-role + namespace: project-v4-multigroup-system rules: - apiGroups: - "" @@ -835,8 +835,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-crew-captain-editor-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-crew-captain-editor-role rules: - apiGroups: - crew.testproject.org @@ -862,8 +862,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-crew-captain-viewer-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-crew-captain-viewer-role rules: - apiGroups: - crew.testproject.org @@ -885,8 +885,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-example.com-busybox-editor-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-example.com-busybox-editor-role rules: - apiGroups: - example.com.testproject.org @@ -912,8 +912,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-example.com-busybox-viewer-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-example.com-busybox-viewer-role rules: - apiGroups: - example.com.testproject.org @@ -935,8 +935,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-example.com-memcached-editor-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-example.com-memcached-editor-role rules: - apiGroups: - example.com.testproject.org @@ -962,8 +962,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-example.com-memcached-viewer-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-example.com-memcached-viewer-role rules: - apiGroups: - example.com.testproject.org @@ -985,8 +985,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-fiz-bar-editor-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-fiz-bar-editor-role rules: - apiGroups: - fiz.testproject.org @@ -1012,8 +1012,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-fiz-bar-viewer-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-fiz-bar-viewer-role rules: - apiGroups: - fiz.testproject.org @@ -1035,8 +1035,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-foo-bar-editor-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-foo-bar-editor-role rules: - apiGroups: - foo.testproject.org @@ -1062,8 +1062,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-foo-bar-viewer-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-foo-bar-viewer-role rules: - apiGroups: - foo.testproject.org @@ -1085,8 +1085,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-foo.policy-healthcheckpolicy-editor-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-foo.policy-healthcheckpolicy-editor-role rules: - apiGroups: - foo.policy.testproject.org @@ -1112,8 +1112,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-foo.policy-healthcheckpolicy-viewer-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-foo.policy-healthcheckpolicy-viewer-role rules: - apiGroups: - foo.policy.testproject.org @@ -1133,7 +1133,7 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: project-v4-multigroup-with-plugins-manager-role + name: project-v4-multigroup-manager-role rules: - apiGroups: - apps @@ -1351,7 +1351,7 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: project-v4-multigroup-with-plugins-metrics-auth-role + name: project-v4-multigroup-metrics-auth-role rules: - apiGroups: - authentication.k8s.io @@ -1369,7 +1369,7 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - name: project-v4-multigroup-with-plugins-metrics-reader + name: project-v4-multigroup-metrics-reader rules: - nonResourceURLs: - /metrics @@ -1381,8 +1381,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-sea-creatures-kraken-editor-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-sea-creatures-kraken-editor-role rules: - apiGroups: - sea-creatures.testproject.org @@ -1408,8 +1408,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-sea-creatures-kraken-viewer-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-sea-creatures-kraken-viewer-role rules: - apiGroups: - sea-creatures.testproject.org @@ -1431,8 +1431,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-sea-creatures-leviathan-editor-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-sea-creatures-leviathan-editor-role rules: - apiGroups: - sea-creatures.testproject.org @@ -1458,8 +1458,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-sea-creatures-leviathan-viewer-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-sea-creatures-leviathan-viewer-role rules: - apiGroups: - sea-creatures.testproject.org @@ -1481,8 +1481,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-ship-cruiser-editor-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-ship-cruiser-editor-role rules: - apiGroups: - ship.testproject.org @@ -1508,8 +1508,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-ship-cruiser-viewer-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-ship-cruiser-viewer-role rules: - apiGroups: - ship.testproject.org @@ -1531,8 +1531,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-ship-destroyer-editor-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-ship-destroyer-editor-role rules: - apiGroups: - ship.testproject.org @@ -1558,8 +1558,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-ship-destroyer-viewer-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-ship-destroyer-viewer-role rules: - apiGroups: - ship.testproject.org @@ -1581,8 +1581,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-ship-frigate-editor-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-ship-frigate-editor-role rules: - apiGroups: - ship.testproject.org @@ -1608,8 +1608,8 @@ kind: ClusterRole metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-ship-frigate-viewer-role + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-ship-frigate-viewer-role rules: - apiGroups: - ship.testproject.org @@ -1631,56 +1631,56 @@ kind: RoleBinding metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-leader-election-rolebinding - namespace: project-v4-multigroup-with-plugins-system + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-leader-election-rolebinding + namespace: project-v4-multigroup-system roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: project-v4-multigroup-with-plugins-leader-election-role + name: project-v4-multigroup-leader-election-role subjects: - kind: ServiceAccount - name: project-v4-multigroup-with-plugins-controller-manager - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-controller-manager + namespace: project-v4-multigroup-system --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-manager-rolebinding + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-manager-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: project-v4-multigroup-with-plugins-manager-role + name: project-v4-multigroup-manager-role subjects: - kind: ServiceAccount - name: project-v4-multigroup-with-plugins-controller-manager - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-controller-manager + namespace: project-v4-multigroup-system --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: - name: project-v4-multigroup-with-plugins-metrics-auth-rolebinding + name: project-v4-multigroup-metrics-auth-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: project-v4-multigroup-with-plugins-metrics-auth-role + name: project-v4-multigroup-metrics-auth-role subjects: - kind: ServiceAccount - name: project-v4-multigroup-with-plugins-controller-manager - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-controller-manager + namespace: project-v4-multigroup-system --- apiVersion: v1 kind: Service metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup control-plane: controller-manager - name: project-v4-multigroup-with-plugins-controller-manager-metrics-service - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-controller-manager-metrics-service + namespace: project-v4-multigroup-system spec: ports: - name: https @@ -1695,9 +1695,9 @@ kind: Service metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins - name: project-v4-multigroup-with-plugins-webhook-service - namespace: project-v4-multigroup-with-plugins-system + app.kubernetes.io/name: project-v4-multigroup + name: project-v4-multigroup-webhook-service + namespace: project-v4-multigroup-system spec: ports: - port: 443 @@ -1711,10 +1711,10 @@ kind: Deployment metadata: labels: app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/name: project-v4-multigroup-with-plugins + app.kubernetes.io/name: project-v4-multigroup control-plane: controller-manager - name: project-v4-multigroup-with-plugins-controller-manager - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-controller-manager + namespace: project-v4-multigroup-system spec: replicas: 1 selector: @@ -1775,7 +1775,7 @@ spec: readOnly: true securityContext: runAsNonRoot: true - serviceAccountName: project-v4-multigroup-with-plugins-controller-manager + serviceAccountName: project-v4-multigroup-controller-manager terminationGracePeriodSeconds: 10 volumes: - name: cert @@ -1786,14 +1786,14 @@ spec: apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: - name: project-v4-multigroup-with-plugins-mutating-webhook-configuration + name: project-v4-multigroup-mutating-webhook-configuration webhooks: - admissionReviewVersions: - v1 clientConfig: service: - name: project-v4-multigroup-with-plugins-webhook-service - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-webhook-service + namespace: project-v4-multigroup-system path: /mutate-crew-testproject-org-v1-captain failurePolicy: Fail name: mcaptain-v1.kb.io @@ -1812,8 +1812,8 @@ webhooks: - v1 clientConfig: service: - name: project-v4-multigroup-with-plugins-webhook-service - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-webhook-service + namespace: project-v4-multigroup-system path: /mutate-ship-testproject-org-v1-destroyer failurePolicy: Fail name: mdestroyer-v1.kb.io @@ -1832,14 +1832,14 @@ webhooks: apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: - name: project-v4-multigroup-with-plugins-validating-webhook-configuration + name: project-v4-multigroup-validating-webhook-configuration webhooks: - admissionReviewVersions: - v1 clientConfig: service: - name: project-v4-multigroup-with-plugins-webhook-service - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-webhook-service + namespace: project-v4-multigroup-system path: /validate-crew-testproject-org-v1-captain failurePolicy: Fail name: vcaptain-v1.kb.io @@ -1858,8 +1858,8 @@ webhooks: - v1 clientConfig: service: - name: project-v4-multigroup-with-plugins-webhook-service - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-webhook-service + namespace: project-v4-multigroup-system path: /validate-example-com-testproject-org-v1alpha1-memcached failurePolicy: Fail name: vmemcached-v1alpha1.kb.io @@ -1878,8 +1878,8 @@ webhooks: - v1 clientConfig: service: - name: project-v4-multigroup-with-plugins-webhook-service - namespace: project-v4-multigroup-with-plugins-system + name: project-v4-multigroup-webhook-service + namespace: project-v4-multigroup-system path: /validate-ship-testproject-org-v2alpha1-cruiser failurePolicy: Fail name: vcruiser-v2alpha1.kb.io diff --git a/testdata/project-v4-multigroup-with-plugins/go.mod b/testdata/project-v4-multigroup/go.mod similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/go.mod rename to testdata/project-v4-multigroup/go.mod index 844feee23d9..03db01b03e8 100644 --- a/testdata/project-v4-multigroup-with-plugins/go.mod +++ b/testdata/project-v4-multigroup/go.mod @@ -1,4 +1,4 @@ -module sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins +module sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup go 1.22.0 diff --git a/testdata/project-v4-multigroup-with-plugins/grafana/controller-resources-metrics.json b/testdata/project-v4-multigroup/grafana/controller-resources-metrics.json similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/grafana/controller-resources-metrics.json rename to testdata/project-v4-multigroup/grafana/controller-resources-metrics.json diff --git a/testdata/project-v4-multigroup-with-plugins/grafana/controller-runtime-metrics.json b/testdata/project-v4-multigroup/grafana/controller-runtime-metrics.json similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/grafana/controller-runtime-metrics.json rename to testdata/project-v4-multigroup/grafana/controller-runtime-metrics.json diff --git a/testdata/project-v4-multigroup-with-plugins/grafana/custom-metrics/config.yaml b/testdata/project-v4-multigroup/grafana/custom-metrics/config.yaml similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/grafana/custom-metrics/config.yaml rename to testdata/project-v4-multigroup/grafana/custom-metrics/config.yaml diff --git a/testdata/project-v4-multigroup-with-plugins/hack/boilerplate.go.txt b/testdata/project-v4-multigroup/hack/boilerplate.go.txt similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/hack/boilerplate.go.txt rename to testdata/project-v4-multigroup/hack/boilerplate.go.txt diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/apps/deployment_controller.go b/testdata/project-v4-multigroup/internal/controller/apps/deployment_controller.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/apps/deployment_controller.go rename to testdata/project-v4-multigroup/internal/controller/apps/deployment_controller.go diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/apps/deployment_controller_test.go b/testdata/project-v4-multigroup/internal/controller/apps/deployment_controller_test.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/apps/deployment_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/apps/deployment_controller_test.go diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/apps/suite_test.go b/testdata/project-v4-multigroup/internal/controller/apps/suite_test.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/apps/suite_test.go rename to testdata/project-v4-multigroup/internal/controller/apps/suite_test.go diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/crew/captain_controller.go b/testdata/project-v4-multigroup/internal/controller/crew/captain_controller.go similarity index 95% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/crew/captain_controller.go rename to testdata/project-v4-multigroup/internal/controller/crew/captain_controller.go index a4c822d68fc..d6878885a45 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/crew/captain_controller.go +++ b/testdata/project-v4-multigroup/internal/controller/crew/captain_controller.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/crew/v1" + crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/crew/v1" ) // CaptainReconciler reconciles a Captain object diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/crew/captain_controller_test.go b/testdata/project-v4-multigroup/internal/controller/crew/captain_controller_test.go similarity index 96% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/crew/captain_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/crew/captain_controller_test.go index 99056904a9d..c2495aee47c 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/crew/captain_controller_test.go +++ b/testdata/project-v4-multigroup/internal/controller/crew/captain_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/crew/v1" + crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/crew/v1" ) var _ = Describe("Captain Controller", func() { diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/crew/suite_test.go b/testdata/project-v4-multigroup/internal/controller/crew/suite_test.go similarity index 96% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/crew/suite_test.go rename to testdata/project-v4-multigroup/internal/controller/crew/suite_test.go index 7550b6a6919..840accd8f8a 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/crew/suite_test.go +++ b/testdata/project-v4-multigroup/internal/controller/crew/suite_test.go @@ -33,7 +33,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/crew/v1" + crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/crew/v1" // +kubebuilder:scaffold:imports ) diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/busybox_controller.go b/testdata/project-v4-multigroup/internal/controller/example.com/busybox_controller.go similarity index 99% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/busybox_controller.go rename to testdata/project-v4-multigroup/internal/controller/example.com/busybox_controller.go index 24286f8eca0..2995a0bb2fa 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/busybox_controller.go +++ b/testdata/project-v4-multigroup/internal/controller/example.com/busybox_controller.go @@ -36,7 +36,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/log" - examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1" + examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/example.com/v1alpha1" ) const busyboxFinalizer = "example.com.testproject.org/finalizer" @@ -403,7 +403,7 @@ func labelsForBusybox() map[string]string { if err == nil { imageTag = strings.Split(image, ":")[1] } - return map[string]string{"app.kubernetes.io/name": "project-v4-multigroup-with-plugins", + return map[string]string{"app.kubernetes.io/name": "project-v4-multigroup", "app.kubernetes.io/version": imageTag, "app.kubernetes.io/managed-by": "BusyboxController", } diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/busybox_controller_test.go b/testdata/project-v4-multigroup/internal/controller/example.com/busybox_controller_test.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/busybox_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/example.com/busybox_controller_test.go index 4bdc2cb6845..3145af0ca6c 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/busybox_controller_test.go +++ b/testdata/project-v4-multigroup/internal/controller/example.com/busybox_controller_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/reconcile" - examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1" + examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/example.com/v1alpha1" ) var _ = Describe("Busybox controller", func() { diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/memcached_controller.go b/testdata/project-v4-multigroup/internal/controller/example.com/memcached_controller.go similarity index 99% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/memcached_controller.go rename to testdata/project-v4-multigroup/internal/controller/example.com/memcached_controller.go index 6d6802f86b0..d3896d58c14 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/memcached_controller.go +++ b/testdata/project-v4-multigroup/internal/controller/example.com/memcached_controller.go @@ -36,7 +36,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/log" - examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1" + examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/example.com/v1alpha1" ) const memcachedFinalizer = "example.com.testproject.org/finalizer" @@ -409,7 +409,7 @@ func labelsForMemcached() map[string]string { if err == nil { imageTag = strings.Split(image, ":")[1] } - return map[string]string{"app.kubernetes.io/name": "project-v4-multigroup-with-plugins", + return map[string]string{"app.kubernetes.io/name": "project-v4-multigroup", "app.kubernetes.io/version": imageTag, "app.kubernetes.io/managed-by": "MemcachedController", } diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/memcached_controller_test.go b/testdata/project-v4-multigroup/internal/controller/example.com/memcached_controller_test.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/memcached_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/example.com/memcached_controller_test.go index 3b2cbf6f538..895a9990717 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/memcached_controller_test.go +++ b/testdata/project-v4-multigroup/internal/controller/example.com/memcached_controller_test.go @@ -32,7 +32,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/reconcile" - examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1" + examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/example.com/v1alpha1" ) var _ = Describe("Memcached controller", func() { diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/suite_test.go b/testdata/project-v4-multigroup/internal/controller/example.com/suite_test.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/suite_test.go rename to testdata/project-v4-multigroup/internal/controller/example.com/suite_test.go index a46a3bf7497..316975ca415 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/example.com/suite_test.go +++ b/testdata/project-v4-multigroup/internal/controller/example.com/suite_test.go @@ -33,7 +33,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/example.com/v1alpha1" + examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/example.com/v1alpha1" // +kubebuilder:scaffold:imports ) diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/fiz/bar_controller.go b/testdata/project-v4-multigroup/internal/controller/fiz/bar_controller.go similarity index 95% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/fiz/bar_controller.go rename to testdata/project-v4-multigroup/internal/controller/fiz/bar_controller.go index d54be828639..7ef0d3623a5 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/fiz/bar_controller.go +++ b/testdata/project-v4-multigroup/internal/controller/fiz/bar_controller.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - fizv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/fiz/v1" + fizv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/fiz/v1" ) // BarReconciler reconciles a Bar object diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/fiz/bar_controller_test.go b/testdata/project-v4-multigroup/internal/controller/fiz/bar_controller_test.go similarity index 96% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/fiz/bar_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/fiz/bar_controller_test.go index 66e969dfbba..c9dca3f1172 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/fiz/bar_controller_test.go +++ b/testdata/project-v4-multigroup/internal/controller/fiz/bar_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - fizv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/fiz/v1" + fizv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/fiz/v1" ) var _ = Describe("Bar Controller", func() { diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/fiz/suite_test.go b/testdata/project-v4-multigroup/internal/controller/fiz/suite_test.go similarity index 96% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/fiz/suite_test.go rename to testdata/project-v4-multigroup/internal/controller/fiz/suite_test.go index c456259e68b..1ef21f902da 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/fiz/suite_test.go +++ b/testdata/project-v4-multigroup/internal/controller/fiz/suite_test.go @@ -33,7 +33,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - fizv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/fiz/v1" + fizv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/fiz/v1" // +kubebuilder:scaffold:imports ) diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo.policy/healthcheckpolicy_controller.go b/testdata/project-v4-multigroup/internal/controller/foo.policy/healthcheckpolicy_controller.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/foo.policy/healthcheckpolicy_controller.go rename to testdata/project-v4-multigroup/internal/controller/foo.policy/healthcheckpolicy_controller.go index 96cc5218b91..2d317620dda 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo.policy/healthcheckpolicy_controller.go +++ b/testdata/project-v4-multigroup/internal/controller/foo.policy/healthcheckpolicy_controller.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - foopolicyv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/foo.policy/v1" + foopolicyv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/foo.policy/v1" ) // HealthCheckPolicyReconciler reconciles a HealthCheckPolicy object diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo.policy/healthcheckpolicy_controller_test.go b/testdata/project-v4-multigroup/internal/controller/foo.policy/healthcheckpolicy_controller_test.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/foo.policy/healthcheckpolicy_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/foo.policy/healthcheckpolicy_controller_test.go index 241a36521a2..55de998a0a2 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo.policy/healthcheckpolicy_controller_test.go +++ b/testdata/project-v4-multigroup/internal/controller/foo.policy/healthcheckpolicy_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - foopolicyv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/foo.policy/v1" + foopolicyv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/foo.policy/v1" ) var _ = Describe("HealthCheckPolicy Controller", func() { diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo.policy/suite_test.go b/testdata/project-v4-multigroup/internal/controller/foo.policy/suite_test.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/foo.policy/suite_test.go rename to testdata/project-v4-multigroup/internal/controller/foo.policy/suite_test.go index 5938bc3f30e..a7a3cafc613 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo.policy/suite_test.go +++ b/testdata/project-v4-multigroup/internal/controller/foo.policy/suite_test.go @@ -33,7 +33,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - foopolicyv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/foo.policy/v1" + foopolicyv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/foo.policy/v1" // +kubebuilder:scaffold:imports ) diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo/bar_controller.go b/testdata/project-v4-multigroup/internal/controller/foo/bar_controller.go similarity index 95% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/foo/bar_controller.go rename to testdata/project-v4-multigroup/internal/controller/foo/bar_controller.go index e9afa39c585..91bf9eff024 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo/bar_controller.go +++ b/testdata/project-v4-multigroup/internal/controller/foo/bar_controller.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - foov1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/foo/v1" + foov1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/foo/v1" ) // BarReconciler reconciles a Bar object diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo/bar_controller_test.go b/testdata/project-v4-multigroup/internal/controller/foo/bar_controller_test.go similarity index 96% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/foo/bar_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/foo/bar_controller_test.go index 4a176a3ed86..12193854c79 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo/bar_controller_test.go +++ b/testdata/project-v4-multigroup/internal/controller/foo/bar_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - foov1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/foo/v1" + foov1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/foo/v1" ) var _ = Describe("Bar Controller", func() { diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo/suite_test.go b/testdata/project-v4-multigroup/internal/controller/foo/suite_test.go similarity index 96% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/foo/suite_test.go rename to testdata/project-v4-multigroup/internal/controller/foo/suite_test.go index 608f8cd1dd3..a04113931ba 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/foo/suite_test.go +++ b/testdata/project-v4-multigroup/internal/controller/foo/suite_test.go @@ -33,7 +33,7 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - foov1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/foo/v1" + foov1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/foo/v1" // +kubebuilder:scaffold:imports ) diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/kraken_controller.go b/testdata/project-v4-multigroup/internal/controller/sea-creatures/kraken_controller.go similarity index 97% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/kraken_controller.go rename to testdata/project-v4-multigroup/internal/controller/sea-creatures/kraken_controller.go index 69cef373560..0c01e96ab7f 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/kraken_controller.go +++ b/testdata/project-v4-multigroup/internal/controller/sea-creatures/kraken_controller.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - seacreaturesv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta1" + seacreaturesv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/sea-creatures/v1beta1" ) // KrakenReconciler reconciles a Kraken object diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/kraken_controller_test.go b/testdata/project-v4-multigroup/internal/controller/sea-creatures/kraken_controller_test.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/kraken_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/sea-creatures/kraken_controller_test.go index 33722ed65e4..b0eae061ff8 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/kraken_controller_test.go +++ b/testdata/project-v4-multigroup/internal/controller/sea-creatures/kraken_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - seacreaturesv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta1" + seacreaturesv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/sea-creatures/v1beta1" ) var _ = Describe("Kraken Controller", func() { diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/leviathan_controller.go b/testdata/project-v4-multigroup/internal/controller/sea-creatures/leviathan_controller.go similarity index 97% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/leviathan_controller.go rename to testdata/project-v4-multigroup/internal/controller/sea-creatures/leviathan_controller.go index a9d133eaf41..1a42db100bd 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/leviathan_controller.go +++ b/testdata/project-v4-multigroup/internal/controller/sea-creatures/leviathan_controller.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - seacreaturesv1beta2 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta2" + seacreaturesv1beta2 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/sea-creatures/v1beta2" ) // LeviathanReconciler reconciles a Leviathan object diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/leviathan_controller_test.go b/testdata/project-v4-multigroup/internal/controller/sea-creatures/leviathan_controller_test.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/leviathan_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/sea-creatures/leviathan_controller_test.go index d4d86ca1aa1..5b1e491aa89 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/leviathan_controller_test.go +++ b/testdata/project-v4-multigroup/internal/controller/sea-creatures/leviathan_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - seacreaturesv1beta2 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta2" + seacreaturesv1beta2 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/sea-creatures/v1beta2" ) var _ = Describe("Leviathan Controller", func() { diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/suite_test.go b/testdata/project-v4-multigroup/internal/controller/sea-creatures/suite_test.go similarity index 96% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/suite_test.go rename to testdata/project-v4-multigroup/internal/controller/sea-creatures/suite_test.go index d0af2c0593f..d2f44fafbe2 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/sea-creatures/suite_test.go +++ b/testdata/project-v4-multigroup/internal/controller/sea-creatures/suite_test.go @@ -33,8 +33,8 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - seacreaturesv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta1" - seacreaturesv1beta2 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/sea-creatures/v1beta2" + seacreaturesv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/sea-creatures/v1beta1" + seacreaturesv1beta2 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/sea-creatures/v1beta2" // +kubebuilder:scaffold:imports ) diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/cruiser_controller.go b/testdata/project-v4-multigroup/internal/controller/ship/cruiser_controller.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/ship/cruiser_controller.go rename to testdata/project-v4-multigroup/internal/controller/ship/cruiser_controller.go index 3f001d16cc6..f8f1bb2c1e3 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/cruiser_controller.go +++ b/testdata/project-v4-multigroup/internal/controller/ship/cruiser_controller.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - shipv2alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1" + shipv2alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v2alpha1" ) // CruiserReconciler reconciles a Cruiser object diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/cruiser_controller_test.go b/testdata/project-v4-multigroup/internal/controller/ship/cruiser_controller_test.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/ship/cruiser_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/ship/cruiser_controller_test.go index f60ede5f866..5d432ab735e 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/cruiser_controller_test.go +++ b/testdata/project-v4-multigroup/internal/controller/ship/cruiser_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - shipv2alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1" + shipv2alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v2alpha1" ) var _ = Describe("Cruiser Controller", func() { diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/destroyer_controller.go b/testdata/project-v4-multigroup/internal/controller/ship/destroyer_controller.go similarity index 96% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/ship/destroyer_controller.go rename to testdata/project-v4-multigroup/internal/controller/ship/destroyer_controller.go index 93067fafd25..ccb1144b6d4 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/destroyer_controller.go +++ b/testdata/project-v4-multigroup/internal/controller/ship/destroyer_controller.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - shipv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v1" + shipv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v1" ) // DestroyerReconciler reconciles a Destroyer object diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/destroyer_controller_test.go b/testdata/project-v4-multigroup/internal/controller/ship/destroyer_controller_test.go similarity index 96% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/ship/destroyer_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/ship/destroyer_controller_test.go index 7c91b76bb7a..c1de1afb8b6 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/destroyer_controller_test.go +++ b/testdata/project-v4-multigroup/internal/controller/ship/destroyer_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - shipv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v1" + shipv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v1" ) var _ = Describe("Destroyer Controller", func() { diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/frigate_controller.go b/testdata/project-v4-multigroup/internal/controller/ship/frigate_controller.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/ship/frigate_controller.go rename to testdata/project-v4-multigroup/internal/controller/ship/frigate_controller.go index a8d6322ca82..a8ee95c5ed4 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/frigate_controller.go +++ b/testdata/project-v4-multigroup/internal/controller/ship/frigate_controller.go @@ -24,7 +24,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - shipv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1" + shipv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v1beta1" ) // FrigateReconciler reconciles a Frigate object diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/frigate_controller_test.go b/testdata/project-v4-multigroup/internal/controller/ship/frigate_controller_test.go similarity index 98% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/ship/frigate_controller_test.go rename to testdata/project-v4-multigroup/internal/controller/ship/frigate_controller_test.go index 1674d98921c..f36a8679754 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/frigate_controller_test.go +++ b/testdata/project-v4-multigroup/internal/controller/ship/frigate_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - shipv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1" + shipv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v1beta1" ) var _ = Describe("Frigate Controller", func() { diff --git a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/suite_test.go b/testdata/project-v4-multigroup/internal/controller/ship/suite_test.go similarity index 95% rename from testdata/project-v4-multigroup-with-plugins/internal/controller/ship/suite_test.go rename to testdata/project-v4-multigroup/internal/controller/ship/suite_test.go index 3c259a3d0a1..a38370a4f56 100644 --- a/testdata/project-v4-multigroup-with-plugins/internal/controller/ship/suite_test.go +++ b/testdata/project-v4-multigroup/internal/controller/ship/suite_test.go @@ -33,9 +33,9 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - shipv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v1" - shipv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v1beta1" - shipv2alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/api/ship/v2alpha1" + shipv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v1" + shipv1beta1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v1beta1" + shipv2alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/api/ship/v2alpha1" // +kubebuilder:scaffold:imports ) diff --git a/testdata/project-v4-multigroup-with-plugins/test/e2e/e2e_suite_test.go b/testdata/project-v4-multigroup/test/e2e/e2e_suite_test.go similarity index 96% rename from testdata/project-v4-multigroup-with-plugins/test/e2e/e2e_suite_test.go rename to testdata/project-v4-multigroup/test/e2e/e2e_suite_test.go index aa6e2a37aca..be68fdc2df9 100644 --- a/testdata/project-v4-multigroup-with-plugins/test/e2e/e2e_suite_test.go +++ b/testdata/project-v4-multigroup/test/e2e/e2e_suite_test.go @@ -25,7 +25,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/test/utils" + "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/test/utils" ) var ( @@ -43,7 +43,7 @@ var ( // projectImage is the name of the image which will be build and loaded // with the code source changes to be tested. - projectImage = "example.com/project-v4-multigroup-with-plugins:v0.0.1" + projectImage = "example.com/project-v4-multigroup:v0.0.1" ) // TestE2E runs the end-to-end (e2e) test suite for the project. These tests execute in an isolated, @@ -52,7 +52,7 @@ var ( // CertManager and Prometheus. func TestE2E(t *testing.T) { RegisterFailHandler(Fail) - _, _ = fmt.Fprintf(GinkgoWriter, "Starting project-v4-multigroup-with-plugins integration test suite\n") + _, _ = fmt.Fprintf(GinkgoWriter, "Starting project-v4-multigroup integration test suite\n") RunSpecs(t, "e2e suite") } diff --git a/testdata/project-v4-multigroup-with-plugins/test/e2e/e2e_test.go b/testdata/project-v4-multigroup/test/e2e/e2e_test.go similarity index 94% rename from testdata/project-v4-multigroup-with-plugins/test/e2e/e2e_test.go rename to testdata/project-v4-multigroup/test/e2e/e2e_test.go index e6aeb8cf2b4..3806ff1d15a 100644 --- a/testdata/project-v4-multigroup-with-plugins/test/e2e/e2e_test.go +++ b/testdata/project-v4-multigroup/test/e2e/e2e_test.go @@ -27,20 +27,20 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup-with-plugins/test/utils" + "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/test/utils" ) // namespace where the project is deployed in -const namespace = "project-v4-multigroup-with-plugins-system" +const namespace = "project-v4-multigroup-system" // serviceAccountName created for the project -const serviceAccountName = "project-v4-multigroup-with-plugins-controller-manager" +const serviceAccountName = "project-v4-multigroup-controller-manager" // metricsServiceName is the name of the metrics service of the project -const metricsServiceName = "project-v4-multigroup-with-plugins-controller-manager-metrics-service" +const metricsServiceName = "project-v4-multigroup-controller-manager-metrics-service" // metricsRoleBindingName is the name of the RBAC that will be created to allow get the metrics data -const metricsRoleBindingName = "project-v4-multigroup-with-plugins-metrics-binding" +const metricsRoleBindingName = "project-v4-multigroup-metrics-binding" var _ = Describe("Manager", Ordered, func() { // Before running the tests, set up the environment by creating the namespace, @@ -121,7 +121,7 @@ var _ = Describe("Manager", Ordered, func() { It("should ensure the metrics endpoint is serving metrics", func() { By("creating a ClusterRoleBinding for the service account to allow access to metrics") cmd := exec.Command("kubectl", "create", "clusterrolebinding", metricsRoleBindingName, - "--clusterrole=project-v4-multigroup-with-plugins-metrics-reader", + "--clusterrole=project-v4-multigroup-metrics-reader", fmt.Sprintf("--serviceaccount=%s:%s", namespace, serviceAccountName), ) _, err := utils.Run(cmd) @@ -204,7 +204,7 @@ var _ = Describe("Manager", Ordered, func() { verifyCAInjection := func(g Gomega) { cmd := exec.Command("kubectl", "get", "mutatingwebhookconfigurations.admissionregistration.k8s.io", - "project-v4-multigroup-with-plugins-mutating-webhook-configuration", + "project-v4-multigroup-mutating-webhook-configuration", "-o", "go-template={{ range .webhooks }}{{ .clientConfig.caBundle }}{{ end }}") mwhOutput, err := utils.Run(cmd) g.Expect(err).NotTo(HaveOccurred()) @@ -218,7 +218,7 @@ var _ = Describe("Manager", Ordered, func() { verifyCAInjection := func(g Gomega) { cmd := exec.Command("kubectl", "get", "validatingwebhookconfigurations.admissionregistration.k8s.io", - "project-v4-multigroup-with-plugins-validating-webhook-configuration", + "project-v4-multigroup-validating-webhook-configuration", "-o", "go-template={{ range .webhooks }}{{ .clientConfig.caBundle }}{{ end }}") vwhOutput, err := utils.Run(cmd) g.Expect(err).NotTo(HaveOccurred()) diff --git a/testdata/project-v4-multigroup-with-plugins/test/utils/utils.go b/testdata/project-v4-multigroup/test/utils/utils.go similarity index 100% rename from testdata/project-v4-multigroup-with-plugins/test/utils/utils.go rename to testdata/project-v4-multigroup/test/utils/utils.go