From 1e5d373e1254877c707aa6a43363280de57520ae Mon Sep 17 00:00:00 2001 From: Luke Ogg Date: Mon, 2 Dec 2024 16:32:22 -0700 Subject: [PATCH] feat: Bump AI Nav API and Agent to v0.1.2 --- licenses.d2iq.yaml | 6 ++++ .../{0.2.2 => 0.2.8}/ai-navigator-app.yaml | 2 +- .../{0.2.2 => 0.2.8}/defaults/cm.yaml | 35 +++---------------- .../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 .../{0.1.1 => 0.1.2}/defaults/cm.yaml | 8 +---- .../defaults/kustomization.yaml | 0 .../{0.1.1 => 0.1.2}/helmrelease.yaml | 2 +- .../helmrelease/helmrelease.yaml | 4 +-- .../{0.1.1 => 0.1.2}/kustomization.yaml | 0 services/licenses.d2iq.yaml | 14 ++++++++ 13 files changed, 32 insertions(+), 45 deletions(-) rename services/ai-navigator-app/{0.2.2 => 0.2.8}/ai-navigator-app.yaml (98%) 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%) rename services/ai-navigator-cluster-info-agent/{0.1.1 => 0.1.2}/defaults/cm.yaml (82%) rename services/ai-navigator-cluster-info-agent/{0.1.1 => 0.1.2}/defaults/kustomization.yaml (100%) rename services/ai-navigator-cluster-info-agent/{0.1.1 => 0.1.2}/helmrelease.yaml (86%) rename services/ai-navigator-cluster-info-agent/{0.1.1 => 0.1.2}/helmrelease/helmrelease.yaml (87%) rename services/ai-navigator-cluster-info-agent/{0.1.1 => 0.1.2}/kustomization.yaml (100%) create mode 100644 services/licenses.d2iq.yaml diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml index 54cde45e80..b0c67b9dfb 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 @@ -594,3 +595,8 @@ resources: - license_path: LICENSE ref: v${image_tag} 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 \ No newline at end of file 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 98% 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 index 005f26385e..6bddf96147 100644 --- a/services/ai-navigator-app/0.2.2/ai-navigator-app.yaml +++ b/services/ai-navigator-app/0.2.8/ai-navigator-app.yaml @@ -62,7 +62,7 @@ spec: serviceAccountName: ai-navigator-app containers: - name: ai-navigator-app - image: mesosphere/ai-navigator-app:v0.0.7 + image: mesosphere/ai-navigator-app:v0.0.3 envFrom: - configMapRef: name: ai-navigator-app-config 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 25c827b0bd..5e09de07b6 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,25 @@ 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 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 +90,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 f1ebc32992..b160619ed9 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 144f32f0ab..66a9f53fb4 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.6 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 diff --git a/services/ai-navigator-cluster-info-agent/0.1.1/defaults/cm.yaml b/services/ai-navigator-cluster-info-agent/0.1.2/defaults/cm.yaml similarity index 82% rename from services/ai-navigator-cluster-info-agent/0.1.1/defaults/cm.yaml rename to services/ai-navigator-cluster-info-agent/0.1.2/defaults/cm.yaml index 9401d7ba2a..91c9ae3878 100644 --- a/services/ai-navigator-cluster-info-agent/0.1.1/defaults/cm.yaml +++ b/services/ai-navigator-cluster-info-agent/0.1.2/defaults/cm.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: ConfigMap metadata: - name: ai-navigator-cluster-info-agent-0.1.1-d2iq-defaults + name: ai-navigator-cluster-info-agent-0.1.2-d2iq-defaults namespace: ${releaseNamespace} data: values.yaml: | @@ -16,12 +16,6 @@ data: # Default values for cluster-info-agent replicaCount: 1 - image: - repository: mesosphere/ai-navigator-cluster-info-agent - pullPolicy: Always - # Overrides the image tag whose default is the chart appVersion. - tag: "v0.1.0" - imagePullSecrets: [] nameOverride: "" fullnameOverride: "" diff --git a/services/ai-navigator-cluster-info-agent/0.1.1/defaults/kustomization.yaml b/services/ai-navigator-cluster-info-agent/0.1.2/defaults/kustomization.yaml similarity index 100% rename from services/ai-navigator-cluster-info-agent/0.1.1/defaults/kustomization.yaml rename to services/ai-navigator-cluster-info-agent/0.1.2/defaults/kustomization.yaml diff --git a/services/ai-navigator-cluster-info-agent/0.1.1/helmrelease.yaml b/services/ai-navigator-cluster-info-agent/0.1.2/helmrelease.yaml similarity index 86% rename from services/ai-navigator-cluster-info-agent/0.1.1/helmrelease.yaml rename to services/ai-navigator-cluster-info-agent/0.1.2/helmrelease.yaml index dfde3b9b05..cfb5dbd4f7 100644 --- a/services/ai-navigator-cluster-info-agent/0.1.1/helmrelease.yaml +++ b/services/ai-navigator-cluster-info-agent/0.1.2/helmrelease.yaml @@ -6,7 +6,7 @@ metadata: spec: force: false interval: 6h - path: ./services/ai-navigator-cluster-info-agent/0.1.1/helmrelease + path: ./services/ai-navigator-cluster-info-agent/0.1.2/helmrelease postBuild: substitute: releaseNamespace: ${releaseNamespace} diff --git a/services/ai-navigator-cluster-info-agent/0.1.1/helmrelease/helmrelease.yaml b/services/ai-navigator-cluster-info-agent/0.1.2/helmrelease/helmrelease.yaml similarity index 87% rename from services/ai-navigator-cluster-info-agent/0.1.1/helmrelease/helmrelease.yaml rename to services/ai-navigator-cluster-info-agent/0.1.2/helmrelease/helmrelease.yaml index 0418a14a0d..67d9d0b72d 100644 --- a/services/ai-navigator-cluster-info-agent/0.1.1/helmrelease/helmrelease.yaml +++ b/services/ai-navigator-cluster-info-agent/0.1.2/helmrelease/helmrelease.yaml @@ -11,7 +11,7 @@ spec: kind: HelmRepository name: mesosphere.github.io-ai-navigator-cluster-info-agent-charts namespace: kommander-flux - version: 0.1.1 + version: 0.1.2 install: remediation: retries: 30 @@ -23,4 +23,4 @@ spec: retries: 30 valuesFrom: - kind: ConfigMap - name: ai-navigator-cluster-info-agent-0.1.1-d2iq-defaults + name: ai-navigator-cluster-info-agent-0.1.2-d2iq-defaults diff --git a/services/ai-navigator-cluster-info-agent/0.1.1/kustomization.yaml b/services/ai-navigator-cluster-info-agent/0.1.2/kustomization.yaml similarity index 100% rename from services/ai-navigator-cluster-info-agent/0.1.1/kustomization.yaml rename to services/ai-navigator-cluster-info-agent/0.1.2/kustomization.yaml diff --git a/services/licenses.d2iq.yaml b/services/licenses.d2iq.yaml new file mode 100644 index 0000000000..b1ef31a3ca --- /dev/null +++ b/services/licenses.d2iq.yaml @@ -0,0 +1,14 @@ +ignore: + - docker.io/library/alpine:3.20.3 + +resources: + - container_image: docker.io/bitnami/kubectl:1.30.5 + sources: + - url: https://github.com/kubernetes/kubectl + ref: v0${image_tag#1} + license_path: LICENSE + - 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