From 7c26724a484b4714742361017ab06de8a8bc767b Mon Sep 17 00:00:00 2001 From: Roy Paulin Date: Mon, 18 Sep 2023 22:10:07 +0200 Subject: [PATCH] Remove admintools from v2 vertica-k8s container (#502) In the v2 container, since we use vclusterops to do admin commands, we can remove admintools and its support applications and libraries (vbr, agent, scrutinize, python site packages). --- .github/workflows/e2e-udx.yml | 15 +++- .github/workflows/e2e-vcluster.yml | 68 ----------------- .github/workflows/e2e.yml | 29 ++++---- docker-vertica-v2/Dockerfile | 10 +-- .../packages/cleanup-initial.sh | 27 +++---- docker-vertica-v2/packages/cleanup.sh | 26 +++++-- docker-vertica/Dockerfile | 3 +- kuttl-test.yaml | 2 +- scripts/setup-kustomize.sh | 4 +- .../udx-java/05-create-creds.yaml | 0 .../udx-java/10-assert.yaml | 0 .../udx-java/10-deploy-operator.yaml | 0 .../udx-java/15-assert.yaml | 0 .../udx-java/15-setup-vdb.yaml | 0 .../udx-java/20-assert.yaml | 0 .../udx-java/20-wait-for-createdb.yaml | 0 .../udx-java/25-assert.yaml | 0 .../udx-java/25-rbac.yaml | 0 .../udx-java/30-upload-files.yaml | 0 .../udx-java/35-assert.yaml | 0 .../35-verify-java-scalar-transform.yaml | 0 .../udx-java/40-assert.yaml | 0 .../udx-java/40-verify-java-uda.yaml | 0 .../udx-java/45-assert.yaml | 0 .../udx-java/45-verify-java-udl.yaml | 0 .../udx-java/90-errors.yaml | 0 .../udx-java/90-uninstall-operator.yaml | 0 .../udx-java/95-delete-cr.yaml | 0 .../udx-java/95-errors.yaml | 0 .../udx-java/96-assert.yaml | 0 .../udx-java/96-cleanup-storage.yaml | 0 .../udx-java/96-errors.yaml | 0 .../udx-java/99-delete-ns.yaml | 0 .../udx-java/README.txt | 0 .../expected-outputs/JavaFunctionsOut.txt | 0 .../expected-outputs/JavaUDAnalyticsOut.txt | 0 .../expected-outputs/JavaUDLFunctionsOut.txt | 0 .../setup-vdb/base/kustomization.yaml | 0 .../udx-java/setup-vdb/base/setup-vdb.yaml | 0 .../vcluster-ks-0/00-create-creds.yaml | 18 ----- .../e2e-vcluster/vcluster-ks-0/10-assert.yaml | 20 ----- .../vcluster-ks-0/10-deploy-operator.yaml | 17 ----- .../e2e-vcluster/vcluster-ks-0/12-assert.yaml | 19 ----- .../vcluster-ks-0/12-clean-communal.yaml | 17 ----- .../e2e-vcluster/vcluster-ks-0/15-assert.yaml | 41 ----------- .../e2e-vcluster/vcluster-ks-0/15-setup.yaml | 17 ----- .../e2e-vcluster/vcluster-ks-0/17-assert.yaml | 73 ------------------- .../vcluster-ks-0/17-wait-for-createdb.yaml | 1 - .../e2e-vcluster/vcluster-ks-0/20-assert.yaml | 26 ------- .../vcluster-ks-0/20-scale-up-sc2-to-2.yaml | 25 ------- .../e2e-vcluster/vcluster-ks-0/25-assert.yaml | 36 --------- .../vcluster-ks-0/25-scale-down-sc2-to-1.yaml | 25 ------- .../e2e-vcluster/vcluster-ks-0/30-assert.yaml | 34 --------- .../vcluster-ks-0/30-remove-sc2.yaml | 22 ------ .../vcluster-ks-0/32-delete-crd.yaml | 18 ----- .../e2e-vcluster/vcluster-ks-0/32-errors.yaml | 20 ----- .../vcluster-ks-0/35-revive-setup-sts.yaml | 17 ----- .../e2e-vcluster/vcluster-ks-0/40-assert.yaml | 45 ------------ .../vcluster-ks-0/40-wait-for-revive.yaml | 1 - .../e2e-vcluster/vcluster-ks-0/90-errors.yaml | 18 ----- .../vcluster-ks-0/90-uninstall-operator.yaml | 17 ----- .../vcluster-ks-0/95-delete-cr.yaml | 18 ----- .../e2e-vcluster/vcluster-ks-0/95-errors.yaml | 24 ------ .../e2e-vcluster/vcluster-ks-0/96-assert.yaml | 19 ----- .../vcluster-ks-0/96-cleanup-storage.yaml | 17 ----- .../e2e-vcluster/vcluster-ks-0/96-errors.yaml | 15 ---- .../vcluster-ks-0/99-delete-ns.yaml | 17 ----- tests/e2e-vcluster/vcluster-ks-0/README.txt | 1 - .../setup-vdb/base/kustomization.yaml | 15 ---- .../setup-vdb/base/setup-vdb.yaml | 45 ------------ .../vdb-to-revive/base/kustomization.yaml | 15 ---- .../vdb-to-revive/base/setup-vdb.yaml | 40 ---------- .../base/kustomization.yaml | 15 ---- .../base/verify-vsql-ksafety.yaml | 59 --------------- .../vcluster-ks-1/00-create-creds.yaml | 18 ----- .../e2e-vcluster/vcluster-ks-1/10-assert.yaml | 20 ----- .../vcluster-ks-1/10-deploy-operator.yaml | 17 ----- .../e2e-vcluster/vcluster-ks-1/12-assert.yaml | 19 ----- .../vcluster-ks-1/12-clean-communal.yaml | 17 ----- .../e2e-vcluster/vcluster-ks-1/15-assert.yaml | 52 ------------- .../e2e-vcluster/vcluster-ks-1/15-setup.yaml | 17 ----- .../e2e-vcluster/vcluster-ks-1/25-assert.yaml | 22 ------ .../vcluster-ks-1/25-kill-one-pod.yaml | 18 ----- .../e2e-vcluster/vcluster-ks-1/30-assert.yaml | 32 -------- .../vcluster-ks-1/30-wait-for-restart.yaml | 1 - .../vcluster-ks-1/35-delete-crd.yaml | 18 ----- .../e2e-vcluster/vcluster-ks-1/35-errors.yaml | 20 ----- .../e2e-vcluster/vcluster-ks-1/40-assert.yaml | 27 ------- .../vcluster-ks-1/40-revive-setup-sts.yaml | 17 ----- .../e2e-vcluster/vcluster-ks-1/45-assert.yaml | 55 -------------- .../vcluster-ks-1/45-wait-for-revive.yaml | 1 - .../e2e-vcluster/vcluster-ks-1/90-errors.yaml | 18 ----- .../vcluster-ks-1/90-uninstall-operator.yaml | 17 ----- .../vcluster-ks-1/95-delete-cr.yaml | 18 ----- .../e2e-vcluster/vcluster-ks-1/95-errors.yaml | 24 ------ .../vcluster-ks-1/96-cleanup-storage.yaml | 17 ----- .../e2e-vcluster/vcluster-ks-1/96-errors.yaml | 15 ---- .../vcluster-ks-1/99-delete-ns.yaml | 17 ----- .../setup-vdb/base/kustomization.yaml | 15 ---- .../setup-vdb/base/setup-vdb.yaml | 40 ---------- .../vdb-to-revive/base/kustomization.yaml | 15 ---- .../vdb-to-revive/base/setup-vdb.yaml | 38 ---------- .../base/kustomization.yaml | 15 ---- .../base/verify-vsql-ksafety.yaml | 59 --------------- 104 files changed, 71 insertions(+), 1619 deletions(-) delete mode 100644 .github/workflows/e2e-vcluster.yml rename tests/e2e-vcluster/vcluster-ks-0/35-assert.yaml => docker-vertica-v2/packages/cleanup-initial.sh (64%) mode change 100644 => 100755 rename tests/{e2e-udx => e2e-udx-failed}/udx-java/05-create-creds.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/10-assert.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/10-deploy-operator.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/15-assert.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/15-setup-vdb.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/20-assert.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/20-wait-for-createdb.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/25-assert.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/25-rbac.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/30-upload-files.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/35-assert.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/35-verify-java-scalar-transform.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/40-assert.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/40-verify-java-uda.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/45-assert.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/45-verify-java-udl.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/90-errors.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/90-uninstall-operator.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/95-delete-cr.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/95-errors.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/96-assert.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/96-cleanup-storage.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/96-errors.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/99-delete-ns.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/README.txt (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/expected-outputs/JavaFunctionsOut.txt (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/expected-outputs/JavaUDAnalyticsOut.txt (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/expected-outputs/JavaUDLFunctionsOut.txt (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/setup-vdb/base/kustomization.yaml (100%) rename tests/{e2e-udx => e2e-udx-failed}/udx-java/setup-vdb/base/setup-vdb.yaml (100%) delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/00-create-creds.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/10-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/10-deploy-operator.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/12-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/12-clean-communal.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/15-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/15-setup.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/17-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/17-wait-for-createdb.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/20-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/20-scale-up-sc2-to-2.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/25-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/25-scale-down-sc2-to-1.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/30-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/30-remove-sc2.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/32-delete-crd.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/32-errors.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/35-revive-setup-sts.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/40-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/40-wait-for-revive.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/90-errors.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/90-uninstall-operator.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/95-delete-cr.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/95-errors.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/96-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/96-cleanup-storage.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/96-errors.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/99-delete-ns.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/README.txt delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/setup-vdb/base/kustomization.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/setup-vdb/base/setup-vdb.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/vdb-to-revive/base/kustomization.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/vdb-to-revive/base/setup-vdb.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/verify-vsql-ksafety/base/kustomization.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-0/verify-vsql-ksafety/base/verify-vsql-ksafety.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/00-create-creds.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/10-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/10-deploy-operator.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/12-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/12-clean-communal.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/15-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/15-setup.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/25-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/25-kill-one-pod.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/30-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/30-wait-for-restart.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/35-delete-crd.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/35-errors.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/40-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/40-revive-setup-sts.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/45-assert.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/45-wait-for-revive.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/90-errors.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/90-uninstall-operator.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/95-delete-cr.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/95-errors.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/96-cleanup-storage.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/96-errors.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/99-delete-ns.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/setup-vdb/base/kustomization.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/setup-vdb/base/setup-vdb.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/vdb-to-revive/base/kustomization.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/vdb-to-revive/base/setup-vdb.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/verify-vsql-ksafety/base/kustomization.yaml delete mode 100644 tests/e2e-vcluster/vcluster-ks-1/verify-vsql-ksafety/base/verify-vsql-ksafety.yaml diff --git a/.github/workflows/e2e-udx.yml b/.github/workflows/e2e-udx.yml index fbb4f7a35..466ff56b2 100644 --- a/.github/workflows/e2e-udx.yml +++ b/.github/workflows/e2e-udx.yml @@ -12,6 +12,9 @@ on: vertica-image: type: string required: false + vertica-deployment-method: + type: string + required: false secrets: DOCKERHUB_USERNAME: description: 'When working with images from docker.io, this is the username for login purposes' @@ -33,6 +36,14 @@ on: description: 'Name of the vertica server image' type: string required: false + vertica-deployment-method: + description: 'Vertica deployment method' + type: choice + required: false + default: admintools + options: + - admintools + - vclusterops jobs: @@ -59,6 +70,8 @@ jobs: export OPERATOR_IMG=${{ inputs.operator-image }} export VLOGGER_IMG=${{ inputs.vlogger-image }} export E2E_TEST_DIRS=tests/e2e-udx + export VERTICA_DEPLOYMENT_METHOD=${{ inputs.vertica-deployment-method }} + if [ "${VERTICA_DEPLOYMENT_METHOD}" != "vclusterops" ]; then E2E_TEST_DIRS+=" tests/e2e-udx-failed"; fi export JAVA_HOME=${JAVA_HOME_8_X64} # We need a java version that matches the one in the Vertica image java --version # Install system packages that some of the tests depend on. Any @@ -71,6 +84,6 @@ jobs: - uses: actions/upload-artifact@v3 if: failure() with: - name: logs-e2e-udx + name: logs-e2e-udx-${{ inputs.vertica-deployment-method }} path: ${{ github.workspace }}/int-tests-output/* diff --git a/.github/workflows/e2e-vcluster.yml b/.github/workflows/e2e-vcluster.yml deleted file mode 100644 index 85907f02c..000000000 --- a/.github/workflows/e2e-vcluster.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: e2e (vcluster) tests - -on: - workflow_call: - inputs: - vlogger-image: - type: string - required: false - operator-image: - type: string - required: false - vertica-image: - type: string - required: false - secrets: - DOCKERHUB_USERNAME: - description: 'When working with images from docker.io, this is the username for login purposes' - required: true - DOCKERHUB_TOKEN: - description: 'When working with images from docker.io, this is the password for login purposes' - required: true - workflow_dispatch: - inputs: - vlogger-image: - description: 'Name of the vertica logger image' - type: string - required: false - operator-image: - description: 'Name of the operator image' - type: string - required: false - vertica-image: - description: 'Name of the vertica server image' - type: string - required: false - -jobs: - - test: - - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v3 - - - name: Set up e2e environment - uses: ./.github/actions/setup-e2e - - - name: Login to Docker Hub - uses: docker/login-action@v2 - if: ${{ startsWith(inputs.vertica-image, 'docker.io') }} - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Run e2e tests - run: | - export VERTICA_IMG=${{ inputs.vertica-image }} - export OPERATOR_IMG=${{ inputs.operator-image }} - export VLOGGER_IMG=${{ inputs.vlogger-image }} - export E2E_TEST_DIRS="tests/e2e-vcluster" - scripts/run-k8s-int-tests.sh -s -e tests/external-images-s3-ci.txt - - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: logs-e2e-vcluster - path: ${{ github.workspace }}/int-tests-output/* diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index af8c303c3..8ec513da3 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -50,8 +50,8 @@ on: - vcluster s3 - vcluster azb - vcluster leg 2 + - vcluster udx - vcluster hostpath - - vcluster run_security_scan: description: 'What images to scan?' type: choice @@ -207,18 +207,6 @@ jobs: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - e2e-vcluster: - if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster' || inputs.e2e_test_suites == '')}} - needs: [build] - uses: ./.github/workflows/e2e-vcluster.yml - with: - vlogger-image: ${{ needs.build.outputs.vlogger-image }} - operator-image: ${{ needs.build.outputs.operator-image }} - vertica-image: ${{ needs.build.outputs.v2-vertica-image }} - secrets: - DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} - DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - e2e-http-server: if: ${{ inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'admintools http server' || inputs.e2e_test_suites == '' }} needs: [build] @@ -264,6 +252,21 @@ jobs: operator-image: ${{ needs.build.outputs.operator-image }} # We must pass the full image since the minimal image cannot run Java UDx's vertica-image: ${{ needs.build.outputs.full-vertica-image }} + vertica-deployment-method: admintools + secrets: + DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + + e2e-udx-vcluster: + if: ${{ ! github.event.pull_request.head.repo.fork && (inputs.e2e_test_suites == 'all' || inputs.e2e_test_suites == 'vcluster udx' || inputs.e2e_test_suites == '')}} + needs: [build] + uses: ./.github/workflows/e2e-udx.yml + with: + vlogger-image: ${{ needs.build.outputs.vlogger-image }} + operator-image: ${{ needs.build.outputs.operator-image }} + # We must pass the full image since the minimal image cannot run Java UDx's + vertica-image: ${{ needs.build.outputs.v2-vertica-image }} + vertica-deployment-method: vclusterops secrets: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/docker-vertica-v2/Dockerfile b/docker-vertica-v2/Dockerfile index 0dab8d91c..62c840a5a 100644 --- a/docker-vertica-v2/Dockerfile +++ b/docker-vertica-v2/Dockerfile @@ -100,6 +100,7 @@ ENV PATH "$PATH:/opt/vertica/bin:/opt/vertica/sbin" ENV DEBIAN_FRONTEND noninteractive COPY ./packages/init.d.functions /etc/rc.d/init.d/functions +COPY ./packages/cleanup-initial.sh /tmp/cleanup-initial.sh # For the init program (process 1), we use s6-overlay. This ensures none of the # processes we start ever become zombie's. It will also restart long running @@ -158,9 +159,7 @@ RUN set -x \ # Untar the init program that was downloaded earlier && tar -C / -Jxpf /tmp/s6-overlay-x86_64.tar.xz \ && tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz \ - # Create a symlink to the rsync for use with vbr. This works around a problem - # seen in some deployments where vbr cannot find rsync. - && ln -s /opt/vertica/bin/rsync /usr/bin/rsync + && sh /tmp/cleanup-initial.sh ENTRYPOINT [ "/init" ] @@ -172,8 +171,9 @@ USER dbadmin LABEL os-family="ubuntu" LABEL image-name="vertica_k8s" LABEL maintainer="K8s Team" -LABEL org.opencontainers.image.source=https://github.com/vertica/vertica-kubernetes/tree/main/docker-vertica \ +LABEL org.opencontainers.image.source=https://github.com/vertica/vertica-kubernetes/tree/main/docker-vertica-v2 \ org.opencontainers.image.title='Vertica Server' \ org.opencontainers.image.description='Runs the Vertica server that is optimized for use with the VerticaDB operator' \ org.opencontainers.image.url=https://github.com/vertica/vertica-kubernetes/ \ - org.opencontainers.image.documentation=https://www.vertica.com/docs/latest/HTML/Content/Authoring/Containers/ContainerizedVertica.htm + org.opencontainers.image.documentation=https://www.vertica.com/docs/latest/HTML/Content/Authoring/Containers/ContainerizedVertica.htm \ + vertica-deployment-method='vclusterops' diff --git a/tests/e2e-vcluster/vcluster-ks-0/35-assert.yaml b/docker-vertica-v2/packages/cleanup-initial.sh old mode 100644 new mode 100755 similarity index 64% rename from tests/e2e-vcluster/vcluster-ks-0/35-assert.yaml rename to docker-vertica-v2/packages/cleanup-initial.sh index 303830243..5709a80f9 --- a/tests/e2e-vcluster/vcluster-ks-0/35-assert.yaml +++ b/docker-vertica-v2/packages/cleanup-initial.sh @@ -1,3 +1,5 @@ +#!/bin/sh + # (c) Copyright [2021-2023] Open Text. # Licensed under the Apache License, Version 2.0 (the "License"); # You may not use this file except in compliance with the License. @@ -11,20 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: v-revive-1-node-sc1 -status: - replicas: 1 ---- -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-revive-1-node -status: - installCount: 1 - addedToDBCount: 1 - subclusterCount: 1 - +# Remove things not necessary for a non-interactive Kubernetes pod +# running Vertica +# removing ssh related files +rm -rf \ + /var/lib/dpkg/info/libssh-4* \ + /usr/share/doc/libssh-4* \ + /usr/lib/apt/methods/ssh \ + /etc/X11/Xsession.d/90x11-common_ssh-agent \ + /usr/share/lintian/overrides/libssh-4 \ No newline at end of file diff --git a/docker-vertica-v2/packages/cleanup.sh b/docker-vertica-v2/packages/cleanup.sh index ca4b8b80c..f9ed0c6dd 100644 --- a/docker-vertica-v2/packages/cleanup.sh +++ b/docker-vertica-v2/packages/cleanup.sh @@ -30,14 +30,11 @@ rm -r -f \ /opt/vertica/oss/python*/lib/python*/test \ /opt/vertica/oss/python*/lib/python*/unittest/test \ /opt/vertica/oss/python*/lib/python*/pip \ - /opt/vertica/oss/python*/lib/python*/site-packages/pip* \ /opt/vertica/oss/python*/bin/pip* \ /opt/vertica/oss/python*/lib/python*/config-[0-9]* \ /opt/vertica/oss/python*/lib/python*/tkinter \ - /opt/vertica/oss/python*/lib/python*/idlelib - -# cleanup all test directories for packages under site-package -find /opt/vertica/oss/python*/lib/python*/site-packages/ -type d -name "*[Tt]est" -exec rm -rf {} + + /opt/vertica/oss/python*/lib/python*/idlelib \ + /opt/vertica/oss/python*/lib/python*/site-packages # cleanup many of the __pycache__ directories find /opt/vertica/oss/ -type d -name "__pycache__" -exec rm -rf {} + @@ -67,8 +64,25 @@ rm -rf \ /home/dbadmin/.ssh \ /opt/vertica/sbin/ssh_config \ /opt/vertica/share/binlib/util/create-or-export-ssh-key \ - /opt/vertica/share/binlib/util/install-ssh-key + /opt/vertica/share/binlib/util/install-ssh-key +# removing admintools and supported libraries(vbr, agent, scrutinize) +rm -rf \ + /opt/vertica/bin/vbr* \ + /opt/vertica/share/vbr \ + /opt/vertica/bin/scrutinize \ + /opt/vertica/agent \ + /opt/vertica/config/logrotate/agent.logrotate \ + /opt/vertica/sbin/vertica_agent* \ + /opt/vertica/config/admintools* \ + /opt/vertica/bin/admintools \ + /opt/vertica/config/logrotate/admintool.logrotate \ + /home/dbadmin/logrotate/logrotate/admintool.logrotate \ + /opt/vertica/bin/adminTools \ + /opt/vertica/sbin/update_vertica \ + /opt/vertica/sbin/install_vertica \ + /opt/vertica/config/apikeys.dat + # (optional) minimal images remove packages that aren't auto installed as well as the sdk folder if [[ ${MINIMAL^^} = "YES" ]] then diff --git a/docker-vertica/Dockerfile b/docker-vertica/Dockerfile index c3d597d33..49acc17ea 100644 --- a/docker-vertica/Dockerfile +++ b/docker-vertica/Dockerfile @@ -213,4 +213,5 @@ LABEL org.opencontainers.image.source=https://github.com/vertica/vertica-kuberne org.opencontainers.image.title='Vertica Server' \ org.opencontainers.image.description='Runs the Vertica server that is optimized for use with the VerticaDB operator' \ org.opencontainers.image.url=https://github.com/vertica/vertica-kubernetes/ \ - org.opencontainers.image.documentation=https://www.vertica.com/docs/latest/HTML/Content/Authoring/Containers/ContainerizedVertica.htm + org.opencontainers.image.documentation=https://www.vertica.com/docs/latest/HTML/Content/Authoring/Containers/ContainerizedVertica.htm \ + vertica-deployment-method='admintools' diff --git a/kuttl-test.yaml b/kuttl-test.yaml index 40697b4b2..c234a2bb7 100644 --- a/kuttl-test.yaml +++ b/kuttl-test.yaml @@ -27,11 +27,11 @@ testDirs: - tests/e2e-leg-4 - tests/e2e-leg-4-failed - tests/e2e-udx + - tests/e2e-udx-failed - tests/e2e-server-upgrade - tests/e2e-operator-upgrade-overlays - tests/e2e-http-server - tests/e2e-enterprise - - tests/e2e-vcluster parallel: 2 timeout: 600 commands: diff --git a/scripts/setup-kustomize.sh b/scripts/setup-kustomize.sh index 4cb017faa..02c8f5d34 100755 --- a/scripts/setup-kustomize.sh +++ b/scripts/setup-kustomize.sh @@ -739,11 +739,11 @@ setup_creds_for_private_repo # Descend into each test and create the overlay kustomization. # The overlay is created in a directory like: overlay/ -for tdir in e2e-leg-*/*/*/base e2e-server-upgrade/*/*/base e2e-operator-upgrade-overlays/*/*/base e2e-udx/*/*/base e2e-http-server/*/*/base e2e-enterprise/*/*/base e2e-vcluster/*/*/base +for tdir in e2e-leg-*/*/*/base e2e-server-upgrade/*/*/base e2e-operator-upgrade-overlays/*/*/base e2e-udx*/*/*/base e2e-http-server/*/*/base e2e-enterprise/*/*/base do create_vdb_pod_kustomization $(dirname $tdir) $(basename $(realpath $tdir/../..)) done -for tdir in e2e-leg-*/* e2e-server-upgrade/* e2e-operator-upgrade-overlays/* e2e-udx/* e2e-http-server/* e2e-vcluster/* +for tdir in e2e-leg-*/* e2e-server-upgrade/* e2e-operator-upgrade-overlays/* e2e-udx*/* e2e-http-server/* do clean_communal_kustomization $tdir done diff --git a/tests/e2e-udx/udx-java/05-create-creds.yaml b/tests/e2e-udx-failed/udx-java/05-create-creds.yaml similarity index 100% rename from tests/e2e-udx/udx-java/05-create-creds.yaml rename to tests/e2e-udx-failed/udx-java/05-create-creds.yaml diff --git a/tests/e2e-udx/udx-java/10-assert.yaml b/tests/e2e-udx-failed/udx-java/10-assert.yaml similarity index 100% rename from tests/e2e-udx/udx-java/10-assert.yaml rename to tests/e2e-udx-failed/udx-java/10-assert.yaml diff --git a/tests/e2e-udx/udx-java/10-deploy-operator.yaml b/tests/e2e-udx-failed/udx-java/10-deploy-operator.yaml similarity index 100% rename from tests/e2e-udx/udx-java/10-deploy-operator.yaml rename to tests/e2e-udx-failed/udx-java/10-deploy-operator.yaml diff --git a/tests/e2e-udx/udx-java/15-assert.yaml b/tests/e2e-udx-failed/udx-java/15-assert.yaml similarity index 100% rename from tests/e2e-udx/udx-java/15-assert.yaml rename to tests/e2e-udx-failed/udx-java/15-assert.yaml diff --git a/tests/e2e-udx/udx-java/15-setup-vdb.yaml b/tests/e2e-udx-failed/udx-java/15-setup-vdb.yaml similarity index 100% rename from tests/e2e-udx/udx-java/15-setup-vdb.yaml rename to tests/e2e-udx-failed/udx-java/15-setup-vdb.yaml diff --git a/tests/e2e-udx/udx-java/20-assert.yaml b/tests/e2e-udx-failed/udx-java/20-assert.yaml similarity index 100% rename from tests/e2e-udx/udx-java/20-assert.yaml rename to tests/e2e-udx-failed/udx-java/20-assert.yaml diff --git a/tests/e2e-udx/udx-java/20-wait-for-createdb.yaml b/tests/e2e-udx-failed/udx-java/20-wait-for-createdb.yaml similarity index 100% rename from tests/e2e-udx/udx-java/20-wait-for-createdb.yaml rename to tests/e2e-udx-failed/udx-java/20-wait-for-createdb.yaml diff --git a/tests/e2e-udx/udx-java/25-assert.yaml b/tests/e2e-udx-failed/udx-java/25-assert.yaml similarity index 100% rename from tests/e2e-udx/udx-java/25-assert.yaml rename to tests/e2e-udx-failed/udx-java/25-assert.yaml diff --git a/tests/e2e-udx/udx-java/25-rbac.yaml b/tests/e2e-udx-failed/udx-java/25-rbac.yaml similarity index 100% rename from tests/e2e-udx/udx-java/25-rbac.yaml rename to tests/e2e-udx-failed/udx-java/25-rbac.yaml diff --git a/tests/e2e-udx/udx-java/30-upload-files.yaml b/tests/e2e-udx-failed/udx-java/30-upload-files.yaml similarity index 100% rename from tests/e2e-udx/udx-java/30-upload-files.yaml rename to tests/e2e-udx-failed/udx-java/30-upload-files.yaml diff --git a/tests/e2e-udx/udx-java/35-assert.yaml b/tests/e2e-udx-failed/udx-java/35-assert.yaml similarity index 100% rename from tests/e2e-udx/udx-java/35-assert.yaml rename to tests/e2e-udx-failed/udx-java/35-assert.yaml diff --git a/tests/e2e-udx/udx-java/35-verify-java-scalar-transform.yaml b/tests/e2e-udx-failed/udx-java/35-verify-java-scalar-transform.yaml similarity index 100% rename from tests/e2e-udx/udx-java/35-verify-java-scalar-transform.yaml rename to tests/e2e-udx-failed/udx-java/35-verify-java-scalar-transform.yaml diff --git a/tests/e2e-udx/udx-java/40-assert.yaml b/tests/e2e-udx-failed/udx-java/40-assert.yaml similarity index 100% rename from tests/e2e-udx/udx-java/40-assert.yaml rename to tests/e2e-udx-failed/udx-java/40-assert.yaml diff --git a/tests/e2e-udx/udx-java/40-verify-java-uda.yaml b/tests/e2e-udx-failed/udx-java/40-verify-java-uda.yaml similarity index 100% rename from tests/e2e-udx/udx-java/40-verify-java-uda.yaml rename to tests/e2e-udx-failed/udx-java/40-verify-java-uda.yaml diff --git a/tests/e2e-udx/udx-java/45-assert.yaml b/tests/e2e-udx-failed/udx-java/45-assert.yaml similarity index 100% rename from tests/e2e-udx/udx-java/45-assert.yaml rename to tests/e2e-udx-failed/udx-java/45-assert.yaml diff --git a/tests/e2e-udx/udx-java/45-verify-java-udl.yaml b/tests/e2e-udx-failed/udx-java/45-verify-java-udl.yaml similarity index 100% rename from tests/e2e-udx/udx-java/45-verify-java-udl.yaml rename to tests/e2e-udx-failed/udx-java/45-verify-java-udl.yaml diff --git a/tests/e2e-udx/udx-java/90-errors.yaml b/tests/e2e-udx-failed/udx-java/90-errors.yaml similarity index 100% rename from tests/e2e-udx/udx-java/90-errors.yaml rename to tests/e2e-udx-failed/udx-java/90-errors.yaml diff --git a/tests/e2e-udx/udx-java/90-uninstall-operator.yaml b/tests/e2e-udx-failed/udx-java/90-uninstall-operator.yaml similarity index 100% rename from tests/e2e-udx/udx-java/90-uninstall-operator.yaml rename to tests/e2e-udx-failed/udx-java/90-uninstall-operator.yaml diff --git a/tests/e2e-udx/udx-java/95-delete-cr.yaml b/tests/e2e-udx-failed/udx-java/95-delete-cr.yaml similarity index 100% rename from tests/e2e-udx/udx-java/95-delete-cr.yaml rename to tests/e2e-udx-failed/udx-java/95-delete-cr.yaml diff --git a/tests/e2e-udx/udx-java/95-errors.yaml b/tests/e2e-udx-failed/udx-java/95-errors.yaml similarity index 100% rename from tests/e2e-udx/udx-java/95-errors.yaml rename to tests/e2e-udx-failed/udx-java/95-errors.yaml diff --git a/tests/e2e-udx/udx-java/96-assert.yaml b/tests/e2e-udx-failed/udx-java/96-assert.yaml similarity index 100% rename from tests/e2e-udx/udx-java/96-assert.yaml rename to tests/e2e-udx-failed/udx-java/96-assert.yaml diff --git a/tests/e2e-udx/udx-java/96-cleanup-storage.yaml b/tests/e2e-udx-failed/udx-java/96-cleanup-storage.yaml similarity index 100% rename from tests/e2e-udx/udx-java/96-cleanup-storage.yaml rename to tests/e2e-udx-failed/udx-java/96-cleanup-storage.yaml diff --git a/tests/e2e-udx/udx-java/96-errors.yaml b/tests/e2e-udx-failed/udx-java/96-errors.yaml similarity index 100% rename from tests/e2e-udx/udx-java/96-errors.yaml rename to tests/e2e-udx-failed/udx-java/96-errors.yaml diff --git a/tests/e2e-udx/udx-java/99-delete-ns.yaml b/tests/e2e-udx-failed/udx-java/99-delete-ns.yaml similarity index 100% rename from tests/e2e-udx/udx-java/99-delete-ns.yaml rename to tests/e2e-udx-failed/udx-java/99-delete-ns.yaml diff --git a/tests/e2e-udx/udx-java/README.txt b/tests/e2e-udx-failed/udx-java/README.txt similarity index 100% rename from tests/e2e-udx/udx-java/README.txt rename to tests/e2e-udx-failed/udx-java/README.txt diff --git a/tests/e2e-udx/udx-java/expected-outputs/JavaFunctionsOut.txt b/tests/e2e-udx-failed/udx-java/expected-outputs/JavaFunctionsOut.txt similarity index 100% rename from tests/e2e-udx/udx-java/expected-outputs/JavaFunctionsOut.txt rename to tests/e2e-udx-failed/udx-java/expected-outputs/JavaFunctionsOut.txt diff --git a/tests/e2e-udx/udx-java/expected-outputs/JavaUDAnalyticsOut.txt b/tests/e2e-udx-failed/udx-java/expected-outputs/JavaUDAnalyticsOut.txt similarity index 100% rename from tests/e2e-udx/udx-java/expected-outputs/JavaUDAnalyticsOut.txt rename to tests/e2e-udx-failed/udx-java/expected-outputs/JavaUDAnalyticsOut.txt diff --git a/tests/e2e-udx/udx-java/expected-outputs/JavaUDLFunctionsOut.txt b/tests/e2e-udx-failed/udx-java/expected-outputs/JavaUDLFunctionsOut.txt similarity index 100% rename from tests/e2e-udx/udx-java/expected-outputs/JavaUDLFunctionsOut.txt rename to tests/e2e-udx-failed/udx-java/expected-outputs/JavaUDLFunctionsOut.txt diff --git a/tests/e2e-udx/udx-java/setup-vdb/base/kustomization.yaml b/tests/e2e-udx-failed/udx-java/setup-vdb/base/kustomization.yaml similarity index 100% rename from tests/e2e-udx/udx-java/setup-vdb/base/kustomization.yaml rename to tests/e2e-udx-failed/udx-java/setup-vdb/base/kustomization.yaml diff --git a/tests/e2e-udx/udx-java/setup-vdb/base/setup-vdb.yaml b/tests/e2e-udx-failed/udx-java/setup-vdb/base/setup-vdb.yaml similarity index 100% rename from tests/e2e-udx/udx-java/setup-vdb/base/setup-vdb.yaml rename to tests/e2e-udx-failed/udx-java/setup-vdb/base/setup-vdb.yaml diff --git a/tests/e2e-vcluster/vcluster-ks-0/00-create-creds.yaml b/tests/e2e-vcluster/vcluster-ks-0/00-create-creds.yaml deleted file mode 100644 index 173d35735..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/00-create-creds.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: kustomize build ../../manifests/communal-creds/overlay | kubectl apply -f - --namespace $NAMESPACE - - script: kustomize build ../../manifests/priv-container-creds/overlay | kubectl apply -f - --namespace $NAMESPACE diff --git a/tests/e2e-vcluster/vcluster-ks-0/10-assert.yaml b/tests/e2e-vcluster/vcluster-ks-0/10-assert.yaml deleted file mode 100644 index fc7e6f83d..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/10-assert.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Pod -metadata: - labels: - control-plane: controller-manager -status: - phase: Running diff --git a/tests/e2e-vcluster/vcluster-ks-0/10-deploy-operator.yaml b/tests/e2e-vcluster/vcluster-ks-0/10-deploy-operator.yaml deleted file mode 100644 index 2e66b8408..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/10-deploy-operator.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: sh -c "cd ../../.. && make deploy-operator NAMESPACE=$NAMESPACE" diff --git a/tests/e2e-vcluster/vcluster-ks-0/12-assert.yaml b/tests/e2e-vcluster/vcluster-ks-0/12-assert.yaml deleted file mode 100644 index 40cac6bef..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/12-assert.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Pod -metadata: - name: clean-communal -status: - phase: Succeeded diff --git a/tests/e2e-vcluster/vcluster-ks-0/12-clean-communal.yaml b/tests/e2e-vcluster/vcluster-ks-0/12-clean-communal.yaml deleted file mode 100644 index 07b773b86..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/12-clean-communal.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: bash -c "kustomize build clean-communal/overlay | kubectl -n $NAMESPACE apply -f - " diff --git a/tests/e2e-vcluster/vcluster-ks-0/15-assert.yaml b/tests/e2e-vcluster/vcluster-ks-0/15-assert.yaml deleted file mode 100644 index 6cbc36f5a..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/15-assert.yaml +++ /dev/null @@ -1,41 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# We only wait for the start of the scale down as we -# want to inject another scale down in the middle. In -# the past, this use to expose a timing window that -# corrupted the admintools.conf. - -apiVersion: v1 -kind: Pod -metadata: - name: v-vcluster-ks-0-sc1-0 -status: - phase: Running ---- -apiVersion: v1 -kind: Pod -metadata: - name: v-vcluster-ks-0-sc2-0 -status: - phase: Running ---- -apiVersion: v1 -kind: Event -reason: CreateDBStart -source: - component: verticadb-operator -involvedObject: - apiVersion: vertica.com/v1beta1 - kind: VerticaDB - name: v-vcluster-ks-0 diff --git a/tests/e2e-vcluster/vcluster-ks-0/15-setup.yaml b/tests/e2e-vcluster/vcluster-ks-0/15-setup.yaml deleted file mode 100644 index cdfe70df2..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/15-setup.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: bash -c "kustomize build setup-vdb/overlay | kubectl -n $NAMESPACE apply -f - " diff --git a/tests/e2e-vcluster/vcluster-ks-0/17-assert.yaml b/tests/e2e-vcluster/vcluster-ks-0/17-assert.yaml deleted file mode 100644 index 0d4fed309..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/17-assert.yaml +++ /dev/null @@ -1,73 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: v-vcluster-ks-0-sc1 - labels: - vertica.com/database: MYDB - vertica.com/subcluster-name: sc1 - vertica.com/subcluster-type: primary - vertica.com/subcluster-svc: sc1 - vertica.com/subcluster-transient: "false" -status: - replicas: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: v-vcluster-ks-0-sc2 - labels: - vertica.com/database: MYDB - vertica.com/subcluster-name: sc2 - vertica.com/subcluster-type: secondary - vertica.com/subcluster-svc: sc2 - vertica.com/subcluster-transient: "false" -status: - replicas: 1 ---- -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-vcluster-ks-0 -status: - subclusterCount: 2 - addedToDBCount: 2 - installCount: 2 - subclusters: - - addedToDBCount: 1 - name: sc1 - - addedToDBCount: 1 - name: sc2 ---- -apiVersion: v1 -kind: Event -reason: CreateDBSucceeded -source: - component: verticadb-operator -involvedObject: - apiVersion: vertica.com/v1beta1 - kind: VerticaDB - name: v-vcluster-ks-0 ---- -apiVersion: v1 -kind: Event -reason: SubclusterAdded -message: Added new subcluster 'sc2' -source: - component: verticadb-operator -involvedObject: - apiVersion: vertica.com/v1beta1 - kind: VerticaDB - name: v-vcluster-ks-0 diff --git a/tests/e2e-vcluster/vcluster-ks-0/17-wait-for-createdb.yaml b/tests/e2e-vcluster/vcluster-ks-0/17-wait-for-createdb.yaml deleted file mode 100644 index bf3726035..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/17-wait-for-createdb.yaml +++ /dev/null @@ -1 +0,0 @@ -# Intentionally empty to give this step a name in kuttl \ No newline at end of file diff --git a/tests/e2e-vcluster/vcluster-ks-0/20-assert.yaml b/tests/e2e-vcluster/vcluster-ks-0/20-assert.yaml deleted file mode 100644 index ed21b9e71..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/20-assert.yaml +++ /dev/null @@ -1,26 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-vcluster-ks-0 -status: - subclusterCount: 2 - addedToDBCount: 3 - installCount: 3 - subclusters: - - addedToDBCount: 1 - name: sc1 - - addedToDBCount: 2 - name: sc2 diff --git a/tests/e2e-vcluster/vcluster-ks-0/20-scale-up-sc2-to-2.yaml b/tests/e2e-vcluster/vcluster-ks-0/20-scale-up-sc2-to-2.yaml deleted file mode 100644 index fd8a57b1c..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/20-scale-up-sc2-to-2.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-vcluster-ks-0 -spec: - subclusters: - - size: 1 - name: sc1 - isPrimary: true - - size: 2 - name: sc2 - isPrimary: false \ No newline at end of file diff --git a/tests/e2e-vcluster/vcluster-ks-0/25-assert.yaml b/tests/e2e-vcluster/vcluster-ks-0/25-assert.yaml deleted file mode 100644 index 771867d87..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/25-assert.yaml +++ /dev/null @@ -1,36 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-vcluster-ks-0 -status: - subclusterCount: 2 - addedToDBCount: 2 - installCount: 2 - subclusters: - - addedToDBCount: 1 - name: sc1 - - addedToDBCount: 1 - name: sc2 ---- -apiVersion: v1 -kind: Event -reason: RemoveNodesSucceeded -source: - component: verticadb-operator -involvedObject: - apiVersion: vertica.com/v1beta1 - kind: VerticaDB - name: v-vcluster-ks-0 \ No newline at end of file diff --git a/tests/e2e-vcluster/vcluster-ks-0/25-scale-down-sc2-to-1.yaml b/tests/e2e-vcluster/vcluster-ks-0/25-scale-down-sc2-to-1.yaml deleted file mode 100644 index 4df785b40..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/25-scale-down-sc2-to-1.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-vcluster-ks-0 -spec: - subclusters: - - size: 1 - name: sc1 - isPrimary: true - - size: 1 - name: sc2 - isPrimary: false \ No newline at end of file diff --git a/tests/e2e-vcluster/vcluster-ks-0/30-assert.yaml b/tests/e2e-vcluster/vcluster-ks-0/30-assert.yaml deleted file mode 100644 index 417f3a210..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/30-assert.yaml +++ /dev/null @@ -1,34 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-vcluster-ks-0 -status: - subclusterCount: 1 - addedToDBCount: 1 - installCount: 1 - subclusters: - - addedToDBCount: 1 - name: sc1 ---- -apiVersion: v1 -kind: Event -reason: SubclusterRemoved -source: - component: verticadb-operator -involvedObject: - apiVersion: vertica.com/v1beta1 - kind: VerticaDB - name: v-vcluster-ks-0 \ No newline at end of file diff --git a/tests/e2e-vcluster/vcluster-ks-0/30-remove-sc2.yaml b/tests/e2e-vcluster/vcluster-ks-0/30-remove-sc2.yaml deleted file mode 100644 index 5a2aca24e..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/30-remove-sc2.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-vcluster-ks-0 -spec: - subclusters: - - size: 1 - name: sc1 - isPrimary: true diff --git a/tests/e2e-vcluster/vcluster-ks-0/32-delete-crd.yaml b/tests/e2e-vcluster/vcluster-ks-0/32-delete-crd.yaml deleted file mode 100644 index b6b1f4a47..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/32-delete-crd.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: - - apiVersion: vertica.com/v1beta1 - kind: VerticaDB diff --git a/tests/e2e-vcluster/vcluster-ks-0/32-errors.yaml b/tests/e2e-vcluster/vcluster-ks-0/32-errors.yaml deleted file mode 100644 index 475e9853f..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/32-errors.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: v-vcluster-ks-1-main ---- -apiVersion: vertica.com/v1beta1 -kind: VerticaDB diff --git a/tests/e2e-vcluster/vcluster-ks-0/35-revive-setup-sts.yaml b/tests/e2e-vcluster/vcluster-ks-0/35-revive-setup-sts.yaml deleted file mode 100644 index eff96a0ff..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/35-revive-setup-sts.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: bash -c "kustomize build vdb-to-revive/overlay | kubectl -n $NAMESPACE apply -f - " diff --git a/tests/e2e-vcluster/vcluster-ks-0/40-assert.yaml b/tests/e2e-vcluster/vcluster-ks-0/40-assert.yaml deleted file mode 100644 index dff12e4d7..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/40-assert.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: v-revive-1-node-sc1 -status: - replicas: 1 ---- -apiVersion: v1 -kind: Event -reason: ReviveDBSucceeded -source: - component: verticadb-operator -involvedObject: - apiVersion: vertica.com/v1beta1 - kind: VerticaDB - name: v-revive-1-node ---- -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-revive-1-node -spec: - local: - dataPath: /my-data - depotPath: /my-depot - requestSize: 100Mi -status: - subclusters: - - addedToDBCount: 1 - name: sc1 - upNodeCount: 1 diff --git a/tests/e2e-vcluster/vcluster-ks-0/40-wait-for-revive.yaml b/tests/e2e-vcluster/vcluster-ks-0/40-wait-for-revive.yaml deleted file mode 100644 index 8bcd1e149..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/40-wait-for-revive.yaml +++ /dev/null @@ -1 +0,0 @@ -# Intentionally empty to give this step a name in kuttl diff --git a/tests/e2e-vcluster/vcluster-ks-0/90-errors.yaml b/tests/e2e-vcluster/vcluster-ks-0/90-errors.yaml deleted file mode 100644 index 400e3948d..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/90-errors.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Pod -metadata: - labels: - control-plane: controller-manager diff --git a/tests/e2e-vcluster/vcluster-ks-0/90-uninstall-operator.yaml b/tests/e2e-vcluster/vcluster-ks-0/90-uninstall-operator.yaml deleted file mode 100644 index 91e808558..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/90-uninstall-operator.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: sh -c "cd ../../.. && make undeploy-operator NAMESPACE=$NAMESPACE" diff --git a/tests/e2e-vcluster/vcluster-ks-0/95-delete-cr.yaml b/tests/e2e-vcluster/vcluster-ks-0/95-delete-cr.yaml deleted file mode 100644 index b6b1f4a47..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/95-delete-cr.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: - - apiVersion: vertica.com/v1beta1 - kind: VerticaDB diff --git a/tests/e2e-vcluster/vcluster-ks-0/95-errors.yaml b/tests/e2e-vcluster/vcluster-ks-0/95-errors.yaml deleted file mode 100644 index 750457af4..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/95-errors.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: apps/v1 -kind: StatefulSet ---- -apiVersion: v1 -kind: Service -metadata: - labels: - app.kubernetes.io/managed-by: verticadb-operator ---- -apiVersion: vertica.com/v1beta1 -kind: VerticaDB diff --git a/tests/e2e-vcluster/vcluster-ks-0/96-assert.yaml b/tests/e2e-vcluster/vcluster-ks-0/96-assert.yaml deleted file mode 100644 index 40cac6bef..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/96-assert.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Pod -metadata: - name: clean-communal -status: - phase: Succeeded diff --git a/tests/e2e-vcluster/vcluster-ks-0/96-cleanup-storage.yaml b/tests/e2e-vcluster/vcluster-ks-0/96-cleanup-storage.yaml deleted file mode 100644 index 07b773b86..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/96-cleanup-storage.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: bash -c "kustomize build clean-communal/overlay | kubectl -n $NAMESPACE apply -f - " diff --git a/tests/e2e-vcluster/vcluster-ks-0/96-errors.yaml b/tests/e2e-vcluster/vcluster-ks-0/96-errors.yaml deleted file mode 100644 index d67f7a88b..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/96-errors.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: PersistentVolumeClaim diff --git a/tests/e2e-vcluster/vcluster-ks-0/99-delete-ns.yaml b/tests/e2e-vcluster/vcluster-ks-0/99-delete-ns.yaml deleted file mode 100644 index 0f56f87b2..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/99-delete-ns.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: kubectl delete ns $NAMESPACE diff --git a/tests/e2e-vcluster/vcluster-ks-0/README.txt b/tests/e2e-vcluster/vcluster-ks-0/README.txt deleted file mode 100644 index e9b458857..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/README.txt +++ /dev/null @@ -1 +0,0 @@ -This will create a database so that its k-safety is 0, then do scaling up to 3 nodes. diff --git a/tests/e2e-vcluster/vcluster-ks-0/setup-vdb/base/kustomization.yaml b/tests/e2e-vcluster/vcluster-ks-0/setup-vdb/base/kustomization.yaml deleted file mode 100644 index e8798aa5e..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/setup-vdb/base/kustomization.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -resources: - - setup-vdb.yaml diff --git a/tests/e2e-vcluster/vcluster-ks-0/setup-vdb/base/setup-vdb.yaml b/tests/e2e-vcluster/vcluster-ks-0/setup-vdb/base/setup-vdb.yaml deleted file mode 100644 index 2bc9ac6b6..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/setup-vdb/base/setup-vdb.yaml +++ /dev/null @@ -1,45 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-vcluster-ks-0 - annotations: - vertica.com/vcluster-ops: "true" -spec: - initPolicy: CreateSkipPackageInstall - image: kustomize-vertica-image - sidecars: - - name: vlogger - image: kustomize-vlogger-image - dbName: MYDB - communal: - includeUIDInPath: false - local: - dataPath: /my-data - depotPath: /my-depot - requestSize: 100Mi - subclusters: - - name: sc1 - size: 1 - isPrimary: true - - name: sc2 - size: 1 - isPrimary: false - kSafety: "0" - certSecrets: [] - imagePullSecrets: [] - volumes: [] - volumeMounts: [] - httpServerMode: Enabled diff --git a/tests/e2e-vcluster/vcluster-ks-0/vdb-to-revive/base/kustomization.yaml b/tests/e2e-vcluster/vcluster-ks-0/vdb-to-revive/base/kustomization.yaml deleted file mode 100644 index e8798aa5e..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/vdb-to-revive/base/kustomization.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -resources: - - setup-vdb.yaml diff --git a/tests/e2e-vcluster/vcluster-ks-0/vdb-to-revive/base/setup-vdb.yaml b/tests/e2e-vcluster/vcluster-ks-0/vdb-to-revive/base/setup-vdb.yaml deleted file mode 100644 index bf3aa9ebb..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/vdb-to-revive/base/setup-vdb.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-revive-1-node - annotations: - vertica.com/vcluster-ops: "true" -spec: - image: kustomize-vertica-image - ignoreClusterLease: true - communal: - includeUIDInPath: false - local: - dataPath: /my-data - depotPath: /my-depot - requestSize: 100Mi - initPolicy: Revive - dbName: MYDB - subclusters: - - name: sc1 - size: 1 - isPrimary: true - kSafety: "0" - requeueTime: 5 - certSecrets: [] - imagePullSecrets: [] - volumes: [] - volumeMounts: [] diff --git a/tests/e2e-vcluster/vcluster-ks-0/verify-vsql-ksafety/base/kustomization.yaml b/tests/e2e-vcluster/vcluster-ks-0/verify-vsql-ksafety/base/kustomization.yaml deleted file mode 100644 index bf91e5e19..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/verify-vsql-ksafety/base/kustomization.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -resources: - - verify-vsql-ksafety.yaml diff --git a/tests/e2e-vcluster/vcluster-ks-0/verify-vsql-ksafety/base/verify-vsql-ksafety.yaml b/tests/e2e-vcluster/vcluster-ks-0/verify-vsql-ksafety/base/verify-vsql-ksafety.yaml deleted file mode 100644 index 442a885f8..000000000 --- a/tests/e2e-vcluster/vcluster-ks-0/verify-vsql-ksafety/base/verify-vsql-ksafety.yaml +++ /dev/null @@ -1,59 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Verifies access to the external service through port 5433. It does this -# by connecting using vsql - ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: script-verify-ksafety-test -data: - test.sh: |- - #!/bin/bash - set -o errexit - set -o xtrace - - CLUSTER_IP=v-vcluster-ks-0-sc1 - KSAFE=$(vsql -h $CLUSTER_IP -tAc "select get_design_ksafe()") - - if [[ $KSAFE == "0" ]]; then - exit 0 - else - exit 5 # incorrect value of ksafe - fi - ---- -apiVersion: v1 -kind: Pod -metadata: - name: test-verify-ksafety - labels: - stern: include -spec: - restartPolicy: Never - containers: - - name: test - image: kustomize-vertica-image - command: ["/home/dbadmin/test.sh"] - volumeMounts: - - name: test-script - mountPath: /home/dbadmin/test.sh - readOnly: true - subPath: test.sh - volumes: - - name: test-script - configMap: - defaultMode: 0777 - name: script-verify-ksafety-test diff --git a/tests/e2e-vcluster/vcluster-ks-1/00-create-creds.yaml b/tests/e2e-vcluster/vcluster-ks-1/00-create-creds.yaml deleted file mode 100644 index 173d35735..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/00-create-creds.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: kustomize build ../../manifests/communal-creds/overlay | kubectl apply -f - --namespace $NAMESPACE - - script: kustomize build ../../manifests/priv-container-creds/overlay | kubectl apply -f - --namespace $NAMESPACE diff --git a/tests/e2e-vcluster/vcluster-ks-1/10-assert.yaml b/tests/e2e-vcluster/vcluster-ks-1/10-assert.yaml deleted file mode 100644 index fc7e6f83d..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/10-assert.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Pod -metadata: - labels: - control-plane: controller-manager -status: - phase: Running diff --git a/tests/e2e-vcluster/vcluster-ks-1/10-deploy-operator.yaml b/tests/e2e-vcluster/vcluster-ks-1/10-deploy-operator.yaml deleted file mode 100644 index 2e66b8408..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/10-deploy-operator.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: sh -c "cd ../../.. && make deploy-operator NAMESPACE=$NAMESPACE" diff --git a/tests/e2e-vcluster/vcluster-ks-1/12-assert.yaml b/tests/e2e-vcluster/vcluster-ks-1/12-assert.yaml deleted file mode 100644 index 40cac6bef..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/12-assert.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Pod -metadata: - name: clean-communal -status: - phase: Succeeded diff --git a/tests/e2e-vcluster/vcluster-ks-1/12-clean-communal.yaml b/tests/e2e-vcluster/vcluster-ks-1/12-clean-communal.yaml deleted file mode 100644 index 07b773b86..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/12-clean-communal.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: bash -c "kustomize build clean-communal/overlay | kubectl -n $NAMESPACE apply -f - " diff --git a/tests/e2e-vcluster/vcluster-ks-1/15-assert.yaml b/tests/e2e-vcluster/vcluster-ks-1/15-assert.yaml deleted file mode 100644 index 2be62012c..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/15-assert.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Pod -metadata: - name: v-vcluster-ks-1-main-0 -status: - phase: Running ---- -apiVersion: v1 -kind: Pod -metadata: - name: v-vcluster-ks-1-main-1 -status: - phase: Running ---- -apiVersion: v1 -kind: Pod -metadata: - name: v-vcluster-ks-1-main-2 -status: - phase: Running ---- -apiVersion: v1 -kind: Event -reason: CreateDBStart -source: - component: verticadb-operator -involvedObject: - apiVersion: vertica.com/v1beta1 - kind: VerticaDB - name: v-vcluster-ks-1 ---- -kind: VerticaDB -apiVersion: vertica.com/v1beta1 -metadata: - name: v-vcluster-ks-1 -status: - subclusterCount: 1 - addedToDBCount: 3 - installCount: 3 diff --git a/tests/e2e-vcluster/vcluster-ks-1/15-setup.yaml b/tests/e2e-vcluster/vcluster-ks-1/15-setup.yaml deleted file mode 100644 index cdfe70df2..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/15-setup.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: bash -c "kustomize build setup-vdb/overlay | kubectl -n $NAMESPACE apply -f - " diff --git a/tests/e2e-vcluster/vcluster-ks-1/25-assert.yaml b/tests/e2e-vcluster/vcluster-ks-1/25-assert.yaml deleted file mode 100644 index 1748f6ad6..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/25-assert.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-vcluster-ks-1 -status: - subclusters: - - addedToDBCount: 3 - installCount: 3 - upNodeCount: 2 diff --git a/tests/e2e-vcluster/vcluster-ks-1/25-kill-one-pod.yaml b/tests/e2e-vcluster/vcluster-ks-1/25-kill-one-pod.yaml deleted file mode 100644 index 405d8501b..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/25-kill-one-pod.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: kubectl delete pod v-vcluster-ks-1-main-2 - namespaced: true diff --git a/tests/e2e-vcluster/vcluster-ks-1/30-assert.yaml b/tests/e2e-vcluster/vcluster-ks-1/30-assert.yaml deleted file mode 100644 index 76d641d72..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/30-assert.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-vcluster-ks-1 -status: - subclusters: - - addedToDBCount: 3 - installCount: 3 - upNodeCount: 3 ---- -apiVersion: v1 -kind: Event -reason: NodeRestartSucceeded -source: - component: verticadb-operator -involvedObject: - apiVersion: vertica.com/v1beta1 - kind: VerticaDB - name: v-vcluster-ks-1 diff --git a/tests/e2e-vcluster/vcluster-ks-1/30-wait-for-restart.yaml b/tests/e2e-vcluster/vcluster-ks-1/30-wait-for-restart.yaml deleted file mode 100644 index bf3726035..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/30-wait-for-restart.yaml +++ /dev/null @@ -1 +0,0 @@ -# Intentionally empty to give this step a name in kuttl \ No newline at end of file diff --git a/tests/e2e-vcluster/vcluster-ks-1/35-delete-crd.yaml b/tests/e2e-vcluster/vcluster-ks-1/35-delete-crd.yaml deleted file mode 100644 index b6b1f4a47..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/35-delete-crd.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: - - apiVersion: vertica.com/v1beta1 - kind: VerticaDB diff --git a/tests/e2e-vcluster/vcluster-ks-1/35-errors.yaml b/tests/e2e-vcluster/vcluster-ks-1/35-errors.yaml deleted file mode 100644 index 475e9853f..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/35-errors.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: v-vcluster-ks-1-main ---- -apiVersion: vertica.com/v1beta1 -kind: VerticaDB diff --git a/tests/e2e-vcluster/vcluster-ks-1/40-assert.yaml b/tests/e2e-vcluster/vcluster-ks-1/40-assert.yaml deleted file mode 100644 index 2c3f572b6..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/40-assert.yaml +++ /dev/null @@ -1,27 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: v-revive-3-node-main -status: - replicas: 3 ---- -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-revive-3-node -status: - subclusters: - - installCount: 3 diff --git a/tests/e2e-vcluster/vcluster-ks-1/40-revive-setup-sts.yaml b/tests/e2e-vcluster/vcluster-ks-1/40-revive-setup-sts.yaml deleted file mode 100644 index eff96a0ff..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/40-revive-setup-sts.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: bash -c "kustomize build vdb-to-revive/overlay | kubectl -n $NAMESPACE apply -f - " diff --git a/tests/e2e-vcluster/vcluster-ks-1/45-assert.yaml b/tests/e2e-vcluster/vcluster-ks-1/45-assert.yaml deleted file mode 100644 index bfdad99d4..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/45-assert.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: v-revive-3-node-main -status: - replicas: 3 - readyReplicas: 3 ---- -apiVersion: v1 -kind: Event -reason: ReviveDBSucceeded -source: - component: verticadb-operator -involvedObject: - apiVersion: vertica.com/v1beta1 - kind: VerticaDB - name: v-revive-3-node ---- -apiVersion: v1 -kind: Event -reason: ClusterRestartSucceeded -source: - component: verticadb-operator -involvedObject: - apiVersion: vertica.com/v1beta1 - kind: VerticaDB - name: v-revive-3-node ---- -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-revive-3-node -spec: - local: - dataPath: /my-data - depotPath: /my-depot - requestSize: 100Mi -status: - subclusters: - - addedToDBCount: 3 - installCount: 3 - upNodeCount: 3 \ No newline at end of file diff --git a/tests/e2e-vcluster/vcluster-ks-1/45-wait-for-revive.yaml b/tests/e2e-vcluster/vcluster-ks-1/45-wait-for-revive.yaml deleted file mode 100644 index 8bcd1e149..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/45-wait-for-revive.yaml +++ /dev/null @@ -1 +0,0 @@ -# Intentionally empty to give this step a name in kuttl diff --git a/tests/e2e-vcluster/vcluster-ks-1/90-errors.yaml b/tests/e2e-vcluster/vcluster-ks-1/90-errors.yaml deleted file mode 100644 index 400e3948d..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/90-errors.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: Pod -metadata: - labels: - control-plane: controller-manager diff --git a/tests/e2e-vcluster/vcluster-ks-1/90-uninstall-operator.yaml b/tests/e2e-vcluster/vcluster-ks-1/90-uninstall-operator.yaml deleted file mode 100644 index 91e808558..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/90-uninstall-operator.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: sh -c "cd ../../.. && make undeploy-operator NAMESPACE=$NAMESPACE" diff --git a/tests/e2e-vcluster/vcluster-ks-1/95-delete-cr.yaml b/tests/e2e-vcluster/vcluster-ks-1/95-delete-cr.yaml deleted file mode 100644 index b6b1f4a47..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/95-delete-cr.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -delete: - - apiVersion: vertica.com/v1beta1 - kind: VerticaDB diff --git a/tests/e2e-vcluster/vcluster-ks-1/95-errors.yaml b/tests/e2e-vcluster/vcluster-ks-1/95-errors.yaml deleted file mode 100644 index 750457af4..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/95-errors.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: apps/v1 -kind: StatefulSet ---- -apiVersion: v1 -kind: Service -metadata: - labels: - app.kubernetes.io/managed-by: verticadb-operator ---- -apiVersion: vertica.com/v1beta1 -kind: VerticaDB diff --git a/tests/e2e-vcluster/vcluster-ks-1/96-cleanup-storage.yaml b/tests/e2e-vcluster/vcluster-ks-1/96-cleanup-storage.yaml deleted file mode 100644 index 07b773b86..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/96-cleanup-storage.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: bash -c "kustomize build clean-communal/overlay | kubectl -n $NAMESPACE apply -f - " diff --git a/tests/e2e-vcluster/vcluster-ks-1/96-errors.yaml b/tests/e2e-vcluster/vcluster-ks-1/96-errors.yaml deleted file mode 100644 index d67f7a88b..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/96-errors.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: v1 -kind: PersistentVolumeClaim diff --git a/tests/e2e-vcluster/vcluster-ks-1/99-delete-ns.yaml b/tests/e2e-vcluster/vcluster-ks-1/99-delete-ns.yaml deleted file mode 100644 index 0f56f87b2..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/99-delete-ns.yaml +++ /dev/null @@ -1,17 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - command: kubectl delete ns $NAMESPACE diff --git a/tests/e2e-vcluster/vcluster-ks-1/setup-vdb/base/kustomization.yaml b/tests/e2e-vcluster/vcluster-ks-1/setup-vdb/base/kustomization.yaml deleted file mode 100644 index e8798aa5e..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/setup-vdb/base/kustomization.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -resources: - - setup-vdb.yaml diff --git a/tests/e2e-vcluster/vcluster-ks-1/setup-vdb/base/setup-vdb.yaml b/tests/e2e-vcluster/vcluster-ks-1/setup-vdb/base/setup-vdb.yaml deleted file mode 100644 index c0c32e6b9..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/setup-vdb/base/setup-vdb.yaml +++ /dev/null @@ -1,40 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-vcluster-ks-1 - annotations: - vertica.com/vcluster-ops: "true" -spec: - initPolicy: CreateSkipPackageInstall - image: kustomize-vertica-image - sidecars: - - name: vlogger - image: kustomize-vlogger-image - communal: - includeUIDInPath: false - local: - dataPath: /my-data - depotPath: /my-depot - requestSize: 100Mi - subclusters: - - name: main - size: 3 - kSafety: "1" - certSecrets: [] - imagePullSecrets: [] - volumes: [] - volumeMounts: [] - httpServerMode: Enabled diff --git a/tests/e2e-vcluster/vcluster-ks-1/vdb-to-revive/base/kustomization.yaml b/tests/e2e-vcluster/vcluster-ks-1/vdb-to-revive/base/kustomization.yaml deleted file mode 100644 index 2bb71286d..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/vdb-to-revive/base/kustomization.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -resources: - - setup-vdb.yaml \ No newline at end of file diff --git a/tests/e2e-vcluster/vcluster-ks-1/vdb-to-revive/base/setup-vdb.yaml b/tests/e2e-vcluster/vcluster-ks-1/vdb-to-revive/base/setup-vdb.yaml deleted file mode 100644 index 873f1254c..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/vdb-to-revive/base/setup-vdb.yaml +++ /dev/null @@ -1,38 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -apiVersion: vertica.com/v1beta1 -kind: VerticaDB -metadata: - name: v-revive-3-node - annotations: - vertica.com/vcluster-ops: "true" -spec: - image: kustomize-vertica-image - ignoreClusterLease: true - communal: - includeUIDInPath: false - initPolicy: Revive - local: - dataPath: /my-data - depotPath: /my-depot - requestSize: 100Mi - dbName: vertdb - requeueTime: 5 - subclusters: - - name: main - size: 3 - certSecrets: [] - imagePullSecrets: [] - volumes: [] - volumeMounts: [] diff --git a/tests/e2e-vcluster/vcluster-ks-1/verify-vsql-ksafety/base/kustomization.yaml b/tests/e2e-vcluster/vcluster-ks-1/verify-vsql-ksafety/base/kustomization.yaml deleted file mode 100644 index bf91e5e19..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/verify-vsql-ksafety/base/kustomization.yaml +++ /dev/null @@ -1,15 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -resources: - - verify-vsql-ksafety.yaml diff --git a/tests/e2e-vcluster/vcluster-ks-1/verify-vsql-ksafety/base/verify-vsql-ksafety.yaml b/tests/e2e-vcluster/vcluster-ks-1/verify-vsql-ksafety/base/verify-vsql-ksafety.yaml deleted file mode 100644 index a3f9fea92..000000000 --- a/tests/e2e-vcluster/vcluster-ks-1/verify-vsql-ksafety/base/verify-vsql-ksafety.yaml +++ /dev/null @@ -1,59 +0,0 @@ -# (c) Copyright [2021-2023] Open Text. -# Licensed under the Apache License, Version 2.0 (the "License"); -# You may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Verifies access to the external service through port 5433. It does this -# by connecting using vsql - ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: script-verify-ksafety-test -data: - test.sh: |- - #!/bin/bash - set -o errexit - set -o xtrace - - CLUSTER_IP=v-scale-up-and-down-main - KSAFE=$(vsql -h $CLUSTER_IP -tAc "select get_design_ksafe()") - - if [[ $KSAFE == "1" ]]; then - exit 0 - else - exit 5 # incorrect value of ksafe - fi - ---- -apiVersion: v1 -kind: Pod -metadata: - name: test-verify-ksafety - labels: - stern: include -spec: - restartPolicy: Never - containers: - - name: test - image: kustomize-vertica-image - command: ["/home/dbadmin/test.sh"] - volumeMounts: - - name: test-script - mountPath: /home/dbadmin/test.sh - readOnly: true - subPath: test.sh - volumes: - - name: test-script - configMap: - defaultMode: 0777 - name: script-verify-ksafety-test