Skip to content

Commit 873abfe

Browse files
committed
Merge remote-tracking branch 'origin/main' into APL-754
2 parents bed28d8 + 5121cad commit 873abfe

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

charts/team-ns/templates/limitrange.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
apiVersion: v1
22
kind: LimitRange
33
metadata:
4-
name: cpu-resource-constraint
4+
name: team-ns-resource-defaults
5+
labels: {{- include "team-ns.chart-labels" . | nindent 4 }}
56
spec:
67
limits:
78
- default: # this section defines default limits

values/team-ns/team-ns.gotmpl

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@ buildStorageClassName: {{ $v._derived.buildStorageClassName }}
1111

1212
{{- $coreTeamServices := list }}
1313
{{- range $s := $v.teamApps }}
14-
{{- if and ($a | get $s.name | get "enabled" true) (hasKey $s "ingress") $v.otomi.isMultitenant }}
14+
{{- if and (hasKey $s "ingress") $v.otomi.isMultitenant }}
1515
{{- range $ing := $s.ingress }}
1616
{{- $svc := merge $ing (dict "isCore" true "name" $s.name "ownHost" ($s | get "ownHost" false)) }}
1717
{{- $coreTeamServices = append $coreTeamServices $svc }}
1818
{{- end }}
1919
{{- end }}
2020
{{- end }}
2121

22+
23+
2224
{{- $teamResourceQuotas := dict }}
2325
{{- range $team | get "settings.resourceQuota" list }}
2426
{{- $_ := set $teamResourceQuotas .name .value }}

0 commit comments

Comments
 (0)