fix: weaviate patched image with fixed CVEs (#2459)

* fix: weaviate patched image with fixed CVEs * fix: weaviate patched image with fixed CVEs * fix: weaviate patched image with fixed CVEs * fix: weaviate patched image with fixed CVEs * fix: postgresql image update for CVE fix * fix: Bump helm chart version for AI Nav api * fix: Add back reference for docker.io/bitnami/postgresql:15.2.0-debian-11-r21-d2iq.0 * build: Updated licenses.d2iq.yaml * fix: Remove extra references * fix: weaviate patched image with fixed CVEs * fix: update the patch * fix: update patch for testing * fix: update patch for testing --------- Co-authored-by: Luke Ogg <[email protected]> Co-authored-by: d2iq-mergebot <[email protected]>
mesosphere · Aug 6, 2024 · af3a956 · af3a956
1 parent ca66d08
commit af3a956
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 16 deletions.
diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
@@ -546,10 +546,10 @@ 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: ghcr.io/kube-logging/fluentd:v1.16-full-build.122
     sources:
@@ -618,9 +618,3 @@ resources:
       - url: https://github.com/mirror/busybox
         ref: master
         license_path: LICENSE
-  # Used by AI Navigator, and can be removed once it also bumps to to 15.2.0-debian-11-r21-d2iq.0
-  - container_image: docker.io/bitnami/postgresql:15.2.0-debian-11-r21
-    sources:
-      - url: https://github.com/postgres/postgres
-        ref: REL_15_2
-        license_path: COPYRIGHT
diff --git a/...navigator-app/0.2.3/ai-navigator-app.yaml → ...navigator-app/0.2.4/ai-navigator-app.yaml b/...navigator-app/0.2.3/ai-navigator-app.yaml → ...navigator-app/0.2.4/ai-navigator-app.yaml
diff --git a/...s/ai-navigator-app/0.2.3/defaults/cm.yaml → ...s/ai-navigator-app/0.2.4/defaults/cm.yaml b/...s/ai-navigator-app/0.2.3/defaults/cm.yaml → ...s/ai-navigator-app/0.2.4/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: ai-navigator-app-0.2.3-d2iq-defaults
+  name: ai-navigator-app-0.2.4-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
@@ -34,8 +34,6 @@ data:
       globalPriorityClassName: dkp-high-priority
       service:
         type: ClusterIP
-      image:
-        tag: 1.21.4
       initContainers:
         sysctlInitContainer:
           image:
@@ -55,8 +53,6 @@ data:
       readReplicas:
         priorityClassName: dkp-high-priority
       enabled: true
-      image:
-        tag: 15.2.0-debian-11-r21
 
     # Default values for cluster-info-api
     replicaCount: 1

diff --git a/...tor-app/0.2.3/defaults/kustomization.yaml → ...tor-app/0.2.4/defaults/kustomization.yaml b/...tor-app/0.2.3/defaults/kustomization.yaml → ...tor-app/0.2.4/defaults/kustomization.yaml
diff --git a/...s/ai-navigator-app/0.2.3/helmrelease.yaml → ...s/ai-navigator-app/0.2.4/helmrelease.yaml b/...s/ai-navigator-app/0.2.3/helmrelease.yaml → ...s/ai-navigator-app/0.2.4/helmrelease.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   force: false
   interval: 6h
-  path: ./services/ai-navigator-app/0.2.3/helmrelease
+  path: ./services/ai-navigator-app/0.2.4/helmrelease
   postBuild:
     substitute:
       releaseNamespace: ${releaseNamespace}

diff --git a/...or-app/0.2.3/helmrelease/helmrelease.yaml → ...or-app/0.2.4/helmrelease/helmrelease.yaml b/...or-app/0.2.3/helmrelease/helmrelease.yaml → ...or-app/0.2.4/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.2
   install:
     remediation:
       retries: 30
@@ -23,4 +23,4 @@ spec:
       retries: 30
   valuesFrom:
     - kind: ConfigMap
-      name: ai-navigator-app-0.2.3-d2iq-defaults
+      name: ai-navigator-app-0.2.4-d2iq-defaults
diff --git a/...ai-navigator-app/0.2.3/kustomization.yaml → ...ai-navigator-app/0.2.4/kustomization.yaml b/...ai-navigator-app/0.2.3/kustomization.yaml → ...ai-navigator-app/0.2.4/kustomization.yaml