~talya/vyx

My laptop, server, and cluster Nix configuration. ·
👀
 nix
r/o

12e8a50ef10d80d3682132284ef7a12d4fc57581 parent 1faaedb4

tree view
authored by Asherah Connor <ashe@kivikakk.ee> 5 months ago
committed by Asherah Connor <ashe@kivikakk.ee> 5 months ago

flux/sources/chog: bump and add enbi annotations.

4 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/flux/sources/chog/bundle.cue b/flux/sources/chog/bundle.cue
index 3acf1e6..9b418b3 100644
--- a/flux/sources/chog/bundle.cue
+++ b/flux/sources/chog/bundle.cue
@@ -11,9 +11,12 @@ bundle: instances: chog: {
values: chog: {
image: {
repository: "nossa.ee/talya/chog"
- tag: "523144276f2e42e404fe01f938727c8351594777"
+ tag: "f5d531177a7330e9b270c15cca5df0eb72b8684c"
digest: ""
}
+ enbi: flakeUrl: "git+https://nossa.ee/~talya/chog?rev=\(image.tag)"
+ enbi: packageName: "chog-docker.stream-layered"
+
replicas: 1
secretName: "chog-secret-20250716-100309"
diff --git a/flux/sources/chog/manifest.yaml b/flux/sources/chog/manifest.yaml
index 364a749..a946c63 100644
--- a/flux/sources/chog/manifest.yaml
+++ b/flux/sources/chog/manifest.yaml
@@ -17,6 +17,10 @@ spec:
app.kubernetes.io/name: chog
template:
metadata:
+ annotations:
+ enbi.hrzn.ee/nixbuild-flakeUrl: git+https://nossa.ee/~talya/chog?rev=f5d531177a7330e9b270c15cca5df0eb72b8684c
+ enbi.hrzn.ee/nixbuild-imageTag: nossa.ee/talya/chog:f5d531177a7330e9b270c15cca5df0eb72b8684c
+ enbi.hrzn.ee/nixbuild-packageName: chog-docker.stream-layered
labels:
app.kubernetes.io/name: chog
spec:
@@ -49,7 +53,7 @@ spec:
value: prod
- name: CHOG_SNAME
value: chog
- image: nossa.ee/talya/chog:523144276f2e42e404fe01f938727c8351594777
+ image: nossa.ee/talya/chog:f5d531177a7330e9b270c15cca5df0eb72b8684c
imagePullPolicy: IfNotPresent
name: chog
resources:
@@ -71,7 +75,7 @@ spec:
- command:
- /bin/chog-epmd
- -d
- image: nossa.ee/talya/chog:523144276f2e42e404fe01f938727c8351594777
+ image: nossa.ee/talya/chog:f5d531177a7330e9b270c15cca5df0eb72b8684c
imagePullPolicy: IfNotPresent
livenessProbe:
initialDelaySeconds: 5
diff --git a/flux/sources/chog/templates/chog.cue b/flux/sources/chog/templates/chog.cue
index 3ce4221..2c8a4fd 100644
--- a/flux/sources/chog/templates/chog.cue
+++ b/flux/sources/chog/templates/chog.cue
@@ -17,6 +17,11 @@ import (
template: {
metadata: {
labels: #config.chog.selector.labels
+ annotations: {
+ "enbi.hrzn.ee/nixbuild-imageTag": #config.chog.image.reference
+ "enbi.hrzn.ee/nixbuild-flakeUrl": #config.chog.enbi.flakeUrl
+ "enbi.hrzn.ee/nixbuild-packageName": #config.chog.enbi.packageName
+ }
if #config.chog.pod.annotations != _|_ {
annotations: #config.chog.pod.annotations
}
diff --git a/flux/sources/chog/templates/config.cue b/flux/sources/chog/templates/config.cue
index b60d3ee..3322fa3 100644
--- a/flux/sources/chog/templates/config.cue
+++ b/flux/sources/chog/templates/config.cue
@@ -29,6 +29,13 @@ import (
image: timoniv1.#Image
+ enbi: {
+ flakeUrl: string
+ packageName: string
+ }
+
+ replicas: *1 | int & >0
+
pod: {
annotations?: timoniv1.#Annotations
@@ -52,8 +59,6 @@ import (
}
}
- replicas: *1 | int & >0
-
securityContext: corev1.#SecurityContext & {
allowPrivilegeEscalation: *false | true
privileged: *false | true