From ae7e7db7486f9369a596cce67bc7534d3826e73f Mon Sep 17 00:00:00 2001 From: Luke Ogg Date: Mon, 9 Dec 2024 10:54:22 -0700 Subject: [PATCH] feat: Patch AI Navigator model size issues (backport to 2.8) (#2906) * feat: Bump Cluster Info API to latest version * fix: Update path --- licenses.d2iq.yaml | 10 ++++- .../{0.2.2 => 0.2.8}/ai-navigator-app.yaml | 0 .../{0.2.2 => 0.2.8}/defaults/cm.yaml | 37 +++---------------- .../defaults/kustomization.yaml | 0 .../{0.2.2 => 0.2.8}/helmrelease.yaml | 2 +- .../helmrelease/helmrelease.yaml | 4 +- .../{0.2.2 => 0.2.8}/kustomization.yaml | 0 7 files changed, 17 insertions(+), 36 deletions(-) rename services/ai-navigator-app/{0.2.2 => 0.2.8}/ai-navigator-app.yaml (100%) rename services/ai-navigator-app/{0.2.2 => 0.2.8}/defaults/cm.yaml (70%) rename services/ai-navigator-app/{0.2.2 => 0.2.8}/defaults/kustomization.yaml (100%) rename services/ai-navigator-app/{0.2.2 => 0.2.8}/helmrelease.yaml (88%) rename services/ai-navigator-app/{0.2.2 => 0.2.8}/helmrelease/helmrelease.yaml (89%) rename services/ai-navigator-app/{0.2.2 => 0.2.8}/kustomization.yaml (100%) diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 54cde45e8..eb643b4e3 100644 --- a/licenses.d2iq.yaml +++ b/licenses.d2iq.yaml @@ -8,6 +8,7 @@ ignore: - docker.io/bitnami/redis-cluster:7.0.12-debian-11-r2 - docker.io/bitnami/memcached:1.6.19-debian-11-r7 - docker.io/library/busybox:1 + - docker.io/library/alpine:3.20.3 - gcr.io/kubecost1/cost-model:prod-1.106.7 - gcr.io/kubecost1/frontend:prod-1.106.7 @@ -589,8 +590,13 @@ resources: notice_path: NOTICE ref: ${image_tag} url: https://github.com/kubernetes-sigs/prometheus-adapter - - container_image: cr.weaviate.io/semitechnologies/weaviate:1.21.4 + - container_image: ghcr.io/mesosphere/dkp-container-images/cr.weaviate.io/semitechnologies/weaviate:1.21.4-d2iq.0 sources: - license_path: LICENSE - ref: v${image_tag} + ref: v${image_tag%-d2iq.0} url: https://github.com/weaviate/weaviate + - container_image: docker.io/bitnami/postgresql:15.8.0-debian-12-r14 + sources: + - url: https://github.com/postgres/postgres + ref: REL_15_8 + license_path: COPYRIGHT diff --git a/services/ai-navigator-app/0.2.2/ai-navigator-app.yaml b/services/ai-navigator-app/0.2.8/ai-navigator-app.yaml similarity index 100% rename from services/ai-navigator-app/0.2.2/ai-navigator-app.yaml rename to services/ai-navigator-app/0.2.8/ai-navigator-app.yaml diff --git a/services/ai-navigator-app/0.2.2/defaults/cm.yaml b/services/ai-navigator-app/0.2.8/defaults/cm.yaml similarity index 70% rename from services/ai-navigator-app/0.2.2/defaults/cm.yaml rename to services/ai-navigator-app/0.2.8/defaults/cm.yaml index 25c827b0b..711a11d70 100644 --- a/services/ai-navigator-app/0.2.2/defaults/cm.yaml +++ b/services/ai-navigator-app/0.2.8/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: ai-navigator-app-0.2.2-d2iq-defaults + name: ai-navigator-app-0.2.8-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | @@ -10,18 +10,6 @@ data: api: enabled: true - # Default values for configmap - modelSettings: - model_name: thenlper/gte-large - chunk_size: 2000 - chunk_overlap: 250 - path: /models - volumeSize: 4Gi - - vector_db: - url: http://weaviate - index_name: Cluster_Info - record_manager: driver_name: "postgresql" username: "postgres" @@ -34,39 +22,27 @@ data: globalPriorityClassName: dkp-high-priority service: type: ClusterIP - image: - tag: 1.21.4 initContainers: sysctlInitContainer: image: - tag: 3.18.4 - securityContext: - runAsUser: 65532 - fsGroup: 65532 - runAsGroup: 65532 - containerSecurityContext: - allowPrivilegeEscalation: false + tag: 3.20.3 storage: size: 5Gi postgresql: + enabled: true primary: priorityClassName: dkp-high-priority + initdb: + scriptsConfigMap: ai-navigator-cluster-info-api-postgresql-initdb readReplicas: priorityClassName: dkp-high-priority - enabled: true - image: - tag: 15.2.0-debian-11-r21 # Default values for cluster-info-api replicaCount: 1 image: - repository: mesosphere/ai-navigator-cluster-info-api - pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. - tag: "v0.1.0" - + pullPolicy: IfNotPresent imagePullSecrets: [] nameOverride: "" fullnameOverride: "" @@ -116,4 +92,3 @@ data: tolerations: [] affinity: {} - kubectlImage: ${kubetoolsImageRepository:=bitnami/kubectl}:${kubetoolsImageTag:=1.29.2} diff --git a/services/ai-navigator-app/0.2.2/defaults/kustomization.yaml b/services/ai-navigator-app/0.2.8/defaults/kustomization.yaml similarity index 100% rename from services/ai-navigator-app/0.2.2/defaults/kustomization.yaml rename to services/ai-navigator-app/0.2.8/defaults/kustomization.yaml diff --git a/services/ai-navigator-app/0.2.2/helmrelease.yaml b/services/ai-navigator-app/0.2.8/helmrelease.yaml similarity index 88% rename from services/ai-navigator-app/0.2.2/helmrelease.yaml rename to services/ai-navigator-app/0.2.8/helmrelease.yaml index f1ebc3299..b160619ed 100644 --- a/services/ai-navigator-app/0.2.2/helmrelease.yaml +++ b/services/ai-navigator-app/0.2.8/helmrelease.yaml @@ -6,7 +6,7 @@ metadata: spec: force: false interval: 6h - path: ./services/ai-navigator-app/0.2.2/helmrelease + path: ./services/ai-navigator-app/0.2.8/helmrelease postBuild: substitute: releaseNamespace: ${releaseNamespace} diff --git a/services/ai-navigator-app/0.2.2/helmrelease/helmrelease.yaml b/services/ai-navigator-app/0.2.8/helmrelease/helmrelease.yaml similarity index 89% rename from services/ai-navigator-app/0.2.2/helmrelease/helmrelease.yaml rename to services/ai-navigator-app/0.2.8/helmrelease/helmrelease.yaml index 144f32f0a..6fe457526 100644 --- a/services/ai-navigator-app/0.2.2/helmrelease/helmrelease.yaml +++ b/services/ai-navigator-app/0.2.8/helmrelease/helmrelease.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-ai-navigator-cluster-info-api-charts namespace: kommander-flux - version: 0.2.1 + version: 0.2.8 install: remediation: retries: 30 @@ -23,4 +23,4 @@ spec: retries: 30 valuesFrom: - kind: ConfigMap - name: ai-navigator-app-0.2.2-d2iq-defaults + name: ai-navigator-app-0.2.8-d2iq-defaults diff --git a/services/ai-navigator-app/0.2.2/kustomization.yaml b/services/ai-navigator-app/0.2.8/kustomization.yaml similarity index 100% rename from services/ai-navigator-app/0.2.2/kustomization.yaml rename to services/ai-navigator-app/0.2.8/kustomization.yaml