chore(teuto-portal-k8s-worker): use teutonet common chart (#855)

teutonet · Apr 12, 2024 · b7a73c5 · b7a73c5
1 parent a35b63c
commit b7a73c5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 13 deletions.
diff --git a/charts/teuto-portal-k8s-worker/Chart.lock b/charts/teuto-portal-k8s-worker/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: common
-  repository: https://charts.bitnami.com/bitnami
-  version: 2.19.1
-digest: sha256:4f539b1fbde383dd5bc020d77d70655108ed4c188b7329c1639df3f1e65de2e0
-generated: "2024-03-27T15:42:53.974530507Z"
+  repository: oci://ghcr.io/teutonet/teutonet-helm-charts
+  version: 1.0.0
+digest: sha256:acfa022eb3ff1b32622813ee173a127c23c729abb6fe8235795b668bb496ed2e
+generated: "2024-04-12T13:36:04.851156918+02:00"
diff --git a/charts/teuto-portal-k8s-worker/Chart.yaml b/charts/teuto-portal-k8s-worker/Chart.yaml
@@ -13,8 +13,8 @@ maintainers:
     email: [email protected]
 dependencies:
   - name: common
-    version: 2.19.1
-    repository: https://charts.bitnami.com/bitnami
+    version: 1.0.0
+    repository: oci://ghcr.io/teutonet/teutonet-helm-charts
 annotations:
   artifacthub.io/images: |
     - image: registry-gitlab.teuto.net/4teuto/dev/teuto-portal/teuto-portal-k8s-worker/teuto-portal-k8s-worker:2.0.0  #  default/Deployment/teuto-portal-k8s-worker.yaml
diff --git a/charts/teuto-portal-k8s-worker/templates/deployment.yaml b/charts/teuto-portal-k8s-worker/templates/deployment.yaml
@@ -53,7 +53,7 @@ spec:
             httpGet:
               path: /-/healthy
               port: metrics
-          resources: {{- toYaml .Values.worker.resources | nindent 12 }}
+          resources: {{- include "common.resources" .Values.worker.resources | nindent 12 }}
           volumeMounts:
             - mountPath: /kubeconfig
               name: clusterconfig

diff --git a/charts/teuto-portal-k8s-worker/values.schema.json b/charts/teuto-portal-k8s-worker/values.schema.json
@@ -203,6 +203,9 @@
           },
           "additionalProperties": false
         },
+        "resourcesPreset": {
+          "$ref": "#/$defs/resourcesPreset"
+        },
         "resources": {
           "$ref": "#/$defs/resourceRequirements"
         }
@@ -218,6 +221,9 @@
   "$defs": {
     "resourceRequirements": {
       "$ref": "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/master-standalone-strict/_definitions.json#/definitions/io.k8s.api.core.v1.ResourceRequirements"
+    },
+    "resourcesPreset": {
+      "$ref": "https://raw.githubusercontent.com/teutonet/teutonet-helm-charts/main/charts/common/values.schema.json#/$defs/resourcesPreset"
     }
   }
 }
diff --git a/charts/teuto-portal-k8s-worker/values.yaml b/charts/teuto-portal-k8s-worker/values.yaml
@@ -32,9 +32,5 @@ worker:
   kubeconfig:
     secret:
       name: ""
-  resources:
-    limits:
-      cpu: 500m
-      memory: 1Gi
-    requests:
-      memory: 256Mi
+  resourcesPreset: micro
+  resources: {}