From 2c454a194cb0a8daf78cc1865f1b29cd632d9e18 Mon Sep 17 00:00:00 2001
From: Peter Kurfer <peter@icb4dc0.de>
Date: Tue, 25 Mar 2025 14:46:20 +0100
Subject: [PATCH 1/2] chore: switch to Harbor images
---
argocd/kustomization.yaml | 1 +
.../resources/secret.harbor-credentials.yaml | Bin 0 -> 728 bytes
ente/.gitattributes | 1 +
ente/kustomization.yaml | 5 +-
ente/resources/cast/deployment.yaml | 50 +++++++++---------
ente/resources/photos/deployment.yaml | 50 +++++++++---------
ente/resources/secret.harbor-credentials.yaml | Bin 0 -> 728 bytes
7 files changed, 57 insertions(+), 50 deletions(-)
create mode 100644 argocd/resources/secret.harbor-credentials.yaml
create mode 100644 ente/resources/secret.harbor-credentials.yaml
diff --git a/argocd/kustomization.yaml b/argocd/kustomization.yaml
index e6f9f7e..323e3c2 100644
--- a/argocd/kustomization.yaml
+++ b/argocd/kustomization.yaml
@@ -5,6 +5,7 @@ namespace: argo-system
resources:
- resources/namespace.yaml
+ - resources/secret.harbor-credentials.yaml
- resources/secret.git-age.yaml
- resources/configmap.git.yaml
- resources/dragonfly.yml
diff --git a/argocd/resources/secret.harbor-credentials.yaml b/argocd/resources/secret.harbor-credentials.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6dd71682c6e354fa3b387880b64476257f5bba98
GIT binary patch
literal 728
zcmV;}0w?`pXJsvAZewzJaCB*JZZ2<fXD@a!3N1b$STZ#=F*zVYZftEdQ)FytPET!a
zPk1*rT6S<aMn^|=S3*ZgS5|m!Flc91M>R`SFi8q)Sy@FnS3*N#bu?{KWJhLeSZ8`T
zT0>}KbxLt<Z7Wb(D`;nAb4z(dazzR)J|I{!H8n9gAWv6Kcxg*-K{!%RM0jL4cS>k)
zG&oRJa8-3yYg9OTO-L^=c5_&4SXyas3VKX*V`x!Iaz|lkZ)!qvXK7AmLQ6?PMoMNe
zMP*MyLu+YjcW`!jF=uK)3N0-yAT=^iGDBv0a!yKhH*{%lX*V-jZC7G(Sz0ePYiu({
zZAf%XIZj$wZ&@o<3W69V@8f9KurLC1ZmDrS5uZ_fXpMaP8~C?!oRQL;;N;ovS`xLB
zHy%1wzV!+@^r>?75!MUy04m@V>};u=6k%wINl>Df{?)RR7QwJk`f&b={)!z6?Ct*{
z5BhsjNZf5P0fL)_y+0*lhW#a03972j17&qS2+kOQmFPS&OWxMx0J{{>dRtk!Rb^LM
z7Q&51=D)hK?664M)<V<T05S}<dXi=Q&`R2*UeAZx;k*J+qi8Yy(?e+-?og3J^qrL}
z^1sf8amG+u^#(zj7DwA&->;$x)!$-TE0lLSULnpN<ai9yyg?l&T%oSy#uJG==2-yz
z@kLNcG9p@}ZpeFw_6@~%2WJRrkCoz>C~{0_x563fcZr+gs7W*V!?0Rn@A7fpJyW?H
z{m2JlB^w&_B0`d7RJUY81VNN|dj5M0%I_pDc%n*#xTL9G_-p<t>vhN0BL>Q<+b1p|
zvJ7Q;9~b=o*bdJu#U+EG@+g(eOJ%KUde%))emw+6c!>GR<k9Es25cfu>+~@KZOh22
zc4XTH6_m=SP4p$enIifg9V8O<I`Ix~nX820@KeK$kBZn!{LsM3yEWUhQmu8zQ6Ncz
K!&Ti+z}Na_phBPk
literal 0
HcmV?d00001
diff --git a/ente/.gitattributes b/ente/.gitattributes
index 677a2c6..ec2b07d 100644
--- a/ente/.gitattributes
+++ b/ente/.gitattributes
@@ -1 +1,2 @@
credentials.yaml filter=age diff=age merge=age -text
+**/secret.*.yaml filter=age diff=age merge=age -text
diff --git a/ente/kustomization.yaml b/ente/kustomization.yaml
index 5ad18ac..2171e6f 100644
--- a/ente/kustomization.yaml
+++ b/ente/kustomization.yaml
@@ -13,10 +13,10 @@ images:
newTag: latest
digest: sha256:08b6fd823efc15a38592a808840012a7ad13cccb645f88dfe981c50fcca8798a
- name: photos
- newName: code.icb4dc0.de/infrastructure/images/ente/photos
+ newName: registry.icb4dc0.de/infrastructure/ente/photos
newTag: v0.9.99
- name: cast
- newName: code.icb4dc0.de/infrastructure/images/ente/cast
+ newName: registry.icb4dc0.de/infrastructure/ente/cast
newTag: v0.9.99
labels:
@@ -27,6 +27,7 @@ labels:
resources:
- resources/namespace.yaml
+ - resources/secret.harbor-credentials.yaml
- resources/museum/db/db.yaml
- resources/museum/db/user.yaml
- resources/museum/cache.yaml
diff --git a/ente/resources/cast/deployment.yaml b/ente/resources/cast/deployment.yaml
index c1fb4c8..4af1048 100644
--- a/ente/resources/cast/deployment.yaml
+++ b/ente/resources/cast/deployment.yaml
@@ -17,28 +17,30 @@ spec:
app.kubernetes.io/part-of: ente
spec:
containers:
- - name: cast
- image: cast
- imagePullPolicy: Always
- env:
- - name: ENDPOINT
- value: https://api.ente.icb4dc0.de
- - name: ALBUMS_ENDPOINT
- value: https://albums.ente.icb4dc0.de
- resources:
- requests:
- memory: "64Mi"
- cpu: "25m"
- limits:
- memory: "128Mi"
- cpu: "50m"
- ports:
- - name: http
- containerPort: 3000
- readinessProbe:
- httpGet:
- port: 3000
- path: /
- scheme: HTTP
+ - name: cast
+ image: cast
+ imagePullPolicy: Always
+ env:
+ - name: ENDPOINT
+ value: https://api.ente.icb4dc0.de
+ - name: ALBUMS_ENDPOINT
+ value: https://albums.ente.icb4dc0.de
+ resources:
+ requests:
+ memory: "64Mi"
+ cpu: "25m"
+ limits:
+ memory: "128Mi"
+ cpu: "50m"
+ ports:
+ - name: http
+ containerPort: 3000
+ readinessProbe:
+ httpGet:
+ port: 3000
+ path: /
+ scheme: HTTP
+ imagePullSecrets:
+ - name: harbor-registry-credentials
nodeSelector:
- kubernetes.io/arch: arm64
\ No newline at end of file
+ kubernetes.io/arch: arm64
diff --git a/ente/resources/photos/deployment.yaml b/ente/resources/photos/deployment.yaml
index 87e7425..bb41a55 100644
--- a/ente/resources/photos/deployment.yaml
+++ b/ente/resources/photos/deployment.yaml
@@ -17,28 +17,30 @@ spec:
app.kubernetes.io/part-of: ente
spec:
containers:
- - name: photos
- image: photos
- imagePullPolicy: Always
- env:
- - name: ENDPOINT
- value: https://api.ente.icb4dc0.de
- - name: ALBUMS_ENDPOINT
- value: https://albums.ente.icb4dc0.de
- resources:
- requests:
- memory: "64Mi"
- cpu: "25m"
- limits:
- memory: "128Mi"
- cpu: "50m"
- ports:
- - name: http
- containerPort: 3000
- readinessProbe:
- httpGet:
- port: 3000
- path: /
- scheme: HTTP
+ - name: photos
+ image: photos
+ imagePullPolicy: Always
+ env:
+ - name: ENDPOINT
+ value: https://api.ente.icb4dc0.de
+ - name: ALBUMS_ENDPOINT
+ value: https://albums.ente.icb4dc0.de
+ resources:
+ requests:
+ memory: "64Mi"
+ cpu: "25m"
+ limits:
+ memory: "128Mi"
+ cpu: "50m"
+ ports:
+ - name: http
+ containerPort: 3000
+ readinessProbe:
+ httpGet:
+ port: 3000
+ path: /
+ scheme: HTTP
+ imagePullSecrets:
+ - name: harbor-registry-credentials
nodeSelector:
- kubernetes.io/arch: arm64
\ No newline at end of file
+ kubernetes.io/arch: arm64
diff --git a/ente/resources/secret.harbor-credentials.yaml b/ente/resources/secret.harbor-credentials.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..ac48de2fa5ef4adcb8bc5e8be69ce6e182b0156a
GIT binary patch
literal 728
zcmV;}0w?`pXJsvAZewzJaCB*JZZ2<fXD@a!3N1b$STZ#=F*zVoaaVd$Zfi3~X=zPZ
zQh8W3XfIPaXGdC3R7_ZNdQ)*oV@`BqSV>T2Lq!TSZESK>Z(~d{D|1d}bXRRkL2^iE
zO*k|{a#m1EPIppKK~Zf?O)*ksS$7I8J|I{!H8n9gAZ1T<P;E?ObZB;MVqtfBcxg~g
zc0@x)PEj*ASyowZFHvxAY)Nf7Voz6d3T9R`R%2;!Gf6^Ac~V0;V{T4jL_sifb6P@p
zbvQOuX=-yadR9Yoc{p!(3N0-yAW&0eba6~#FK#kHNqS>fIcG6MR9R~<cz9$%QejOu
zZFG8YdN5F8Z+b^-3hjHXO5$)4&nt_<fv7xLOevST-1fg^fu*4JiDGGhF8xF6I7~w#
z5EL)UH)j~MXZK!C@m{Z7nyN*6RE_bq8O!Di_JQxx-xhGorg4~4@%B1|-~yWfhy{oE
zrz94@sczi48?TM@s>jhbx9C3wQn?){s&L&jf_N&iF}V*om8;I&HU#b*c?bS;0V(Xy
z2SIjS=A$;I1IiKuR~@TM^i)$0C7m(jW6ZTu{0kGAw}|Cg$d5&{I$pLokks&4Pm%~o
zYFPCu>qst`CaY}dpw-gOA;N@K_GA5R?H=*F?#a~M8%0zmm)gtKBCS9^bq?b;&@s$n
z4s%3ya%-2mf1jX(TQ;U&m<-~yeY%=GC;gI5)12sd;C1mM;&tR{9Fkp@6;zAISKr)d
zT4MV-wW<ZH;~+)4!ybkxSq-{?dV{E9z11yM*)3KdnB!LeN2r1G6bxKe^&O%SdYEVx
z__(nbJE)>_tBlzQtxS#7zf*eBUW<zlywl>|X_)pvl3ddl?s~3Lw$Uk=oSVTn*8;Vp
zEqAh%_+8o>ro5R?NVqm6;7p(m7%yO6TC2?j`rLYsvSEj^zzxm0r-%m#^$@WekZ?+Q
K)Lhh+#4!c%SV39<
literal 0
HcmV?d00001
--
2.45.3
From 02688fff5a44357a99d3d333d1af06b56c197648 Mon Sep 17 00:00:00 2001
From: Peter <peter@icb4dc0.de>
Date: Wed, 26 Mar 2025 03:35:05 +0000
Subject: [PATCH 2/2] chore(deps): update ghcr.io/projectcontour/contour docker
tag to v1.30.3
---
contour/kustomization.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contour/kustomization.yaml b/contour/kustomization.yaml
index c161669..d668d63 100644
--- a/contour/kustomization.yaml
+++ b/contour/kustomization.yaml
@@ -6,7 +6,7 @@ namespace: projectcontour
images:
- name: contour
newName: ghcr.io/projectcontour/contour
- newTag: v1.30.2
+ newTag: v1.30.3
resources:
- crds/contour.yaml
--
2.45.3