fix(addons): remove extra resources from there too (#768)

2026-07-03 05:19:17 -03:00 · 2024-03-27 01:29:31 +02:00
parent cec6a4cd3e
commit 283d52ef0d
12 changed files with 174 additions and 1 deletions
--- a/library/common-test/tests/addons/autoperms_test.yaml
+++ b/library/common-test/tests/addons/autoperms_test.yaml
@@ -635,6 +635,9 @@ tests:

  - it: should have different resources
    set:
+      resources:
+        limits:
+          nvidia.com/gpu: 1
      workload:
        workload-name:
          enabled: true
@@ -680,6 +683,7 @@ tests:
            limits:
              cpu: 4000m
              memory: 8Gi
+              nvidia.com/gpu: 1
      - documentIndex: *jobDoc
        equal:
          path: spec.template.spec.containers[0].resources
--- a/library/common-test/tests/addons/codeserver_test.yaml
+++ b/library/common-test/tests/addons/codeserver_test.yaml
@@ -65,6 +65,9 @@ tests:
  - it: addon enabled should pass without other service
    set:
      workload: *workload
+      resources:
+        limits:
+          nvidia.com/gpu: 1
      service:
        main:
          enabled: false
@@ -90,10 +93,33 @@ tests:
        equal:
          path: spec.template.spec.containers[0].name
          value: test-release-name-common-test-codeserver
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[0]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *DeploymentDocument
        equal:
          path: spec.template.spec.containers[1].name
          value: test-release-name-common-test
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[1]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+                nvidia.com/gpu: 1
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *AddonServiceDocument
        equal:
          path: metadata.name
--- a/library/common-test/tests/addons/netshoot_test.yaml
+++ b/library/common-test/tests/addons/netshoot_test.yaml
@@ -7,6 +7,9 @@ release:
 tests:
  - it: addon enabled should pass
    set:
+      resources:
+        limits:
+          nvidia.com/gpu: 1
      workload:
        main:
          enabled: true
@@ -46,10 +49,33 @@ tests:
        equal:
          path: spec.template.spec.containers[0].name
          value: test-release-name-common-test
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[0]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+                nvidia.com/gpu: 1
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *DeploymentDocument
        equal:
          path: spec.template.spec.containers[1].name
          value: test-release-name-common-test-netshoot
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[1]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *ServiceDocument
        equal:
          path: metadata.name
--- a/library/common-test/tests/addons/vpn_test.yaml
+++ b/library/common-test/tests/addons/vpn_test.yaml
@@ -7,6 +7,9 @@ release:
 tests:
  - it: addon vpn gluetun enabled with config and env should pass
    set:
+      resources:
+        limits:
+          nvidia.com/gpu: 1
      addons:
        vpn:
          type: gluetun
@@ -71,10 +74,33 @@ tests:
        equal:
          path: spec.template.spec.containers[0].name
          value: test-release-name-common-test
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[0]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+                nvidia.com/gpu: 1
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *DeploymentDocument
        equal:
          path: spec.template.spec.containers[1].name
          value: test-release-name-common-test-vpn
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[1]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *ServiceDocument
        equal:
          path: metadata.name
@@ -520,6 +546,9 @@ tests:

  - it: tailscale addon enabled with authkey should pass
    set:
+      resources:
+        limits:
+          nvidia.com/gpu: 1
      addons:
        vpn:
          type: tailscale
@@ -544,10 +573,33 @@ tests:
        equal:
          path: spec.template.spec.containers[0].name
          value: test-release-name-common-test
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[0]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+                nvidia.com/gpu: 1
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *DeploymentDocument
        equal:
          path: spec.template.spec.containers[1].name
          value: test-release-name-common-test-tailscale
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[1]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *DeploymentDocument
        contains:
          path: spec.template.spec.containers[1].env
@@ -671,6 +723,9 @@ tests:

  - it: addon vpn openvpn enabled with configFile
    set:
+      resources:
+        limits:
+          nvidia.com/gpu: 1
      addons:
        vpn:
          type: openvpn
@@ -737,6 +792,18 @@ tests:
        equal:
          path: spec.template.spec.containers[0].name
          value: test-release-name-common-test
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[0]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+                nvidia.com/gpu: 1
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *DeploymentDocument
        contains:
          path: spec.template.spec.containers[1].volumeMounts
@@ -755,6 +822,17 @@ tests:
        equal:
          path: spec.template.spec.containers[1].name
          value: test-release-name-common-test-vpn
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[1]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *DeploymentDocument
        contains:
          path: spec.template.spec.volumes
@@ -766,6 +844,9 @@ tests:

  - it: addon vpn wireguard enabled with configFile
    set:
+      resources:
+        limits:
+          nvidia.com/gpu: 1
      addons:
        vpn:
          type: wireguard
@@ -832,6 +913,18 @@ tests:
        equal:
          path: spec.template.spec.containers[0].name
          value: test-release-name-common-test
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[0]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+                nvidia.com/gpu: 1
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *DeploymentDocument
        contains:
          path: spec.template.spec.containers[1].volumeMounts
@@ -850,6 +943,17 @@ tests:
        equal:
          path: spec.template.spec.containers[1].name
          value: test-release-name-common-test-vpn
+      - documentIndex: *DeploymentDocument
+        isSubset:
+          path: spec.template.spec.containers[1]
+          content:
+            resources:
+              limits:
+                cpu: 4000m
+                memory: 8Gi
+              requests:
+                cpu: 10m
+                memory: 50Mi
      - documentIndex: *DeploymentDocument
        contains:
          path: spec.template.spec.volumes
--- a/library/common/Chart.yaml
+++ b/library/common/Chart.yaml
@@ -15,7 +15,7 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 20.2.8
+version: 20.2.9
 annotations:
  artifacthub.io/category: "integration-delivery"
  artifacthub.io/license: "BUSL-1.1"
--- a/library/common/templates/addons/code-server/_container.tpl
+++ b/library/common/templates/addons/code-server/_container.tpl
@@ -18,6 +18,8 @@ probes:
    path: "/"
 imageSelector: "codeserverImage"
 imagePullPolicy: {{ .Values.codeserverImage.pullPolicy }}
+resources:
+  excludeExtra: true
 securityContext:
  runAsUser: 0
  runAsGroup: 0
--- a/library/common/templates/addons/netshoot/_container.tpl
+++ b/library/common/templates/addons/netshoot/_container.tpl
@@ -15,6 +15,8 @@ probes:
  startup:
    enabled: false
 imageSelector: "netshootImage"
+resources:
+  excludeExtra: true
 securityContext:
  runAsUser: 0
  runAsGroup: 0
--- a/library/common/templates/addons/vpn/_gluetunContainer.tpl
+++ b/library/common/templates/addons/vpn/_gluetunContainer.tpl
@@ -16,6 +16,8 @@ probes:
    enabled: false
  startup:
    enabled: false
+resources:
+  excludeExtra: true
 securityContext:
  runAsUser: 0
  runAsNonRoot: false
--- a/library/common/templates/addons/vpn/_openvpnContainer.tpl
+++ b/library/common/templates/addons/vpn/_openvpnContainer.tpl
@@ -16,6 +16,8 @@ probes:
    enabled: false
  startup:
    enabled: false
+resources:
+  excludeExtra: true
 securityContext:
  runAsUser: 0
  runAsGroup: 0
--- a/library/common/templates/addons/vpn/_tailscaleContainer.tpl
+++ b/library/common/templates/addons/vpn/_tailscaleContainer.tpl
@@ -18,6 +18,8 @@ probes:
    enabled: false
 command:
  - /usr/local/bin/containerboot
+resources:
+  excludeExtra: true
 securityContext:
  {{- if $.Values.addons.vpn.tailscale.userspace }}
  runAsUser: 1000
--- a/library/common/templates/addons/vpn/_wireguardContainer.tpl
+++ b/library/common/templates/addons/vpn/_wireguardContainer.tpl
@@ -16,6 +16,8 @@ probes:
    enabled: false
  startup:
    enabled: false
+resources:
+  excludeExtra: true
 securityContext:
  runAsUser: 568
  runAsGroup: 568
--- a/library/common/templates/lib/util/_autoperms.tpl
+++ b/library/common/templates/lib/util/_autoperms.tpl
@@ -59,6 +59,7 @@ podSpec:
            - DAC_OVERRIDE
            - FOWNER
      resources:
+        excludeExtra: true
        limits:
          cpu: 2000m
          memory: 2Gi