diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index dfbc6d84a..42aaa6487 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,13 +9,6 @@ repos: stages: [commit] always_run: true pass_filenames: false - - id: check-default-apps-versions - name: Check default apps versions - entry: hack/validate-default-apps-versions.sh - language: system - stages: [commit] - always_run: true - pass_filenames: false - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.0.1 hooks: diff --git a/hack/validate-default-apps-versions.sh b/hack/validate-default-apps-versions.sh deleted file mode 100755 index 8503ff4d6..000000000 --- a/hack/validate-default-apps-versions.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -latestKommanderVersion=$(find "services/kommander" -maxdepth 1 -type d -regextype sed -regex '.*/[0-9]\+.[0-9]\+.[0-9]\+' -printf "%f\n" | sort --version-sort | tail -1) - -validate_apps_in_yaml_path() { - readarray apps < <(yq -e '.data["values.yaml"]' "services/kommander/$latestKommanderVersion/defaults/cm.yaml" | yq -e "$1") - - for app in "${apps[@]}"; do - name=$(echo "$app" | yq -e 'keys | .[0]') - version=$(echo "$app" | yq -e '.[]') - if [ ! -d "services/$name/$version" ]; then - echo "app $name in version $version specified in $1 doesn't exist" - exit 1 - fi - done -} - -validate_apps_in_yaml_path ".attached.prerequisites.defaultApps" -validate_apps_in_yaml_path ".kommander-licensing.defaultEnterpriseApps" diff --git a/services/kommander/0.6.0/defaults/cm.yaml b/services/kommander/0.6.0/defaults/cm.yaml index 34c1c0318..368082322 100644 --- a/services/kommander/0.6.0/defaults/cm.yaml +++ b/services/kommander/0.6.0/defaults/cm.yaml @@ -67,14 +67,16 @@ data: tag: ${kommanderLicensingControllerWebhookImageTag} repository: ${kommanderLicensingControllerWebhookImageRepository} defaultEnterpriseApps: - centralized-kubecost: "0.34.0" - kubecost: "0.34.0" - kubecost-thanos-traefik: "0.0.1" - centralized-grafana: "45.21.0" - karma: "2.0.2" - karma-traefik: "0.0.1" - prometheus-thanos-traefik: "0.0.1" - thanos: "12.4.3" + - "centralized-kubecost" + - "kubecost" + - "kubecost-thanos-traefik" + - "centralized-grafana" + - "karma" + - "karma-traefik" + - "prometheus-thanos-traefik" + - "thanos" + kommander-ui: + enabled: false capimate: image: tag: v0.0.0-dev.0 @@ -96,15 +98,15 @@ data: attached: prerequisites: defaultApps: - reloader: "1.0.24" - traefik: "23.0.1" - kubernetes-dashboard: "6.0.7" - kubecost: "0.34.0" - kube-prometheus-stack: "45.21.0" - prometheus-adapter: "4.2.0" - prometheus-thanos-traefik: "0.0.1" - kubecost-thanos-traefik: "0.0.1" - cert-manager: "1.11.0" - karma-traefik: "0.0.1" - gatekeeper: "3.12.0" - kommander-flux: "0.41.2" + - "reloader" + - "traefik" + - "kubernetes-dashboard" + - "kubecost" + - "kube-prometheus-stack" + - "prometheus-adapter" + - "prometheus-thanos-traefik" + - "kubecost-thanos-traefik" + - "cert-manager" + - "karma-traefik" + - "gatekeeper" + - "kommander-flux"