Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add metrics agents #461

Merged
merged 6 commits into from
Nov 4, 2024
Merged

add metrics agents #461

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92ff25b
add metrics agents
klinch0 Nov 4, 2024
676db03
remove cpu limits
klinch0 Nov 4, 2024
e1953b1
Merge branch 'main' into feature/patch12-add-client-monitoring
kvaps Nov 4, 2024
0892ddb
fix migrations
kvaps Nov 4, 2024
83353e6
fix bundles
kvaps Nov 4, 2024
384b2b9
improve e2e
kvaps Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repos:
exclude: '^.*templates/.*\.yaml$'
args: [--unsafe]
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.41.0
rev: v0.42.0
hooks:
- id: markdownlint
args: [--fix, --disable, MD013, MD041, --]
Expand Down
54 changes: 54 additions & 0 deletions packages/apps/kubernetes/templates/helmreleases/cert-manager-crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: {{ .Release.Name }}-cert-manager-crds
labels:
cozystack.io/repository: system
coztstack.io/target-cluster-name: {{ .Release.Name }}
Comment on lines +6 to +7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo in label key.

There's a typo in the label key: coztstack.io should be cozystack.io.

  labels:
    cozystack.io/repository: system
-   coztstack.io/target-cluster-name: {{ .Release.Name }}
+   cozystack.io/target-cluster-name: {{ .Release.Name }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
cozystack.io/repository: system
coztstack.io/target-cluster-name: {{ .Release.Name }}
cozystack.io/repository: system
cozystack.io/target-cluster-name: {{ .Release.Name }}

Comment on lines +6 to +7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo in target cluster label key.

There's a typo in the label key: coztstack.io should be cozystack.io.

  labels:
    cozystack.io/repository: system
-    coztstack.io/target-cluster-name: {{ .Release.Name }}
+    cozystack.io/target-cluster-name: {{ .Release.Name }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
cozystack.io/repository: system
coztstack.io/target-cluster-name: {{ .Release.Name }}
cozystack.io/repository: system
cozystack.io/target-cluster-name: {{ .Release.Name }}

spec:
interval: 5m
releaseName: cert-manager-crds
chart:
spec:
chart: cozy-cert-manager-crds
reconcileStrategy: Revision
sourceRef:
kind: HelmRepository
name: cozystack-system
namespace: cozy-system
Comment on lines +11 to +18
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codebase verification

Chart configuration needs attention

The verification reveals potential issues:

  • The chart cozy-cert-manager-crds is referenced in multiple bundle configurations
  • However, the specified HelmRepository named cozystack-system in the cozy-system namespace is not found in the repository
  • This missing repository configuration could cause deployment failures

Action items:

  • Ensure the HelmRepository resource is properly defined in the cozy-system namespace
  • Verify the chart is available in the referenced repository
  • Consider documenting the repository setup requirements
🔗 Analysis chain

Verify chart availability in the repository.

The chart specification looks correct, but let's ensure the custom chart exists in the repository.

Let me gather more specific information about the chart and repository configuration.

Let me check one final thing to verify the HelmRepository configuration.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Verify the existence of the cert-manager CRDs chart in the repository
# Expected: Find references to the chart in Chart.yaml or similar files

# Search for references to the chart name
echo "Searching for chart references..."
rg -l "cozy-cert-manager-crds" --type yaml

# Search for potential chart directory
echo "Searching for chart directory..."
fd -t d "cozy-cert-manager-crds"

Length of output: 1301

Script:

#!/bin/bash
# Check HelmRepository configuration and chart references
echo "Checking HelmRepository configuration..."
rg -A 5 'kind: HelmRepository.*cozystack-system' --type yaml

echo -e "\nChecking chart references in bundle configurations..."
rg -A 10 'cozy-cert-manager-crds' packages/core/platform/bundles/

Length of output: 3484

Script:

#!/bin/bash
# Check for HelmRepository definition in the system namespace
echo "Checking HelmRepository in cozy-system namespace..."
rg -A 5 'kind: HelmRepository.*name: cozystack-system' --type yaml

echo -e "\nChecking for repository configuration files..."
fd -t f "repository" -e yaml

Length of output: 389

kubeConfig:
secretRef:
name: {{ .Release.Name }}-kubeconfig
targetNamespace: cozy-cert-manager-crds
storageNamespace: cozy-cert-manager-crds
install:
createNamespace: true
remediation:
retries: -1
upgrade:
remediation:
retries: -1
{{- if .Values.addons.certManager.valuesOverride }}
valuesFrom:
- kind: Secret
name: {{ .Release.Name }}-cert-manager-crds-values-override
valuesKey: values
{{- end }}

dependsOn:
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
- name: {{ .Release.Name }}
namespace: {{ .Release.Namespace }}
{{- end }}
- name: {{ .Release.Name }}-cilium
namespace: {{ .Release.Namespace }}
{{- if .Values.addons.certManager.valuesOverride }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ .Release.Name }}-cert-manager-crds-values-override
stringData:
values: |
{{- toYaml .Values.addons.certManager.valuesOverride | nindent 4 }}
{{- end }}
2 changes: 2 additions & 0 deletions packages/apps/kubernetes/templates/helmreleases/cert-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ spec:
{{- end }}
- name: {{ .Release.Name }}-cilium
namespace: {{ .Release.Namespace }}
- name: {{ .Release.Name }}-cert-manager-crds
namespace: {{ .Release.Namespace }}
{{- end }}
{{- if .Values.addons.certManager.valuesOverride }}
---
Expand Down
105 changes: 105 additions & 0 deletions packages/apps/kubernetes/templates/helmreleases/monitoring-agents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
{{- $targetTenant := index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }}
{{- if .Values.addons.monitoringAgents.enabled }}
Comment on lines +1 to +3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Add error handling for missing namespace annotation

The code assumes the namespace annotation namespace.cozystack.io/monitoring exists. If it's missing, this could cause runtime template rendering failures.

Consider adding a default value or validation:

-{{- $targetTenant := index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }}
+{{- $targetTenant := default "default" (index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" | default "") }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
{{- $targetTenant := index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }}
{{- if .Values.addons.monitoringAgents.enabled }}
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
{{- $targetTenant := default "default" (index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" | default "") }}
{{- if .Values.addons.monitoringAgents.enabled }}
🧰 Tools
🪛 yamllint

[error] 1-1: syntax error: expected the node content, but found '-'

(syntax)

Comment on lines +1 to +3
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Add nil checks for namespace lookup and annotation access

The current implementation might fail if:

  1. The namespace doesn't exist (lookup returns nil)
  2. The required annotation is missing

Add nil checks with this diff:

{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
+{{- if $myNS }}
+{{- if hasKey $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }}
{{- $targetTenant := index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }}
{{- if .Values.addons.monitoringAgents.enabled }}
+{{- else }}
+{{- fail "Missing required annotation: namespace.cozystack.io/monitoring" }}
+{{- end }}
+{{- else }}
+{{- fail "Namespace not found" }}
+{{- end }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
{{- $targetTenant := index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }}
{{- if .Values.addons.monitoringAgents.enabled }}
{{- $myNS := lookup "v1" "Namespace" "" .Release.Namespace }}
{{- if $myNS }}
{{- if hasKey $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }}
{{- $targetTenant := index $myNS.metadata.annotations "namespace.cozystack.io/monitoring" }}
{{- if .Values.addons.monitoringAgents.enabled }}
{{- else }}
{{- fail "Missing required annotation: namespace.cozystack.io/monitoring" }}
{{- end }}
{{- else }}
{{- fail "Namespace not found" }}
{{- end }}
🧰 Tools
🪛 yamllint

[error] 1-1: syntax error: expected the node content, but found '-'

(syntax)

apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: {{ .Release.Name }}-monitoring-agents
labels:
cozystack.io/repository: system
coztstack.io/target-cluster-name: {{ .Release.Name }}
Comment on lines +8 to +10
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo in label key

There's a typo in the label key: coztstack.io should be cozystack.io.

-    coztstack.io/target-cluster-name: {{ .Release.Name }}
+    cozystack.io/target-cluster-name: {{ .Release.Name }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
labels:
cozystack.io/repository: system
coztstack.io/target-cluster-name: {{ .Release.Name }}
labels:
cozystack.io/repository: system
cozystack.io/target-cluster-name: {{ .Release.Name }}

Comment on lines +8 to +10
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo in label key

There's a typo in the label key: coztstack.io should be cozystack.io

  labels:
    cozystack.io/repository: system
-    coztstack.io/target-cluster-name: {{ .Release.Name }}
+    cozystack.io/target-cluster-name: {{ .Release.Name }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
labels:
cozystack.io/repository: system
coztstack.io/target-cluster-name: {{ .Release.Name }}
labels:
cozystack.io/repository: system
cozystack.io/target-cluster-name: {{ .Release.Name }}

spec:
interval: 5m
releaseName: cozy-monitoring-agents
chart:
spec:
chart: cozy-monitoring-agents
reconcileStrategy: Revision
sourceRef:
kind: HelmRepository
name: cozystack-system
namespace: cozy-system
kubeConfig:
secretRef:
name: {{ .Release.Name }}-kubeconfig
targetNamespace: cozy-monitoring-agents
storageNamespace: cozy-monitoring-agents
install:
createNamespace: true
timeout: "300s"
remediation:
retries: -1
upgrade:
remediation:
retries: -1
dependsOn:
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
- name: {{ .Release.Name }}
namespace: {{ .Release.Namespace }}
{{- end }}
- name: {{ .Release.Name }}-cilium
namespace: {{ .Release.Namespace }}
- name: {{ .Release.Name }}-cozy-victoria-metrics-operator
namespace: {{ .Release.Namespace }}
values:
vmagent:
externalLabels:
cluster: {{ .Release.Name }}
tenant: {{ $targetTenant }}
remoteWrite:
url: http://vminsert-shortterm.{{ $targetTenant }}.svc:8480/insert/0/prometheus

fluent-bit:
readinessProbe:
httpGet:
path: /
daemonSetVolumes:
- name: varlog
hostPath:
path: /var/log
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
daemonSetVolumeMounts:
- name: varlog
mountPath: /var/log
- name: varlibdockercontainers
mountPath: /var/lib/docker/containers
readOnly: true
Comment on lines +56 to +68
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Make container runtime paths configurable

The host paths for logs are hardcoded to Docker-specific locations. This might not work with other container runtimes (containerd, CRI-O).

Consider making these paths configurable through values:

     daemonSetVolumes:
       - name: varlog
         hostPath:
-          path: /var/log
+          path: {{ .Values.fluent_bit.log_path | default "/var/log" }}
       - name: varlibdockercontainers
         hostPath:
-          path: /var/lib/docker/containers
+          path: {{ .Values.fluent_bit.container_log_path | default "/var/lib/docker/containers" }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
daemonSetVolumes:
- name: varlog
hostPath:
path: /var/log
- name: varlibdockercontainers
hostPath:
path: /var/lib/docker/containers
daemonSetVolumeMounts:
- name: varlog
mountPath: /var/log
- name: varlibdockercontainers
mountPath: /var/lib/docker/containers
readOnly: true
daemonSetVolumes:
- name: varlog
hostPath:
path: {{ .Values.fluent_bit.log_path | default "/var/log" }}
- name: varlibdockercontainers
hostPath:
path: {{ .Values.fluent_bit.container_log_path | default "/var/lib/docker/containers" }}
daemonSetVolumeMounts:
- name: varlog
mountPath: /var/log
- name: varlibdockercontainers
mountPath: /var/lib/docker/containers
readOnly: true

config:
outputs: |
[OUTPUT]
Name http
Match kube.*
Host vlogs-generic.{{ $targetTenant }}.svc
port 9428
compress gzip
uri /insert/jsonline?_stream_fields=stream,kubernetes_pod_name,kubernetes_container_name,kubernetes_namespace_name&_msg_field=log&_time_field=date
format json_lines
json_date_format iso8601
header AccountID 0
header ProjectID 0
filters: |
Comment on lines +70 to +82
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Enhance security and reliability of HTTP output configuration

The current HTTP output configuration:

  1. Uses unencrypted HTTP
  2. Lacks retry/backoff configurations
  3. Has hardcoded AccountID/ProjectID values

Consider adding:

  1. HTTPS support with TLS verification
  2. Retry configurations with backoff
  3. Making AccountID/ProjectID configurable via values.yaml
  4. Adding error handling for failed submissions

[FILTER]
Name kubernetes
Match kube.*
Merge_Log On
Keep_Log On
K8S-Logging.Parser On
K8S-Logging.Exclude On
[FILTER]
Name nest
Match *
Wildcard pod_name
Operation lift
Nested_under kubernetes
Add_prefix kubernetes_
[FILTER]
Name modify
Match *
Add tenant {{ $targetTenant }}
[FILTER]
Name modify
Match *
Add cluster {{ .Release.Name }}
{{- end }}
41 changes: 41 additions & 0 deletions packages/apps/kubernetes/templates/helmreleases/victoria-metrics-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{{- if .Values.addons.monitoringAgents.enabled }}
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: {{ .Release.Name }}-cozy-victoria-metrics-operator
labels:
cozystack.io/repository: system
coztstack.io/target-cluster-name: {{ .Release.Name }}
Comment on lines +1 to +8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo in cluster label name.

There's a typo in the target cluster label key: coztstack.io should be cozystack.io.

-    coztstack.io/target-cluster-name: {{ .Release.Name }}
+    cozystack.io/target-cluster-name: {{ .Release.Name }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
{{- if .Values.addons.monitoringAgents.enabled }}
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: {{ .Release.Name }}-cozy-victoria-metrics-operator
labels:
cozystack.io/repository: system
coztstack.io/target-cluster-name: {{ .Release.Name }}
{{- if .Values.addons.monitoringAgents.enabled }}
apiVersion: helm.toolkit.fluxcd.io/v2
kind: HelmRelease
metadata:
name: {{ .Release.Name }}-cozy-victoria-metrics-operator
labels:
cozystack.io/repository: system
cozystack.io/target-cluster-name: {{ .Release.Name }}
🧰 Tools
🪛 yamllint

[error] 1-1: syntax error: expected the node content, but found '-'

(syntax)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix typo in label key.

There's a typo in the label key: coztstack.io should be cozystack.io.

-    coztstack.io/target-cluster-name: {{ .Release.Name }}
+    cozystack.io/target-cluster-name: {{ .Release.Name }}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
coztstack.io/target-cluster-name: {{ .Release.Name }}
cozystack.io/target-cluster-name: {{ .Release.Name }}

spec:
interval: 5m
releaseName: cozy-victoria-metrics-operator
chart:
spec:
chart: cozy-victoria-metrics-operator
reconcileStrategy: Revision
sourceRef:
kind: HelmRepository
name: cozystack-system
namespace: cozy-system
kubeConfig:
secretRef:
name: {{ .Release.Name }}-kubeconfig
targetNamespace: cozy-victoria-metrics-operator
storageNamespace: cozy-victoria-metrics-operator
install:
createNamespace: true
remediation:
retries: -1
upgrade:
remediation:
retries: -1
Comment on lines +25 to +31
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Consider adding a failure threshold for retries.

The current configuration sets unlimited retries (retries: -1) for both install and upgrade remediation. This could lead to infinite retry loops if there's a persistent issue.

   install:
     createNamespace: true
     remediation:
-      retries: -1
+      retries: 5
+      failureThreshold: 300
   upgrade:
     remediation:
-      retries: -1
+      retries: 5
+      failureThreshold: 300
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
install:
createNamespace: true
remediation:
retries: -1
upgrade:
remediation:
retries: -1
install:
createNamespace: true
remediation:
retries: 5
failureThreshold: 300
upgrade:
remediation:
retries: 5
failureThreshold: 300

dependsOn:
{{- if lookup "helm.toolkit.fluxcd.io/v2" "HelmRelease" .Release.Namespace .Release.Name }}
- name: {{ .Release.Name }}
namespace: {{ .Release.Namespace }}
{{- end }}
- name: {{ .Release.Name }}-cilium
namespace: {{ .Release.Namespace }}
- name: {{ .Release.Name }}-cert-manager-crds
namespace: {{ .Release.Namespace }}
{{- end }}
17 changes: 16 additions & 1 deletion packages/apps/kubernetes/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,23 @@
"default": {}
}
}
},
"monitoringAgents": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean",
"description": "Enables MonitoringAgents (fluentbit, vmagents for sending logs and metrics to storage) if tenant monitoring enabled, send to tenant storage, else to root storage",
"default": false
},
"valuesOverride": {
"type": "object",
"description": "Custom values to override",
"default": {}
}
}
}
}
}
}
}
}
9 changes: 9 additions & 0 deletions packages/apps/kubernetes/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,12 @@ addons:
##
enabled: false
valuesOverride: {}

## MonitoringAgents
##
monitoringAgents:
## @param addons.monitoringAgents.enabled Enables MonitoringAgents (fluentbit, vmagents for sending logs and metrics to storage) if tenant monitoring enabled, send to tenant storage, else to root storage
## @param addons.monitoringAgents.valuesOverride Custom values to override
##
enabled: false
valuesOverride: {}
3 changes: 1 addition & 2 deletions packages/apps/redis/templates/redisfailover.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ spec:
cpu: 150m
memory: 400Mi
limits:
cpu: 2
memory: 1000Mi
{{- with .Values.size }}
storage:
Expand All @@ -37,7 +36,7 @@ spec:
storageClassName: {{ . }}
{{- end }}
{{- end }}
exporter:
exporter:
enabled: true
image: oliver006/redis_exporter:v1.55.0-alpine
args:
Expand Down
2 changes: 1 addition & 1 deletion packages/apps/vm-instance/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
#name: Virtual Machine
name: vm-instance
description: Virtual machine instance
icon: /logos/vm.svg
icon: /logos/vmi.svg

# A chart can be either an 'application' or a 'library' chart.
#
Expand Down
0 packages/apps/vm-instance/logos/vm.svg → packages/apps/vm-instance/logos/vmi.svg
View file
Open in desktop
File renamed without changes
2 changes: 1 addition & 1 deletion packages/core/installer/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cozystack:
image: ghcr.io/aenix-io/cozystack/cozystack:v0.17.1@sha256:7c83bf1a31096cecc78da2a10b0bb4e2c1723bdcbfd79cd523516d737fa1f952
image: kklinch0/cozystack:12.3.9@sha256:952e757f12e49e064763e6e6d3814b69bf0ea383abe418c18cddcc727acf7f58
15 changes: 14 additions & 1 deletion packages/core/platform/bundles/distro-full.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,17 @@ releases:
autoDirectNodeRoutes: true
routingMode: native

- name: cert-manager-crds
releaseName: cert-manager-crds
chart: cozy-cert-manager-crds
namespace: cozy-cert-manager
dependsOn: [cilium]

- name: cert-manager
releaseName: cert-manager
chart: cozy-cert-manager
namespace: cozy-cert-manager
dependsOn: [cilium]
dependsOn: [cert-manager-crds]

- name: cert-manager-issuers
releaseName: cert-manager-issuers
Expand All @@ -56,6 +62,13 @@ releases:
privileged: true
dependsOn: [cilium,victoria-metrics-operator]

- name: monitoring-agents
releaseName: monitoring-agents
chart: cozy-monitoring-agents
namespace: cozy-monitoring
privileged: true
dependsOn: [monitoring]

- name: metallb
releaseName: metallb
chart: cozy-metallb
Expand Down
17 changes: 15 additions & 2 deletions packages/core/platform/bundles/distro-hosted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,17 @@ releases:
namespace: cozy-fluxcd
dependsOn: [fluxcd-operator]

- name: cert-manager-crds
releaseName: cert-manager-crds
chart: cozy-cert-manager-crds
namespace: cozy-cert-manager
dependsOn: []

- name: cert-manager
releaseName: cert-manager
chart: cozy-cert-manager
namespace: cozy-cert-manager
dependsOn: []
dependsOn: [cert-manager-crds]

- name: cert-manager-issuers
releaseName: cert-manager-issuers
Expand All @@ -39,6 +45,13 @@ releases:
privileged: true
dependsOn: [victoria-metrics-operator]

- name: monitoring-agents
releaseName: monitoring-agents
chart: cozy-monitoring-agents
namespace: cozy-monitoring
privileged: true
dependsOn: [monitoring]

- name: etcd-operator
releaseName: etcd-operator
chart: cozy-etcd-operator
Expand Down Expand Up @@ -99,7 +112,7 @@ releases:
chart: cozy-external-dns
namespace: cozy-external-dns
optional: true
dependsOn: []
dependsOn: []

- name: external-secrets-operator
releaseName: external-secrets-operator
Expand Down
Loading
Loading