From 7cd7de73eeeacedce80bf33ea660c2090a4be762 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 25 Apr 2024 15:47:51 +0200 Subject: [PATCH] Introduce replicas options Signed-off-by: Andrei Kvapil --- hack/gen_versions_map.sh | 25 +++++++++-- packages/apps/clickhouse/Chart.yaml | 4 +- .../apps/clickhouse/templates/clickhouse.yaml | 4 +- packages/apps/clickhouse/values.yaml | 2 + packages/apps/http-cache/Chart.yaml | 4 +- .../templates/haproxy/configmap.yaml | 2 +- .../templates/haproxy/deployment.yaml | 2 +- .../templates/nginx/deployment.yaml | 2 +- packages/apps/http-cache/values.yaml | 6 +++ packages/apps/kafka/Chart.yaml | 2 +- packages/apps/kafka/templates/kafka.yaml | 4 +- packages/apps/kafka/values.yaml | 2 + packages/apps/kubernetes/Chart.yaml | 4 +- .../apps/kubernetes/templates/cluster.yaml | 42 +++++++++---------- packages/apps/kubernetes/values.schema.json | 11 ----- packages/apps/kubernetes/values.yaml | 9 ++++ packages/apps/mysql/Chart.yaml | 4 +- packages/apps/mysql/templates/mariadb.yaml | 4 +- packages/apps/mysql/values.yaml | 2 + packages/apps/postgres/Chart.yaml | 4 +- packages/apps/postgres/templates/db.yaml | 2 +- packages/apps/postgres/values.yaml | 1 + packages/apps/rabbitmq/Chart.yaml | 4 +- .../apps/rabbitmq/templates/rabbitmq.yaml | 2 +- packages/apps/rabbitmq/values.schema.json | 4 ++ packages/apps/rabbitmq/values.yaml | 1 + packages/apps/redis/Chart.yaml | 4 +- .../apps/redis/templates/redisfailover.yaml | 2 +- packages/apps/redis/values.schema.json | 4 ++ packages/apps/redis/values.yaml | 1 + packages/apps/tcp-balancer/Chart.yaml | 4 +- .../tcp-balancer/templates/deployment.yaml | 2 +- packages/apps/tcp-balancer/values.yaml | 1 + packages/apps/versions_map | 27 ++++++++---- packages/apps/vpn/Chart.yaml | 6 +-- packages/apps/vpn/templates/deployment.yaml | 2 +- packages/apps/vpn/values.yaml | 1 + 37 files changed, 130 insertions(+), 77 deletions(-) delete mode 100644 packages/apps/kubernetes/values.schema.json diff --git a/hack/gen_versions_map.sh b/hack/gen_versions_map.sh index 1d9f1c5d..8e635780 100755 --- a/hack/gen_versions_map.sh +++ b/hack/gen_versions_map.sh @@ -20,9 +20,28 @@ miss_map=$(echo "$new_map" | awk 'NR==FNR { new_map[$1 " " $2] = $3; next } { if resolved_miss_map=$( echo "$miss_map" | while read chart version commit; do if [ "$commit" = HEAD ]; then - line=$(git show HEAD:"./$chart/Chart.yaml" | awk '/^version:/ {print NR; exit}') - change_commit=$(git --no-pager blame -L"$line",+1 HEAD -- "$chart/Chart.yaml" | awk '{print $1}') - commit=$(git describe --always "$change_commit~1") + line=$(awk '/^version:/ {print NR; exit}' "./$chart/Chart.yaml") + change_commit=$(git --no-pager blame -L"$line",+1 -- "$chart/Chart.yaml" | awk '{print $1}') + + if [ "$change_commit" = "00000000" ]; then + # Not commited yet, use previus commit + line=$(git show HEAD:"./$chart/Chart.yaml" | awk '/^version:/ {print NR; exit}') + commit=$(git --no-pager blame -L"$line",+1 HEAD -- "$chart/Chart.yaml" | awk '{print $1}') + if [ $(echo $commit | cut -c1) = "^" ]; then + # Previus commit not exists + commit=$(echo $commit | cut -c2-) + fi + else + # Commited, but version_map wasn't updated + line=$(git show HEAD:"./$chart/Chart.yaml" | awk '/^version:/ {print NR; exit}') + change_commit=$(git --no-pager blame -L"$line",+1 HEAD -- "$chart/Chart.yaml" | awk '{print $1}') + if [ $(echo $change_commit | cut -c1) = "^" ]; then + # Previus commit not exists + commit=$(echo $change_commit | cut -c2-) + else + commit=$(git describe --always "$change_commit~1") + fi + fi fi echo "$chart $version $commit" done diff --git a/packages/apps/clickhouse/Chart.yaml b/packages/apps/clickhouse/Chart.yaml index 13752c29..1b9862a0 100644 --- a/packages/apps/clickhouse/Chart.yaml +++ b/packages/apps/clickhouse/Chart.yaml @@ -16,10 +16,10 @@ 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.0 +version: 0.2.0 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "24.3.0" diff --git a/packages/apps/clickhouse/templates/clickhouse.yaml b/packages/apps/clickhouse/templates/clickhouse.yaml index a040ba1c..da754055 100644 --- a/packages/apps/clickhouse/templates/clickhouse.yaml +++ b/packages/apps/clickhouse/templates/clickhouse.yaml @@ -21,8 +21,8 @@ spec: clusters: - name: "clickhouse" layout: - shardsCount: 1 - replicasCount: 2 + shardsCount: {{ .Values.shards }} + replicasCount: {{ .Values.replicas }} {{- with .Values.size }} templates: volumeClaimTemplates: diff --git a/packages/apps/clickhouse/values.yaml b/packages/apps/clickhouse/values.yaml index d75aef2f..d6b3ecc9 100644 --- a/packages/apps/clickhouse/values.yaml +++ b/packages/apps/clickhouse/values.yaml @@ -1,4 +1,6 @@ size: 10Gi +shards: 1 +replicas: 2 users: user1: diff --git a/packages/apps/http-cache/Chart.yaml b/packages/apps/http-cache/Chart.yaml index 85eecbf4..716252ae 100644 --- a/packages/apps/http-cache/Chart.yaml +++ b/packages/apps/http-cache/Chart.yaml @@ -16,10 +16,10 @@ 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.0 +version: 0.2.0 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "1.25.3" diff --git a/packages/apps/http-cache/templates/haproxy/configmap.yaml b/packages/apps/http-cache/templates/haproxy/configmap.yaml index a6b5adf8..4012649d 100644 --- a/packages/apps/http-cache/templates/haproxy/configmap.yaml +++ b/packages/apps/http-cache/templates/haproxy/configmap.yaml @@ -74,7 +74,7 @@ data: option redispatch 1 default-server observe layer7 error-limit 10 on-error mark-down - {{- range $i, $e := until (int $.Values.replicas) }} + {{- range $i, $e := until (int $.Values.nginx.replicas) }} server cache{{ $i }} {{ $.Release.Name }}-nginx-cache-{{ $i }}:80 check {{- end }} {{- range $i, $e := $.Values.endpoints }} diff --git a/packages/apps/http-cache/templates/haproxy/deployment.yaml b/packages/apps/http-cache/templates/haproxy/deployment.yaml index d0b0246e..10ef9b55 100644 --- a/packages/apps/http-cache/templates/haproxy/deployment.yaml +++ b/packages/apps/http-cache/templates/haproxy/deployment.yaml @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} spec: - replicas: 2 + replicas: {{ .Values.haproxy.replicas }} selector: matchLabels: app: {{ .Release.Name }}-haproxy diff --git a/packages/apps/http-cache/templates/nginx/deployment.yaml b/packages/apps/http-cache/templates/nginx/deployment.yaml index 175b393a..0ac6e83e 100644 --- a/packages/apps/http-cache/templates/nginx/deployment.yaml +++ b/packages/apps/http-cache/templates/nginx/deployment.yaml @@ -11,7 +11,7 @@ spec: selector: matchLabels: app: {{ $.Release.Name }}-nginx-cache -{{- range $i := until 3 }} +{{- range $i := until (int $.Values.nginx.replicas) }} --- apiVersion: apps/v1 kind: Deployment diff --git a/packages/apps/http-cache/values.yaml b/packages/apps/http-cache/values.yaml index 68df71fc..5f326ece 100644 --- a/packages/apps/http-cache/values.yaml +++ b/packages/apps/http-cache/values.yaml @@ -1,4 +1,10 @@ external: false + +haproxy: + replicas: 2 +nginx: + replicas: 2 + size: 10Gi endpoints: - 10.100.3.1:80 diff --git a/packages/apps/kafka/Chart.yaml b/packages/apps/kafka/Chart.yaml index 2ed27680..5bb5a25c 100644 --- a/packages/apps/kafka/Chart.yaml +++ b/packages/apps/kafka/Chart.yaml @@ -22,4 +22,4 @@ version: 0.1.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "3.7.0" diff --git a/packages/apps/kafka/templates/kafka.yaml b/packages/apps/kafka/templates/kafka.yaml index 345f33e2..9a8ebeb7 100644 --- a/packages/apps/kafka/templates/kafka.yaml +++ b/packages/apps/kafka/templates/kafka.yaml @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} spec: kafka: - replicas: 3 + replicas: {{ .Values.replicas }} listeners: - name: plain port: 9092 @@ -41,7 +41,7 @@ spec: {{- end }} deleteClaim: true zookeeper: - replicas: 3 + replicas: {{ .Values.replicas }} storage: type: persistent-claim {{- with .Values.zookeeper.size }} diff --git a/packages/apps/kafka/values.yaml b/packages/apps/kafka/values.yaml index 8978312d..e99bfa89 100644 --- a/packages/apps/kafka/values.yaml +++ b/packages/apps/kafka/values.yaml @@ -1,8 +1,10 @@ external: false kafka: size: 10Gi + replicas: 3 zookeeper: size: 5Gi + replicas: 3 topics: - name: Results diff --git a/packages/apps/kubernetes/Chart.yaml b/packages/apps/kubernetes/Chart.yaml index 5e269c04..49dbcc63 100644 --- a/packages/apps/kubernetes/Chart.yaml +++ b/packages/apps/kubernetes/Chart.yaml @@ -16,10 +16,10 @@ 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.0 +version: 0.2.0 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "1.19.0" diff --git a/packages/apps/kubernetes/templates/cluster.yaml b/packages/apps/kubernetes/templates/cluster.yaml index ee45816d..31382c74 100644 --- a/packages/apps/kubernetes/templates/cluster.yaml +++ b/packages/apps/kubernetes/templates/cluster.yaml @@ -64,12 +64,13 @@ metadata: cluster.x-k8s.io/managed-by: kamaji name: {{ .Release.Name }} namespace: {{ .Release.Namespace }} +{{- range $groupName, $group := .Values.nodeGroups }} --- apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate metadata: - name: {{ .Release.Name }}-md-0 - namespace: {{ .Release.Namespace }} + name: {{ $.Release.Name }}-{{ $groupName }} + namespace: {{ $.Release.Namespace }} spec: template: spec: @@ -78,7 +79,7 @@ spec: kubeletExtraArgs: {} discovery: bootstrapToken: - apiServerEndpoint: {{ .Release.Name }}.{{ .Release.Namespace }}.svc:6443 + apiServerEndpoint: {{ $.Release.Name }}.{{ $.Release.Namespace }}.svc:6443 initConfiguration: skipPhases: - addon/kube-proxy @@ -86,8 +87,8 @@ spec: apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 kind: KubevirtMachineTemplate metadata: - name: {{ .Release.Name }}-md-0 - namespace: {{ .Release.Namespace }} + name: {{ $.Release.Name }}-{{ $groupName }} + namespace: {{ $.Release.Namespace }} spec: template: spec: @@ -95,7 +96,7 @@ spec: checkStrategy: ssh virtualMachineTemplate: metadata: - namespace: {{ .Release.Namespace }} + namespace: {{ $.Release.Namespace }} spec: runStrategy: Always template: @@ -103,7 +104,7 @@ spec: domain: cpu: threads: 1 - cores: 2 + cores: {{ $group.resources.cpu }} sockets: 1 devices: disks: @@ -112,7 +113,7 @@ spec: name: containervolume networkInterfaceMultiqueue: true memory: - guest: 1024Mi + guest: {{ $group.resources.memory }} evictionStrategy: External volumes: - containerDisk: @@ -122,29 +123,28 @@ spec: apiVersion: cluster.x-k8s.io/v1beta1 kind: MachineDeployment metadata: - name: {{ .Release.Name }}-md-0 - namespace: {{ .Release.Namespace }} + name: {{ $.Release.Name }}-{{ $groupName }} + namespace: {{ $.Release.Namespace }} annotations: - cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "2" - cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "0" - capacity.cluster-autoscaler.kubernetes.io/memory: "1024Mi" - capacity.cluster-autoscaler.kubernetes.io/cpu: "2" + cluster.x-k8s.io/cluster-api-autoscaler-node-group-min-size: "{{ $group.minReplicas }}" + cluster.x-k8s.io/cluster-api-autoscaler-node-group-max-size: "{{ $group.maxReplicas }}" + capacity.cluster-autoscaler.kubernetes.io/memory: "{{ $group.resources.memory }}" + capacity.cluster-autoscaler.kubernetes.io/cpu: "{{ $group.resources.cpu }}" spec: - clusterName: {{ .Release.Name }} - selector: - matchLabels: null + clusterName: {{ $.Release.Name }} template: spec: bootstrap: configRef: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate - name: {{ .Release.Name }}-md-0 + name: {{ $.Release.Name }}-{{ $groupName }} namespace: default - clusterName: {{ .Release.Name }} + clusterName: {{ $.Release.Name }} infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1 kind: KubevirtMachineTemplate - name: {{ .Release.Name }}-md-0 + name: {{ $.Release.Name }}-{{ $groupName }} namespace: default - version: v1.23.10 + version: v1.29.0 +{{- end }} diff --git a/packages/apps/kubernetes/values.schema.json b/packages/apps/kubernetes/values.schema.json deleted file mode 100644 index a0202ab5..00000000 --- a/packages/apps/kubernetes/values.schema.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "$schema": "http://json-schema.org/schema#", - "type": "object", - "properties": { - "host": { - "type": "string", - "title": "Domain name for this kubernetes cluster", - "description": "This host will be used for all apps deployed in this tenant" - } - } -} diff --git a/packages/apps/kubernetes/values.yaml b/packages/apps/kubernetes/values.yaml index aa0b60b1..2a8fd46b 100644 --- a/packages/apps/kubernetes/values.yaml +++ b/packages/apps/kubernetes/values.yaml @@ -1 +1,10 @@ host: "" +controlPlane: + replicas: 2 +nodeGroups: + md0: + minReplicas: 0 + maxReplicas: 10 + resources: + cpu: 2 + memory: 1024Mi diff --git a/packages/apps/mysql/Chart.yaml b/packages/apps/mysql/Chart.yaml index e6054714..25f3132d 100644 --- a/packages/apps/mysql/Chart.yaml +++ b/packages/apps/mysql/Chart.yaml @@ -16,10 +16,10 @@ 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.2.0 +version: 0.3.0 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "11.0.2" diff --git a/packages/apps/mysql/templates/mariadb.yaml b/packages/apps/mysql/templates/mariadb.yaml index ddd22d6f..185e0a41 100644 --- a/packages/apps/mysql/templates/mariadb.yaml +++ b/packages/apps/mysql/templates/mariadb.yaml @@ -12,7 +12,7 @@ spec: port: 3306 - replicas: 2 + replicas: {{ .Values.replicas }} affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: @@ -28,11 +28,13 @@ spec: - {{ .Release.Name }} topologyKey: "kubernetes.io/hostname" + {{- if gt (int .Values.replicas) 1 }} replication: enabled: true #primary: # podIndex: 0 # automaticFailover: true + {{- end }} metrics: enabled: true diff --git a/packages/apps/mysql/values.yaml b/packages/apps/mysql/values.yaml index 7c15f60f..72ef8099 100644 --- a/packages/apps/mysql/values.yaml +++ b/packages/apps/mysql/values.yaml @@ -1,6 +1,8 @@ external: false size: 10Gi +replicas: 2 + users: root: password: strongpassword diff --git a/packages/apps/postgres/Chart.yaml b/packages/apps/postgres/Chart.yaml index fabef869..c9e8d9f5 100644 --- a/packages/apps/postgres/Chart.yaml +++ b/packages/apps/postgres/Chart.yaml @@ -16,10 +16,10 @@ 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.0 +version: 0.2.0 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "16.2" diff --git a/packages/apps/postgres/templates/db.yaml b/packages/apps/postgres/templates/db.yaml index b1821201..7c7d5b9e 100644 --- a/packages/apps/postgres/templates/db.yaml +++ b/packages/apps/postgres/templates/db.yaml @@ -4,7 +4,7 @@ kind: Cluster metadata: name: {{ .Release.Name }} spec: - instances: 2 + instances: {{ .Values.replicas }} enableSuperuserAccess: true postgresql: diff --git a/packages/apps/postgres/values.yaml b/packages/apps/postgres/values.yaml index e105395a..0348ce02 100644 --- a/packages/apps/postgres/values.yaml +++ b/packages/apps/postgres/values.yaml @@ -1,5 +1,6 @@ external: false size: 10Gi +replicas: 2 users: user1: diff --git a/packages/apps/rabbitmq/Chart.yaml b/packages/apps/rabbitmq/Chart.yaml index b13a7d57..f8f02830 100644 --- a/packages/apps/rabbitmq/Chart.yaml +++ b/packages/apps/rabbitmq/Chart.yaml @@ -16,10 +16,10 @@ 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.0 +version: 0.2.0 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "3.12.2" diff --git a/packages/apps/rabbitmq/templates/rabbitmq.yaml b/packages/apps/rabbitmq/templates/rabbitmq.yaml index 0d7b3611..5e668498 100644 --- a/packages/apps/rabbitmq/templates/rabbitmq.yaml +++ b/packages/apps/rabbitmq/templates/rabbitmq.yaml @@ -6,7 +6,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} spec: - replicas: 3 + replicas: {{ .Values.replicas }} {{- if .Values.external }} service: type: LoadBalancer diff --git a/packages/apps/rabbitmq/values.schema.json b/packages/apps/rabbitmq/values.schema.json index c0387207..45d6206b 100644 --- a/packages/apps/rabbitmq/values.schema.json +++ b/packages/apps/rabbitmq/values.schema.json @@ -5,6 +5,10 @@ "external": { "type": "boolean", "title": "Enable external Access" + }, + "replicas": { + "type": "integer", + "title": "Replicas" } } } diff --git a/packages/apps/rabbitmq/values.yaml b/packages/apps/rabbitmq/values.yaml index f1e9966e..67acc9b7 100644 --- a/packages/apps/rabbitmq/values.yaml +++ b/packages/apps/rabbitmq/values.yaml @@ -1 +1,2 @@ +replicas: 3 external: false diff --git a/packages/apps/redis/Chart.yaml b/packages/apps/redis/Chart.yaml index 9e6bb39e..3159738e 100644 --- a/packages/apps/redis/Chart.yaml +++ b/packages/apps/redis/Chart.yaml @@ -16,10 +16,10 @@ 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.2.0 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "6.2.6" diff --git a/packages/apps/redis/templates/redisfailover.yaml b/packages/apps/redis/templates/redisfailover.yaml index 611a6396..9e073256 100644 --- a/packages/apps/redis/templates/redisfailover.yaml +++ b/packages/apps/redis/templates/redisfailover.yaml @@ -14,7 +14,7 @@ spec: limits: memory: 100Mi redis: - replicas: 3 + replicas: {{ .Values.replicas }} resources: requests: cpu: 150m diff --git a/packages/apps/redis/values.schema.json b/packages/apps/redis/values.schema.json index 35d736b6..abf5910c 100644 --- a/packages/apps/redis/values.schema.json +++ b/packages/apps/redis/values.schema.json @@ -9,6 +9,10 @@ "size": { "type": "string", "title": "Disk Size" + }, + "replicas": { + "type": "integer", + "title": "Replicas" } } } diff --git a/packages/apps/redis/values.yaml b/packages/apps/redis/values.yaml index b3f151ff..259663a4 100644 --- a/packages/apps/redis/values.yaml +++ b/packages/apps/redis/values.yaml @@ -1,2 +1,3 @@ +replicas: 2 external: false size: 5Gi diff --git a/packages/apps/tcp-balancer/Chart.yaml b/packages/apps/tcp-balancer/Chart.yaml index cc7f457e..8f3a6551 100644 --- a/packages/apps/tcp-balancer/Chart.yaml +++ b/packages/apps/tcp-balancer/Chart.yaml @@ -16,10 +16,10 @@ 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.0 +version: 0.2.0 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "2.9.7" diff --git a/packages/apps/tcp-balancer/templates/deployment.yaml b/packages/apps/tcp-balancer/templates/deployment.yaml index 128da5ce..0f70bbae 100644 --- a/packages/apps/tcp-balancer/templates/deployment.yaml +++ b/packages/apps/tcp-balancer/templates/deployment.yaml @@ -7,7 +7,7 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} spec: - replicas: 2 + replicas: {{ .Values.replicas }} selector: matchLabels: app: {{ .Release.Name }}-haproxy diff --git a/packages/apps/tcp-balancer/values.yaml b/packages/apps/tcp-balancer/values.yaml index 1136e28a..fa9ffa7d 100644 --- a/packages/apps/tcp-balancer/values.yaml +++ b/packages/apps/tcp-balancer/values.yaml @@ -1,4 +1,5 @@ external: false +replicas: 2 httpAndHttps: mode: tcp targetPorts: diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 6fe6f60b..6f26de2e 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -1,17 +1,26 @@ -clickhouse 0.1.0 HEAD -http-cache 0.1.0 HEAD +clickhouse 0.1.0 ca79f72 +clickhouse 0.2.0 HEAD +http-cache 0.1.0 a956713 +http-cache 0.2.0 HEAD kafka 0.1.0 HEAD -kubernetes 0.1.0 HEAD +kubernetes 0.1.0 f642698 +kubernetes 0.2.0 HEAD mysql 0.1.0 f642698 -mysql 0.2.0 HEAD -postgres 0.1.0 HEAD -rabbitmq 0.1.0 HEAD -redis 0.1.1 HEAD -tcp-balancer 0.1.0 HEAD +mysql 0.2.0 8b975ff0 +mysql 0.3.0 HEAD +postgres 0.1.0 f642698 +postgres 0.2.0 HEAD +rabbitmq 0.1.0 f642698 +rabbitmq 0.2.0 HEAD +redis 0.1.1 f642698 +redis 0.2.0 HEAD +tcp-balancer 0.1.0 f642698 +tcp-balancer 0.2.0 HEAD tenant 0.1.3 3d1b86c tenant 0.1.4 d200480 tenant 0.1.5 e3ab858 tenant 1.0.0 HEAD virtual-machine 0.1.4 f2015d6 virtual-machine 0.1.5 HEAD -vpn 0.1.0 HEAD +vpn 0.1.0 f642698 +vpn 0.2.0 HEAD diff --git a/packages/apps/vpn/Chart.yaml b/packages/apps/vpn/Chart.yaml index 2cff0a62..f19008c9 100644 --- a/packages/apps/vpn/Chart.yaml +++ b/packages/apps/vpn/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: vpn -description: Establish a connection from your computer +description: Managed VPN service icon: https://upload.wikimedia.org/wikipedia/commons/thumb/6/60/Outline_VPN_icon.png/600px-Outline_VPN_icon.png # A chart can be either an 'application' or a 'library' chart. @@ -16,10 +16,10 @@ 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.0 +version: 0.2.0 # 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 # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.16.0" +appVersion: "1.8.1" diff --git a/packages/apps/vpn/templates/deployment.yaml b/packages/apps/vpn/templates/deployment.yaml index 745c5192..72050a25 100644 --- a/packages/apps/vpn/templates/deployment.yaml +++ b/packages/apps/vpn/templates/deployment.yaml @@ -4,7 +4,7 @@ kind: Deployment metadata: name: {{ .Release.Name }}-vpn spec: - replicas: 2 + replicas: {{ .Values.replicas }} selector: matchLabels: app: {{ .Release.Name }}-vpn diff --git a/packages/apps/vpn/values.yaml b/packages/apps/vpn/values.yaml index 84579944..a7f0e5b5 100644 --- a/packages/apps/vpn/values.yaml +++ b/packages/apps/vpn/values.yaml @@ -1,4 +1,5 @@ external: false +replicas: 2 users: user1: