Compare commits
369 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 78339c3f30 | |||
|
64532535cc
|
|||
| 0029f598cb | |||
| 2641a76b96 | |||
| cd6132a846 | |||
| f6b9f011de | |||
| 766d8a7939 | |||
| 95a555753b | |||
|
1d0f30aac3
|
|||
| 51c172fbeb | |||
| bb427a2b39 | |||
| 4e9763657a | |||
| ea79e359b0 | |||
| ceec770fd6 | |||
| 75a12df69c | |||
| ffe896fdf2 | |||
| c7a7c776ba | |||
| f6e9288a50 | |||
| e31e72b3d7 | |||
| 51d1c056ba | |||
| 37aff0737a | |||
| 9886b7e754 | |||
| 2c718ed7c9 | |||
| d13a7df980 | |||
| ea53f34c87 | |||
| a15c26fdf4 | |||
| 4e1677a77f | |||
| ee9f6997fc | |||
| 3c1edae36f | |||
| b576255404 | |||
| 67be13a7e8 | |||
| 9b5beb3113 | |||
| 46b6f647dd | |||
| 8673ea9d3d | |||
| 3ffd39e73f | |||
| 2427e2a04b | |||
| 15d2138791 | |||
| 2b6bda727f | |||
| 0063635012 | |||
| 96cf9e8857 | |||
| 22da3c2c97 | |||
| d4064a5669 | |||
| 30648f2168 | |||
| 7fb93d0348 | |||
| fa56ff9b78 | |||
| 46efc9e580 | |||
| 7afdee783c | |||
| c80e9f84cb | |||
| d0a4f0d9b5 | |||
| 467e1a47f0 | |||
| caad872e88 | |||
| 0eb5ab4011 | |||
| 9705af52b0 | |||
| 3324005d0d | |||
| 55e496c5db | |||
| ce5a488dd0 | |||
| 95dfa4ffe2 | |||
| 21c39c9612 | |||
| 7ae0a2ac41 | |||
| 624252a373 | |||
| 527a5812e1 | |||
| ab843a0b86 | |||
| 8d80a0ea7d | |||
| 9a2931f3ec | |||
|
9a5f2b8fea
|
|||
|
f50851c775
|
|||
|
d1a1421e2d
|
|||
|
cbd0775a47
|
|||
| ec16ae1085 | |||
| 074e3d4dbd | |||
| 029ce12b89 | |||
| b11b663ecb | |||
| ef06d7e045 | |||
| 7031317fb8 | |||
| a0fc2b3254 | |||
| 8f51b96bcc | |||
| 9edf45c01e | |||
|
7a91dae2f8
|
|||
|
de8e6c9853
|
|||
|
bfc617f958
|
|||
| e23af34c66 | |||
|
0b73242b65
|
|||
|
464280cdc4
|
|||
| a12c718072 | |||
| d7fc7db846 | |||
| 3837105590 | |||
| 4d4ed402ee | |||
| 631e8c2d16 | |||
| 506614a5c9 | |||
| b34ae49feb | |||
| 5a177eb96b | |||
| f3acad98da | |||
| a895b98de1 | |||
| 22990310db | |||
| 307d31faa3 | |||
| 1192b0392c | |||
| 2fb1c1980a | |||
| 55a62aceca | |||
| 6a344e3c36 | |||
| a9f5278fc6 | |||
| 10e444dcea | |||
| b37456adba | |||
| f5a47b6132 | |||
| 504e10ef8a | |||
| ecd51a2ba0 | |||
| 499ed19350 | |||
| 3cd61f2fc6 | |||
| 83ed9ff376 | |||
| 05ac1ce63c | |||
| 5287a39c8e | |||
| 08ecf044d9 | |||
| 41da3b0c5d | |||
| 2ea905b65e | |||
| 54bed9de81 | |||
| 7c8686b066 | |||
| 420135fb58 | |||
| 1c115e4a18 | |||
| 21a60458f5 | |||
| e93b1c7e3d | |||
| dd0fcf2ac9 | |||
|
403e679fe1
|
|||
| f2e553f280 | |||
| e3c13cde39 | |||
| 976a6ffa69 | |||
| 72cb3133c5 | |||
| 9075eb0600 | |||
|
738112f980
|
|||
|
773504c908
|
|||
| cf3f5b1491 | |||
| 85191d3c7c | |||
|
6f00d54907
|
|||
|
ca061d4a73
|
|||
|
304b904624
|
|||
|
0c46dff7bf
|
|||
| 1e188543ae | |||
| 2c01000db6 | |||
| c440b928fb | |||
| b92dabdc7d | |||
| 2d0d02db53 | |||
| 0747eae47e | |||
| d61da55bd0 | |||
| 4a009ac289 | |||
|
6b75aee78a
|
|||
|
4e58206d4c
|
|||
| ae6a66e84a | |||
| 0928357879 | |||
| 148baf56bb | |||
| 8802095f7b | |||
|
27f4e7d4c4
|
|||
| 33faab0934 | |||
| e537bdc5ce | |||
|
9779200961
|
|||
| 4cd08aa272 | |||
| 9baf7ee679 | |||
| 25c771dd18 | |||
| 34b0e847cd | |||
| ad74a42e06 | |||
| 4e4046b039 | |||
| 5fdce2d587 | |||
| 40a6299cc9 | |||
| 09a1fc6818 | |||
| c6ed02923d | |||
| 9affe0635d | |||
| 7933097e49 | |||
| 2cccf9c491 | |||
|
3cba08a1cf
|
|||
| a65bfc4799 | |||
| 1c8f5cbac4 | |||
| 35ba03478a | |||
| 99d3a8de4b | |||
| 37df9393da | |||
| 6a335cc29c | |||
| d8b8752d72 | |||
| 06da4dbf90 | |||
| 526c93681f | |||
| 5d27d845af | |||
| 9a03aeb9f6 | |||
| 1206f7c1d7 | |||
| 8ac8b8a0d6 | |||
| 9ef3a2befc | |||
| b118fac0e9 | |||
| b59721f070 | |||
| 2cb3944b94 | |||
| e1623fd50f | |||
| 26019264ab | |||
| c60c9cffe5 | |||
| f49b51e1d3 | |||
| 63e568d7a2 | |||
| 0d850c8a42 | |||
| 7cb63928bd | |||
| daf14e8005 | |||
| 62fe3166d1 | |||
| a08256a8fd | |||
| baae2905c6 | |||
| 42d8cb8540 | |||
| 12f0eb36b5 | |||
| fa1a9e5f0b | |||
| c83eba8d64 | |||
| cd0c3abac3 | |||
| f3ae944fcf | |||
| e916d61b05 | |||
| f2a56cf49a | |||
| 36066d3b6d | |||
| c2afa5a553 | |||
| 435767ea9d | |||
| df1b89d83e | |||
| 90e8533455 | |||
| 9522f65305 | |||
| 0a5ab4879f | |||
| a924e97ffe | |||
| 466b3a6044 | |||
| c0771389f6 | |||
| f8e8157853 | |||
| f60abcf350 | |||
| 37ef0895e7 | |||
| 66793f2254 | |||
| 29cea16774 | |||
| 4c29c496b1 | |||
| 9028e61550 | |||
| 40e2203792 | |||
|
a68b95ec28
|
|||
|
44ae197178
|
|||
| 49b3c9449c | |||
| 05e384fe1c | |||
| 655ba25c34 | |||
| 3b3cf61166 | |||
| be39728357 | |||
| da575886df | |||
| 56d915253f | |||
| bcb503745a | |||
| 9c32b7fc31 | |||
| 0dbd3388b5 | |||
| 83524b515c | |||
| 282c8067f9 | |||
| e26716df52 | |||
| f09ce8d64f | |||
|
3730513e91
|
|||
|
8f7e7d45eb
|
|||
| cedad824d4 | |||
| c8bae7c1c0 | |||
| 03d1e8b58f | |||
| 6b10eb3a32 | |||
| 0d2d80ce08 | |||
| 3fafab1d0a | |||
| dd4feef0f4 | |||
|
e2836e4809
|
|||
| b84ec672de | |||
|
c568bece48
|
|||
|
54d177bd35
|
|||
| e81839cc65 | |||
| f81b8f67f5 | |||
| 830c7b824e | |||
| 594ac10cce | |||
| 57934229d0 | |||
| 5e2fda2d66 | |||
|
d02e28c4da
|
|||
| 298a6064b0 | |||
| 1cfbebb54c | |||
| ad910f56e5 | |||
| 753c67c773 | |||
| c1ed29ee64 | |||
| 452adc835e | |||
| 55b700559c | |||
| 7ccd304313 | |||
| 956077239b | |||
| 13f2ee83e3 | |||
| 16e59c3b82 | |||
| bb3bd76dfa | |||
| 9aaacbaf5f | |||
| 85834c2c53 | |||
| d9c67540c6 | |||
|
9e738dec2f
|
|||
|
5d4eb9b346
|
|||
|
2d6b60b73e
|
|||
|
cd9de152e9
|
|||
|
5daa70bd05
|
|||
|
2c2e896b49
|
|||
|
123d804aac
|
|||
|
68de2d2c08
|
|||
|
61691f1edb
|
|||
| af17fa4f23 | |||
| 660c1b7a69 | |||
| 91981fd88e | |||
| 5c5b83ccee | |||
| c5191547b9 | |||
| e8943a9c5e | |||
| ebbefe6165 | |||
| 972b88a50c | |||
| e37066179c | |||
| a0e32fe9e7 | |||
| c326668d25 | |||
| 8677b171c0 | |||
| 039ec8fee7 | |||
| 6bc22fa9e4 | |||
| 419d6f6649 | |||
| 910fb908ea | |||
| 880bc79899 | |||
| 6da34d2a0c | |||
| 862b3d32a8 | |||
|
abf7199c05
|
|||
|
a431a8b333
|
|||
| 5209d2e758 | |||
|
09ce53cdd6
|
|||
| 9d979d5de3 | |||
| 2e7dcccb0c | |||
| 07dbc73e3d | |||
| abcfe60f05 | |||
| 3a570f5976 | |||
| af77c9a487 | |||
| 96fff7c3ca | |||
| e6e9ac9f15 | |||
| 2dea0dee4b | |||
| 169f2635a7 | |||
| c544671782 | |||
| 57f46cb077 | |||
| 8531ea98ae | |||
| 0c7f57c31c | |||
| 1fe09304db | |||
| 6fe28794c0 | |||
| bc1b2e1b51 | |||
| e4e3438dbe | |||
| 923c070ee0 | |||
| 2d648e92fd | |||
| f796b7e533 | |||
|
3ffe11364d
|
|||
| 8e3d006f08 | |||
| a1c9132690 | |||
| 539db3683b | |||
| 8db39ca626 | |||
| 821456cc94 | |||
|
5898354c41
|
|||
| c7483d7b85 | |||
| 0a7236d013 | |||
| e11185f0b1 | |||
| 391f6288fd | |||
| cc2df623d9 | |||
| 3d0ef97139 | |||
| 20daac947c | |||
| 57525f2d35 | |||
| ce09084991 | |||
|
596d4f5520
|
|||
| 8d0995333a | |||
| 5d450d1af7 | |||
| 18d4a30e49 | |||
| 55eb3b75db | |||
| 1c67ab4c51 | |||
| 32b4892ecb | |||
| 3109fc3fe8 | |||
| 6157eb42d4 | |||
| 654b69b4e4 | |||
| 88f32e2c91 | |||
| d1bd25eaa6 | |||
| d162c182cb | |||
| 43b3a9e44a | |||
| 3e5910e3d7 | |||
| 719c6949af | |||
| c46c23b471 | |||
| 3124f6294c | |||
| d0660f5f60 | |||
| c7395f6673 | |||
| ebad597333 | |||
| 24fc3d0294 | |||
| 7206436c87 | |||
| 19b4e0f792 | |||
| 100911d333 | |||
| 97f2b11702 | |||
| c3610f846b | |||
| 427f17adb2 | |||
|
56e4602af0
|
@@ -1,13 +1,6 @@
|
||||
/* Oceanbox Keycloak Login Theme
|
||||
*
|
||||
* Branding aligned with oceanbox.io:
|
||||
* Primary teal: #0bb4aa
|
||||
* Dark teal: #37746F
|
||||
* Deep blue: #031275
|
||||
* Background: #f9fafd
|
||||
* Text: #101010
|
||||
*/
|
||||
/* Oceanbox Keycloak Login Theme */
|
||||
|
||||
/* Brand colours */
|
||||
:root {
|
||||
--pf-v5-global--primary-color--100: #0bb4aa;
|
||||
--pf-v5-global--primary-color--200: #099e95;
|
||||
@@ -15,17 +8,10 @@
|
||||
--pf-v5-global--link--Color--hover: #031275;
|
||||
}
|
||||
|
||||
/* Background */
|
||||
.login-pf body {
|
||||
background: #f9fafd url("../img/oceanbox-bg.png") no-repeat center bottom fixed;
|
||||
background-size: cover;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
/* Login container layout */
|
||||
.pf-v5-c-login__container {
|
||||
grid-template-columns: 34rem;
|
||||
grid-template-areas: "header"
|
||||
"main";
|
||||
}
|
||||
|
||||
/* Logo */
|
||||
@@ -43,67 +29,19 @@ div.kc-logo-text span {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Header */
|
||||
#kc-header-wrapper {
|
||||
font-size: 29px;
|
||||
text-transform: uppercase;
|
||||
letter-spacing: 3px;
|
||||
line-height: 1.2em;
|
||||
white-space: normal;
|
||||
color: #37746F !important;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
/* Login card */
|
||||
.pf-v5-c-login__main {
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 4px 24px rgba(0, 0, 0, 0.08);
|
||||
}
|
||||
|
||||
/* Primary button */
|
||||
.pf-v5-c-button.pf-m-primary {
|
||||
--pf-v5-c-button--m-primary--BackgroundColor: #0bb4aa;
|
||||
--pf-v5-c-button--m-primary--hover--BackgroundColor: #099e95;
|
||||
--pf-v5-c-button--m-primary--active--BackgroundColor: #37746F;
|
||||
--pf-v5-c-button--m-primary--focus--BackgroundColor: #099e95;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
/* Links */
|
||||
.pf-v5-c-button.pf-m-link {
|
||||
--pf-v5-c-button--m-link--Color: #0bb4aa;
|
||||
--pf-v5-c-button--m-link--hover--Color: #031275;
|
||||
}
|
||||
|
||||
a {
|
||||
a, .pf-v5-c-button.pf-m-link {
|
||||
color: #0bb4aa;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
a:hover, .pf-v5-c-button.pf-m-link:hover {
|
||||
color: #031275;
|
||||
}
|
||||
|
||||
/* Form inputs */
|
||||
.pf-v5-c-form-control > input,
|
||||
.pf-v5-c-form-control > textarea {
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
#kc-recovery-codes-list {
|
||||
columns: 2;
|
||||
}
|
||||
|
||||
#certificate_subjectDN {
|
||||
overflow-wrap: break-word;
|
||||
}
|
||||
|
||||
hr {
|
||||
margin-top: var(--pf-v5-global--spacer--sm);
|
||||
margin-bottom: var(--pf-v5-global--spacer--md);
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
div.pf-v5-c-login__main-header {
|
||||
grid-template-columns: 70% 30%;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,10 +4,10 @@ description: Atlantis map and simulation service
|
||||
type: application
|
||||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
version: v1.46.5
|
||||
version: v2.6.6
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application.
|
||||
appVersion: v1.46.5
|
||||
appVersion: v2.6.6
|
||||
dependencies:
|
||||
- name: diagrid-dashboard
|
||||
version: "0.1.0"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||
tag: v1.46.5
|
||||
tag: v2.6.6
|
||||
pullPolicy: IfNotPresent
|
||||
init:
|
||||
enabled: false
|
||||
|
||||
@@ -13,9 +13,9 @@ type: application
|
||||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
# Versions are expected to follow Semantic Versioning (https://semver.org/)
|
||||
version: v1.46.5
|
||||
version: v2.6.6
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application. Versions are not expected to
|
||||
# follow Semantic Versioning. They should reflect the version the application is using.
|
||||
# It is recommended to use it with quotes.
|
||||
appVersion: "v1.46.5"
|
||||
appVersion: "v2.6.6"
|
||||
|
||||
@@ -10,7 +10,7 @@ image:
|
||||
# This sets the pull policy for images.
|
||||
pullPolicy: IfNotPresent
|
||||
# Overrides the image tag whose default is the chart appVersion.
|
||||
tag: v1.46.5
|
||||
tag: v2.6.6
|
||||
# This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
|
||||
imagePullSecrets:
|
||||
- name: gitlab-pull-secret
|
||||
|
||||
@@ -47,7 +47,7 @@ service:
|
||||
port: 8080
|
||||
ingress:
|
||||
enabled: true
|
||||
className: nginx
|
||||
className: haproxy
|
||||
persistence:
|
||||
enabled: false
|
||||
size: 1G
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
apiVersion: v2
|
||||
name: fapr
|
||||
description: A Helm chart for Fapr (F# Dapr workflow orchestrator)
|
||||
type: application
|
||||
version: v0.1.0
|
||||
appVersion: v0.1.0
|
||||
@@ -0,0 +1,61 @@
|
||||
{{/* vim: set filetype=mustache: */}}
|
||||
{{/*
|
||||
Expand the name of the chart.
|
||||
*/}}
|
||||
{{- define "fapr.name" -}}
|
||||
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Create a default fully qualified app name.
|
||||
*/}}
|
||||
{{- define "fapr.fullname" -}}
|
||||
{{- if .Values.fullnameOverride }}
|
||||
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
|
||||
{{- else }}
|
||||
{{- $name := default .Chart.Name .Values.nameOverride }}
|
||||
{{- if contains $name .Release.Name }}
|
||||
{{- .Release.Name | trunc 63 | trimSuffix "-" }}
|
||||
{{- else }}
|
||||
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Create chart name and version as used by the chart label.
|
||||
*/}}
|
||||
{{- define "fapr.chart" -}}
|
||||
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Common labels
|
||||
*/}}
|
||||
{{- define "fapr.labels" -}}
|
||||
helm.sh/chart: {{ include "fapr.chart" . }}
|
||||
{{ include "fapr.selectorLabels" . }}
|
||||
{{- if .Chart.AppVersion }}
|
||||
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
||||
{{- end }}
|
||||
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Selector labels
|
||||
*/}}
|
||||
{{- define "fapr.selectorLabels" -}}
|
||||
app.kubernetes.io/name: {{ include "fapr.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Create the name of the service account to use
|
||||
*/}}
|
||||
{{- define "fapr.serviceAccountName" -}}
|
||||
{{- if .Values.serviceAccount.create -}}
|
||||
{{ default (include "fapr.fullname" .) .Values.serviceAccount.name }}
|
||||
{{- else -}}
|
||||
{{ default "default" .Values.serviceAccount.name }}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
@@ -0,0 +1,85 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "fapr.fullname" . }}
|
||||
labels:
|
||||
{{- include "fapr.labels" . | nindent 4 }}
|
||||
spec:
|
||||
{{- if not .Values.autoscaling.enabled }}
|
||||
replicas: {{ .Values.replicaCount }}
|
||||
{{- end }}
|
||||
selector:
|
||||
matchLabels:
|
||||
{{- include "fapr.selectorLabels" . | nindent 6 }}
|
||||
template:
|
||||
metadata:
|
||||
{{- with .Values.podAnnotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "fapr.selectorLabels" . | nindent 8 }}
|
||||
spec:
|
||||
{{- with .Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
serviceAccountName: {{ include "fapr.serviceAccountName" . }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.podSecurityContext | nindent 8 }}
|
||||
containers:
|
||||
- name: {{ .Chart.Name }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.securityContext | nindent 12 }}
|
||||
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: {{ .Values.service.port }}
|
||||
protocol: TCP
|
||||
env:
|
||||
{{- toYaml .Values.env | nindent 12 }}
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /healthz
|
||||
port: http
|
||||
initialDelaySeconds: 5
|
||||
periodSeconds: 15
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /healthz
|
||||
port: http
|
||||
initialDelaySeconds: 3
|
||||
periodSeconds: 10
|
||||
resources:
|
||||
{{- toYaml .Values.resources | nindent 12 }}
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
- name: appsettings
|
||||
mountPath: /app/appsettings.json
|
||||
subPath: appsettings.json
|
||||
readOnly: true
|
||||
volumes:
|
||||
- name: data
|
||||
{{- if .Values.persistence.enabled }}
|
||||
persistentVolumeClaim:
|
||||
claimName: {{ .Values.persistence.existingClaim | default (include "fapr.fullname" .) }}
|
||||
{{- else }}
|
||||
emptyDir: {}
|
||||
{{- end }}
|
||||
- name: appsettings
|
||||
configMap:
|
||||
name: {{ include "fapr.fullname" . }}-appsettings
|
||||
{{- with .Values.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.affinity }}
|
||||
affinity:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.tolerations }}
|
||||
tolerations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
@@ -0,0 +1,21 @@
|
||||
{{- if and .Values.persistence.enabled (not .Values.persistence.existingClaim) }}
|
||||
kind: PersistentVolumeClaim
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
name: {{ include "fapr.fullname" . }}
|
||||
labels:
|
||||
{{ include "fapr.labels" . | indent 4 }}
|
||||
spec:
|
||||
accessModes:
|
||||
- {{ .Values.persistence.accessMode | quote }}
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.persistence.size | quote }}
|
||||
{{- if .Values.persistence.storageClass }}
|
||||
{{- if (eq "-" .Values.persistence.storageClass) }}
|
||||
storageClassName: ""
|
||||
{{- else }}
|
||||
storageClassName: "{{ .Values.persistence.storageClass }}"
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
@@ -0,0 +1,49 @@
|
||||
{{- if .Values.redis.enabled -}}
|
||||
apiVersion: dragonflydb.io/v1alpha1
|
||||
kind: Dragonfly
|
||||
metadata:
|
||||
name: {{ include "fapr.fullname" . }}-redis
|
||||
namespace: {{ .Release.Namespace }}
|
||||
annotations:
|
||||
linkerd.io/inject: disabled
|
||||
labels:
|
||||
app.kubernetes.io/created-by: dragonfly-operator
|
||||
{{- include "fapr.labels" . | nindent 4 }}
|
||||
spec:
|
||||
args:
|
||||
- --dbfilename=dump
|
||||
- --maxmemory=$(MAX_MEMORY)Mi
|
||||
- --proactor_threads=1
|
||||
- --logtostderr
|
||||
- --save_schedule=
|
||||
env:
|
||||
- name: MAX_MEMORY
|
||||
valueFrom:
|
||||
resourceFieldRef:
|
||||
resource: limits.memory
|
||||
divisor: 1Mi
|
||||
replicas: {{ .Values.redis.replicas | default "1" }}
|
||||
resources:
|
||||
requests:
|
||||
cpu: {{ .Values.redis.resources.cpu | default "100m" }}
|
||||
memory: {{ .Values.redis.resources.memory | default "128Mi" }}
|
||||
limits:
|
||||
memory: {{ .Values.redis.resources.memory | default "128Mi" }}
|
||||
authentication:
|
||||
passwordFromSecret:
|
||||
name: {{ .Values.redis.secret.name | default (printf "%s-redis" (include "fapr.fullname" .)) | quote }}
|
||||
key: {{ .Values.redis.secret.key | quote }}
|
||||
{{- if .Values.redis.backup.enabled }}
|
||||
snapshot:
|
||||
dir: /data
|
||||
cron: "0 3 * * *"
|
||||
enableOnMasterOnly: false
|
||||
persistentVolumeClaimSpec:
|
||||
storageClassName: {{ .Values.redis.storageClass | default "managed-nfs-storage" }}
|
||||
accessModes:
|
||||
- ReadWriteOnce
|
||||
resources:
|
||||
requests:
|
||||
storage: {{ .Values.redis.size | default "1Gi" }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
@@ -0,0 +1,15 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ include "fapr.fullname" . }}
|
||||
labels:
|
||||
{{- include "fapr.labels" . | nindent 4 }}
|
||||
spec:
|
||||
type: {{ .Values.service.type }}
|
||||
ports:
|
||||
- port: {{ .Values.service.port }}
|
||||
targetPort: http
|
||||
protocol: TCP
|
||||
name: http
|
||||
selector:
|
||||
{{- include "fapr.selectorLabels" . | nindent 4 }}
|
||||
@@ -0,0 +1,12 @@
|
||||
{{- if .Values.serviceAccount.create -}}
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: {{ include "fapr.serviceAccountName" . }}
|
||||
labels:
|
||||
{{- include "fapr.labels" . | nindent 4 }}
|
||||
{{- with .Values.serviceAccount.annotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
@@ -0,0 +1,67 @@
|
||||
# Default values for fapr.
|
||||
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/fapr/fapr
|
||||
tag: v0.1.0
|
||||
pullPolicy: IfNotPresent
|
||||
env:
|
||||
- name: APP_NAME
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: metadata.name
|
||||
- name: APP_NAMESPACE
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: metadata.namespace
|
||||
imagePullSecrets:
|
||||
- name: gitlab-pull-secret
|
||||
nameOverride: ""
|
||||
fullnameOverride: ""
|
||||
serviceAccount:
|
||||
create: true
|
||||
annotations: {}
|
||||
name: ""
|
||||
podAnnotations: {}
|
||||
podSecurityContext:
|
||||
fsGroup: 0
|
||||
securityContext:
|
||||
capabilities:
|
||||
drop:
|
||||
- ALL
|
||||
readOnlyRootFilesystem: false
|
||||
runAsNonRoot: false
|
||||
runAsUser: 0
|
||||
service:
|
||||
type: ClusterIP
|
||||
port: 8080
|
||||
persistence:
|
||||
enabled: true
|
||||
existingClaim: ""
|
||||
size: 1Gi
|
||||
storageClass: "ceph-rbd"
|
||||
accessMode: ReadWriteMany
|
||||
redis:
|
||||
enabled: true
|
||||
replicas: 1
|
||||
backup:
|
||||
enabled: false
|
||||
size: 1Gi
|
||||
storageClass: "ceph-rbd"
|
||||
secret:
|
||||
name: ""
|
||||
key: "redis-password"
|
||||
resources:
|
||||
cpu: 100m
|
||||
memory: 128Mi
|
||||
resources: {}
|
||||
autoscaling:
|
||||
enabled: false
|
||||
minReplicas: 1
|
||||
maxReplicas: 3
|
||||
targetCPUUtilizationPercentage: 80
|
||||
serviceMonitor:
|
||||
enabled: false
|
||||
nodeSelector: {}
|
||||
tolerations: []
|
||||
affinity: {}
|
||||
@@ -47,7 +47,7 @@ service:
|
||||
port: 8080
|
||||
ingress:
|
||||
enabled: true
|
||||
className: nginx
|
||||
className: haproxy
|
||||
persistence:
|
||||
enabled: false
|
||||
size: 1G
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
dependencies:
|
||||
- name: diagrid-dashboard
|
||||
repository: file://../diagrid-dashboard
|
||||
version: 0.1.0
|
||||
digest: sha256:4fdb3148a2a6439223d7844a3083da2de324dd47e5cb3ac4a5d9c436e6e2c775
|
||||
generated: "2026-02-25T16:15:48.608231856+01:00"
|
||||
@@ -4,10 +4,10 @@ description: A Helm chart for Kubernetes
|
||||
type: application
|
||||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
version: v1.6.13
|
||||
version: v1.7.1
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application.
|
||||
appVersion: v1.6.13
|
||||
appVersion: v1.7.1
|
||||
dependencies:
|
||||
- name: diagrid-dashboard
|
||||
version: "0.1.0"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/plume/plume
|
||||
tag: v1.6.13
|
||||
tag: v1.7.1
|
||||
pullPolicy: IfNotPresent
|
||||
init:
|
||||
enabled: false
|
||||
@@ -90,6 +90,5 @@ serviceMonitor:
|
||||
nodeSelector: {}
|
||||
tolerations: []
|
||||
affinity: {}
|
||||
|
||||
diagrid-dashboard:
|
||||
enabled: false
|
||||
|
||||
@@ -4,10 +4,10 @@ description: A Helm chart for Kubernetes
|
||||
type: application
|
||||
# This is the chart version. This version number should be incremented each time you make changes
|
||||
# to the chart and its templates, including the app version.
|
||||
version: v1.46.5
|
||||
version: v2.6.6
|
||||
# This is the version number of the application being deployed. This version number should be
|
||||
# incremented each time you make changes to the application.
|
||||
appVersion: v1.46.5
|
||||
appVersion: v2.6.6
|
||||
dependencies:
|
||||
- name: diagrid-dashboard
|
||||
version: "0.1.0"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
|
||||
tag: v1.46.5
|
||||
tag: v2.6.6
|
||||
pullPolicy: IfNotPresent
|
||||
init:
|
||||
enabled: false
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: argocd
|
||||
namespace: argocd
|
||||
chart: argo/argo-cd
|
||||
version: 9.4.10
|
||||
version: 9.5.12
|
||||
condition: argo.enabled
|
||||
values:
|
||||
- ../values/argo/values/argocd.yaml.gotmpl
|
||||
@@ -35,7 +35,7 @@ releases:
|
||||
- name: argo-rollouts
|
||||
namespace: argocd
|
||||
chart: argo/argo-rollouts
|
||||
version: 2.40.6
|
||||
version: 2.40.9
|
||||
condition: argo.rollouts.enabled
|
||||
values:
|
||||
- ../values/argo/values/rollouts.yaml.gotmpl
|
||||
@@ -43,7 +43,7 @@ releases:
|
||||
- name: argo-workflows
|
||||
namespace: argocd
|
||||
chart: argo/argo-workflows
|
||||
version: 0.47.5
|
||||
version: 1.0.13
|
||||
condition: argo.workflows.enabled
|
||||
missingFileHandler: Info
|
||||
- name: manifests
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
# yaml-language-server: $schema=https://www.schemastore.org/helmfile.json
|
||||
|
||||
bases:
|
||||
- ../envs/environments.yaml.gotmpl
|
||||
|
||||
repositories:
|
||||
- name: catalyst
|
||||
oci: true
|
||||
url: 'public.ecr.aws/diagrid'
|
||||
|
||||
commonLabels:
|
||||
tier: system
|
||||
|
||||
releases:
|
||||
- name: catalyst
|
||||
namespace: cra-agent
|
||||
chart: catalyst/catalyst
|
||||
version: 1.47.0
|
||||
condition: catalyst.enabled
|
||||
values:
|
||||
- ../values/catalyst/values/values.yaml
|
||||
- ../values/catalyst/values/values-{{ .Environment.Name }}.yaml
|
||||
postRenderer: ../bin/kustomizer
|
||||
postRendererArgs:
|
||||
- ../values/catalyst/kustomize/{{ .Environment.Name }}
|
||||
missingFileHandler: Info
|
||||
- name: manifests
|
||||
namespace: cra-agent
|
||||
chart: manifests
|
||||
condition: catalyst.enabled
|
||||
missingFileHandler: Info
|
||||
values:
|
||||
- ../values/env.yaml
|
||||
- ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
|
||||
- ../values/catalyst/env.yaml.gotmpl
|
||||
- ../values/catalyst/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
|
||||
hooks:
|
||||
- events: [ prepare, cleanup ]
|
||||
showlogs: true
|
||||
command: ../bin/helmify
|
||||
args:
|
||||
- '{{`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}`}}'
|
||||
- '{{`{{ .Release.Chart }}`}}'
|
||||
- '{{`{{ .Environment.Name }}`}}'
|
||||
- ../values/catalyst/manifests
|
||||
- manifests
|
||||
@@ -13,7 +13,7 @@ releases:
|
||||
- name: cert-manager
|
||||
namespace: cert-manager
|
||||
chart: cert-manager/cert-manager
|
||||
version: v1.19.4
|
||||
version: v1.20.2
|
||||
condition: cert_manager.enabled
|
||||
values:
|
||||
- ../values/cert-manager/values/cert-manager.yaml.gotmpl
|
||||
|
||||
@@ -13,7 +13,7 @@ releases:
|
||||
- name: dragonfly
|
||||
namespace: dragonfly
|
||||
chart: dragonfly/dragonfly-operator
|
||||
version: v1.4.0
|
||||
version: v1.5.0
|
||||
condition: dragonfly.enabled
|
||||
values:
|
||||
- ../values/dragonfly/values/dragonfly.yaml.gotmpl
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
bases:
|
||||
- ../envs/environments.yaml.gotmpl
|
||||
|
||||
commonLabels:
|
||||
tier: oceanbox
|
||||
|
||||
releases:
|
||||
- name: {{ .Environment.Name }}-fapr
|
||||
namespace: {{ .Environment.Name }}-fapr
|
||||
chart: ../charts/fapr
|
||||
condition: fapr.enabled
|
||||
values:
|
||||
- ../values/fapr/values/values.yaml
|
||||
- ../values/fapr/values/values-{{ .Environment.Name }}.yaml
|
||||
- ../values/fapr/values/values-{{ .Environment.Name }}-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
|
||||
postRenderer: ../bin/kustomizer
|
||||
postRendererArgs:
|
||||
- ../values/fapr/kustomize/{{ .Environment.Name }}-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}
|
||||
missingFileHandler: Info
|
||||
- name: manifests
|
||||
namespace: {{ .Environment.Name }}-fapr
|
||||
chart: manifests
|
||||
condition: fapr.enabled
|
||||
missingFileHandler: Info
|
||||
values:
|
||||
- ../values/env.yaml
|
||||
- ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
|
||||
- ../values/fapr/env.yaml.gotmpl
|
||||
- ../values/fapr/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
|
||||
hooks:
|
||||
- events: [ prepare, cleanup ]
|
||||
showlogs: true
|
||||
command: ../bin/helmify
|
||||
args:
|
||||
- '{{`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}`}}'
|
||||
- '{{`{{ .Release.Chart }}`}}'
|
||||
- '{{`{{ .Environment.Name }}`}}'
|
||||
- ../values/fapr/manifests
|
||||
- manifests
|
||||
@@ -13,7 +13,7 @@ releases:
|
||||
- name: gitea
|
||||
namespace: gitea
|
||||
chart: gitea/gitea
|
||||
version: 12.5.0
|
||||
version: 12.6.0
|
||||
condition: gitea.enabled
|
||||
values:
|
||||
- ../values/gitea/values/values.yaml
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
bases:
|
||||
- ../envs/environments.yaml.gotmpl
|
||||
|
||||
repositories:
|
||||
- name: haproxytech
|
||||
oci: true
|
||||
url: 'ghcr.io/haproxytech/helm-charts'
|
||||
|
||||
commonLabels:
|
||||
tier: system
|
||||
|
||||
releases:
|
||||
- name: ingress-haproxy
|
||||
namespace: ingress-haproxy
|
||||
chart: haproxytech/kubernetes-ingress
|
||||
version: 1.49.0
|
||||
condition: haproxy.enabled
|
||||
values:
|
||||
- ../values/ingress-haproxy/values/ingress-haproxy.yaml.gotmpl
|
||||
- ../values/ingress-haproxy/values/ingress-haproxy-{{ .Environment.Name }}.yaml.gotmpl
|
||||
postRenderer: ../bin/kustomizer
|
||||
postRendererArgs:
|
||||
- ../values/ingress-haproxy/kustomize/{{ .Environment.Name }}
|
||||
missingFileHandler: Info
|
||||
- name: manifests
|
||||
namespace: ingress-haproxy
|
||||
chart: manifests
|
||||
condition: haproxy.enabled
|
||||
missingFileHandler: Info
|
||||
values:
|
||||
- ../values/env.yaml
|
||||
- ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
|
||||
- ../values/ingress-haproxy/env.yaml.gotmpl
|
||||
- ../values/ingress-haproxy/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
|
||||
hooks:
|
||||
- events: [ prepare, cleanup ]
|
||||
showlogs: true
|
||||
command: ../bin/helmify
|
||||
args:
|
||||
- '{{`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}`}}'
|
||||
- '{{`{{ .Release.Chart }}`}}'
|
||||
- '{{`{{ .Environment.Name }}`}}'
|
||||
- ../values/ingress-haproxy/manifests
|
||||
- manifests
|
||||
@@ -12,7 +12,7 @@ releases:
|
||||
- name: ingress-nginx
|
||||
namespace: ingress-nginx
|
||||
chart: ingress-nginx/ingress-nginx
|
||||
version: 4.14.3
|
||||
version: 4.15.1
|
||||
condition: nginx.enabled
|
||||
values:
|
||||
- ../values/ingress-nginx/values/ingress-nginx.yaml.gotmpl
|
||||
|
||||
@@ -8,7 +8,7 @@ releases:
|
||||
- name: kueue
|
||||
namespace: kueue-system
|
||||
chart: oci://registry.k8s.io/kueue/charts/kueue
|
||||
version: 0.16.2
|
||||
version: 0.17.1
|
||||
condition: kueue.enabled
|
||||
values:
|
||||
- ../values/kueue/values/values.yaml
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: kyverno
|
||||
namespace: kyverno
|
||||
chart: kyverno/kyverno
|
||||
version: 3.7.1
|
||||
version: 3.8.0
|
||||
condition: kyverno.enabled
|
||||
values:
|
||||
- ../values/kyverno/values/kyverno.yaml.gotmpl
|
||||
|
||||
@@ -12,7 +12,7 @@ releases:
|
||||
- name: loki
|
||||
namespace: loki
|
||||
chart: loki/loki
|
||||
version: 6.53.0
|
||||
version: 7.0.0
|
||||
condition: loki.enabled
|
||||
values:
|
||||
- ../values/loki/values/loki.yaml.gotmpl
|
||||
|
||||
@@ -12,7 +12,7 @@ releases:
|
||||
- name: mariadb-operator
|
||||
namespace: mariadb-operator
|
||||
chart: mariadb-operator/mariadb-operator
|
||||
version: 25.10.4
|
||||
version: 26.3.0
|
||||
condition: mariadb_operator.enabled
|
||||
values:
|
||||
- ../values/mariadb-operator/values/mariadb-operator.yaml.gotmpl
|
||||
|
||||
@@ -16,7 +16,7 @@ releases:
|
||||
namespace: {{ .Environment.Name }}-openfga
|
||||
{{- end }}
|
||||
chart: openfga/openfga
|
||||
version: 0.2.56
|
||||
version: 0.3.3
|
||||
condition: openfga.enabled
|
||||
values:
|
||||
- ../values/openfga/values/values.yaml
|
||||
|
||||
@@ -12,7 +12,7 @@ releases:
|
||||
- name: opentelemetry-collector
|
||||
namespace: otel
|
||||
chart: open-telemetry/opentelemetry-collector
|
||||
version: 0.146.1
|
||||
version: 0.153.0
|
||||
condition: otel.enabled
|
||||
values:
|
||||
- ../values/opentelemetry-collector/values/values.yaml
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: postgres-operator
|
||||
namespace: cnpg
|
||||
chart: cloudnative-pg/cloudnative-pg
|
||||
version: 0.27.0
|
||||
version: 0.28.0
|
||||
condition: postgres_operator.enabled
|
||||
values:
|
||||
- ../values/postgres-operator/values/postgres-operator.yaml.gotmpl
|
||||
@@ -27,7 +27,7 @@ releases:
|
||||
- name: plugin-barman-cloud
|
||||
namespace: cnpg
|
||||
chart: cloudnative-pg/plugin-barman-cloud
|
||||
version: 0.5.0
|
||||
version: 0.6.0
|
||||
condition: postgres_operator.enabled
|
||||
values:
|
||||
- ../values/postgres-operator/values/plugin-barman-cloud.yaml.gotmpl
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: prometheus
|
||||
namespace: prometheus
|
||||
chart: prometheus/kube-prometheus-stack
|
||||
version: 82.10.3
|
||||
version: 82.15.1
|
||||
condition: prometheus.enabled
|
||||
values:
|
||||
- ../values/prometheus/values/prometheus.yaml.gotmpl
|
||||
|
||||
@@ -13,7 +13,7 @@ releases:
|
||||
- name: slurm-operator
|
||||
namespace: slinky
|
||||
chart: slurm-operator/slurm-operator
|
||||
version: 1.0.2
|
||||
version: 1.0.3
|
||||
condition: slurm_operator.enabled
|
||||
values:
|
||||
- ../values/slurm-operator/values/slurm-operator.yaml.gotmpl
|
||||
|
||||
@@ -13,7 +13,7 @@ releases:
|
||||
- name: slurm
|
||||
namespace: slurm
|
||||
chart: slurm/slurm
|
||||
version: 1.0.2
|
||||
version: 1.0.3
|
||||
condition: slurm.enabled
|
||||
values:
|
||||
- ../values/slurm/values/slurm.yaml.gotmpl
|
||||
|
||||
@@ -14,7 +14,7 @@ releases:
|
||||
- name: umami
|
||||
namespace: analytics
|
||||
chart: umami/umami
|
||||
version: 7.7.3
|
||||
version: 7.9.1
|
||||
condition: umami.enabled
|
||||
values:
|
||||
- ../values/umami/values/values.yaml
|
||||
|
||||
@@ -15,7 +15,7 @@ releases:
|
||||
- name: velero
|
||||
namespace: velero
|
||||
chart: velero/velero
|
||||
version: 12.0.0
|
||||
version: 12.0.1
|
||||
condition: velero.enabled
|
||||
values:
|
||||
- ../values/velero/values/velero.yaml.gotmpl
|
||||
|
||||
@@ -12,7 +12,7 @@ releases:
|
||||
- name: x509-exporter
|
||||
namespace: x509-exporter
|
||||
chart: x509-exporter/x509-certificate-exporter
|
||||
version: 3.19.1
|
||||
version: 3.21.0
|
||||
condition: x509_exporter.enabled
|
||||
values:
|
||||
- ../values/x509-exporter/values/x509-exporter.yaml.gotmpl
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ treefmt.evalModule pkgs {
|
||||
# --- Nix formatting ---
|
||||
nixfmt = {
|
||||
enable = true;
|
||||
package = pkgs.nixfmt-rfc-style;
|
||||
package = pkgs.nixfmt;
|
||||
};
|
||||
statix.enable = true;
|
||||
deadnix.enable = true;
|
||||
|
||||
+5
-5
@@ -3,8 +3,8 @@
|
||||
"nixpkgs": {
|
||||
"type": "Channel",
|
||||
"name": "nixpkgs-unstable",
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre961788.75690239f08f/nixexprs.tar.xz",
|
||||
"hash": "sha256-p0h/nSeqzIkbn/2uFC4keoIPwmqXGHsX0gkCXM7km00="
|
||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre981196.b86751bc4085/nixexprs.tar.xz",
|
||||
"hash": "sha256-mBqzkn7oJti2hqeO8iTbDxKw+1ifxpP53feQ0CEXies="
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"type": "Git",
|
||||
@@ -15,9 +15,9 @@
|
||||
},
|
||||
"branch": "main",
|
||||
"submodules": false,
|
||||
"revision": "71b125cd05fbfd78cab3e070b73544abe24c5016",
|
||||
"url": "https://github.com/numtide/treefmt-nix/archive/71b125cd05fbfd78cab3e070b73544abe24c5016.tar.gz",
|
||||
"hash": "sha256-6E/yhXP7Oy/NbXtf1ktzmU8SdVqJQ09HC/48ebEGBpk="
|
||||
"revision": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
|
||||
"url": "https://github.com/numtide/treefmt-nix/archive/790751ff7fd3801feeaf96d7dc416a8d581265ba.tar.gz",
|
||||
"hash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0="
|
||||
}
|
||||
},
|
||||
"version": 7
|
||||
|
||||
@@ -0,0 +1,151 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: arome-script
|
||||
namespace: cron
|
||||
data:
|
||||
download.py: |
|
||||
import os
|
||||
import sys
|
||||
from netCDF4 import Dataset
|
||||
import re
|
||||
from datetime import datetime, timedelta
|
||||
|
||||
fname ="https://thredds.met.no/thredds/dodsC/meps25epsarchive/YEAR/MONTH/DAY/meps_det_sfc_YEARMONTHDAYT00Z.ncml"
|
||||
outdir = "/data/hdd/data/AROME"
|
||||
|
||||
|
||||
def generate_thredds_names(start, stop):
|
||||
start_date = datetime(int(start.split("-")[0]),
|
||||
int(start.split("-")[1]),
|
||||
int(start.split("-")[2]))
|
||||
end_date = datetime(int(stop.split("-")[0]),
|
||||
int(stop.split("-")[1]),
|
||||
int(stop.split("-")[2]))
|
||||
|
||||
date_list = []
|
||||
while start_date <= end_date:
|
||||
date_list.append(start_date)
|
||||
start_date += timedelta(days=1)
|
||||
|
||||
fileList = []
|
||||
for date in date_list:
|
||||
y = str(date.year)
|
||||
m = (str(date.month)).zfill(2)
|
||||
d = (str(date.day)).zfill(2)
|
||||
|
||||
f = re.sub("YEAR", y, fname)
|
||||
f = re.sub("MONTH", m, f)
|
||||
f = re.sub("DAY", d, f)
|
||||
fileList.append(f)
|
||||
|
||||
return fileList
|
||||
|
||||
def copy_thredds_file(threddsFile, savename):
|
||||
dsin = Dataset(threddsFile)
|
||||
|
||||
dsout = Dataset(savename, "w")
|
||||
|
||||
for dname, the_dim in dsin.dimensions.items():
|
||||
dsout.createDimension(dname, len(the_dim) if not the_dim.isunlimited() else None)
|
||||
|
||||
aromeNames = ["time",
|
||||
"longitude",
|
||||
"latitude",
|
||||
"land_area_fraction",
|
||||
"air_temperature_2m",
|
||||
"precipitation_amount_acc",
|
||||
"water_evaporation_amount",
|
||||
"relative_humidity_2m",
|
||||
"integral_of_surface_downwelling_longwave_flux_in_air_wrt_time",
|
||||
"integral_of_surface_net_downward_shortwave_flux_wrt_time",
|
||||
"air_pressure_at_sea_level",
|
||||
"x_wind_10m",
|
||||
"y_wind_10m"]
|
||||
|
||||
for v_name, varin in dsin.variables.items():
|
||||
if v_name in aromeNames:
|
||||
fill_value = None
|
||||
|
||||
if hasattr(varin, "_FillValue"):
|
||||
fill_value = varin._FillValue
|
||||
|
||||
outVar = dsout.createVariable(v_name, varin.datatype, varin.dimensions, fill_value=fill_value)
|
||||
|
||||
outVar.setncatts({k: varin.getncattr(k) for k in varin.ncattrs() if k not in ["_FillValue"]})
|
||||
|
||||
outVar[:] = varin[:]
|
||||
dsout.close()
|
||||
|
||||
|
||||
os.makedirs(outdir, exist_ok=True)
|
||||
|
||||
fList = generate_thredds_names("2026-04-24", datetime.today().strftime("%Y-%m-%d"))
|
||||
failed = False
|
||||
for fname in fList:
|
||||
savename = os.path.join(outdir, fname.split("/")[-1].split(".")[0] + ".nc")
|
||||
if os.path.exists(savename):
|
||||
print(f"Skipping {savename}, already exists")
|
||||
continue
|
||||
print(savename)
|
||||
try:
|
||||
try:
|
||||
copy_thredds_file(fname, savename)
|
||||
except:
|
||||
alt_fname = re.sub("sfc", "2_5km", fname)
|
||||
alt_fname = re.sub("ncml", "nc", alt_fname)
|
||||
copy_thredds_file(alt_fname, savename)
|
||||
except Exception as e:
|
||||
print(f"File not found: {fname} ({e})")
|
||||
failed = True
|
||||
|
||||
if failed:
|
||||
sys.exit(1)
|
||||
---
|
||||
apiVersion: batch/v1
|
||||
kind: CronJob
|
||||
metadata:
|
||||
name: arome
|
||||
namespace: cron
|
||||
spec:
|
||||
schedule: 0 6 * * * # Everyday at 06:00, use https://crontab.guru
|
||||
concurrencyPolicy: "Forbid" # If only one at at time set to Allow else Forbid
|
||||
successfulJobsHistoryLimit: 10
|
||||
failedJobsHistoryLimit: 3
|
||||
jobTemplate:
|
||||
spec:
|
||||
backoffLimit: 3
|
||||
template:
|
||||
spec:
|
||||
restartPolicy: "Never"
|
||||
containers:
|
||||
- name: cronpod
|
||||
image: juselius/busynix:1.1
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
- |
|
||||
if nix-shell -p 'python3.withPackages(ps: [ps.netcdf4])' --run 'python3 /scripts/download.py'; then
|
||||
chown -R 5000:5000 /data/hdd/data/AROME
|
||||
chmod -R g+w /data/hdd/data/AROME
|
||||
else
|
||||
echo "Job failed, sleeping 30 minutes before retry..."
|
||||
sleep 1800
|
||||
exit 1
|
||||
fi
|
||||
resources: {}
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
- name: script
|
||||
mountPath: /scripts
|
||||
securityContext: {}
|
||||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: ekman-data
|
||||
- name: script
|
||||
configMap:
|
||||
name: arome-script
|
||||
defaultMode: 0755
|
||||
@@ -0,0 +1,178 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: mur-script
|
||||
namespace: cron
|
||||
data:
|
||||
download.py: |
|
||||
import argparse
|
||||
import os
|
||||
import sys
|
||||
import requests
|
||||
from datetime import datetime
|
||||
|
||||
parser = argparse.ArgumentParser(description="Download MUR SST files from NASA Earthdata")
|
||||
parser.add_argument("-sd", "--start_date", required=True, help="Start date (YYYY-MM-DD)")
|
||||
parser.add_argument("-ed", "--end_date", required=True, help="End date (YYYY-MM-DD)")
|
||||
parser.add_argument("-o", "--out_dir", default="MUR_SST_nc", help="Output directory")
|
||||
parser.add_argument("-v", "--verbose", action="store_true", help="Verbose output")
|
||||
args = parser.parse_args()
|
||||
|
||||
|
||||
def create_session():
|
||||
session = requests.Session()
|
||||
session.headers.update({
|
||||
"User-Agent": "mur-sst-downloader",
|
||||
"Accept-Encoding": "identity"
|
||||
})
|
||||
return session
|
||||
|
||||
|
||||
def get_download_urls(startdate, enddate, verbose=False):
|
||||
url = (
|
||||
"https://cmr.earthdata.nasa.gov/search/granules.umm_json"
|
||||
f"?collection_concept_id=C1996881146-POCLOUD"
|
||||
f"&temporal={startdate}T00:00:00Z,{enddate}T00:00:00Z"
|
||||
"&pageSize=365"
|
||||
)
|
||||
|
||||
r = requests.get(url)
|
||||
r.raise_for_status()
|
||||
data = r.json()
|
||||
|
||||
urls = []
|
||||
for item in data["items"]:
|
||||
for link in item["umm"]["RelatedUrls"]:
|
||||
# Prefer direct HTTPS download links
|
||||
if link.get("Type") == "GET DATA":
|
||||
urls.append(link["URL"])
|
||||
|
||||
if verbose:
|
||||
print(f"Found {len(urls)} files")
|
||||
|
||||
return urls
|
||||
|
||||
|
||||
def download_file(session, url, out_dir, verbose=False):
|
||||
filename = os.path.basename(url)
|
||||
local_path = os.path.join(out_dir, filename)
|
||||
|
||||
if os.path.exists(local_path):
|
||||
if verbose:
|
||||
print(f"Skipping existing: {filename}")
|
||||
return True
|
||||
|
||||
if verbose:
|
||||
print(f"Downloading: {filename}")
|
||||
|
||||
try:
|
||||
with session.get(url, stream=True, allow_redirects=True, timeout=60) as r:
|
||||
if r.status_code == 401:
|
||||
raise Exception("Unauthorized (check .netrc credentials)")
|
||||
|
||||
r.raise_for_status()
|
||||
|
||||
with open(local_path, "wb") as f:
|
||||
for chunk in r.iter_content(chunk_size=8192):
|
||||
if chunk:
|
||||
f.write(chunk)
|
||||
|
||||
if verbose:
|
||||
print(f"Saved: {filename}")
|
||||
return True
|
||||
|
||||
except Exception as e:
|
||||
print(f"Failed: {filename} -> {e}")
|
||||
return False
|
||||
|
||||
|
||||
def validate_dates(start, end):
|
||||
try:
|
||||
datetime.strptime(start, "%Y-%m-%d")
|
||||
datetime.strptime(end, "%Y-%m-%d")
|
||||
except ValueError:
|
||||
print("Error: Dates must be in YYYY-MM-DD format")
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
def main():
|
||||
validate_dates(args.start_date, args.end_date)
|
||||
|
||||
# os.makedirs(args.out_dir, exist_ok=True)
|
||||
|
||||
session = create_session()
|
||||
|
||||
urls = get_download_urls(args.start_date, args.end_date, args.verbose)
|
||||
|
||||
failed = False
|
||||
for url in urls:
|
||||
if not download_file(session, url, args.out_dir, args.verbose):
|
||||
failed = True
|
||||
|
||||
if failed:
|
||||
sys.exit(1)
|
||||
print(f"\nDone. Downloaded files to: {args.out_dir}")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
---
|
||||
apiVersion: batch/v1
|
||||
kind: CronJob
|
||||
metadata:
|
||||
name: mur
|
||||
namespace: cron
|
||||
spec:
|
||||
schedule: "0 6 * * *" # Everyday at 06:00, use https://crontab.guru
|
||||
concurrencyPolicy: "Forbid"
|
||||
successfulJobsHistoryLimit: 10
|
||||
failedJobsHistoryLimit: 3
|
||||
jobTemplate:
|
||||
spec:
|
||||
backoffLimit: 3
|
||||
template:
|
||||
spec:
|
||||
restartPolicy: "Never"
|
||||
containers:
|
||||
- name: cronpod
|
||||
image: juselius/busynix:1.1
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
- |
|
||||
nix-shell -p 'python3.withPackages(ps: [ps.requests])' coreutils --run '
|
||||
python3 /scripts/download.py \
|
||||
-sd $(date -d "3 days ago" +%Y-%m-%d) \
|
||||
-ed $(date +%Y-%m-%d) \
|
||||
-o /data/hdd/data/river-data/MUR/MUR_SST_nc \
|
||||
-v &&
|
||||
chown -R 5000:5000 /data/hdd/data/river-data/MUR/MUR_SST_nc &&
|
||||
chmod -R g+w /data/hdd/data/river-data/MUR/MUR_SST_nc
|
||||
' || {
|
||||
echo "Job failed, sleeping 30 minutes before retry..."
|
||||
sleep 1800
|
||||
exit 1
|
||||
}
|
||||
resources: {}
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
- name: script
|
||||
mountPath: /scripts
|
||||
- name: netrc
|
||||
mountPath: /root/.netrc
|
||||
subPath: .netrc
|
||||
readOnly: true
|
||||
securityContext: {}
|
||||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: ekman-data
|
||||
- name: script
|
||||
configMap:
|
||||
name: mur-script
|
||||
defaultMode: 0755
|
||||
- name: netrc
|
||||
secret:
|
||||
secretName: mur-netrc
|
||||
@@ -0,0 +1,245 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: nemo-script
|
||||
namespace: cron
|
||||
data:
|
||||
download.sh: |
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# this script downloads files from
|
||||
# https://data.marine.copernicus.eu/product/NWSHELF_ANALYSISFORECAST_PHY_004_013
|
||||
|
||||
set -euf -o pipefail
|
||||
|
||||
START_DATE="$1"
|
||||
END_DATE="$2"
|
||||
|
||||
current_date="$START_DATE"
|
||||
|
||||
while [[ "$current_date" < "$END_DATE" ]]; do
|
||||
next_date=$(date -I -d "$current_date + 1 day")
|
||||
echo "Running subset for $current_date to $next_date"
|
||||
|
||||
outfile="cmems_mod_nws_phy-sal_anfc_1.5km-3D_PT1H-i_${current_date}--${next_date}.nc"
|
||||
if [[ -f "/data/hdd/data/NEMO/$outfile" ]]; then
|
||||
echo "Skipping salt (already exists)"
|
||||
else
|
||||
copernicusmarine subset \
|
||||
--dataset-id cmems_mod_nws_phy-sal_anfc_1.5km-3D_PT1H-i \
|
||||
-t "$current_date" \
|
||||
-T "$next_date" \
|
||||
-f "$outfile" \
|
||||
-o /data/hdd/data/NEMO/
|
||||
echo "Downloaded salt"
|
||||
fi
|
||||
|
||||
outfile="cmems_mod_nws_phy-cur_anfc_1.5km-3D_PT1H-i_${current_date}--${next_date}.nc"
|
||||
if [[ -f "/data/hdd/data/NEMO/$outfile" ]]; then
|
||||
echo "Skipping currents (already exists)"
|
||||
else
|
||||
copernicusmarine subset \
|
||||
--dataset-id cmems_mod_nws_phy-cur_anfc_1.5km-3D_PT1H-i \
|
||||
-t "$current_date" \
|
||||
-T "$next_date" \
|
||||
-f "$outfile" \
|
||||
-o /data/hdd/data/NEMO/
|
||||
echo "Downloaded currents"
|
||||
fi
|
||||
|
||||
outfile="cmems_mod_nws_phy-tem_anfc_1.5km-3D_PT1H-i_${current_date}--${next_date}.nc"
|
||||
if [[ -f "/data/hdd/data/NEMO/$outfile" ]]; then
|
||||
echo "Skipping temperature (already exists)"
|
||||
else
|
||||
copernicusmarine subset \
|
||||
--dataset-id cmems_mod_nws_phy-tem_anfc_1.5km-3D_PT1H-i \
|
||||
-t "$current_date" \
|
||||
-T "$next_date" \
|
||||
-f "$outfile" \
|
||||
-o /data/hdd/data/NEMO/
|
||||
echo "Downloaded temperature"
|
||||
fi
|
||||
|
||||
outfile="cmems_mod_nws_phy-ssh_anfc_1.5km-2D_PT15M-i_${current_date}--${next_date}.nc"
|
||||
if [[ -f "/data/hdd/data/NEMO/$outfile" ]]; then
|
||||
echo "Skipping ssh (already exists)"
|
||||
else
|
||||
copernicusmarine subset \
|
||||
--dataset-id cmems_mod_nws_phy-ssh_anfc_1.5km-2D_PT15M-i \
|
||||
-t "$current_date" \
|
||||
-T "$next_date" \
|
||||
-f "$outfile" \
|
||||
-o /data/hdd/data/NEMO/
|
||||
echo "Downloaded ssh"
|
||||
fi
|
||||
|
||||
current_date="$next_date"
|
||||
done
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: nemo-nix
|
||||
namespace: cron
|
||||
data:
|
||||
shell.nix: |
|
||||
let
|
||||
nixpkgs = builtins.fetchTarball {
|
||||
url = "https://releases.nixos.org/nixos/25.11/nixos-25.11.9586.10e7ad5bbcb4/nixexprs.tar.xz";
|
||||
sha256 = "sha256-wjAIDqQxE+kWV2lbykQCcS+F0ArQwmN8iNw0kcj4iaA=";
|
||||
};
|
||||
pkgs = import nixpkgs { overlays = [ (import ./default.nix) ]; };
|
||||
in pkgs.mkShell {
|
||||
buildInputs = [
|
||||
(pkgs.python3.withPackages (ps: [ pkgs.copernicusmarine ]))
|
||||
pkgs.coreutils
|
||||
pkgs.bash
|
||||
];
|
||||
}
|
||||
default.nix: |
|
||||
final: prev: {
|
||||
arcosparse = prev.callPackage ./arcosparse.nix { };
|
||||
copernicusmarine = prev.callPackage ./copernicusmarine.nix {
|
||||
arcosparse = final.arcosparse;
|
||||
};
|
||||
}
|
||||
copernicusmarine.nix: |
|
||||
{
|
||||
fetchPypi,
|
||||
python3Packages,
|
||||
arcosparse,
|
||||
}:
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "copernicusmarine";
|
||||
version = "2.2.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "copernicusmarine";
|
||||
sha256 = "sha256-5T3iH4Hh08wIao2MMveb/bVnVz0pK0PoN4CRk811P0g=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
nativeBuildInputs = [ python3Packages.poetry-core ];
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
boto3
|
||||
click
|
||||
dask
|
||||
h5netcdf
|
||||
arcosparse
|
||||
lxml
|
||||
numpy
|
||||
pydantic
|
||||
pystac
|
||||
requests
|
||||
semver
|
||||
setuptools
|
||||
tqdm
|
||||
xarray
|
||||
zarr
|
||||
];
|
||||
}
|
||||
arcosparse.nix: |
|
||||
{
|
||||
fetchPypi,
|
||||
python3Packages,
|
||||
}:
|
||||
python3Packages.buildPythonPackage rec {
|
||||
pname = "arcosparse";
|
||||
version = "0.4.2";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "arcosparse";
|
||||
sha256 = "sha256-Z8NW+dsC3uXk101kr8tzsgjAoFb4KNdGkxyFkJ5UhFA=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = true;
|
||||
|
||||
nativeBuildInputs = [ python3Packages.poetry-core ];
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pyarrow
|
||||
pandas
|
||||
pystac
|
||||
tqdm
|
||||
requests
|
||||
];
|
||||
}
|
||||
---
|
||||
apiVersion: batch/v1
|
||||
kind: CronJob
|
||||
metadata:
|
||||
name: nemo
|
||||
namespace: cron
|
||||
spec:
|
||||
schedule: "0 13 * * *" # Everyday at 13:00, use https://crontab.guru
|
||||
concurrencyPolicy: "Forbid"
|
||||
successfulJobsHistoryLimit: 10
|
||||
failedJobsHistoryLimit: 3
|
||||
jobTemplate:
|
||||
spec:
|
||||
backoffLimit: 3
|
||||
template:
|
||||
spec:
|
||||
restartPolicy: "Never"
|
||||
containers:
|
||||
- name: cronpod
|
||||
image: ghcr.io/lix-project/lix:latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
- |
|
||||
nix-shell /nix-overlay/shell.nix \
|
||||
--keep COPERNICUSMARINE_SERVICE_USERNAME \
|
||||
--keep COPERNICUSMARINE_SERVICE_PASSWORD \
|
||||
--run '
|
||||
copernicusmarine login \
|
||||
--username "$COPERNICUSMARINE_SERVICE_USERNAME" \
|
||||
--password "$COPERNICUSMARINE_SERVICE_PASSWORD" \
|
||||
--force-overwrite &&
|
||||
bash /scripts/download.sh \
|
||||
$(date -d "2 days ago" +%Y-%m-%d) \
|
||||
$(date +%Y-%m-%d) &&
|
||||
chown -R 5000:5000 /data/hdd/data/NEMO &&
|
||||
chmod -R g+w /data/hdd/data/NEMO
|
||||
' || {
|
||||
echo "Job failed, sleeping 30 minutes before retry..."
|
||||
sleep 1800
|
||||
exit 1
|
||||
}
|
||||
env:
|
||||
- name: COPERNICUSMARINE_SERVICE_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: nemo-credentials
|
||||
key: username
|
||||
- name: COPERNICUSMARINE_SERVICE_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: nemo-credentials
|
||||
key: password
|
||||
resources: {}
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
- name: script
|
||||
mountPath: /scripts
|
||||
- name: nix
|
||||
mountPath: /nix-overlay
|
||||
securityContext: {}
|
||||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: ekman-data
|
||||
- name: script
|
||||
configMap:
|
||||
name: nemo-script
|
||||
defaultMode: 0755
|
||||
- name: nix
|
||||
configMap:
|
||||
name: nemo-nix
|
||||
defaultMode: 0644
|
||||
@@ -0,0 +1,113 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: norkyst-script
|
||||
namespace: cron
|
||||
data:
|
||||
download.sh: |
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# this script downloads files from:
|
||||
# https://thredds.met.no/thredds/catalog/fou-hi/new_norkyst800m/norkyst_v3_test/his/catalog.html
|
||||
|
||||
# safe bash settings
|
||||
set -euf -o pipefail
|
||||
|
||||
JOBS=8 # parallel downloads
|
||||
|
||||
# define start and end dates (YYYY-MM-DD)
|
||||
start_date=$(date -d "yesterday" +%Y-%m-%d)
|
||||
end_date=$(date -d "yesterday" +%Y-%m-%d)
|
||||
|
||||
# check if thredds is reachable before attempting any downloads
|
||||
if ! wget --spider --quiet "https://thredds.met.no/thredds/catalog/fou-hi/new_norkyst800m/norkyst_v3_test/his/catalog.html"; then
|
||||
echo "thredds.met.no is unreachable, aborting"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# function to print stuff in red
|
||||
red() {
|
||||
printf "\e[31m%s\e[0m" "$1"
|
||||
}
|
||||
|
||||
download_day() {
|
||||
local current_date="$1"
|
||||
local year month day file_name target_file_name url
|
||||
year=$(date -d "${current_date}" +%Y)
|
||||
month=$(date -d "${current_date}" +%m)
|
||||
day=$(date -d "${current_date}" +%d)
|
||||
|
||||
mkdir -p "/data/hdd/data/norkyst/${year}/${month}"
|
||||
|
||||
file_name="norkyst800_his_sdepth_${year}${month}${day}T00Z_m00_AN.nc"
|
||||
target_file_name="/data/hdd/data/norkyst/${year}/${month}/${file_name}"
|
||||
url="https://thredds.met.no/thredds/fileServer/fou-hi/new_norkyst800m/norkyst_v3_test/his/${year}/${month}/${day}/${file_name}"
|
||||
|
||||
if [[ ! -f "${target_file_name}" ]]; then
|
||||
if wget --spider --quiet "${url}"; then
|
||||
echo "downloading ${url}"
|
||||
wget --tries=5 --waitretry=60 -O "${target_file_name}" "${url}"
|
||||
else
|
||||
echo "${target_file_name} $(red 'not found on server')"
|
||||
fi
|
||||
else
|
||||
echo "${target_file_name} already exists locally"
|
||||
fi
|
||||
}
|
||||
|
||||
export -f download_day red
|
||||
|
||||
current_date=$(date -d "${start_date}" +%Y-%m-%d)
|
||||
while [[ "${current_date}" < "${end_date}" || "${current_date}" == "${end_date}" ]]; do
|
||||
echo "${current_date}"
|
||||
current_date=$(date -d "${current_date} + 1 day" +%Y-%m-%d)
|
||||
done | parallel -j "${JOBS}" download_day
|
||||
---
|
||||
apiVersion: batch/v1
|
||||
kind: CronJob
|
||||
metadata:
|
||||
name: norkyst
|
||||
namespace: cron
|
||||
spec:
|
||||
schedule: 0 13 * * * # Everyday at 13:00, use https://crontab.guru
|
||||
concurrencyPolicy: "Allow"
|
||||
successfulJobsHistoryLimit: 10
|
||||
failedJobsHistoryLimit: 3
|
||||
jobTemplate:
|
||||
spec:
|
||||
backoffLimit: 3
|
||||
template:
|
||||
spec:
|
||||
restartPolicy: "Never"
|
||||
containers:
|
||||
- name: cronpod
|
||||
image: juselius/busynix:1.1
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
- |
|
||||
nix-env -iA nixpkgs.wget nixpkgs.coreutils nixpkgs.bash nixpkgs.parallel
|
||||
if bash /scripts/download.sh; then
|
||||
chown -R 10000:10000 /data/hdd/data/norkyst
|
||||
chmod -R g+w /data/hdd/data/norkyst
|
||||
else
|
||||
echo "Job failed, sleeping 30 minutes before retry..."
|
||||
sleep 1800
|
||||
exit 1
|
||||
fi
|
||||
resources: {}
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
- name: script
|
||||
mountPath: /scripts
|
||||
securityContext: {}
|
||||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: ekman-data
|
||||
- name: script
|
||||
configMap:
|
||||
name: norkyst-script
|
||||
defaultMode: 0755
|
||||
@@ -0,0 +1,153 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: norshelf-script
|
||||
namespace: cron
|
||||
data:
|
||||
download.sh: |
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# this script downloads files from:
|
||||
# https://thredds.met.no/thredds/catalog/sea_norshelf_files/YYYY/catalog.html
|
||||
|
||||
# safe bash settings
|
||||
set -euf -o pipefail
|
||||
|
||||
# define start and end dates (YYYY-MM-DD)
|
||||
start_date="2026-03-01"
|
||||
end_date=$(date +%Y-%m-%d)
|
||||
|
||||
# check if thredds is reachable before attempting any downloads
|
||||
if ! wget --spider --quiet "https://thredds.met.no/thredds/catalog/sea_norshelf_files/catalog.html"; then
|
||||
echo "thredds.met.no is unreachable, aborting"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# function to print stuff in red
|
||||
red() {
|
||||
printf "\e[31m%s\e[0m" "$1"
|
||||
}
|
||||
|
||||
current_date=$(date -d "${start_date}" +%Y-%m-%d)
|
||||
while [[ "${current_date}" < "${end_date}" || "${current_date}" == "${end_date}" ]]; do
|
||||
year=$(date -d "${current_date}" +%Y)
|
||||
month=$(date -d "${current_date}" +%m)
|
||||
day=$(date -d "${current_date}" +%d)
|
||||
|
||||
mkdir -p "/data/hdd/data/norshelf/sea_norshelf_files/${year}/${month}"
|
||||
|
||||
file_name="norshelf_qck_an_${year}${month}${day}T00Z.nc"
|
||||
target_file_name="/data/hdd/data/norshelf/sea_norshelf_files/${year}/${month}/${file_name}"
|
||||
url="https://thredds.met.no/thredds/fileServer/sea_norshelf_files/${year}/${month}/${file_name}"
|
||||
|
||||
if [[ ! -f "${target_file_name}" ]]; then
|
||||
if wget --spider --quiet "${url}"; then
|
||||
echo "downloading ${url}"
|
||||
wget --tries=5 --waitretry=60 -O "${target_file_name}" "${url}"
|
||||
else
|
||||
echo "${target_file_name} $(red 'not found on server')"
|
||||
fi
|
||||
else
|
||||
echo "${target_file_name} already exists locally"
|
||||
fi
|
||||
|
||||
# move to next day
|
||||
current_date=$(date -d "${current_date} + 1 day" +%Y-%m-%d)
|
||||
done
|
||||
---
|
||||
apiVersion: batch/v1
|
||||
kind: CronJob
|
||||
metadata:
|
||||
name: norshelf
|
||||
namespace: cron
|
||||
spec:
|
||||
schedule: 0 13 * * * # Everyday at 13:00, use https://crontab.guru
|
||||
concurrencyPolicy: "Forbid" # If only one at at time set to Allow else Forbid
|
||||
successfulJobsHistoryLimit: 10
|
||||
failedJobsHistoryLimit: 3
|
||||
jobTemplate:
|
||||
spec:
|
||||
backoffLimit: 3
|
||||
template:
|
||||
spec:
|
||||
restartPolicy: "Never"
|
||||
containers:
|
||||
- name: cronpod
|
||||
image: juselius/busynix:1.1
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
- |
|
||||
nix-env -iA nixpkgs.wget nixpkgs.coreutils nixpkgs.bash
|
||||
if bash /scripts/download.sh; then
|
||||
chown -R 5000:5000 /data/hdd/data/norshelf
|
||||
chmod -R g+w /data/hdd/data/norshelf
|
||||
else
|
||||
echo "Job failed, sleeping 30 minutes before retry..."
|
||||
sleep 1800
|
||||
exit 1
|
||||
fi
|
||||
resources: {}
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
- name: script
|
||||
mountPath: /scripts
|
||||
securityContext: {}
|
||||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: ekman-data
|
||||
- name: script
|
||||
configMap:
|
||||
name: norshelf-script
|
||||
defaultMode: 0755
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
name: ekman-data
|
||||
namespace: cron
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteMany
|
||||
resources:
|
||||
requests:
|
||||
storage: 1Gi
|
||||
storageClassName: ""
|
||||
volumeMode: Filesystem
|
||||
volumeName: pv-ekman-data
|
||||
status:
|
||||
accessModes:
|
||||
- ReadWriteMany
|
||||
capacity:
|
||||
storage: 1Gi
|
||||
---
|
||||
apiVersion: v1
|
||||
kind: PersistentVolume
|
||||
metadata:
|
||||
name: pv-ekman-data
|
||||
spec:
|
||||
accessModes:
|
||||
- ReadWriteMany
|
||||
claimRef:
|
||||
apiVersion: v1
|
||||
kind: PersistentVolumeClaim
|
||||
name: ekman-data
|
||||
namespace: cron
|
||||
capacity:
|
||||
storage: 1Gi
|
||||
csi:
|
||||
driver: rook-ceph.cephfs.csi.ceph.com
|
||||
nodeStageSecretRef:
|
||||
name: rook-csi-cephfs-node
|
||||
namespace: rook-ceph
|
||||
volumeAttributes:
|
||||
clusterID: rook-ceph
|
||||
fsName: data
|
||||
rootPath: /
|
||||
staticVolume: "true"
|
||||
volumeHandle: pv-ekman-data
|
||||
persistentVolumeReclaimPolicy: Retain
|
||||
volumeMode: Filesystem
|
||||
@@ -0,0 +1,60 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: nve-config
|
||||
namespace: cron
|
||||
data:
|
||||
appsettings.json: |
|
||||
{
|
||||
"NveUrl": "https://chartserver.nve.no/ShowData.aspx?req=getchart&ver=1.0",
|
||||
"DataDir": "/data/hdd/data/river-data"
|
||||
}
|
||||
---
|
||||
apiVersion: batch/v1
|
||||
kind: CronJob
|
||||
metadata:
|
||||
name: nve
|
||||
namespace: cron
|
||||
spec:
|
||||
schedule: "0 8 * * *" # Everyday at 08:00, use https://crontab.guru
|
||||
concurrencyPolicy: "Forbid"
|
||||
successfulJobsHistoryLimit: 10
|
||||
failedJobsHistoryLimit: 3
|
||||
jobTemplate:
|
||||
spec:
|
||||
backoffLimit: 3
|
||||
template:
|
||||
spec:
|
||||
restartPolicy: "Never"
|
||||
containers:
|
||||
- name: cronpod
|
||||
image: git.oceanbox.io/oceanbox/churn/riverrun:24a8bbbc-debug
|
||||
imagePullPolicy: IfNotPresent
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
- |
|
||||
if riverrun data --download --ndays 5000; then
|
||||
chown -R 5000:5000 /data/hdd/data/river-data/Data
|
||||
chmod -R g+w /data/hdd/data/river-data/Data
|
||||
else
|
||||
echo "Job failed, sleeping 30 minutes before retry..."
|
||||
sleep 1800
|
||||
exit 1
|
||||
fi
|
||||
resources: {}
|
||||
volumeMounts:
|
||||
- name: data
|
||||
mountPath: /data
|
||||
- name: config
|
||||
mountPath: /app/appsettings.json
|
||||
subPath: appsettings.json
|
||||
readOnly: true
|
||||
securityContext: {}
|
||||
volumes:
|
||||
- name: data
|
||||
persistentVolumeClaim:
|
||||
claimName: ekman-data
|
||||
- name: config
|
||||
configMap:
|
||||
name: nve-config
|
||||
+3
-1
@@ -3,10 +3,12 @@
|
||||
"extends": [
|
||||
"config:recommended"
|
||||
],
|
||||
"minimumReleaseAge": "7 days",
|
||||
"dependencyDashboard": true,
|
||||
"semanticCommits": "disabled",
|
||||
"ignorePaths": [
|
||||
"**/bootstrap/**"
|
||||
"**/bootstrap/**",
|
||||
"**/attic/**"
|
||||
],
|
||||
"helmfile": {
|
||||
"managerFilePatterns": [
|
||||
|
||||
@@ -94,8 +94,14 @@ spec:
|
||||
server: https://kubernetes.default.svc
|
||||
- namespace: jobset-system
|
||||
server: https://kubernetes.default.svc
|
||||
- namespace: ingress-haproxy
|
||||
server: https://kubernetes.default.svc
|
||||
- namespace: dex
|
||||
server: https://kubernetes.default.svc
|
||||
- namespace: cra-agent
|
||||
server: https://kubernetes.default.svc
|
||||
- namespace: catalyst
|
||||
server: https://kubernetes.default.svc
|
||||
sourceRepos:
|
||||
- https://argoproj.github.io/argo-helm
|
||||
- https://kubernetes-sigs.github.io/metrics-server/
|
||||
@@ -139,7 +145,9 @@ spec:
|
||||
- ghcr.io/dragonflydb/dragonfly-operator/helm/dragonfly-operator
|
||||
- docker.gitea.com
|
||||
- https://operator.mariadb.com/mariadb-enterprise-operator
|
||||
- https://operator.mariadb.com
|
||||
- https://ot-container-kit.github.io/helm-charts
|
||||
- https://operator.mariadb.com
|
||||
- https://twin.github.io/helm-charts
|
||||
- https://charts.dexidp.io
|
||||
- public.ecr.aws/diagrid/catalyst
|
||||
- ghcr.io/haproxytech/helm-charts
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: beta-atlantis-actor-config
|
||||
data:
|
||||
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8"
|
||||
XTRACT_QUEUE: "prod-queue"
|
||||
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.8"
|
||||
PLUME_QUEUE: "prod-queue"
|
||||
@@ -76,7 +76,7 @@
|
||||
"https://maps.beta.oceanbox.io"
|
||||
],
|
||||
"appName": "atlantis",
|
||||
"appEnv": "prod",
|
||||
"appEnv": "preprod",
|
||||
"appNamespace": "atlantis",
|
||||
"appVersion": "2.95.1",
|
||||
"otelCollector": "http://opentelemetry-collector.otel.svc:4317",
|
||||
|
||||
@@ -7,4 +7,9 @@
|
||||
path: /spec/template/spec/containers/0/envFrom/-
|
||||
value:
|
||||
secretRef:
|
||||
name: prod-atlantis-env
|
||||
name: prod-atlantis-env
|
||||
- op: add
|
||||
path: /spec/template/spec/containers/0/envFrom/-
|
||||
value:
|
||||
configMapRef:
|
||||
name: beta-atlantis-actor-config
|
||||
@@ -14,6 +14,7 @@ patches:
|
||||
resources:
|
||||
- ../base
|
||||
- rbac.yaml
|
||||
- actor-config.yaml
|
||||
- tracing.yaml
|
||||
- bindings.yaml
|
||||
- pubsub.yaml
|
||||
|
||||
@@ -8,6 +8,7 @@ rules:
|
||||
- ""
|
||||
resourceNames:
|
||||
- beta-atlantis-appsettings
|
||||
- beta-atlantis-actor-config
|
||||
resources:
|
||||
- configmaps
|
||||
verbs:
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: prod-atlantis-actor-config
|
||||
data:
|
||||
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.8"
|
||||
XTRACT_QUEUE: "prod-queue"
|
||||
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.8"
|
||||
PLUME_QUEUE: "prod-queue"
|
||||
@@ -7,4 +7,9 @@
|
||||
path: /spec/template/spec/containers/0/envFrom/-
|
||||
value:
|
||||
secretRef:
|
||||
name: prod-atlantis-env
|
||||
name: prod-atlantis-env
|
||||
- op: add
|
||||
path: /spec/template/spec/containers/0/envFrom/-
|
||||
value:
|
||||
configMapRef:
|
||||
name: prod-atlantis-actor-config
|
||||
@@ -13,6 +13,7 @@ patches:
|
||||
resources:
|
||||
- ../base
|
||||
- secrets.yaml
|
||||
- actor-config.yaml
|
||||
- rbac.yaml
|
||||
- tracing.yaml
|
||||
- bindings.yaml
|
||||
|
||||
@@ -8,6 +8,7 @@ rules:
|
||||
- ""
|
||||
resourceNames:
|
||||
- prod-atlantis-appsettings
|
||||
- prod-atlantis-actor-config
|
||||
resources:
|
||||
- configmaps
|
||||
verbs:
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: staging-atlantis-actor-config
|
||||
data:
|
||||
XTRACT_IMAGE: "git.oceanbox.io/oceanbox/katamari/excavator:v1.2.12"
|
||||
XTRACT_QUEUE: "dev-queue"
|
||||
PLUME_IMAGE: "git.oceanbox.io/oceanbox/katamari/plume:v1.2.12"
|
||||
PLUME_QUEUE: "dev-queue"
|
||||
@@ -7,4 +7,9 @@
|
||||
path: /spec/template/spec/containers/0/envFrom/-
|
||||
value:
|
||||
secretRef:
|
||||
name: staging-atlantis-env
|
||||
name: staging-atlantis-env
|
||||
- op: add
|
||||
path: /spec/template/spec/containers/0/envFrom/-
|
||||
value:
|
||||
configMapRef:
|
||||
name: staging-atlantis-actor-config
|
||||
@@ -14,6 +14,7 @@ resources:
|
||||
- ../base
|
||||
- rbac.yaml
|
||||
- secrets.yaml
|
||||
- actor-config.yaml
|
||||
- tracing.yaml
|
||||
- bindings.yaml
|
||||
- pubsub.yaml
|
||||
@@ -21,4 +22,4 @@ resources:
|
||||
- subscriptions.yaml
|
||||
- configurations.yaml
|
||||
- secretstore.yaml
|
||||
- keyvault.yaml
|
||||
- keyvault.yaml
|
||||
|
||||
@@ -8,6 +8,7 @@ rules:
|
||||
- ""
|
||||
resourceNames:
|
||||
- staging-atlantis-appsettings
|
||||
- staging-atlantis-actor-config
|
||||
resources:
|
||||
- configmaps
|
||||
verbs:
|
||||
|
||||
@@ -2,7 +2,7 @@ replicaCount: 1
|
||||
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||
tag: v1.46.2
|
||||
tag: v2.6.6
|
||||
|
||||
podAnnotations:
|
||||
dapr.io/app-id: "beta-atlantis"
|
||||
@@ -11,7 +11,7 @@ env:
|
||||
- name: APP_NAMESPACE
|
||||
value: beta-atlantis
|
||||
- name: APP_VERSION
|
||||
value: "2.97.4-beta"
|
||||
value: "2.6.6-beta"
|
||||
- name: LOG_LEVEL
|
||||
value: "1"
|
||||
- name: ANALYTICS_WEB_ID
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
|
||||
tag: 23006866-debug
|
||||
tag: 0042495a-debug
|
||||
podAnnotations:
|
||||
dapr.io/app-id: "staging-atlantis"
|
||||
env:
|
||||
|
||||
@@ -3,17 +3,14 @@ kind: Ingress
|
||||
metadata:
|
||||
annotations:
|
||||
cert-manager.io/cluster-issuer: letsencrypt-production
|
||||
nginx.ingress.kubernetes.io/backend-protocol: HTTP
|
||||
nginx.ingress.kubernetes.io/proxy-body-size: "0"
|
||||
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
|
||||
nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
|
||||
nginx.ingress.kubernetes.io/ssl-redirect: "true"
|
||||
haproxy.org/backend-protocol: h1
|
||||
haproxy.org/timeout-server: 600s
|
||||
labels:
|
||||
app.kubernetes.io/component: attic
|
||||
name: attic
|
||||
namespace: attic
|
||||
spec:
|
||||
ingressClassName: nginx
|
||||
ingressClassName: haproxy
|
||||
rules:
|
||||
- host: attic.srv.oceanbox.io
|
||||
http:
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
catalyst:
|
||||
enabled: true
|
||||
autosync: false
|
||||
@@ -0,0 +1,4 @@
|
||||
catalyst:
|
||||
enabled: false
|
||||
autosync: false
|
||||
env: {{ .Environment.Name }}
|
||||
@@ -0,0 +1,42 @@
|
||||
{{- if .Values.clusterConfig.argo.enabled }}
|
||||
apiVersion: argoproj.io/v1alpha1
|
||||
kind: Application
|
||||
metadata:
|
||||
name: catalyst
|
||||
namespace: argocd
|
||||
annotations:
|
||||
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
|
||||
finalizers:
|
||||
- resources-finalizer.argocd.argoproj.io
|
||||
spec:
|
||||
destination:
|
||||
namespace: cra-agent
|
||||
server: https://kubernetes.default.svc
|
||||
project: sys
|
||||
sources:
|
||||
- repoURL: {{ .Values.clusterConfig.manifests }}
|
||||
targetRevision: HEAD
|
||||
path: helmfile.d
|
||||
plugin:
|
||||
name: helmfile-cmp
|
||||
env:
|
||||
- name: CLUSTER_NAME
|
||||
value: {{ .Values.clusterConfig.cluster }}
|
||||
- name: HELMFILE_ENVIRONMENT
|
||||
value: {{ .Values.catalyst.env }}
|
||||
- name: HELMFILE_FILE_PATH
|
||||
value: catalyst.yaml.gotmpl
|
||||
syncPolicy:
|
||||
managedNamespaceMetadata:
|
||||
labels:
|
||||
component: aux
|
||||
syncOptions:
|
||||
- CreateNamespace=true
|
||||
- ApplyOutOfSyncOnly=true
|
||||
# - ServerSideApply=true
|
||||
{{- if .Values.catalyst.autosync }}
|
||||
automated:
|
||||
prune: true
|
||||
# selfHeal: false
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
@@ -0,0 +1,11 @@
|
||||
apiVersion: postgresql.cnpg.io/v1
|
||||
kind: Cluster
|
||||
metadata:
|
||||
name: catalyst-db
|
||||
namespace: cra-agent
|
||||
spec:
|
||||
instances: 1
|
||||
imageName: ghcr.io/cloudnative-pg/postgresql:18
|
||||
storage:
|
||||
resizeInUseVolumes: true
|
||||
size: 10Gi
|
||||
@@ -0,0 +1,15 @@
|
||||
{{- if .Values.clusterConfig.cilium.enabled }}
|
||||
apiVersion: cilium.io/v2
|
||||
kind: CiliumNetworkPolicy
|
||||
metadata:
|
||||
name: allow-api-catalyst
|
||||
namespace: cra-agent
|
||||
spec:
|
||||
description: Allow Catalyst API
|
||||
egress:
|
||||
- toFQDNs:
|
||||
- matchPattern: binaries.prisma.sh
|
||||
endpointSelector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/instance: cra-agent
|
||||
{{- end }}
|
||||
@@ -0,0 +1,18 @@
|
||||
agent:
|
||||
config:
|
||||
project:
|
||||
default_managed_state_store_type: postgresql-shared-external
|
||||
external_postgresql:
|
||||
enabled: true
|
||||
auth_type: connectionString
|
||||
namespace: postgres
|
||||
connection_string_host: catalyst-db-rw.cra-agent.svc.cluster.local
|
||||
connection_string_port: 5432
|
||||
connection_string_username: app
|
||||
connection_string_password: 5kDx7c9rSXxk32uEhCnMMHIpSWtg85SXDcpRJg58qskDMTtaalxWdCR9SfBcayjw
|
||||
connection_string_database: app
|
||||
gateway:
|
||||
tls:
|
||||
enabled: true
|
||||
existingSecret: cra-agent-tls
|
||||
join_token: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOlsidXJuOmNsb3VkZ3JpZCIsInVybjphZG1pbmdyaWQiXSwiZXhwIjoxNzc2MjU4MjE4LCJob3N0SWQiOiJ6dnpna3p6cyIsImh0dHBzOi8vZGlhZ3JpZC5pby9lbWFpbCI6IiIsImh0dHBzOi8vZGlhZ3JpZC5pby9vcmdJZCI6ImNhMzRjMWY5LTliMWMtNGI5Yi04MDlhLWI3MTgzYTE1MWQxMiIsImlzcyI6ImRpYWdyaWQuaW8iLCJqdGkiOiI5NTc3NDk1Nzc5NDQ1OTgyIiwicmVnaW9uSWQiOiJraW5kLXJlZ2lvbiIsInN1YiI6ImpvaW5Ub2tlbiJ9.a-xAzGsnDHGFoNRt4cR6BSihyirSCvy_EhksEu0Ok2g"
|
||||
@@ -9,14 +9,6 @@ metadata:
|
||||
name: shared-gateway
|
||||
namespace: kube-system
|
||||
spec:
|
||||
infrastructure:
|
||||
annotations:
|
||||
load-balancer.hetzner.cloud/location: hel1
|
||||
load-balancer.hetzner.cloud/type: lb11
|
||||
load-balancer.hetzner.cloud/name: load-balancer-2
|
||||
load-balancer.hetzner.cloud/use-private-ip: "true"
|
||||
load-balancer.hetzner.cloud/uses-proxyprotocol: "true"
|
||||
load-balancer.hetzner.cloud/http-redirect-https: "false"
|
||||
gatewayClassName: cilium
|
||||
listeners:
|
||||
- name: http
|
||||
|
||||
@@ -12,7 +12,7 @@ cilium:
|
||||
enabled: true
|
||||
# kube-proxy stays running during migration; disable replacement until done.
|
||||
# TODO: set to true after migration
|
||||
kubeProxyReplacement: false
|
||||
kubeProxyReplacement: true
|
||||
# Direct apiserver connection -- do not rely on the kubernetes service IP
|
||||
# during migration since we are touching the CNI layer.
|
||||
# TODO: remove k8sServiceHost / k8sServicePort (or keep pointing at apiserver localhost)
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
cilium:
|
||||
enabled: true
|
||||
clustermesh:
|
||||
enabled: false
|
||||
envoy:
|
||||
enabled: true
|
||||
nodePort:
|
||||
|
||||
@@ -38,4 +38,4 @@ volumeMounts:
|
||||
readOnly: true
|
||||
subPath: appsettings.json
|
||||
image:
|
||||
tag: 38eeb4cc-debug
|
||||
tag: 0042495a-debug
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user