summaryrefslogtreecommitdiff
path: root/f3s/argocd
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2026-01-19 15:36:27 +0200
committerPaul Buetow <paul@buetow.org>2026-01-19 15:36:27 +0200
commit55229ad06ed229c859082bb34085f277af7d8bea (patch)
tree4c530ca0bc8ff53cd3cdf3259a7c1a21814fdd3f /f3s/argocd
parent8d55f785e6df35381a971adcc6ee5f8518eaac22 (diff)
parent4d87a596c3188f07732a26a1cc4abb875289b969 (diff)
Merge branch 'master' of codeberg.org:snonux/conf
Diffstat (limited to 'f3s/argocd')
-rw-r--r--f3s/argocd/git-server-repo-creds.yaml29
1 files changed, 29 insertions, 0 deletions
diff --git a/f3s/argocd/git-server-repo-creds.yaml b/f3s/argocd/git-server-repo-creds.yaml
index 54207bc..250bd5f 100644
--- a/f3s/argocd/git-server-repo-creds.yaml
+++ b/f3s/argocd/git-server-repo-creds.yaml
@@ -1,5 +1,6 @@
# ArgoCD Repository Credential for self-hosted git-server
# This secret tells ArgoCD how to authenticate to the git-server via SSH
+<<<<<<< HEAD
apiVersion: v1
kind: Secret
metadata:
@@ -20,3 +21,31 @@ stringData:
AAAEAbwYhRydHh8HlKI35Takf/1qCSvZmdJBzbngvz5Zv1bwhETlsgb/g5SaMPNJWJ/t4u
K1n4Zbk+Sy6IyUEl+EcYAAAAEmFyZ29jZEBmM3MuY2x1c3RlcgECAw==
-----END OPENSSH PRIVATE KEY-----
+||||||| 7b4d629
+=======
+#
+# IMPORTANT: Do not commit the private key to git!
+# Deploy this secret manually with:
+# kubectl create secret generic git-server-repo-creds \
+# --namespace=cicd \
+# --from-literal=type=git \
+# --from-literal=url=ssh://git@git-server.cicd.svc.cluster.local \
+# --from-literal=insecure=true \
+# --from-file=sshPrivateKey=/path/to/your/private-key
+# kubectl label secret git-server-repo-creds -n cicd argocd.argoproj.io/secret-type=repository
+#
+# Or use the template below with your key injected at deploy time:
+apiVersion: v1
+kind: Secret
+metadata:
+ name: git-server-repo-creds
+ namespace: cicd
+ labels:
+ argocd.argoproj.io/secret-type: repository
+type: Opaque
+stringData:
+ type: git
+ url: ssh://git@git-server.cicd.svc.cluster.local
+ insecure: "true"
+ # sshPrivateKey: <INJECT_AT_DEPLOY_TIME>
+>>>>>>> 529caf525d3c8594bcf0208697629827113dc1fc