From 85c67c1f5dcca2864b2cd81758d0dd7d447d2360 Mon Sep 17 00:00:00 2001 From: superaleks <47592680+superaleks@users.noreply.github.com> Date: Tue, 12 Apr 2022 17:03:27 +0200 Subject: [PATCH] [bitnami/*] Fixing the inconsistencies (#9759) * Fixing the inconsistencies Signed-off-by: alukic * Fixed environment variable name Signed-off-by: alukic * Changed variable name for PhpMyAdmin Signed-off-by: alukic * Removed unused references to matrix platform Signed-off-by: alukic * Apply review suggestion Signed-off-by: alukic * Change variable names Signed-off-by: alukic * Space Signed-off-by: alukic * Fix the space miniO Signed-off-by: alukic * Missing space solR workflow Signed-off-by: alukic * Naming convention Signed-off-by: alukic * Fixing the inconsistencies Signed-off-by: alukic * Fixed environment variable name Signed-off-by: alukic * Changed variable name for PhpMyAdmin Signed-off-by: alukic * Removed unused references to matrix platform Signed-off-by: alukic * Apply review suggestion Signed-off-by: alukic * Change variable names Signed-off-by: alukic * Space Signed-off-by: alukic * Fix the space miniO Signed-off-by: alukic * Missing space solR workflow Signed-off-by: alukic * Naming convention Signed-off-by: alukic --- .github/workflows/vib-airflow.yaml | 18 ++++---- .github/workflows/vib-grafana.yml | 18 ++++---- .github/workflows/vib-harbor.yml | 16 +++----- .github/workflows/vib-kibana.yaml | 18 ++++---- .github/workflows/vib-minio.yaml | 18 ++++---- .github/workflows/vib-phpmyadmin.yaml | 18 ++++---- .github/workflows/vib-redis.yaml | 36 ++++++++-------- .github/workflows/vib-solr.yaml | 18 ++++---- .../workflows/vib-thanos-queryfrontend.yaml | 36 ---------------- .github/workflows/vib-thanos.yaml | 41 +++++++++++++++++++ ...anos-bucketweb.yaml => vib-wordpress.yaml} | 18 ++++---- .github/workflows/vib.yaml | 36 ---------------- ...m-verify.json => vib-complete-verify.json} | 2 +- ...m-verify.json => vib-complete-verify.json} | 2 +- ...m-verify.json => vib-complete-verify.json} | 2 +- ...m-verify.json => vib-complete-verify.json} | 2 +- ...m-verify.json => vib-complete-verify.json} | 2 +- ...m-verify.json => vib-complete-verify.json} | 2 +- ...m-verify.json => vib-complete-verify.json} | 2 +- ...m-verify.json => vib-complete-verify.json} | 2 +- ...m-verify.json => vib-complete-verify.json} | 2 +- .vib/redis/vib-pipeline.json | 34 --------------- ...m-verify.json => vib-complete-verify.json} | 2 +- ...m-verify.json => vib-complete-verify.json} | 0 ...m-verify.json => vib-complete-verify.json} | 0 .vib/vib-pipeline.json | 34 --------------- .../vib-complete-verify.json} | 2 +- 27 files changed, 125 insertions(+), 256 deletions(-) delete mode 100644 .github/workflows/vib-thanos-queryfrontend.yaml create mode 100644 .github/workflows/vib-thanos.yaml rename .github/workflows/{vib-thanos-bucketweb.yaml => vib-wordpress.yaml} (55%) delete mode 100644 .github/workflows/vib.yaml rename .vib/airflow/{vib-platform-verify.json => vib-complete-verify.json} (96%) rename .vib/grafana/{vib-platform-verify.json => vib-complete-verify.json} (96%) rename .vib/harbor/{vib-platform-verify.json => vib-complete-verify.json} (96%) rename .vib/kibana/{vib-platform-verify.json => vib-complete-verify.json} (96%) rename .vib/minio/{vib-platform-verify.json => vib-complete-verify.json} (96%) rename .vib/phpmyadmin/{vib-platform-verify.json => vib-complete-verify.json} (96%) rename .vib/redis/replicas/{vib-platform-verify.json => vib-complete-verify.json} (96%) rename .vib/redis/sentinel/{vib-platform-verify.json => vib-complete-verify.json} (94%) rename .vib/redis/standalone/{vib-platform-verify.json => vib-complete-verify.json} (94%) delete mode 100644 .vib/redis/vib-pipeline.json rename .vib/solr/{vib-platform-verify.json => vib-complete-verify.json} (96%) rename .vib/thanos/bucketweb/{vib-platform-verify.json => vib-complete-verify.json} (100%) rename .vib/thanos/queryfrontend/{vib-platform-verify.json => vib-complete-verify.json} (100%) delete mode 100644 .vib/vib-pipeline.json rename .vib/{vib-platform-verify.json => wordpress/vib-complete-verify.json} (97%) diff --git a/.github/workflows/vib-airflow.yaml b/.github/workflows/vib-airflow.yaml index 95519be176..71a0e99fe6 100644 --- a/.github/workflows/vib-airflow.yaml +++ b/.github/workflows/vib-airflow.yaml @@ -10,27 +10,23 @@ env: CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} VIB_PUBLIC_URL: https://cp.bromelia.vmware.com jobs: - vib-k8s-verify: # verify in multiple target platforms + vib-verify: runs-on: ubuntu-latest environment: vmware-image-builder strategy: matrix: include: - - target-platform: gke - target-platform-id: 91d398a2-25c4-4cda-8732-75a3cfc179a1 - - target-platform: aks - target-platform-id: 7b13a7bb-011c-474f-ad71-8152fc321b9e - - target-platform: tkg + - target-platform: Tanzu Kubernetes Grid target-platform-id: 7ddab896-2e4e-4d58-a501-f79897eba3a0 fail-fast: false - name: K8s verify ${{ matrix.target-platform}} + name: Airflow on ${{ matrix.target-platform }} steps: - uses: actions/checkout@v2 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - uses: vmware-labs/vmware-image-builder-action@main with: - pipeline: airflow/vib-platform-verify.json + pipeline: airflow/vib-complete-verify.json env: - TARGET_PLATFORM: ${{ matrix.target-platform-id }} + VIB_ENV_TARGET_PLATFORM: ${{ matrix.target-platform-id }} diff --git a/.github/workflows/vib-grafana.yml b/.github/workflows/vib-grafana.yml index 70110de774..4c66d47f3b 100644 --- a/.github/workflows/vib-grafana.yml +++ b/.github/workflows/vib-grafana.yml @@ -10,27 +10,23 @@ env: CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} VIB_PUBLIC_URL: https://cp.bromelia.vmware.com jobs: - vib-k8s-verify: # verify in multiple target platforms + vib-verify: runs-on: ubuntu-latest environment: vmware-image-builder strategy: matrix: include: - - target-platform: gke - target-platform-id: 91d398a2-25c4-4cda-8732-75a3cfc179a1 - - target-platform: aks - target-platform-id: 7b13a7bb-011c-474f-ad71-8152fc321b9e - - target-platform: tkg + - target-platform: Tanzu Kubernetes Grid target-platform-id: 7ddab896-2e4e-4d58-a501-f79897eba3a0 fail-fast: false - name: K8s verify ${{ matrix.target-platform}} + name: Grafana on ${{ matrix.target-platform }} steps: - uses: actions/checkout@v2 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - uses: vmware-labs/vmware-image-builder-action@main with: - pipeline: grafana/vib-platform-verify.json + pipeline: grafana/vib-complete-verify.json env: - TARGET_PLATFORM: ${{ matrix.target-platform-id }} + VIB_ENV_TARGET_PLATFORM: ${{ matrix.target-platform-id }} diff --git a/.github/workflows/vib-harbor.yml b/.github/workflows/vib-harbor.yml index f9c9f9f071..72d84e7f45 100644 --- a/.github/workflows/vib-harbor.yml +++ b/.github/workflows/vib-harbor.yml @@ -10,27 +10,23 @@ env: CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} VIB_PUBLIC_URL: https://cp.bromelia.vmware.com jobs: - vib-k8s-verify: # verify in multiple target platforms + vib-verify: runs-on: ubuntu-latest environment: vmware-image-builder strategy: matrix: include: - - target-platform: gke - target-platform-id: 91d398a2-25c4-4cda-8732-75a3cfc179a1 - - target-platform: aks - target-platform-id: 7b13a7bb-011c-474f-ad71-8152fc321b9e - - target-platform: tkg + - target-platform: Tanzu Kubernetes Grid target-platform-id: 7ddab896-2e4e-4d58-a501-f79897eba3a0 fail-fast: false - name: K8s verify ${{ matrix.target-platform}} + name: Harbor on ${{ matrix.target-platform }} steps: - uses: actions/checkout@v2 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - uses: vmware-labs/vmware-image-builder-action@main with: - pipeline: harbor/vib-platform-verify.json + pipeline: harbor/vib-complete-verify.json env: VIB_ENV_TARGET_PLATFORM: ${{ matrix.target-platform-id }} diff --git a/.github/workflows/vib-kibana.yaml b/.github/workflows/vib-kibana.yaml index 18105f4644..278564721a 100644 --- a/.github/workflows/vib-kibana.yaml +++ b/.github/workflows/vib-kibana.yaml @@ -10,27 +10,23 @@ env: CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} VIB_PUBLIC_URL: https://cp.bromelia.vmware.com jobs: - vib-k8s-verify: # verify in multiple target platforms + vib-verify: runs-on: ubuntu-latest environment: vmware-image-builder strategy: matrix: include: - - target-platform: gke - target-platform-id: 91d398a2-25c4-4cda-8732-75a3cfc179a1 - - target-platform: aks - target-platform-id: 7b13a7bb-011c-474f-ad71-8152fc321b9e - - target-platform: tkg + - target-platform: Tanzu Kubernetes Grid target-platform-id: 7ddab896-2e4e-4d58-a501-f79897eba3a0 fail-fast: false - name: K8s verify ${{ matrix.target-platform}} + name: Kibana on ${{ matrix.target-platform }} steps: - uses: actions/checkout@v2 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - uses: vmware-labs/vmware-image-builder-action@main with: - pipeline: kibana/vib-platform-verify.json + pipeline: kibana/vib-complete-verify.json env: - TARGET_PLATFORM: ${{ matrix.target-platform-id }} + VIB_ENV_TARGET_PLATFORM: ${{ matrix.target-platform-id }} diff --git a/.github/workflows/vib-minio.yaml b/.github/workflows/vib-minio.yaml index be5fe9ec12..4ce074b455 100644 --- a/.github/workflows/vib-minio.yaml +++ b/.github/workflows/vib-minio.yaml @@ -10,27 +10,23 @@ env: CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} VIB_PUBLIC_URL: https://cp.bromelia.vmware.com jobs: - vib-k8s-verify: # verify in multiple target platforms + vib-verify: runs-on: ubuntu-latest environment: vmware-image-builder strategy: matrix: include: - - target-platform: gke - target-platform-id: 91d398a2-25c4-4cda-8732-75a3cfc179a1 - - target-platform: aks - target-platform-id: 7b13a7bb-011c-474f-ad71-8152fc321b9e - - target-platform: tkg + - target-platform: Tanzu Kubernetes Grid target-platform-id: 7ddab896-2e4e-4d58-a501-f79897eba3a0 fail-fast: false - name: K8s verify ${{ matrix.target-platform}} + name: MiniO on ${{ matrix.target-platform }} steps: - uses: actions/checkout@v2 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} + ref: ${ {github.event.pull_request.head.ref}} + repository: ${{ github.event.pull_request.head.repo.full_name }} - uses: vmware-labs/vmware-image-builder-action@main with: - pipeline: minio/vib-platform-verify.json + pipeline: minio/vib-complete-verify.json env: - TARGET_PLATFORM: ${{ matrix.target-platform-id }} + VIB_ENV_TARGET_PLATFORM: ${{ matrix.target-platform-id }} diff --git a/.github/workflows/vib-phpmyadmin.yaml b/.github/workflows/vib-phpmyadmin.yaml index 5f954897b8..6613de6dcd 100644 --- a/.github/workflows/vib-phpmyadmin.yaml +++ b/.github/workflows/vib-phpmyadmin.yaml @@ -10,27 +10,23 @@ env: CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} VIB_PUBLIC_URL: https://cp.bromelia.vmware.com jobs: - vib-k8s-verify: # verify in multiple target platforms + vib-verify: runs-on: ubuntu-latest environment: vmware-image-builder strategy: matrix: include: - - target-platform: gke - target-platform-id: 91d398a2-25c4-4cda-8732-75a3cfc179a1 - - target-platform: aks - target-platform-id: 7b13a7bb-011c-474f-ad71-8152fc321b9e - - target-platform: tkg + - target-platform: Tanzu Kubernetes Grid target-platform-id: 7ddab896-2e4e-4d58-a501-f79897eba3a0 fail-fast: false - name: K8s verify ${{ matrix.target-platform}} + name: PhpMyAdmin on ${{ matrix.target-platform }} steps: - uses: actions/checkout@v2 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - uses: vmware-labs/vmware-image-builder-action@main with: - pipeline: phpmyadmin/vib-platform-verify.json + pipeline: phpmyadmin/vib-complete-verify.json env: - TARGET_PLATFORM: ${{ matrix.target-platform-id }} + VIB_ENV_TARGET_PLATFORM: ${{ matrix.target-platform-id }} diff --git a/.github/workflows/vib-redis.yaml b/.github/workflows/vib-redis.yaml index 41de8236b1..9571659966 100644 --- a/.github/workflows/vib-redis.yaml +++ b/.github/workflows/vib-redis.yaml @@ -10,47 +10,47 @@ env: CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} VIB_PUBLIC_URL: https://cp.bromelia.vmware.com jobs: - vib-verify-standalone: # verify in GKE + vib-verify-standalone: runs-on: ubuntu-latest environment: vmware-image-builder - name: Redis Standalone + name: Redis Standalone on Tanzu Kubernetes Grid steps: - uses: actions/checkout@v2 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - uses: vmware-labs/vmware-image-builder-action@main with: - pipeline: redis/standalone/vib-platform-verify.json + pipeline: redis/standalone/vib-complete-verify.json env: - TARGET_PLATFORM: 91d398a2-25c4-4cda-8732-75a3cfc179a1 + VIB_ENV_TARGET_PLATFORM: 7ddab896-2e4e-4d58-a501-f79897eba3a0 - vib-verify-sentinel: # verify in AKS + vib-verify-sentinel: runs-on: ubuntu-latest environment: vmware-image-builder - name: Redis Sentinel + name: Redis Sentinel on Tanzu Kubernetes Grid steps: - uses: actions/checkout@v2 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - uses: vmware-labs/vmware-image-builder-action@main with: - pipeline: redis/sentinel/vib-platform-verify.json + pipeline: redis/sentinel/vib-complete-verify.json env: - TARGET_PLATFORM: 7b13a7bb-011c-474f-ad71-8152fc321b9e + VIB_ENV_TARGET_PLATFORM: 7ddab896-2e4e-4d58-a501-f79897eba3a0 - vib-verify-replica: # verify in TKG + vib-verify-replica: runs-on: ubuntu-latest environment: vmware-image-builder - name: Redis Replica + name: Redis Replica on Tanzu Kubernetes Grid steps: - uses: actions/checkout@v2 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - uses: vmware-labs/vmware-image-builder-action@main with: - pipeline: redis/replicas/vib-platform-verify.json + pipeline: redis/replicas/vib-complete-verify.json env: - TARGET_PLATFORM: 7ddab896-2e4e-4d58-a501-f79897eba3a0 + VIB_ENV_TARGET_PLATFORM: 7ddab896-2e4e-4d58-a501-f79897eba3a0 diff --git a/.github/workflows/vib-solr.yaml b/.github/workflows/vib-solr.yaml index 92c58a1cde..51a9563d61 100644 --- a/.github/workflows/vib-solr.yaml +++ b/.github/workflows/vib-solr.yaml @@ -10,27 +10,23 @@ env: CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} VIB_PUBLIC_URL: https://cp.bromelia.vmware.com jobs: - vib-k8s-verify: # verify in multiple target platforms + vib-verify: runs-on: ubuntu-latest environment: vmware-image-builder strategy: matrix: include: - - target-platform: gke - target-platform-id: 91d398a2-25c4-4cda-8732-75a3cfc179a1 - - target-platform: aks - target-platform-id: 7b13a7bb-011c-474f-ad71-8152fc321b9e - - target-platform: tkg + - target-platform: Tanzu Kubernetes Grid target-platform-id: 7ddab896-2e4e-4d58-a501-f79897eba3a0 fail-fast: false - name: K8s verify ${{ matrix.target-platform}} + name: SolR on ${{ matrix.target-platform }} steps: - uses: actions/checkout@v2 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - uses: vmware-labs/vmware-image-builder-action@main with: - pipeline: solr/vib-platform-verify.json + pipeline: solr/vib-complete-verify.json env: - VIB_ENV_TARGET_PLATFORM: ${{ matrix.target-platform-id }} \ No newline at end of file + VIB_ENV_TARGET_PLATFORM: ${{ matrix.target-platform-id }} diff --git a/.github/workflows/vib-thanos-queryfrontend.yaml b/.github/workflows/vib-thanos-queryfrontend.yaml deleted file mode 100644 index c8f0acaafe..0000000000 --- a/.github/workflows/vib-thanos-queryfrontend.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: 'vib' -on: # rebuild any PRs and main branch changes - pull_request_target: - branches: - - master - paths: - - 'bitnami/thanos/*' -env: - CSP_API_URL: https://console.cloud.vmware.com - CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} - VIB_PUBLIC_URL: https://cp.bromelia.vmware.com -jobs: - vib-k8s-verify: # verify in multiple target platforms - runs-on: ubuntu-latest - environment: vmware-image-builder - strategy: - matrix: - include: - - target-platform: gke - target-platform-id: 91d398a2-25c4-4cda-8732-75a3cfc179a1 - - target-platform: aks - target-platform-id: 7b13a7bb-011c-474f-ad71-8152fc321b9e - - target-platform: tkg - target-platform-id: 7ddab896-2e4e-4d58-a501-f79897eba3a0 - fail-fast: false - name: K8s verify ${{ matrix.target-platform}} - steps: - - uses: actions/checkout@v2 - with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} - - uses: vmware-labs/vmware-image-builder-action@main - with: - pipeline: thanos/queryfrontend/vib-platform-verify.json - env: - VIB_ENV_TARGET_PLATFORM: ${{ matrix.target-platform-id }} diff --git a/.github/workflows/vib-thanos.yaml b/.github/workflows/vib-thanos.yaml new file mode 100644 index 0000000000..743873efe7 --- /dev/null +++ b/.github/workflows/vib-thanos.yaml @@ -0,0 +1,41 @@ +name: 'vib' +on: # rebuild any PRs and main branch changes + pull_request_target: + branches: + - master + paths: + - 'bitnami/thanos/*' +env: + CSP_API_URL: https://console.cloud.vmware.com + CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} + VIB_PUBLIC_URL: https://cp.bromelia.vmware.com +jobs: + vib-verify-bucketweb: + runs-on: ubuntu-latest + environment: vmware-image-builder + name: BucketWeb on Tanzu Kubernetes Grid + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} + - uses: vmware-labs/vmware-image-builder-action@main + with: + pipeline: thanos/bucketweb/vib-complete-verify.json + env: + VIB_ENV_TARGET_PLATFORM: 7ddab896-2e4e-4d58-a501-f79897eba3a0 + + vib-verify-queryfrontend: + runs-on: ubuntu-latest + environment: vmware-image-builder + name: QueryFrontend on Tanzu Kubernetes Grid + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} + - uses: vmware-labs/vmware-image-builder-action@main + with: + pipeline: thanos/queryfrontend/vib-complete-verify.json + env: + VIB_ENV_TARGET_PLATFORM: 7ddab896-2e4e-4d58-a501-f79897eba3a0 diff --git a/.github/workflows/vib-thanos-bucketweb.yaml b/.github/workflows/vib-wordpress.yaml similarity index 55% rename from .github/workflows/vib-thanos-bucketweb.yaml rename to .github/workflows/vib-wordpress.yaml index 8d8379033f..b1fe110376 100644 --- a/.github/workflows/vib-thanos-bucketweb.yaml +++ b/.github/workflows/vib-wordpress.yaml @@ -4,33 +4,29 @@ on: # rebuild any PRs and main branch changes branches: - master paths: - - 'bitnami/thanos/*' + - 'bitnami/wordpress/*' env: CSP_API_URL: https://console.cloud.vmware.com CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} VIB_PUBLIC_URL: https://cp.bromelia.vmware.com jobs: - vib-k8s-verify: # verify in multiple target platforms + vib-verify: runs-on: ubuntu-latest environment: vmware-image-builder strategy: matrix: include: - - target-platform: gke - target-platform-id: 91d398a2-25c4-4cda-8732-75a3cfc179a1 - - target-platform: aks - target-platform-id: 7b13a7bb-011c-474f-ad71-8152fc321b9e - - target-platform: tkg + - target-platform: Tanzu Kubernetes Grid target-platform-id: 7ddab896-2e4e-4d58-a501-f79897eba3a0 fail-fast: false - name: K8s verify ${{ matrix.target-platform}} + name: WordPress on ${{ matrix.target-platform }} steps: - uses: actions/checkout@v2 with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - uses: vmware-labs/vmware-image-builder-action@main with: - pipeline: thanos/bucketweb/vib-platform-verify.json + pipeline: wordpress/vib-complete-verify.json env: VIB_ENV_TARGET_PLATFORM: ${{ matrix.target-platform-id }} diff --git a/.github/workflows/vib.yaml b/.github/workflows/vib.yaml deleted file mode 100644 index 1771b02b77..0000000000 --- a/.github/workflows/vib.yaml +++ /dev/null @@ -1,36 +0,0 @@ -name: 'vib' -on: # rebuild any PRs and main branch changes - pull_request_target: - branches: - - master - paths: - - 'bitnami/wordpress/*' -env: - CSP_API_URL: https://console.cloud.vmware.com - CSP_API_TOKEN: ${{ secrets.CSP_API_TOKEN }} - VIB_PUBLIC_URL: https://cp.bromelia.vmware.com -jobs: - vib-k8s-verify: # verify in multiple target platforms - runs-on: ubuntu-latest - environment: vmware-image-builder - strategy: - matrix: - include: - - target-platform: gke - target-platform-id: 91d398a2-25c4-4cda-8732-75a3cfc179a1 - - target-platform: aks - target-platform-id: 7b13a7bb-011c-474f-ad71-8152fc321b9e - - target-platform: tkg - target-platform-id: 7ddab896-2e4e-4d58-a501-f79897eba3a0 - fail-fast: false - name: K8s verify ${{ matrix.target-platform}} - steps: - - uses: actions/checkout@v2 - with: - ref: ${{github.event.pull_request.head.ref}} - repository: ${{github.event.pull_request.head.repo.full_name}} - - uses: vmware-labs/vmware-image-builder-action@main - with: - pipeline: vib-platform-verify.json - env: - TARGET_PLATFORM: ${{ matrix.target-platform-id }} diff --git a/.vib/airflow/vib-platform-verify.json b/.vib/airflow/vib-complete-verify.json similarity index 96% rename from .vib/airflow/vib-platform-verify.json rename to .vib/airflow/vib-complete-verify.json index 2becd29e86..edc1aa8dcb 100644 --- a/.vib/airflow/vib-platform-verify.json +++ b/.vib/airflow/vib-complete-verify.json @@ -21,7 +21,7 @@ }, "runtime_parameters": "ImF1dGgiOgogICJwYXNzd29yZCI6ICJDb21wbGljYXRlZFBhc3N3b3JkMTIzITQiCiJsb2FkRXhhbXBsZXMiOiB0cnVlCiJzZXJ2aWNlIjoKICAicG9ydHMiOgogICAgImh0dHAiOiA4MAogICJ0eXBlIjogIkxvYWRCYWxhbmNlciI=", "target_platform": { - "target_platform_id": "{TARGET_PLATFORM}", + "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { "name": "M4" } diff --git a/.vib/grafana/vib-platform-verify.json b/.vib/grafana/vib-complete-verify.json similarity index 96% rename from .vib/grafana/vib-platform-verify.json rename to .vib/grafana/vib-complete-verify.json index 95536c013a..3f766919d9 100644 --- a/.vib/grafana/vib-platform-verify.json +++ b/.vib/grafana/vib-complete-verify.json @@ -21,7 +21,7 @@ }, "runtime_parameters": "YWRtaW46CiAgdXNlcjogInRlc3RfYWRtaW4iCiAgcGFzc3dvcmQ6ICJDb21wbGljYXRlZFBhc3N3b3JkMTIzITQiCnNlcnZpY2U6CiAgdHlwZTogTG9hZEJhbGFuY2VyCiAgcG9ydHM6CiAgICBncmFmYW5hOiA4MApwbHVnaW5zOiAiZ3JhZmFuYS1rdWJlcm5ldGVzLWFwcCIKc210cDoKICBlbmFibGVkOiB0cnVlCiAgdXNlcjogc210cF91c2VyCiAgcGFzc3dvcmQ6IHNtdHBfcGFzc3dvcmQKICBob3N0OiAic210cCIKICBmcm9tQWRkcmVzczogInRlc3RAc210cC5jb20iCiAgZnJvbU5hbWU6ICJ0ZXN0X3NtdHAi", "target_platform": { - "target_platform_id": "{TARGET_PLATFORM}", + "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { "name": "L4" } diff --git a/.vib/harbor/vib-platform-verify.json b/.vib/harbor/vib-complete-verify.json similarity index 96% rename from .vib/harbor/vib-platform-verify.json rename to .vib/harbor/vib-complete-verify.json index 669ca5f6ba..882e928cf4 100644 --- a/.vib/harbor/vib-platform-verify.json +++ b/.vib/harbor/vib-complete-verify.json @@ -21,7 +21,7 @@ }, "runtime_parameters": "ImFkbWluUGFzc3dvcmQiOiAiQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0IgoiZXhwb3N1cmVUeXBlIjogInByb3h5IgoicG9zdGdyZXNxbCI6CiAgImF1dGgiOgogICAgInBvc3RncmVzUGFzc3dvcmQiOiAiN2RNeExmY3F4TiIKInNlcnZpY2UiOgogICJwb3J0cyI6CiAgICAiaHR0cCI6IDgwCiAgInR5cGUiOiAiTG9hZEJhbGFuY2VyIgo=", "target_platform": { - "target_platform_id": "{TARGET_PLATFORM}", + "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { "name": "S4" } diff --git a/.vib/kibana/vib-platform-verify.json b/.vib/kibana/vib-complete-verify.json similarity index 96% rename from .vib/kibana/vib-platform-verify.json rename to .vib/kibana/vib-complete-verify.json index fcb54e0b41..9537f085d4 100644 --- a/.vib/kibana/vib-platform-verify.json +++ b/.vib/kibana/vib-complete-verify.json @@ -21,7 +21,7 @@ }, "runtime_parameters": "c2VydmljZToKICBwb3J0OiA4MAogIHR5cGU6IExvYWRCYWxhbmNlcgplbGFzdGljc2VhcmNoOgogIGhvc3RzOgogICAgLSBsb2NhbGhvc3QKICBwb3J0OiA5MjAwCnNpZGVjYXJzOiAKIC0gbmFtZTogZWxhc3RpY3NlYXJjaAogICBpbWFnZTogYml0bmFtaS9lbGFzdGljc2VhcmNoOmxhdGVzdAogICBpbWFnZVB1bGxQb2xpY3k6IElmTm90UHJlc2VudAogICBwb3J0czoKICAgICAtIG5hbWU6IGh0dHAKICAgICAgIGNvbnRhaW5lclBvcnQ6IDkyMDA=", "target_platform": { - "target_platform_id": "{TARGET_PLATFORM}", + "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { "name": "M4" } diff --git a/.vib/minio/vib-platform-verify.json b/.vib/minio/vib-complete-verify.json similarity index 96% rename from .vib/minio/vib-platform-verify.json rename to .vib/minio/vib-complete-verify.json index 5d27517775..6775a7ab16 100644 --- a/.vib/minio/vib-platform-verify.json +++ b/.vib/minio/vib-complete-verify.json @@ -21,7 +21,7 @@ }, "runtime_parameters": "YXV0aDoKICByb290VXNlcjogdGVzdF9hZG1pbgogIHJvb3RQYXNzd29yZDogQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0CnNlcnZpY2U6CiAgdHlwZTogTG9hZEJhbGFuY2VyCiAgcG9ydHM6CiAgICBjb25zb2xlOiA4MA==", "target_platform": { - "target_platform_id": "{TARGET_PLATFORM}", + "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { "name": "S4" } diff --git a/.vib/phpmyadmin/vib-platform-verify.json b/.vib/phpmyadmin/vib-complete-verify.json similarity index 96% rename from .vib/phpmyadmin/vib-platform-verify.json rename to .vib/phpmyadmin/vib-complete-verify.json index 99529b94df..f378a23afc 100644 --- a/.vib/phpmyadmin/vib-platform-verify.json +++ b/.vib/phpmyadmin/vib-complete-verify.json @@ -21,7 +21,7 @@ }, "runtime_parameters": "ZGI6CiAgaG9zdDogbWFyaWFkYgogIGFsbG93QXJiaXRyYXJ5U2VydmVyOiB0cnVlCiAgcG9ydDogMzMwNgogIGJ1bmRsZVRlc3REQjogdHJ1ZQpzZXJ2aWNlOgogIHR5cGU6IExvYWRCYWxhbmNlcgogIHBvcnRzOgogICAgaHR0cDogODAKbWFyaWFkYjoKICBhdXRoOgogICAgcm9vdFBhc3N3b3JkOiByb290UGFzc3dvcmQ=", "target_platform": { - "target_platform_id": "{TARGET_PLATFORM}", + "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { "name": "M4" } diff --git a/.vib/redis/replicas/vib-platform-verify.json b/.vib/redis/replicas/vib-complete-verify.json similarity index 96% rename from .vib/redis/replicas/vib-platform-verify.json rename to .vib/redis/replicas/vib-complete-verify.json index ef06b4ee96..c0077ec49e 100644 --- a/.vib/redis/replicas/vib-platform-verify.json +++ b/.vib/redis/replicas/vib-complete-verify.json @@ -21,7 +21,7 @@ }, "runtime_parameters": "YXV0aDoKICBwYXNzd29yZDogInRlc3RfcGFzc3dvcmQiCm1hc3RlcjoKICBjb250YWluZXJTZWN1cml0eUNvbnRleHQ6CiAgICBlbmFibGVkOiB0cnVlCiAgICBydW5Bc1VzZXI6IDEwMDIgCiAgcGVyc2lzdGVuY2U6CiAgICBwYXRoOiAvZGF0YS1wZXJzaXN0ZW5jZQpyZXBsaWNhOgogIHJlcGxpY2FDb3VudDogMgogIGNvbnRhaW5lclNlY3VyaXR5Q29udGV4dDoKICAgIGVuYWJsZWQ6IHRydWUKICAgIHJ1bkFzVXNlcjogMTAwMg==", "target_platform": { - "target_platform_id": "{TARGET_PLATFORM}", + "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { "name": "S4" } diff --git a/.vib/redis/sentinel/vib-platform-verify.json b/.vib/redis/sentinel/vib-complete-verify.json similarity index 94% rename from .vib/redis/sentinel/vib-platform-verify.json rename to .vib/redis/sentinel/vib-complete-verify.json index 2816366977..f1d8dc8dbc 100644 --- a/.vib/redis/sentinel/vib-platform-verify.json +++ b/.vib/redis/sentinel/vib-complete-verify.json @@ -21,7 +21,7 @@ }, "runtime_parameters": "c2VudGluZWw6CiAgZW5hYmxlZDogdHJ1ZQ==", "target_platform": { - "target_platform_id": "{TARGET_PLATFORM}", + "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { "name": "S4" } diff --git a/.vib/redis/standalone/vib-platform-verify.json b/.vib/redis/standalone/vib-complete-verify.json similarity index 94% rename from .vib/redis/standalone/vib-platform-verify.json rename to .vib/redis/standalone/vib-complete-verify.json index bbdb07a87b..0ae804b8ed 100644 --- a/.vib/redis/standalone/vib-platform-verify.json +++ b/.vib/redis/standalone/vib-complete-verify.json @@ -21,7 +21,7 @@ }, "runtime_parameters": "YXJjaGl0ZWN0dXJlOiBzdGFuZGFsb25l", "target_platform": { - "target_platform_id": "{TARGET_PLATFORM}", + "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { "name": "S4" } diff --git a/.vib/redis/vib-pipeline.json b/.vib/redis/vib-pipeline.json deleted file mode 100644 index b46337a3bf..0000000000 --- a/.vib/redis/vib-pipeline.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "phases": { - "package": { - "context": { - "resources": { - "url": "{SHA_ARCHIVE}", - "path": "/bitnami/redis" - } - }, - "actions": [ - { - "action_id": "helm-package" - }, - { - "action_id": "helm-lint" - } - ] - }, - "verify": { - "context": { - "runtime_parameters": "d29yZHByZXNzVXNlcm5hbWU6IHRlc3RfdXNlcgp3b3JkcHJlc3NQYXNzd29yZDogQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0CndvcmRwcmVzc0VtYWlsOiB0ZXN0X3VzZXJfZW1haWxAZW1haWwuY29tCndvcmRwcmVzc0ZpcnN0TmFtZTogVGVzdE5hbWUKd29yZHByZXNzTGFzdE5hbWU6IFRlc3RMYXN0TmFtZQp3b3JkcHJlc3NCbG9nTmFtZTogVGVzdF9Vc2VycydzIEJsb2chCnNtdHBIb3N0OiBtYWlsLnNlcnZlci5jb20Kc210cFBvcnQ6IDEyMApzbXRwVXNlcjogdGVzdF9tYWlsX3VzZXIKc210cFBhc3N3b3JkOiB0ZXN0X21haWxfcGFzc3dvcmQKbWFyaWFkYjoKICBhdXRoOgogICAgZGF0YWJhc2U6IHRlc3Rfd29yZHByZXNzX2RhdGFiYXNlCiAgICB1c2VybmFtZTogdGVzdF93b3JkcHJlc3NfdXNlcm5hbWUKICAgIHBhc3N3b3JkOiB0ZXN0X3dvcmRwcmVzc19wYXNzd29yZAp3b3JkcHJlc3NQbHVnaW5zOiBhbGwKY29udGFpbmVyU2VjdXJpdHlDb250ZXh0OgogIGVuYWJsZWQ6IHRydWUKICBydW5Bc1VzZXI6IDEwMDIKICBydW5Bc05vblJvb3Q6IHRydWUKd29yZHByZXNzVGFibGVQcmVmaXg6IHdvcmRwcmVzc18Kd29yZHByZXNzQXV0b1VwZGF0ZUxldmVsOiBtaW5vcg==" - }, - "actions": [ - { - "action_id": "trivy", - "params": { - "threshold": "CRITICAL", - "vuln_type": ["OS"] - } - } - ] - } - } - } diff --git a/.vib/solr/vib-platform-verify.json b/.vib/solr/vib-complete-verify.json similarity index 96% rename from .vib/solr/vib-platform-verify.json rename to .vib/solr/vib-complete-verify.json index 5159429001..29c7b6da02 100644 --- a/.vib/solr/vib-platform-verify.json +++ b/.vib/solr/vib-complete-verify.json @@ -21,7 +21,7 @@ }, "runtime_parameters": "ImF1dGgiOgogICJhZG1pblBhc3N3b3JkIjogIkNvbXBsaWNhdGVkUGFzc3dvcmQxMjMhNCIKICAiYWRtaW5Vc2VybmFtZSI6ICJ1c2VyIgoic2VydmljZSI6CiAgInBvcnRzIjoKICAgICJodHRwIjogODAKICAidHlwZSI6ICJMb2FkQmFsYW5jZXIi", "target_platform": { - "target_platform_id": "{TARGET_PLATFORM}", + "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { "name": "S4" } diff --git a/.vib/thanos/bucketweb/vib-platform-verify.json b/.vib/thanos/bucketweb/vib-complete-verify.json similarity index 100% rename from .vib/thanos/bucketweb/vib-platform-verify.json rename to .vib/thanos/bucketweb/vib-complete-verify.json diff --git a/.vib/thanos/queryfrontend/vib-platform-verify.json b/.vib/thanos/queryfrontend/vib-complete-verify.json similarity index 100% rename from .vib/thanos/queryfrontend/vib-platform-verify.json rename to .vib/thanos/queryfrontend/vib-complete-verify.json diff --git a/.vib/vib-pipeline.json b/.vib/vib-pipeline.json deleted file mode 100644 index bf9e457d36..0000000000 --- a/.vib/vib-pipeline.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "phases": { - "package": { - "context": { - "resources": { - "url": "{SHA_ARCHIVE}", - "path": "/bitnami/wordpress" - } - }, - "actions": [ - { - "action_id": "helm-package" - }, - { - "action_id": "helm-lint" - } - ] - }, - "verify": { - "context": { - "runtime_parameters": "d29yZHByZXNzVXNlcm5hbWU6IHRlc3RfdXNlcgp3b3JkcHJlc3NQYXNzd29yZDogQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0CndvcmRwcmVzc0VtYWlsOiB0ZXN0X3VzZXJfZW1haWxAZW1haWwuY29tCndvcmRwcmVzc0ZpcnN0TmFtZTogVGVzdE5hbWUKd29yZHByZXNzTGFzdE5hbWU6IFRlc3RMYXN0TmFtZQp3b3JkcHJlc3NCbG9nTmFtZTogVGVzdF9Vc2VycydzIEJsb2chCnNtdHBIb3N0OiBtYWlsLnNlcnZlci5jb20Kc210cFBvcnQ6IDEyMApzbXRwVXNlcjogdGVzdF9tYWlsX3VzZXIKc210cFBhc3N3b3JkOiB0ZXN0X21haWxfcGFzc3dvcmQKbWFyaWFkYjoKICBhdXRoOgogICAgZGF0YWJhc2U6IHRlc3Rfd29yZHByZXNzX2RhdGFiYXNlCiAgICB1c2VybmFtZTogdGVzdF93b3JkcHJlc3NfdXNlcm5hbWUKICAgIHBhc3N3b3JkOiB0ZXN0X3dvcmRwcmVzc19wYXNzd29yZAp3b3JkcHJlc3NQbHVnaW5zOiBhbGwKY29udGFpbmVyU2VjdXJpdHlDb250ZXh0OgogIGVuYWJsZWQ6IHRydWUKICBydW5Bc1VzZXI6IDEwMDIKICBydW5Bc05vblJvb3Q6IHRydWUKd29yZHByZXNzVGFibGVQcmVmaXg6IHdvcmRwcmVzc18Kd29yZHByZXNzQXV0b1VwZGF0ZUxldmVsOiBtaW5vcg==" - }, - "actions": [ - { - "action_id": "trivy", - "params": { - "threshold": "CRITICAL", - "vuln_type": ["OS"] - } - } - ] - } - } -} diff --git a/.vib/vib-platform-verify.json b/.vib/wordpress/vib-complete-verify.json similarity index 97% rename from .vib/vib-platform-verify.json rename to .vib/wordpress/vib-complete-verify.json index d0e09273e6..1566da0261 100644 --- a/.vib/vib-platform-verify.json +++ b/.vib/wordpress/vib-complete-verify.json @@ -21,7 +21,7 @@ }, "runtime_parameters": "d29yZHByZXNzVXNlcm5hbWU6IHRlc3RfdXNlcgp3b3JkcHJlc3NQYXNzd29yZDogQ29tcGxpY2F0ZWRQYXNzd29yZDEyMyE0CndvcmRwcmVzc0VtYWlsOiB0ZXN0X3VzZXJfZW1haWxAZW1haWwuY29tCndvcmRwcmVzc0ZpcnN0TmFtZTogVGVzdE5hbWUKd29yZHByZXNzTGFzdE5hbWU6IFRlc3RMYXN0TmFtZQp3b3JkcHJlc3NCbG9nTmFtZTogVGVzdF9Vc2VycydzIEJsb2chCnNtdHBIb3N0OiBtYWlsLnNlcnZlci5jb20Kc210cFBvcnQ6IDEyMApzbXRwVXNlcjogdGVzdF9tYWlsX3VzZXIKc210cFBhc3N3b3JkOiB0ZXN0X21haWxfcGFzc3dvcmQKbWFyaWFkYjoKICBhdXRoOgogICAgZGF0YWJhc2U6IHRlc3Rfd29yZHByZXNzX2RhdGFiYXNlCiAgICB1c2VybmFtZTogdGVzdF93b3JkcHJlc3NfdXNlcm5hbWUKICAgIHBhc3N3b3JkOiB0ZXN0X3dvcmRwcmVzc19wYXNzd29yZAp3b3JkcHJlc3NQbHVnaW5zOiBhbGwKY29udGFpbmVyU2VjdXJpdHlDb250ZXh0OgogIGVuYWJsZWQ6IHRydWUKICBydW5Bc1VzZXI6IDEwMDIKICBydW5Bc05vblJvb3Q6IHRydWUKd29yZHByZXNzVGFibGVQcmVmaXg6IHdvcmRwcmVzc18K", "target_platform": { - "target_platform_id": "{TARGET_PLATFORM}", + "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}", "size": { "name": "S4" }