Skip to content

Commit d550a67

Browse files
kvapskvaps
authored
Merge branch 'main' into 519-cross-arch-components
2 parents 15d7b6d + 8e6941d commit d550a67

87 files changed

Lines changed: 719 additions & 620 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ repos:
1818
(cd "$dir" && make generate)
1919
fi
2020
done
21+
git diff --color=always | cat
2122
'
2223
language: script
2324
files: ^.*$

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ build: build-deps
2020
make -C packages/system/kubeovn image
2121
make -C packages/system/kubeovn-webhook image
2222
make -C packages/system/dashboard image
23+
make -C packages/system/metallb image
2324
make -C packages/system/kamaji image
2425
make -C packages/system/bucket image
2526
make -C packages/core/testing image

‎hack/e2e.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ if ! kubectl wait --timeout=2m --for=condition=ready -n tenant-root hr monitorin
334334
kubectl wait --timeout=2m --for=condition=ready -n tenant-root hr monitoring
335335
fi
336336

337-
kubectl patch -n tenant-root ingresses.apps.cozystack.io ingress --type=merge -p '{"spec":{
338-
"dashboard": true
337+
kubectl patch -n cozy-system cm cozystack --type=merge -p '{"data":{
338+
"expose-services": "api,dashboard,cdi-uploadproxy,vm-exportproxy,keycloak"
339339
}}'
340340

341341
# Wait for nginx-ingress-controller

‎packages/apps/clickhouse/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.7.0
19+
version: 0.8.0
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

‎packages/apps/clickhouse/templates/_resources.tpl‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,34 @@ These presets are for basic testing and not meant to be used in production
1111
{{ include "resources.preset" (dict "type" "nano") -}}
1212
*/}}
1313
{{- define "resources.preset" -}}
14-
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
1514
{{- $presets := dict
1615
"nano" (dict
1716
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
18-
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
17+
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
1918
)
2019
"micro" (dict
2120
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
22-
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
21+
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
2322
)
2423
"small" (dict
2524
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
26-
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
25+
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
2726
)
2827
"medium" (dict
29-
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
30-
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
28+
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
29+
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
3130
)
3231
"large" (dict
33-
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
34-
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
32+
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
33+
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
3534
)
3635
"xlarge" (dict
37-
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
38-
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
36+
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
37+
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
3938
)
4039
"2xlarge" (dict
41-
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
42-
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
40+
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
41+
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
4342
)
4443
}}
4544
{{- if hasKey $presets .type -}}

‎packages/apps/ferretdb/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.5.0
19+
version: 0.6.0
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

‎packages/apps/ferretdb/templates/_resources.tpl‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,34 @@ These presets are for basic testing and not meant to be used in production
1111
{{ include "resources.preset" (dict "type" "nano") -}}
1212
*/}}
1313
{{- define "resources.preset" -}}
14-
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
1514
{{- $presets := dict
1615
"nano" (dict
1716
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
18-
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
17+
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
1918
)
2019
"micro" (dict
2120
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
22-
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
21+
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
2322
)
2423
"small" (dict
2524
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
26-
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
25+
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
2726
)
2827
"medium" (dict
29-
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
30-
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
28+
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
29+
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
3130
)
3231
"large" (dict
33-
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
34-
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
32+
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
33+
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
3534
)
3635
"xlarge" (dict
37-
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
38-
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
36+
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
37+
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
3938
)
4039
"2xlarge" (dict
41-
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
42-
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
40+
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
41+
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
4342
)
4443
}}
4544
{{- if hasKey $presets .type -}}

‎packages/apps/http-cache/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.4.0
19+
version: 0.5.0
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

‎packages/apps/http-cache/templates/_resources.tpl‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,34 @@ These presets are for basic testing and not meant to be used in production
1111
{{ include "resources.preset" (dict "type" "nano") -}}
1212
*/}}
1313
{{- define "resources.preset" -}}
14-
{{/* The limits are the requests increased by 50% (except ephemeral-storage and xlarge/2xlarge sizes)*/}}
1514
{{- $presets := dict
1615
"nano" (dict
1716
"requests" (dict "cpu" "100m" "memory" "128Mi" "ephemeral-storage" "50Mi")
18-
"limits" (dict "cpu" "150m" "memory" "192Mi" "ephemeral-storage" "2Gi")
17+
"limits" (dict "memory" "128Mi" "ephemeral-storage" "2Gi")
1918
)
2019
"micro" (dict
2120
"requests" (dict "cpu" "250m" "memory" "256Mi" "ephemeral-storage" "50Mi")
22-
"limits" (dict "cpu" "375m" "memory" "384Mi" "ephemeral-storage" "2Gi")
21+
"limits" (dict "memory" "256Mi" "ephemeral-storage" "2Gi")
2322
)
2423
"small" (dict
2524
"requests" (dict "cpu" "500m" "memory" "512Mi" "ephemeral-storage" "50Mi")
26-
"limits" (dict "cpu" "750m" "memory" "768Mi" "ephemeral-storage" "2Gi")
25+
"limits" (dict "memory" "512Mi" "ephemeral-storage" "2Gi")
2726
)
2827
"medium" (dict
29-
"requests" (dict "cpu" "500m" "memory" "1024Mi" "ephemeral-storage" "50Mi")
30-
"limits" (dict "cpu" "750m" "memory" "1536Mi" "ephemeral-storage" "2Gi")
28+
"requests" (dict "cpu" "500m" "memory" "1Gi" "ephemeral-storage" "50Mi")
29+
"limits" (dict "memory" "1Gi" "ephemeral-storage" "2Gi")
3130
)
3231
"large" (dict
33-
"requests" (dict "cpu" "1.0" "memory" "2048Mi" "ephemeral-storage" "50Mi")
34-
"limits" (dict "cpu" "1.5" "memory" "3072Mi" "ephemeral-storage" "2Gi")
32+
"requests" (dict "cpu" "1" "memory" "2Gi" "ephemeral-storage" "50Mi")
33+
"limits" (dict "memory" "2Gi" "ephemeral-storage" "2Gi")
3534
)
3635
"xlarge" (dict
37-
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
38-
"limits" (dict "cpu" "3.0" "memory" "6144Mi" "ephemeral-storage" "2Gi")
36+
"requests" (dict "cpu" "2" "memory" "4Gi" "ephemeral-storage" "50Mi")
37+
"limits" (dict "memory" "4Gi" "ephemeral-storage" "2Gi")
3938
)
4039
"2xlarge" (dict
41-
"requests" (dict "cpu" "1.0" "memory" "3072Mi" "ephemeral-storage" "50Mi")
42-
"limits" (dict "cpu" "6.0" "memory" "12288Mi" "ephemeral-storage" "2Gi")
40+
"requests" (dict "cpu" "4" "memory" "8Gi" "ephemeral-storage" "50Mi")
41+
"limits" (dict "memory" "8Gi" "ephemeral-storage" "2Gi")
4342
)
4443
}}
4544
{{- if hasKey $presets .type -}}

‎packages/apps/kafka/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ type: application
1616
# This is the chart version. This version number should be incremented each time you make changes
1717
# to the chart and its templates, including the app version.
1818
# Versions are expected to follow Semantic Versioning (https://semver.org/)
19-
version: 0.5.0
19+
version: 0.6.0
2020

2121
# This is the version number of the application being deployed. This version number should be
2222
# incremented each time you make changes to the application. Versions are not expected to

0 commit comments

Comments
 (0)