From a08dde770473a14ebd30aa2a8c8ab15177fa91a1 Mon Sep 17 00:00:00 2001 From: Michiel Date: Tue, 23 May 2023 12:33:09 +0200 Subject: [PATCH] [bitnami/chartmuseum] Deprecate chartmuseum container (#34545) Signed-off-by: Michiel --- .vib/chartmuseum/goss/chartmuseum.yaml | 11 --- .vib/chartmuseum/goss/goss.yaml | 12 --- .vib/chartmuseum/goss/vars.yaml | 10 -- .vib/chartmuseum/vib-publish.json | 125 ------------------------- .vib/chartmuseum/vib-verify.json | 69 -------------- 5 files changed, 227 deletions(-) delete mode 100644 .vib/chartmuseum/goss/chartmuseum.yaml delete mode 100644 .vib/chartmuseum/goss/goss.yaml delete mode 100644 .vib/chartmuseum/goss/vars.yaml delete mode 100644 .vib/chartmuseum/vib-publish.json delete mode 100644 .vib/chartmuseum/vib-verify.json diff --git a/.vib/chartmuseum/goss/chartmuseum.yaml b/.vib/chartmuseum/goss/chartmuseum.yaml deleted file mode 100644 index ab1b292cca66..000000000000 --- a/.vib/chartmuseum/goss/chartmuseum.yaml +++ /dev/null @@ -1,11 +0,0 @@ -group: - harbor: - exists: true -user: - harbor: - exists: true -command: - # Ensure a set of directories exist and the non-root user has write privileges to them - check-directories-exist-with-user: - exec: ls -dl /etc/ssl/certs /etc/pki/tls/certs/ 2>/dev/null | grep "drwxrwxr-x" - exit-status: 0 \ No newline at end of file diff --git a/.vib/chartmuseum/goss/goss.yaml b/.vib/chartmuseum/goss/goss.yaml deleted file mode 100644 index c7469879d169..000000000000 --- a/.vib/chartmuseum/goss/goss.yaml +++ /dev/null @@ -1,12 +0,0 @@ -gossfile: - # Goss tests exclusive to the current container - ../../chartmuseum/goss/chartmuseum.yaml: {} - # Load scripts from .vib/common/goss/templates - ../../common/goss/templates/check-app-version.yaml: {} - ../../common/goss/templates/check-binaries.yaml: {} - ../../common/goss/templates/check-broken-symlinks.yaml: {} - ../../common/goss/templates/check-ca-certs.yaml: {} - ../../common/goss/templates/check-directories.yaml: {} - ../../common/goss/templates/check-linked-libraries.yaml: {} - ../../common/goss/templates/check-sed-in-place.yaml: {} - ../../common/goss/templates/check-spdx.yaml: {} diff --git a/.vib/chartmuseum/goss/vars.yaml b/.vib/chartmuseum/goss/vars.yaml deleted file mode 100644 index d0dfdc084f9d..000000000000 --- a/.vib/chartmuseum/goss/vars.yaml +++ /dev/null @@ -1,10 +0,0 @@ -binaries: - - chartmuseum -directories: - - mode: "0775" - paths: - - /bitnami/data -version: - bin_name: chartmuseum - flag: --version -root_dir: /opt/bitnami diff --git a/.vib/chartmuseum/vib-publish.json b/.vib/chartmuseum/vib-publish.json deleted file mode 100644 index be511ba6f95b..000000000000 --- a/.vib/chartmuseum/vib-publish.json +++ /dev/null @@ -1,125 +0,0 @@ -{ - "context": { - "resources": { - "url": "{VIB_ENV_CONTAINER_URL}", - "path": "{VIB_ENV_PATH}" - }, - "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd" - }, - "phases": { - "package": { - "actions": [ - { - "action_id": "container-image-package", - "params": { - "application": { - "details": { - "name": "{VIB_ENV_CONTAINER}", - "tag": "{VIB_ENV_TAG}" - } - }, - "architectures": [ - "linux/amd64", - "linux/arm64" - ] - } - }, - { - "action_id": "container-image-lint", - "params": { - "threshold": "error" - } - } - ] - }, - "verify": { - "actions": [ - { - "action_id": "goss", - "params": { - "resources": { - "path": "/.vib" - }, - "tests_file": "chartmuseum/goss/goss.yaml", - "vars_file": "chartmuseum/goss/vars.yaml", - "remote": { - "pod": { - "workload": "deploy-chartmuseum" - } - } - } - }, - { - "action_id": "trivy", - "params": { - "threshold": "CRITICAL", - "vuln_type": [ - "OS" - ] - } - }, - { - "action_id": "grype", - "params": { - "threshold": "CRITICAL", - "package_type": [ - "OS" - ] - } - }, - { - "action_id": "osspi-application", - "params": { - "additional_packages_file": "osspi-packages-amd64.json", - "scan_type": "BASE_OS", - "osm": { - "associated_bossd_release": "{VIB_ENV_BOSSD_RELEASE_ID}", - "product_name": "main-catalog-{VIB_ENV_CONTAINER}", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", - "architecture_overrides": [ - { - "architecture": "linux/amd64", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container", - "additional_packages_file": "osspi-packages-amd64.json" - }, - { - "architecture": "linux/arm64", - "product_version": "{VIB_ENV_APP_VERSION}-{VIB_ENV_OS_FLAVOUR}-container-arm64", - "additional_packages_file": "osspi-packages-arm64.json" - } - ] - }, - "resources": { - "url": "{VIB_ENV_PACKAGES_JSON_URL}", - "path": "/{VIB_ENV_PATH}", - "authn": { - "header": "Authorization", - "token": "Bearer {VIB_ENV_GITHUB_TOKEN}" - } - } - } - } - ] - }, - "publish": { - "actions": [ - { - "action_id": "container-image-publish", - "params": { - "metadata": { - "tags": {VIB_ENV_ROLLING_TAGS} - }, - "repository": { - "kind": "OCI", - "url": "{VIB_ENV_REGISTRY_URL}", - "authn": { - "username": "{VIB_ENV_REGISTRY_USERNAME}", - "password": "{VIB_ENV_REGISTRY_PASSWORD}" - } - } - } - } - ] - } - } -} diff --git a/.vib/chartmuseum/vib-verify.json b/.vib/chartmuseum/vib-verify.json deleted file mode 100644 index 4688d8603494..000000000000 --- a/.vib/chartmuseum/vib-verify.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "context": { - "resources": { - "url": "{SHA_ARCHIVE}", - "path": "{VIB_ENV_PATH}" - }, - "runtime_parameters": "Y29tbWFuZDogWyJ0YWlsIiwgIi1mIiwgIi9kZXYvbnVsbCJd" - }, - "phases": { - "package": { - "actions": [ - { - "action_id": "container-image-package", - "params": { - "application": { - "details": { - "name": "{VIB_ENV_CONTAINER}", - "tag": "{VIB_ENV_TAG}" - } - } - } - }, - { - "action_id": "container-image-lint", - "params": { - "threshold": "error" - } - } - ] - }, - "verify": { - "actions": [ - { - "action_id": "goss", - "params": { - "resources": { - "path": "/.vib" - }, - "tests_file": "chartmuseum/goss/goss.yaml", - "vars_file": "chartmuseum/goss/vars.yaml", - "remote": { - "pod": { - "workload": "deploy-chartmuseum" - } - } - } - }, - { - "action_id": "trivy", - "params": { - "threshold": "CRITICAL", - "vuln_type": [ - "OS" - ] - } - }, - { - "action_id": "grype", - "params": { - "threshold": "CRITICAL", - "package_type": [ - "OS" - ] - } - } - ] - } - } -}