Skip to content

Commit 20d6213

Browse files
authored
Merge branch 'main' into fix-selfservice
2 parents d1b22b1 + 41d316a commit 20d6213

File tree

5 files changed

+28
-0
lines changed

5 files changed

+28
-0
lines changed

charts/team-ns/templates/builds/buildpack.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ spec:
114114
metadata:
115115
creationTimestamp: null
116116
spec:
117+
{{- if $v.buildStorageClassName }}
118+
storageClassName: {{ $v.buildStorageClassName }}
119+
{{- end }}
117120
accessModes:
118121
- ReadWriteOnce
119122
resources:
@@ -158,6 +161,9 @@ spec:
158161
metadata:
159162
creationTimestamp: null
160163
spec:
164+
{{- if $v.buildStorageClassName }}
165+
storageClassName: {{ $v.buildStorageClassName }}
166+
{{- end }}
161167
accessModes:
162168
- ReadWriteOnce
163169
resources:

charts/team-ns/templates/builds/docker.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ spec:
112112
metadata:
113113
creationTimestamp: null
114114
spec:
115+
{{- if $v.buildStorageClassName }}
116+
storageClassName: {{ $v.buildStorageClassName }}
117+
{{- end }}
115118
accessModes:
116119
- ReadWriteOnce
117120
resources:
@@ -156,6 +159,9 @@ spec:
156159
metadata:
157160
creationTimestamp: null
158161
spec:
162+
{{- if $v.buildStorageClassName }}
163+
storageClassName: {{ $v.buildStorageClassName }}
164+
{{- end }}
159165
accessModes:
160166
- ReadWriteOnce
161167
resources:
+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: v1
2+
kind: LimitRange
3+
metadata:
4+
name: cpu-resource-constraint
5+
spec:
6+
limits:
7+
- default: # this section defines default limits
8+
cpu: 200m
9+
memory: 64Mi
10+
defaultRequest: # this section defines default requests
11+
cpu: 50m
12+
memory: 32Mi
13+
type: Container

helmfile.d/snippets/derived.gotmpl

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ environments:
4444
default:
4545
values:
4646
- _derived: # < introduced to hold compound logic in meaningful prop names for easier consumption
47+
buildStorageClassName: {{ if eq $v.cluster.provider "linode" }}"linode-block-storage"{{ else }}""{{ end }}
4748
caCert: |
4849
{{- if eq $issuer "letsencrypt" }}
4950
-----BEGIN CERTIFICATE-----

values/team-ns/team-ns.gotmpl

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
{{- $domain := ($v.cluster | get "domainSuffix" nil) }}
88
{{- $keycloakRealm := printf "https://%s/realms/otomi" $v._derived.keycloakDomain }}
99

10+
buildStorageClassName: {{ $v._derived.buildStorageClassName }}
11+
1012
{{- $coreTeamServices := list }}
1113
{{- range $s := $v.teamApps }}
1214
{{- if and ($a | get $s.name | get "enabled" true) (hasKey $s "ingress") $v.otomi.isMultitenant }}

0 commit comments

Comments
 (0)