release: PR for v2.2.0

CHANGELOG/release-notes-v2.2.0.md

@@ -0,0 +1,18 @@
+## v2.2.0
+
+## Enhancements
+- feat: add native sidecar container support (#6946)
+- feat: add env-driven timeout for buildx builder pod readiness (#6944)
+- feat: app filters enhancement (#6939)
+## Bugs
+- fix: new dependabot fixes (#6955)
+- fix: streamline AWS session creation and improve error handling (#6948)
+- fix: dependabot security advisory (#6945)
+## Others
+- chore: added sql migration  (#6951)
+- misc: Release candidate v0.46.0 (#6953)
+- sync: new dependabot security fixes (#6950)
+- misc: mig seq in develop (#6949)
+- sync: migration seq (#6942)
+
+

charts/devtron/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: devtron-operator
-appVersion: 2.1.1
+appVersion: 2.2.0
 description: Chart to configure and install Devtron. Devtron is a Kubernetes Orchestration system.
 keywords:
   - Devtron
@@ -11,7 +11,7 @@ keywords:
   - argocd
   - Hyperion
 engine: gotpl
-version: 0.23.2
+version: 0.23.3
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:
@@ -23,9 +23,12 @@ dependencies:
   version: "0.x.x"
   repository: https://helm.devtron.ai
   condition: security.enabled
+- name: redis
+  version: "2.4.0"
+  repository: "https://groundhog2k.github.io/helm-charts/"
+  condition: devtronEnterprise.athenaApi.enabled
 maintainers:
 - email: prakarsh@devtron.ai
   name: Prakarsh
 icon: https://s3-ap-southeast-1.amazonaws.com/devtron.ai/images/devtron-sqr-logo.png
-home: https://devtron.ai
-
+home: https://devtron.ai

charts/devtron/devtron-bom.yaml

@@ -15,7 +15,7 @@ global:
     PG_DATABASE: orchestrator
 extraManifests: []
 installer:
-  release: "v2.1.1"
+  release: "v2.2.0"
   registry: ""
   image: "inception"
   tag: "473deaa4-185-21582"
@@ -41,13 +41,13 @@ components:
         FEATURE_CODE_MIRROR_ENABLE: "true"
         FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE: "true"
     registry: ""
-    image: "dashboard:8a175cbd-690-38843"
+    image: "dashboard:c7b89667-690-39290"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
   devtron:
     registry: ""
-    image: "hyperion:1188d0b9-280-38819"
-    cicdImage: "devtron:1188d0b9-434-38818"
+    image: "hyperion:0874dcaf-280-39287"
+    cicdImage: "devtron:0874dcaf-434-39286"
     imagePullPolicy: IfNotPresent
     customOverrides: {}
     podSecurityContext:
@@ -61,7 +61,7 @@ components:
     healthPort: 8080
   ciRunner:
     registry: ""
-    image: "ci-runner:fbde4d5e-138-38754"
+    image: "ci-runner:3b3d6d0e-138-39293"
   argocdDexServer:
     registry: ""
     image: "dex:v2.30.2"
@@ -70,7 +70,7 @@ components:
       authenticator: "authenticator:e414faff-393-13273"
   kubelink:
     registry: ""
-    image: "kubelink:fbde4d5e-564-38749"
+    image: "kubelink:09867a9c-564-39289"
     imagePullPolicy: IfNotPresent
     configs:
       ENABLE_HELM_RELEASE_CACHE: "true"
@@ -93,7 +93,7 @@ components:
     healthPort: 50052
   kubewatch:
     registry: ""
-    image: "kubewatch:fbde4d5e-419-38744"
+    image: "kubewatch:09867a9c-419-39288"
     imagePullPolicy: IfNotPresent
     healthPort: 8080
     configs:
@@ -118,7 +118,7 @@ components:
       image: postgres_exporter:v0.10.1
   gitsensor:
     registry: ""
-    image: "git-sensor:fbde4d5e-200-38750"
+    image: "git-sensor:3b3d6d0e-200-39291"
     imagePullPolicy: IfNotPresent
     serviceMonitor:
       enabled: false
@@ -136,7 +136,7 @@ components:
   # Values for lens
   lens:
     registry: ""
-    image: "lens:fbde4d5e-333-38752"
+    image: "lens:3b3d6d0e-333-39292"
     imagePullPolicy: IfNotPresent
     configs:
       GIT_SENSOR_PROTOCOL: GRPC
@@ -171,7 +171,7 @@ components:
     entMigratorImage: "devtron-utils:geni-v1.1.4"
   chartSync:
     registry: ""
-    image: chart-sync:fbde4d5e-836-38757
+    image: chart-sync:3b3d6d0e-836-39296
     schedule: "0 19 * * *"
     podSecurityContext:
       fsGroup: 1001
@@ -209,7 +209,7 @@ workflowController:
   IMDSv1ExecutorImage: "argoexec:v3.0.7"
 security:
   imageScanner:
-    image: "image-scanner:fbde4d5e-141-38756"
+    image: "image-scanner:3b3d6d0e-141-39295"
     healthPort: 8080
     configs:
       TRIVY_DB_REPOSITORY: mirror.gcr.io/aquasec/trivy-db
@@ -220,7 +220,7 @@ security:
       tag: 4.3.6
 # Values for notifier integration
 notifier:
-  image: "notifier:580d409b-372-38755"
+  image: "notifier:9804331c-372-39294"
   healthPort: 3000
 minio:
   image: "minio:RELEASE.2021-02-14T04-01-33Z"
@@ -240,6 +240,10 @@ monitoring:
       image: "k8s-sidecar:1.1.0"
       curlImage: "curl:7.73.0"
       imagePullPolicy: IfNotPresent
+redis:
+  image:
+    registry: "mirror.gcr.io"
+  fullnameOverride: "redis"
 devtronEnterprise:
   enabled: false
   finops:
@@ -270,6 +274,36 @@ devtronEnterprise:
       runAsNonRoot: true
       runAsUser: 1001
     healthPort: 8080
+  silverSurfer:
+    image: "silver-surfer:e3b9a2f6-1191-38789"
+    imagePullPolicy: IfNotPresent
+    resources: {}
+    podSecurityContext:
+      fsGroup: 1001
+      runAsGroup: 1001
+      runAsUser: 1001
+    containerSecurityContext:
+      allowPrivilegeEscalation: false
+      runAsNonRoot: true
+      runAsUser: 1001
+  athenaApi:
+    enabled: false
+    registry: ""
+    image: "athena-api:75a5ebf3-1218-39284"
+    imagePullPolicy: IfNotPresent
+    healthPort: 8000
+    configs:
+      LLM_TEMPERATURE: "0.01"
+      REDIS_URL: redis://redis.devtroncd
+      PG_DATABASE: athena
+    secrets: {}
+  athenaMcp:
+    registry: ""
+    image: "athena-mcp:75a5ebf3-1219-39285"
+    imagePullPolicy: IfNotPresent
+    healthPort: 8000
+    configs: {}
+    secrets: {}
   scoop:
     enabled: false
     registry: ""

charts/devtron/templates/athena-api.yaml

@@ -0,0 +1,107 @@
+{{- if and $.Values.devtronEnterprise.enabled $.Values.devtronEnterprise.athenaApi.enabled }}
+{{- with $.Values.devtronEnterprise.athenaApi }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: athena-api-service
+  labels:
+    app: athena-api
+spec:
+  type: ClusterIP
+  ports:
+    - name: app 
+      targetPort: app
+      protocol: TCP
+      port: 80
+  selector:
+    app: athena-api
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: athena-api
+  labels:
+    app: athena-api
+spec:
+  selector:
+    matchLabels:
+      app: athena-api
+  replicas: 1
+  minReadySeconds: 60
+  template:
+    metadata:
+      labels:
+        app: athena-api
+    spec:
+      {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.devtronEnterprise.athenaApi.nodeSelector "tolerations" $.Values.devtronEnterprise.athenaApi.tolerations "imagePullSecrets" $.Values.devtronEnterprise.athenaApi.imagePullSecrets "global" $.Values.global) | indent 6 }}
+      {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.devtronEnterprise.athenaApi.podSecurityContext "global" $.Values.global) | indent 6 }}
+      terminationGracePeriodSeconds: 30
+      restartPolicy: Always
+      serviceAccountName: devtron
+      containers:
+      - name: athena-api
+        image: {{ include "common.image" (dict "component" $.Values.devtronEnterprise.athenaApi "global" $.Values.global) }}
+        {{- if  .imagePullPolicy }}
+        imagePullPolicy: {{ .imagePullPolicy }}
+        {{- end }}
+        {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.devtron.containerSecurityContext "global" $.Values.global) | indent 8 }}
+        ports:
+          - name: app
+            containerPort: 8000
+            protocol: TCP
+        {{- if .resources }}
+        resources:
+        {{- toYaml .resources | nindent 10 }}
+        {{- end }}
+        envFrom:
+          - configMapRef:
+              name: athena-api-cm
+          - secretRef:
+              name: athena-api-secret
+          - configMapRef:
+              name: devtron-common-cm
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /health
+            port: {{ $.Values.devtronEnterprise.athenaApi.healthPort}}
+            scheme: HTTP
+          initialDelaySeconds: 20
+          periodSeconds: 300
+          successThreshold: 1
+          timeoutSeconds: 5
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /health
+            port: {{ $.Values.devtronEnterprise.athenaApi.healthPort}}
+            scheme: HTTP
+          initialDelaySeconds: 20
+          periodSeconds: 600
+          successThreshold: 1
+          timeoutSeconds: 5
+---
+apiVersion: v1
+data:
+  ARGOCD_OPTS: --grpc-web --insecure
+  ARGOCD_SERVER: argocd-server.devtroncd:80
+  DEVTRON_MCP_API_ENDPOINT: http://athena-mcp-engine-service.devtroncd/devtron/mcp
+  HOLMES_ENABLED: "true"
+  LLM_MAX_OUTPUT_TOKEN: "6000"
+  MAX_TOOL_RESPONSE_TOKENS: "3000"
+  CHAT_AGENT_MAX_TOOL_CALLS: "10"
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
+{{- if .configs}}
+{{ toYaml $.Values.devtronEnterprise.athenaApi.configs | indent 2 }}
+{{- end }}
+  SERVICE_NAME: athena-api
+  SERVICE_PLATFORM: local
+  SERVICE_VERSION: 0.2.0
+kind: ConfigMap
+metadata:
+  labels:
+    app: athena-api-server
+  name: athena-api-cm
+  namespace: devtroncd
+{{- end }}
+{{- end }}

charts/devtron/templates/athena-mcp.yaml

@@ -0,0 +1,84 @@
+{{- if and $.Values.devtronEnterprise.enabled $.Values.devtronEnterprise.athenaApi.enabled }}
+{{- with $.Values.devtronEnterprise.athenaMcp }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: athena-mcp-engine-service
+  labels:
+    app: athena-mcp
+spec:
+  type: ClusterIP
+  ports:
+    - name: app
+      targetPort: app
+      protocol: TCP
+      port: 80
+  selector:
+    app: athena-mcp
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: athena-mcp
+  labels:
+    app: athena-mcp
+spec:
+  selector:
+    matchLabels:
+      app: athena-mcp
+  replicas: 1
+  minReadySeconds: 60
+  template:
+    metadata:
+      labels:
+        app: athena-mcp
+    spec:
+      {{- include "common.schedulerConfig" (dict "nodeSelector" $.Values.devtronEnterprise.athenaMcp.nodeSelector "tolerations" $.Values.devtronEnterprise.athenaMcp.tolerations "imagePullSecrets" $.Values.devtronEnterprise.athenaMcp.imagePullSecrets "global" $.Values.global) | indent 6 }}
+      {{- include "common.podSecurityContext" (dict "podSecurityContext" $.Values.devtronEnterprise.athenaMcp.podSecurityContext "global" $.Values.global) | indent 6 }}
+      restartPolicy: Always
+      serviceAccountName: devtron
+      terminationGracePeriodSeconds: 30
+      containers:
+      - name: athena-mcp-server
+        image: {{ include "common.image" (dict "component" $.Values.devtronEnterprise.athenaMcp "global" $.Values.global) }}
+        {{- if  .imagePullPolicy }}
+        imagePullPolicy: {{ .imagePullPolicy }}
+        {{- end }}
+        {{- include "common.containerSecurityContext" (dict "containerSecurityContext" $.Values.components.devtron.containerSecurityContext "global" $.Values.global) | indent 8 }}
+        ports:
+          - name: app
+            containerPort: 8000
+            protocol: TCP
+        {{- if .resources }}
+        resources:
+        {{- toYaml .resources | nindent 10 }}
+        {{- end }}
+        envFrom:
+          - configMapRef:
+              name: athena-mcp-cm
+          - secretRef:
+              name: athena-mcp-secret
+          - configMapRef:
+              name: devtron-common-cm
+---
+apiVersion: v1
+data:
+  DEVTRON_API_ENDPOINT: http://devtron-service.devtroncd
+  DEVTRON_CENTRAL_API_URL: https://api.devtron.ai
+  DOC_RAG_SEARCH_SERVER_URL: https://api.devtron.ai
+  REQUIRED_RECOMMENDATION_DATA_COUNT: "10"
+  SERVICE_NAME: athena-mcp-engine-service
+  SERVICE_PLATFORM: k8s
+  SERVICE_VERSION: 0.2.0
+{{ toYaml $.Values.global.dbConfig | indent 2 }}
+{{- if .configs}}
+{{ toYaml $.Values.devtronEnterprise.athenaMcp.configs | indent 2 }}
+{{- end }}
+kind: ConfigMap
+metadata:
+  labels:
+    app: athena-mcp-server
+  name: athena-mcp-cm
+  namespace: devtroncd
+{{- end }}
+{{- end }}