Skip to content

Commit fb227e5

Browse files
committed
CH-225 fix default null
1 parent b7b6710 commit fb227e5

3 files changed

Lines changed: 3 additions & 12 deletions

File tree

deployment-configuration/helm/templates/auto-gatekeepers.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,7 @@ spec:
163163
- name: https
164164
containerPort: 8443
165165
resources:
166-
requests:
167-
cpu: {{ .app.harness.proxy.gatekeeper.resources.requests.cpu | default .root.Values.proxy.gatekeeper.resources.requests.cpu }}
168-
memory: {{ .app.harness.proxy.gatekeeper.resources.requests.memory | default .root.Values.proxy.gatekeeper.resources.requests.memory | default "32Mi" }}
169-
limits:
170-
cpu: {{ .app.harness.proxy.gatekeeper.resources.limits.cpu | default .root.Values.proxy.gatekeeper.resources.limits.cpu }}
171-
memory: {{ .app.harness.proxy.gatekeeper.resources.limits.memory | default .root.Values.proxy.gatekeeper.resources.limits.memory | default "64Mi" }}
166+
{{ .app.harness.proxy.gatekeeper.resources | default .root.Values.proxy.gatekeeper.resources | toYaml | nindent 10 }}
172167
volumes:
173168
- name: "{{ .subdomain }}-gk-proxy-config"
174169
configMap:

deployment-configuration/helm/values.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ proxy:
8383
replicas: 1
8484
resources:
8585
requests:
86-
cpu:
87-
memory: "64Mi"
86+
memory: "32Mi"
8887
limits:
89-
cpu:
90-
memory: "128Mi"
88+
memory: "64Mi"

deployment-configuration/value-template.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ harness:
146146
replicas: 1
147147
resources:
148148
requests:
149-
cpu:
150149
memory: "32Mi"
151150
limits:
152-
cpu:
153151
memory: "64Mi"

0 commit comments

Comments
 (0)