Skip to content

Commit 1c97632

Browse files
committed
feat(#787): restructure heml-values
In order to make the configuration of the components within the kubernetes installation better configurable, the helm-values were restructures by separating them by component and don't make so much globally. Signed-off-by: Tobias Anker <tobias.anker@kitsunemimi.moe>
1 parent 78d39e4 commit 1c97632

70 files changed

Lines changed: 1232 additions & 140 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

deploy/k8s/ainari/templates/ainari-issuer.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: cert-manager.io/v1
216
kind: Issuer
317
metadata:

deploy/k8s/ainari/templates/dashboard/dashboard-certificate.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: cert-manager.io/v1
216
kind: Certificate
317
metadata:
@@ -7,4 +21,4 @@ spec:
721
issuerRef:
822
name: selfsigned-issuer
923
dnsNames:
10-
- {{ .Values.api.domain_dashboard }}
24+
- {{ .Values.dashboard.api.domain }}
Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,24 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: v1
216
metadata:
317
name: dashboard-config
418
data:
519
config.json: |+
620
{
7-
"apiUrl": "https://{{ .Values.api.domain_miko }}"
21+
"apiUrl": "https://{{ .Values.miko.api.domain }}"
822
}
923
1024
kind: ConfigMap

deploy/k8s/ainari/templates/dashboard/dashboard-deployment.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: apps/v1
216
kind: Deployment
317
metadata:
418
name: dashboard
519
labels:
620
app: dashboard
721
spec:
8-
replicas: 1
22+
replicas: {{ .Values.dashboard.replica_count }}
923
selector:
1024
matchLabels:
1125
app: dashboard
@@ -34,8 +48,8 @@ spec:
3448
topologyKey: kubernetes.io/hostname
3549
containers:
3650
- name: dashboard
37-
image: {{ .Values.docker.registry }}/ainari_dashboard:{{ .Values.docker.tag }}
38-
imagePullPolicy: {{ .Values.docker.pull_policy }}
51+
image: {{ .Values.dashboard.docker.repository }}:{{ .Values.dashboard.docker.tag }}
52+
imagePullPolicy: {{ .Values.dashboard.docker.pull_policy }}
3953
env:
4054
- name: RUST_LOG
4155
value: "debug"

deploy/k8s/ainari/templates/dashboard/dashboard-ingress.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: networking.k8s.io/v1
216
kind: Ingress
317
metadata:
@@ -10,7 +24,7 @@ metadata:
1024
spec:
1125
ingressClassName: nginx
1226
rules:
13-
- host: {{ .Values.api.domain_dashboard }}
27+
- host: {{ .Values.dashboard.api.domain }}
1428
http:
1529
paths:
1630
- path: /

deploy/k8s/ainari/templates/dashboard/dashboard-nginx-config.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: v1
216
metadata:
317
name: dashboard-nginx-config
@@ -15,14 +29,14 @@ data:
1529
{
1630
listen 8080;
1731
server_tokens off;
18-
server_name {{ .Values.api.domain_dashboard }};
32+
server_name {{ .Values.dashboard.api.domain }};
1933
return 301 https://$host$request_uri;
2034
}
2135
2236
server
2337
{
2438
server_tokens off;
25-
server_name {{ .Values.api.domain_dashboard }};
39+
server_name {{ .Values.dashboard.api.domain }};
2640
2741
listen 8443 ssl;
2842
listen [::]:8443 ssl;
@@ -74,7 +88,7 @@ data:
7488
7589
proxy_pass http://127.0.0.1:80/;
7690
proxy_read_timeout 180;
77-
proxy_redirect http://127.0.0.1:80 https://{{ .Values.api.domain_dashboard }};
91+
proxy_redirect http://127.0.0.1:80 https://{{ .Values.dashboard.api.domain }};
7892
}
7993
}
8094
}

deploy/k8s/ainari/templates/dashboard/dashboard-tls-service.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: v1
216
kind: Service
317
metadata:

deploy/k8s/ainari/templates/hanami/hanami-certificate.yaml

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: cert-manager.io/v1
216
kind: Certificate
317
metadata:
@@ -7,5 +21,5 @@ spec:
721
issuerRef:
822
name: selfsigned-issuer
923
dnsNames:
10-
- {{ .Values.api.domain_hanami }}
24+
- {{ .Values.hanami.api.domain }}
1125

deploy/k8s/ainari/templates/hanami/hanami-config.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: v1
216
metadata:
317
name: hanami-config

deploy/k8s/ainari/templates/hanami/hanami-deployment.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
1+
# Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License")
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
115
apiVersion: apps/v1
216
kind: Deployment
317
metadata:
418
name: hanami
519
labels:
620
app: hanami
721
spec:
8-
replicas: 1
22+
replicas: {{ .Values.hanami.replica_count }}
923
selector:
1024
matchLabels:
1125
app: hanami
@@ -34,8 +48,8 @@ spec:
3448
topologyKey: kubernetes.io/hostname
3549
containers:
3650
- name: hanami
37-
image: {{ .Values.docker.registry }}/hanami:{{ .Values.docker.tag }}
38-
imagePullPolicy: {{ .Values.docker.pull_policy }}
51+
image: {{ .Values.hanami.docker.repository }}:{{ .Values.hanami.docker.tag }}
52+
imagePullPolicy: {{ .Values.hanami.docker.pull_policy }}
3953
env:
4054
- name: RUST_LOG
4155
value: "debug"

0 commit comments

Comments
 (0)