diff --git a/packages/apps/clickhouse/Chart.yaml b/packages/apps/clickhouse/Chart.yaml index 38aabea0..adee60fa 100644 --- a/packages/apps/clickhouse/Chart.yaml +++ b/packages/apps/clickhouse/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.9.0 +version: 0.9.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/clickhouse/templates/clickhouse.yaml b/packages/apps/clickhouse/templates/clickhouse.yaml index dc19ebe4..3f5117a1 100644 --- a/packages/apps/clickhouse/templates/clickhouse.yaml +++ b/packages/apps/clickhouse/templates/clickhouse.yaml @@ -92,6 +92,9 @@ spec: templates: volumeClaimTemplates: - name: data-volume-template + metadata: + labels: + app.kubernetes.io/instance: {{ .Release.Name }} spec: accessModes: - ReadWriteOnce @@ -99,6 +102,9 @@ spec: requests: storage: {{ .Values.size }} - name: log-volume-template + metadata: + labels: + app.kubernetes.io/instance: {{ .Release.Name }} spec: accessModes: - ReadWriteOnce @@ -107,6 +113,9 @@ spec: storage: {{ .Values.logStorageSize }} podTemplates: - name: clickhouse-per-host + metadata: + labels: + app.kubernetes.io/instance: {{ .Release.Name }} spec: affinity: podAntiAffinity: @@ -133,6 +142,9 @@ spec: mountPath: /var/log/clickhouse-server serviceTemplates: - name: svc-template + metadata: + labels: + app.kubernetes.io/instance: {{ .Release.Name }} generateName: chendpoint-{chi} spec: ports: diff --git a/packages/apps/clickhouse/templates/workloadmonitor.yaml b/packages/apps/clickhouse/templates/workloadmonitor.yaml index 9ddd576e..f87db7bf 100644 --- a/packages/apps/clickhouse/templates/workloadmonitor.yaml +++ b/packages/apps/clickhouse/templates/workloadmonitor.yaml @@ -9,5 +9,5 @@ spec: kind: clickhouse type: clickhouse selector: - clickhouse.altinity.com/chi: {{ $.Release.Name }} + app.kubernetes.io/instance: {{ $.Release.Name }} version: {{ $.Chart.Version }} diff --git a/packages/apps/ferretdb/Chart.yaml b/packages/apps/ferretdb/Chart.yaml index 273d9d97..dea14dfd 100644 --- a/packages/apps/ferretdb/Chart.yaml +++ b/packages/apps/ferretdb/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.6.0 +version: 0.6.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/ferretdb/templates/external-svc.yaml b/packages/apps/ferretdb/templates/external-svc.yaml index 2e0501c8..31d54695 100644 --- a/packages/apps/ferretdb/templates/external-svc.yaml +++ b/packages/apps/ferretdb/templates/external-svc.yaml @@ -2,6 +2,8 @@ apiVersion: v1 kind: Service metadata: name: {{ .Release.Name }} + labels: + app.kubernetes.io/instance: {{ .Release.Name }} spec: type: {{ ternary "LoadBalancer" "ClusterIP" .Values.external }} {{- if .Values.external }} diff --git a/packages/apps/ferretdb/templates/ferretdb.yaml b/packages/apps/ferretdb/templates/ferretdb.yaml index b69662b2..7fbba009 100644 --- a/packages/apps/ferretdb/templates/ferretdb.yaml +++ b/packages/apps/ferretdb/templates/ferretdb.yaml @@ -12,6 +12,7 @@ spec: metadata: labels: app: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} spec: containers: - name: ferretdb diff --git a/packages/apps/ferretdb/templates/postgres.yaml b/packages/apps/ferretdb/templates/postgres.yaml index e6d89c63..716242ee 100644 --- a/packages/apps/ferretdb/templates/postgres.yaml +++ b/packages/apps/ferretdb/templates/postgres.yaml @@ -35,6 +35,7 @@ spec: inheritedMetadata: labels: policy.cozystack.io/allow-to-apiserver: "true" + app.kubernetes.io/instance: {{ .Release.Name }} {{- if .Values.users }} managed: diff --git a/packages/apps/ferretdb/templates/workloadmonitor.yaml b/packages/apps/ferretdb/templates/workloadmonitor.yaml index 96e7d87e..a1b364d0 100644 --- a/packages/apps/ferretdb/templates/workloadmonitor.yaml +++ b/packages/apps/ferretdb/templates/workloadmonitor.yaml @@ -9,5 +9,5 @@ spec: kind: ferretdb type: ferretdb selector: - app: {{ $.Release.Name }} + app.kubernetes.io/instance: {{ $.Release.Name }} version: {{ $.Chart.Version }} diff --git a/packages/apps/http-cache/Chart.yaml b/packages/apps/http-cache/Chart.yaml index 151b3b42..774812b9 100644 --- a/packages/apps/http-cache/Chart.yaml +++ b/packages/apps/http-cache/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.0 +version: 0.5.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/mysql/Chart.yaml b/packages/apps/mysql/Chart.yaml index f9dcb7c6..efdca6cc 100644 --- a/packages/apps/mysql/Chart.yaml +++ b/packages/apps/mysql/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.0 +version: 0.7.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/postgres/Chart.yaml b/packages/apps/postgres/Chart.yaml index 35d83b81..5d470f8c 100644 --- a/packages/apps/postgres/Chart.yaml +++ b/packages/apps/postgres/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.12.0 +version: 0.12.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/redis/Chart.yaml b/packages/apps/redis/Chart.yaml index 2a07e2c0..a71a3dc8 100644 --- a/packages/apps/redis/Chart.yaml +++ b/packages/apps/redis/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.0 +version: 0.7.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/tcp-balancer/Chart.yaml b/packages/apps/tcp-balancer/Chart.yaml index 5955c5be..f1976432 100644 --- a/packages/apps/tcp-balancer/Chart.yaml +++ b/packages/apps/tcp-balancer/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.4.0 +version: 0.4.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/tcp-balancer/templates/deployment.yaml b/packages/apps/tcp-balancer/templates/deployment.yaml index fff64a4c..63ce34ab 100644 --- a/packages/apps/tcp-balancer/templates/deployment.yaml +++ b/packages/apps/tcp-balancer/templates/deployment.yaml @@ -15,6 +15,7 @@ spec: metadata: labels: app: {{ .Release.Name }}-haproxy + app.kubernetes.io/instance: {{ .Release.Name }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} spec: diff --git a/packages/apps/tcp-balancer/templates/workloadmonitor.yaml b/packages/apps/tcp-balancer/templates/workloadmonitor.yaml new file mode 100644 index 00000000..41dce2ab --- /dev/null +++ b/packages/apps/tcp-balancer/templates/workloadmonitor.yaml @@ -0,0 +1,13 @@ +--- +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }} +spec: + replicas: {{ .Values.replicas }} + minReplicas: 1 + kind: tcp-balancer + type: haproxy + selector: + app.kubernetes.io/instance: {{ $.Release.Name }} + version: {{ $.Chart.Version }} diff --git a/packages/apps/versions_map b/packages/apps/versions_map index c66475d3..43479646 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -9,7 +9,8 @@ clickhouse 0.6.0 1ec10165 clickhouse 0.6.1 c62a83a7 clickhouse 0.6.2 8267072d clickhouse 0.7.0 93bdf411 -clickhouse 0.9.0 HEAD +clickhouse 0.9.0 6130f43d +clickhouse 0.9.1 HEAD ferretdb 0.1.0 e9716091 ferretdb 0.1.1 91b0499a ferretdb 0.2.0 6c5cf5bf @@ -18,13 +19,15 @@ ferretdb 0.4.0 b40e1b09 ferretdb 0.4.1 1ec10165 ferretdb 0.4.2 8267072d ferretdb 0.5.0 93bdf411 -ferretdb 0.6.0 HEAD +ferretdb 0.6.0 6130f43d +ferretdb 0.6.1 HEAD http-cache 0.1.0 263e47be http-cache 0.2.0 53f2365e http-cache 0.3.0 6c5cf5bf http-cache 0.3.1 0f312d5c http-cache 0.4.0 93bdf411 -http-cache 0.5.0 HEAD +http-cache 0.5.0 6130f43d +http-cache 0.5.1 HEAD kafka 0.1.0 f7eaab0a kafka 0.2.0 c0685f43 kafka 0.2.1 dfbc210b @@ -76,7 +79,8 @@ mysql 0.5.1 0f312d5c mysql 0.5.2 1ec10165 mysql 0.5.3 8267072d mysql 0.6.0 93bdf411 -mysql 0.7.0 HEAD +mysql 0.7.0 6130f43d +mysql 0.7.1 HEAD nats 0.1.0 e9716091 nats 0.2.0 6c5cf5bf nats 0.3.0 78366f19 @@ -101,7 +105,8 @@ postgres 0.9.0 8267072d postgres 0.10.0 721c12a7 postgres 0.10.1 93bdf411 postgres 0.11.0 f9f8bb2f -postgres 0.12.0 HEAD +postgres 0.12.0 6130f43d +postgres 0.12.1 HEAD rabbitmq 0.1.0 263e47be rabbitmq 0.2.0 53f2365e rabbitmq 0.3.0 6c5cf5bf @@ -119,11 +124,13 @@ redis 0.3.1 c62a83a7 redis 0.4.0 84f3ccc0 redis 0.5.0 4e68e65c redis 0.6.0 93bdf411 -redis 0.7.0 HEAD +redis 0.7.0 6130f43d +redis 0.7.1 HEAD tcp-balancer 0.1.0 263e47be tcp-balancer 0.2.0 53f2365e tcp-balancer 0.3.0 93bdf411 -tcp-balancer 0.4.0 HEAD +tcp-balancer 0.4.0 6130f43d +tcp-balancer 0.4.1 HEAD tenant 0.1.4 afc997ef tenant 0.1.5 e3ab858a tenant 1.0.0 263e47be @@ -161,9 +168,11 @@ virtual-machine 0.8.1 93c46161 virtual-machine 0.8.2 de19450f virtual-machine 0.9.0 721c12a7 virtual-machine 0.9.1 93bdf411 -virtual-machine 0.10.0 HEAD +virtual-machine 0.10.0 6130f43d +virtual-machine 0.10.1 HEAD vm-disk 0.1.0 d971f2ff -vm-disk 0.1.1 HEAD +vm-disk 0.1.1 6130f43d +vm-disk 0.1.2 HEAD vm-instance 0.1.0 1ec10165 vm-instance 0.2.0 84f3ccc0 vm-instance 0.3.0 4e68e65c @@ -172,10 +181,12 @@ vm-instance 0.4.1 0ab39f20 vm-instance 0.5.0 3fa4dd3a vm-instance 0.5.1 de19450f vm-instance 0.6.0 721c12a7 -vm-instance 0.7.0 HEAD +vm-instance 0.7.0 6130f43d +vm-instance 0.7.1 HEAD vpn 0.1.0 263e47be vpn 0.2.0 53f2365e vpn 0.3.0 6c5cf5bf vpn 0.3.1 1ec10165 vpn 0.4.0 93bdf411 -vpn 0.5.0 HEAD +vpn 0.5.0 6130f43d +vpn 0.5.1 HEAD diff --git a/packages/apps/virtual-machine/Chart.yaml b/packages/apps/virtual-machine/Chart.yaml index 000ccba6..152ccb73 100644 --- a/packages/apps/virtual-machine/Chart.yaml +++ b/packages/apps/virtual-machine/Chart.yaml @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.10.0 +version: 0.10.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/virtual-machine/templates/dashboard-resourcemap.yaml b/packages/apps/virtual-machine/templates/dashboard-resourcemap.yaml index 22af2faa..4f09a79b 100644 --- a/packages/apps/virtual-machine/templates/dashboard-resourcemap.yaml +++ b/packages/apps/virtual-machine/templates/dashboard-resourcemap.yaml @@ -21,5 +21,5 @@ spec: kind: virtual-machine type: virtual-machine selector: - vm.kubevirt.io/name: {{ .Release.Name }} + app.kubernetes.io/instance: {{ .Release.Name }} version: {{ $.Chart.Version }} diff --git a/packages/apps/virtual-machine/templates/vm.yaml b/packages/apps/virtual-machine/templates/vm.yaml index 1d94799b..f9010748 100644 --- a/packages/apps/virtual-machine/templates/vm.yaml +++ b/packages/apps/virtual-machine/templates/vm.yaml @@ -26,6 +26,8 @@ spec: dataVolumeTemplates: - metadata: name: {{ include "virtual-machine.fullname" . }} + labels: + app.kubernetes.io/instance: {{ .Release.Name }} spec: storage: resources: diff --git a/packages/apps/vm-disk/Chart.yaml b/packages/apps/vm-disk/Chart.yaml index 9c112064..6e1237ab 100644 --- a/packages/apps/vm-disk/Chart.yaml +++ b/packages/apps/vm-disk/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.1 +version: 0.1.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/vm-disk/templates/dv.yaml b/packages/apps/vm-disk/templates/dv.yaml index 06b5e4dc..f7de5fbd 100644 --- a/packages/apps/vm-disk/templates/dv.yaml +++ b/packages/apps/vm-disk/templates/dv.yaml @@ -7,6 +7,8 @@ metadata: cdi.kubevirt.io/storage.bind.immediate.requested: "" {{- end }} vm-disk.cozystack.io/optical: "{{ .Values.optical }}" + labels: + app.kubernetes.io/instance: {{ .Release.Name }} name: {{ .Release.Name }} spec: {{- if $existingDV }} diff --git a/packages/apps/vm-disk/templates/workloadmonitor.yaml b/packages/apps/vm-disk/templates/workloadmonitor.yaml new file mode 100644 index 00000000..b964cecc --- /dev/null +++ b/packages/apps/vm-disk/templates/workloadmonitor.yaml @@ -0,0 +1,12 @@ +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }} +spec: + replicas: 0 + minReplicas: 0 + kind: vm-disk + type: vm-disk + selector: + app.kubernetes.io/instance: {{ .Release.Name }} + version: {{ $.Chart.Version }} diff --git a/packages/apps/vm-instance/Chart.yaml b/packages/apps/vm-instance/Chart.yaml index 8011ca1f..60a72d5f 100644 --- a/packages/apps/vm-instance/Chart.yaml +++ b/packages/apps/vm-instance/Chart.yaml @@ -17,7 +17,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.7.0 +version: 0.7.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/vm-instance/templates/dashboard-resourcemap.yaml b/packages/apps/vm-instance/templates/dashboard-resourcemap.yaml index d735b5c3..a495b494 100644 --- a/packages/apps/vm-instance/templates/dashboard-resourcemap.yaml +++ b/packages/apps/vm-instance/templates/dashboard-resourcemap.yaml @@ -22,5 +22,5 @@ spec: kind: virtual-machine type: virtual-machine selector: - {{- include "virtual-machine.selectorLabels" . | nindent 4 }} + app.kubernetes.io/instance: {{ .Release.Name }} version: {{ $.Chart.Version }} diff --git a/packages/apps/vpn/Chart.yaml b/packages/apps/vpn/Chart.yaml index 4382233a..b772db4f 100644 --- a/packages/apps/vpn/Chart.yaml +++ b/packages/apps/vpn/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.5.0 +version: 0.5.1 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/vpn/charts/cozy-lib b/packages/apps/vpn/charts/cozy-lib new file mode 120000 index 00000000..e1813509 --- /dev/null +++ b/packages/apps/vpn/charts/cozy-lib @@ -0,0 +1 @@ +../../../library/cozy-lib \ No newline at end of file diff --git a/packages/apps/vpn/templates/deployment.yaml b/packages/apps/vpn/templates/deployment.yaml index 8de539ab..c4acb5d5 100644 --- a/packages/apps/vpn/templates/deployment.yaml +++ b/packages/apps/vpn/templates/deployment.yaml @@ -14,6 +14,7 @@ spec: labels: app: {{ .Release.Name }}-vpn name: {{ .Release.Name }}-vpn + app.kubernetes.io/instance: {{ .Release.Name }} annotations: checksum/config: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} spec: @@ -43,9 +44,9 @@ spec: - name: outline-vpn image: quay.io/outline/shadowbox:stable {{- if .Values.resources }} - resources: {{- toYaml .Values.resources | nindent 10 }} + resources: {{- include "cozy-lib.resources.sanitize" (list .Values.resources $) | nindent 12 }} {{- else if ne .Values.resourcesPreset "none" }} - resources: {{- include "resources.preset" (dict "type" .Values.resourcesPreset "Release" .Release) | nindent 10 }} + resources: {{- include "cozy-lib.resources.preset" (list .Values.resourcesPreset $) | nindent 12 }} {{- end }} ports: - containerPort: 40000 diff --git a/packages/apps/vpn/templates/service.yaml b/packages/apps/vpn/templates/service.yaml index 7e3a3523..9b2a805c 100644 --- a/packages/apps/vpn/templates/service.yaml +++ b/packages/apps/vpn/templates/service.yaml @@ -5,6 +5,7 @@ metadata: name: {{ .Release.Name }}-vpn labels: app: {{ .Release.Name }}-vpn + app.kubernetes.io/instance: {{ .Release.Name }} spec: {{- if .Values.externalIPs }} externalIPs: diff --git a/packages/apps/vpn/templates/workloadmonitor.yaml b/packages/apps/vpn/templates/workloadmonitor.yaml new file mode 100644 index 00000000..a75f7940 --- /dev/null +++ b/packages/apps/vpn/templates/workloadmonitor.yaml @@ -0,0 +1,12 @@ +apiVersion: cozystack.io/v1alpha1 +kind: WorkloadMonitor +metadata: + name: {{ $.Release.Name }} +spec: + replicas: {{ .Values.replicas }} + minReplicas: 1 + kind: vpn + type: vpn + selector: + app.kubernetes.io/instance: {{ .Release.Name }} + version: {{ $.Chart.Version }} diff --git a/packages/core/installer/values.yaml b/packages/core/installer/values.yaml index 8dfe9afa..35046315 100644 --- a/packages/core/installer/values.yaml +++ b/packages/core/installer/values.yaml @@ -1,2 +1,2 @@ cozystack: - image: ghcr.io/cozystack/cozystack/installer:v0.31.1@sha256:b8f418e45dcbf351b13ce743f3528b195159753430d35c619dd82a1c676ae3bb + image: ghcr.io/cozystack/cozystack/installer:latest@sha256:b7717793407a6ba64bb0cddddcc4cab0864e3ef1646c7d58d2359fbd163e7260