Compare commits

..

1 Commits

Author SHA1 Message Date
mrtz 8ea1500546 chore: update npins dependencies
Automated update of Nix dependencies via npins.

    Updated packages:
    +      "hash": "sha256-RuGWBqXVEsZwwBvRGS/nRrA6PQyOQwVaAu139Z853Bk="
2026-01-30 14:59:50 +00:00
288 changed files with 953 additions and 4423 deletions
+6 -9
View File
@@ -1,16 +1,13 @@
#!/usr/bin/env bash
# the shebang is ignored, but nice for editors
watch_file npins/sources.json
watch_file nix/sources.json
watch_file nix/checks.nix
# Load .env file if it exists
dotenv_if_exists
# Set npins dir
export NPINS_DIRECTORY="nix"
# Activate development shell
if type lorri &>/dev/null; then
echo "direnv: using lorri from PATH ($(type -p lorri))"
eval "$(lorri direnv)"
else
# fall back to using direnv's builtin nix support
# to prevent bootstrapping problems.
use nix
fi
use nix
+54
View File
@@ -0,0 +1,54 @@
# yaml-language-server: $schema=https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json
default:
tags:
- nix
include:
- project: oceanbox/gitlab-ci
ref: v4.5
file: template/Base.gitlab-ci.yml
# stages:
# - release
# image:
# name: alpine/helm:latest
# entrypoint: ["/bin/bash", "-c"]
# release:
# stage: release
# rules:
# - if: "$CI_COMMIT_BRANCH =~ /^main/"
# when: always
# - when: never
# script:
# - |
# cd $CI_PROJECT_DIR
# for i in $(git show --pretty="" --name-only | grep '^charts/.*/Chart.yaml' | cut -d/ -f2); do
# pack=$(helm package ./charts/$i | sed 's/Success.*: \(.*\)/\1/')
# if [ ! -z $pack ]; then
# chart=$(basename $pack)
# curl --request POST \
# --user gitlab-ci-token:$CI_JOB_TOKEN \
# --form "chart=@${chart}" \
# "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/api/stable/charts"
# fi
# done
# rebuild:
# stage: release
# rules:
# - when: manual
# allow_failure: true
# script:
# - |
# cd $CI_PROJECT_DIR
# for i in $(find ./charts -maxdepth 2 -name Chart.yaml | cut -d/ -f3); do
# pack=$(helm package ./charts/$i | sed 's/Success.*: \(.*\)/\1/')
# if [ ! -z $pack ]; then
# chart=$(basename $pack)
# curl --request POST \
# --user gitlab-ci-token:$CI_JOB_TOKEN \
# --form "chart=@${chart}" \
# "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/api/stable/charts"
# fi
# done
+1 -1
View File
@@ -1,4 +1,4 @@
FROM ghcr.io/helmfile/helmfile:v1.3.1
FROM ghcr.io/helmfile/helmfile:v1.1.9
RUN mkdir -p /home/argocd/cmp-server/config/
COPY plugin.yaml /home/argocd/cmp-server/config/
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/sh
img=git.oceanbox.io/platform/manifests/helmfile-cmp
img=registry.gitlab.com/oceanbox/manifests/helmfile-cmp
tag=${1:-latest}
docker build -t "${img}":"${tag}" .
-3
View File
@@ -1,3 +0,0 @@
FROM busybox
COPY keycloak-themes/oceanbox /theme
@@ -1,47 +0,0 @@
/* Oceanbox Keycloak Login Theme */
/* Brand colours */
:root {
--pf-v5-global--primary-color--100: #0bb4aa;
--pf-v5-global--primary-color--200: #099e95;
--pf-v5-global--link--Color: #0bb4aa;
--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;
}
/* Logo */
div.kc-logo-text {
background-image: url('../img/oceanbox-logo-text.png');
height: 80px;
width: 360px;
background-repeat: no-repeat;
background-size: contain;
background-position: center;
margin: 0 auto;
}
div.kc-logo-text span {
display: none;
}
/* 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;
}
/* Links */
a, .pf-v5-c-button.pf-m-link {
color: #0bb4aa;
}
a:hover, .pf-v5-c-button.pf-m-link:hover {
color: #031275;
}
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

@@ -1,5 +0,0 @@
parent=keycloak.v2
import=common/keycloak
stylesCommon=vendor/patternfly-v5/patternfly.min.css vendor/patternfly-v5/patternfly-addons.css
styles=css/styles.css css/oceanbox.css
+2 -2
View File
@@ -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.42.25
version: v1.35.2
# 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.42.25
appVersion: v1.35.2
dependencies:
- name: diagrid-dashboard
version: "0.1.0"
+3 -2
View File
@@ -3,8 +3,8 @@
# Declare variables to be passed into your templates.
replicaCount: 1
image:
repository: git.oceanbox.io/oceanbox/poseidon/atlantis
tag: v1.42.25
repository: registry.gitlab.com/oceanbox/poseidon/atlantis
tag: v1.35.2
pullPolicy: IfNotPresent
init:
enabled: false
@@ -116,5 +116,6 @@ serviceMonitor:
nodeSelector: {}
tolerations: []
affinity: {}
diagrid-dashboard:
enabled: false
+2 -2
View File
@@ -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: v2.9.4
version: v1.35.2
# 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: "v2.9.4"
appVersion: "v1.35.2"
+2 -2
View File
@@ -6,11 +6,11 @@
replicaCount: 1
# This sets the container image more information can be found here: https://kubernetes.io/docs/concepts/containers/images/
image:
repository: git.oceanbox.io/oceanbox/poseidon/codex
repository: registry.gitlab.com/oceanbox/poseidon/codex
# This sets the pull policy for images.
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: v2.9.4
tag: v1.35.2
# 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
@@ -8,7 +8,6 @@ data:
kind: Component
metadata:
name: statestore
namespace: {{ .Values.statestore.namespace | default "default" }}
scopes:
- {{ .Values.statestore.scope }}
spec:
@@ -18,10 +17,10 @@ data:
- name: redisUsername
value: default
- name: redisPassword
value: {{ .Values.statestore.password | default "secret" }}
value: secret
- name: actorStateStore
value: "true"
- name: redisDB
value: "{{ .Values.statestore.redisDB | default "0" }}"
value: "1"
type: state.redis
version: v1
-3
View File
@@ -5,9 +5,6 @@
statestore:
scope: my-scope
redis: my-redis
namespace: default
password: secret
redisDB: "0"
# This will set the replicaset count more information can be found here: https://kubernetes.io/docs/concepts/workloads/controllers/replicaset/
replicaCount: 1
+2 -2
View File
@@ -42,11 +42,11 @@ spec:
value: "3"
livenessProbe:
httpGet:
path: /healthz
path: /
port: http
readinessProbe:
httpGet:
path: /healthz
path: /
port: http
resources:
{{- toYaml .Values.resources | nindent 12 }}
+4 -4
View File
@@ -3,7 +3,7 @@
# Declare variables to be passed into your templates.
replicaCount: 1
image:
repository: git.oceanbox.io/oceanbox/documentation/docs
repository: registry.gitlab.com/oceanbox/documentation
tag: v0.1.0
pullPolicy: IfNotPresent
init:
@@ -21,8 +21,8 @@ env:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
# imagePullSecrets:
# - name: gitea-pull-secret
imagePullSecrets:
- name: gitea-pull-secret
nameOverride: ""
fullnameOverride: ""
serviceAccount:
@@ -47,7 +47,7 @@ service:
port: 8080
ingress:
enabled: true
className: haproxy
className: nginx
persistence:
enabled: false
size: 1G
-6
View File
@@ -1,6 +0,0 @@
apiVersion: v2
name: fapr
description: A Helm chart for Fapr (F# Dapr workflow orchestrator)
type: application
version: v0.1.0
appVersion: v0.1.0
-61
View File
@@ -1,61 +0,0 @@
{{/* 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 -}}
-85
View File
@@ -1,85 +0,0 @@
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 }}
-21
View File
@@ -1,21 +0,0 @@
{{- 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 }}
-49
View File
@@ -1,49 +0,0 @@
{{- 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 }}
-15
View File
@@ -1,15 +0,0 @@
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 }}
-12
View File
@@ -1,12 +0,0 @@
{{- 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 }}
-67
View File
@@ -1,67 +0,0 @@
# 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: {}
+1 -1
View File
@@ -47,7 +47,7 @@ service:
port: 8080
ingress:
enabled: true
className: haproxy
className: nginx
persistence:
enabled: false
size: 1G
-6
View File
@@ -1,6 +0,0 @@
dependencies:
- name: diagrid-dashboard
repository: file://../diagrid-dashboard
version: 0.1.0
digest: sha256:4fdb3148a2a6439223d7844a3083da2de324dd47e5cb3ac4a5d9c436e6e2c775
generated: "2026-02-25T16:15:48.608231856+01:00"
+2 -7
View File
@@ -4,12 +4,7 @@ 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.7.1
version: v1.6.7
# 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.7.1
dependencies:
- name: diagrid-dashboard
version: "0.1.0"
repository: "file://../diagrid-dashboard"
condition: diagrid-dashboard.enabled
appVersion: v1.6.7
+2 -4
View File
@@ -3,8 +3,8 @@
# Declare variables to be passed into your templates.
replicaCount: 1
image:
repository: git.oceanbox.io/oceanbox/plume/plume
tag: v1.7.1
repository: registry.gitlab.com/oceanbox/plume
tag: v1.6.7
pullPolicy: IfNotPresent
init:
enabled: false
@@ -90,5 +90,3 @@ serviceMonitor:
nodeSelector: {}
tolerations: []
affinity: {}
diagrid-dashboard:
enabled: false
+2 -2
View File
@@ -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.42.25
version: v1.35.2
# 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.42.25
appVersion: v1.35.2
dependencies:
- name: diagrid-dashboard
version: "0.1.0"
+3 -2
View File
@@ -4,8 +4,8 @@
replicaCount: 1
image:
repository: git.oceanbox.io/oceanbox/poseidon/sorcerer
tag: v1.42.25
repository: registry.gitlab.com/oceanbox/poseidon/sorcerer
tag: v1.35.2
pullPolicy: IfNotPresent
init:
enabled: false
@@ -108,6 +108,7 @@ serviceMonitor:
nodeSelector: {}
tolerations: []
affinity: {}
diagrid-dashboard:
enabled: false
statestore:
-7
View File
@@ -20,11 +20,4 @@ environments:
- ../values/*/env.yaml.gotmpl
- ../values/*/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
missingFileHandler: Info
beta:
values:
- ../values/env.yaml
- ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
- ../values/*/env.yaml.gotmpl
- ../values/*/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
missingFileHandler: Info
+5 -4
View File
@@ -15,7 +15,7 @@ releases:
- name: argocd
namespace: argocd
chart: argo/argo-cd
version: 9.5.15
version: 7.9.1
condition: argo.enabled
values:
- ../values/argo/values/argocd.yaml.gotmpl
@@ -27,7 +27,7 @@ releases:
- name: argocd-apps
namespace: argocd
chart: argo/argocd-apps
version: 2.0.5
version: 2.0.4
condition: argo.apps.enabled
values:
- ../values/argo/values/apps.yaml.gotmpl
@@ -35,7 +35,7 @@ releases:
- name: argo-rollouts
namespace: argocd
chart: argo/argo-rollouts
version: 2.40.9
version: 2.40.5
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: 1.0.14
version: 0.45.27
condition: argo.workflows.enabled
missingFileHandler: Info
- name: manifests
@@ -66,3 +66,4 @@ releases:
- '{{`{{ .Environment.Name }}`}}'
- ../values/argo/manifests
- _argo
-46
View File
@@ -1,46 +0,0 @@
# 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
+1 -1
View File
@@ -13,7 +13,7 @@ releases:
- name: cert-manager
namespace: cert-manager
chart: cert-manager/cert-manager
version: v1.20.2
version: v1.19.2
condition: cert_manager.enabled
values:
- ../values/cert-manager/values/cert-manager.yaml.gotmpl
+4 -4
View File
@@ -3,8 +3,7 @@ bases:
repositories:
- name: cilium
oci: true
url: 'quay.io/cilium/charts'
url: 'https://helm.cilium.io'
commonLabels:
tier: system
@@ -16,11 +15,11 @@ releases:
- name: cilium
namespace: kube-system
chart: cilium/cilium
version: {{ if eq (requiredEnv "ARGOCD_ENV_CLUSTER_NAME") "hel1" }}1.19.1{{ else if eq (requiredEnv "ARGOCD_ENV_CLUSTER_NAME") "ekman" }}1.19.1{{ else }}1.16.19{{ end }}
version: 1.16.2
condition: cilium.enabled
values:
- ../values/cilium/values/cilium.yaml.gotmpl
- ../values/cilium/values/cilium-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
- ../values/cilium/values/cilium-{{ .Environment.Name }}.yaml.gotmpl
missingFileHandler: Info
- name: manifests
namespace: cilium
@@ -56,3 +55,4 @@ releases:
- '{{`{{ .Environment.Name }}`}}'
- ../values/cilium/cilium-manifests
- manifests
+2 -2
View File
@@ -6,7 +6,7 @@ commonLabels:
releases:
- name: docs
namespace: docs
namespace: {{ .Environment.Name }}-docs
chart: ../charts/docs
condition: docs.enabled
values:
@@ -17,7 +17,7 @@ releases:
- ../values/docs/kustomize/{{ .Environment.Name }}
missingFileHandler: Info
- name: manifests
namespace: docs
namespace: {{ .Environment.Name }}-docs
chart: manifests
condition: docs.enabled
missingFileHandler: Info
+1 -1
View File
@@ -13,7 +13,7 @@ releases:
- name: dragonfly
namespace: dragonfly
chart: dragonfly/dragonfly-operator
version: v1.5.0
version: v1.3.1
condition: dragonfly.enabled
values:
- ../values/dragonfly/values/dragonfly.yaml.gotmpl
-39
View File
@@ -1,39 +0,0 @@
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
+1 -1
View File
@@ -12,7 +12,7 @@ releases:
- name: gatus
namespace: uptime
chart: gatus/gatus
version: 1.5.0
version: 1.4.5
condition: gatus.enabled
values:
- ../values/gatus/values/values.yaml
+1 -1
View File
@@ -13,7 +13,7 @@ releases:
- name: gitea
namespace: gitea
chart: gitea/gitea
version: 12.6.0
version: 12.5.0
condition: gitea.enabled
values:
- ../values/gitea/values/values.yaml
-44
View File
@@ -1,44 +0,0 @@
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.42.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
+1 -1
View File
@@ -12,7 +12,7 @@ releases:
- name: ingress-nginx
namespace: ingress-nginx
chart: ingress-nginx/ingress-nginx
version: 4.15.1
version: 4.14.1
condition: nginx.enabled
values:
- ../values/ingress-nginx/values/ingress-nginx.yaml.gotmpl
-41
View File
@@ -1,41 +0,0 @@
bases:
- ../envs/environments.yaml.gotmpl
repositories:
- name: jobset
oci: true
url: registry.k8s.io/jobset/charts
releases:
- name: jobset
namespace: jobset-system
chart: jobset/jobset
version: 0.11.1
condition: jobset.enabled
values:
- ../values/jobset/values/jobset.yaml.gotmpl
- ../values/jobset/values/jobset-{{ .Environment.Name }}.yaml.gotmpl
postRenderer: ../bin/kustomizer
postRendererArgs:
- ../values/jobset/kustomize/{{ .Environment.Name }}
missingFileHandler: Info
- name: manifests
namespace: jobset-system
chart: manifests
condition: jobset.enabled
missingFileHandler: Info
values:
- ../values/env.yaml
- ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
- ../values/jobset/env.yaml.gotmpl
- ../values/jobset/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/jobset/manifests
- manifests
+1 -1
View File
@@ -12,7 +12,7 @@ releases:
- name: {{ .Environment.Name }}-keycloak
namespace: keycloak
chart: bitnami/keycloak
version: 25.2.0
version: 24.0.2
condition: keycloak.enabled
values:
- ../values/keycloak/values/values.yaml
+1 -1
View File
@@ -8,7 +8,7 @@ releases:
- name: kueue
namespace: kueue-system
chart: oci://registry.k8s.io/kueue/charts/kueue
version: 0.17.1
version: 0.15.0
condition: kueue.enabled
values:
- ../values/kueue/values/values.yaml
+1 -1
View File
@@ -15,7 +15,7 @@ releases:
- name: kyverno
namespace: kyverno
chart: kyverno/kyverno
version: 3.8.1
version: 3.6.1
condition: kyverno.enabled
values:
- ../values/kyverno/values/kyverno.yaml.gotmpl
+1 -1
View File
@@ -12,7 +12,7 @@ releases:
- name: loki
namespace: loki
chart: loki/loki
version: 7.0.0
version: 6.42.0
condition: loki.enabled
values:
- ../values/loki/values/loki.yaml.gotmpl
+2 -2
View File
@@ -6,7 +6,7 @@ commonLabels:
releases:
- name: makai
namespace: makai
namespace: {{ .Environment.Name }}-makai
chart: ../charts/makai
condition: makai.enabled
values:
@@ -17,7 +17,7 @@ releases:
- ../values/makai/kustomize/{{ .Environment.Name }}
missingFileHandler: Info
- name: manifests
namespace: makai
namespace: {{ .Environment.Name }}-makai
chart: manifests
condition: makai.enabled
missingFileHandler: Info
+1 -1
View File
@@ -12,7 +12,7 @@ releases:
- name: mariadb-operator
namespace: mariadb-operator
chart: mariadb-operator/mariadb-operator
version: 26.3.0
version: 25.10.3
condition: mariadb_operator.enabled
values:
- ../values/mariadb-operator/values/mariadb-operator.yaml.gotmpl
+1 -1
View File
@@ -16,7 +16,7 @@ releases:
namespace: {{ .Environment.Name }}-openfga
{{- end }}
chart: openfga/openfga
version: 0.3.5
version: 0.2.50
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.156.2
version: 0.142.1
condition: otel.enabled
values:
- ../values/opentelemetry-collector/values/values.yaml
+2 -2
View File
@@ -15,7 +15,7 @@ releases:
- name: postgres-operator
namespace: cnpg
chart: cloudnative-pg/cloudnative-pg
version: 0.28.2
version: 0.27.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.6.0
version: 0.3.1
condition: postgres_operator.enabled
values:
- ../values/postgres-operator/values/plugin-barman-cloud.yaml.gotmpl
+1 -1
View File
@@ -15,7 +15,7 @@ releases:
- name: prometheus
namespace: prometheus
chart: prometheus/kube-prometheus-stack
version: 85.3.0
version: 72.7.0
condition: prometheus.enabled
values:
- ../values/prometheus/values/prometheus.yaml.gotmpl
+1 -1
View File
@@ -13,7 +13,7 @@ releases:
- name: slurm-operator
namespace: slinky
chart: slurm-operator/slurm-operator
version: 1.0.3
version: 0.4.1
condition: slurm_operator.enabled
values:
- ../values/slurm-operator/values/slurm-operator.yaml.gotmpl
+1 -1
View File
@@ -13,7 +13,7 @@ releases:
- name: slurm
namespace: slurm
chart: slurm/slurm
version: 1.0.3
version: 0.4.1
condition: slurm.enabled
values:
- ../values/slurm/values/slurm.yaml.gotmpl
+1 -1
View File
@@ -14,7 +14,7 @@ releases:
- name: umami
namespace: analytics
chart: umami/umami
version: 7.9.4
version: 6.0.1
condition: umami.enabled
values:
- ../values/umami/values/values.yaml
+1 -1
View File
@@ -15,7 +15,7 @@ releases:
- name: velero
namespace: velero
chart: velero/velero
version: 12.0.1
version: 11.3.2
condition: velero.enabled
values:
- ../values/velero/values/velero.yaml.gotmpl
+2 -3
View File
@@ -3,8 +3,7 @@ bases:
repositories:
- name: x509-exporter
oci: true
url: 'quay.io/enix/charts'
url: 'https://charts.enix.io'
commonLabels:
tier: sys
@@ -13,7 +12,7 @@ releases:
- name: x509-exporter
namespace: x509-exporter
chart: x509-exporter/x509-certificate-exporter
version: 4.1.0
version: 3.19.1
condition: x509_exporter.enabled
values:
- ../values/x509-exporter/values/x509-exporter.yaml.gotmpl
View File
-19
View File
@@ -1,19 +0,0 @@
{
buildGoModule,
fetchFromGitHub,
}:
buildGoModule rec {
pname = "kueuectl";
version = "0.16.3";
src = fetchFromGitHub {
owner = "kubernetes-sigs";
repo = "kueue";
rev = "v${version}";
hash = "sha256-JbU+ZoQ+YriaiIbbVCe45OTYycxYRanLhmQAdpE+xQ4=";
};
vendorHash = null;
subPackages = [ "cmd/kueuectl" ];
}
+24
View File
@@ -0,0 +1,24 @@
{
"pins": {
"git-hooks": {
"type": "Git",
"repository": {
"type": "GitHub",
"owner": "cachix",
"repo": "git-hooks.nix"
},
"branch": "master",
"submodules": false,
"revision": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
"url": "https://github.com/cachix/git-hooks.nix/archive/a1ef738813b15cf8ec759bdff5761b027e3e1d23.tar.gz",
"hash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U="
},
"nixpkgs": {
"type": "Channel",
"name": "nixpkgs-unstable",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre937085.6308c3b21396/nixexprs.tar.xz",
"hash": "sha256-RuGWBqXVEsZwwBvRGS/nRrA6PQyOQwVaAu139Z853Bk="
}
},
"version": 7
}
-71
View File
@@ -1,71 +0,0 @@
{
sources ? import ../npins,
pkgs ? import sources.nixpkgs { },
treefmt ? import sources.treefmt-nix,
}:
let
globalExcludes = [
"npins/default.nix"
"attic"
"vcluster"
".*vendor"
".*chart/.*"
".*schema.json"
];
in
treefmt.evalModule pkgs {
projectRootFile = ".git/config";
settings = {
excludes = globalExcludes;
};
programs = {
# --- Nix formatting ---
nixfmt = {
enable = true;
package = pkgs.nixfmt;
};
statix.enable = true;
deadnix.enable = true;
# --- Shell ---
shellcheck = {
enable = true;
excludes = [
"vcluster/"
"attic/"
];
};
shfmt.enable = true;
# --- YAML ---
yamllint = {
enable = true;
excludes = [
"attic/"
"charts/templates/"
"charts/"
"values/"
"vcluster/"
];
settings = {
extends = "default";
rules = {
document-start = "disable";
line-length = {
max = 300;
};
};
};
};
# --- JSON ---
jsonfmt.enable = true;
# Optional: keep JSON sorted
# prettier.enable = true;
};
}

Some files were not shown because too many files have changed in this diff Show More