Compare commits
18 Commits
auto-updat
...
auto-updat
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1e023bfb00 | ||
| 0e4204b2ea | |||
| 3230c67f16 | |||
| 60c764a657 | |||
| 869a75f6e4 | |||
| 26429f1d4c | |||
| 5718981b67 | |||
| 8c6ca27523 | |||
| 4334ea25b7 | |||
| 18e60344b3 | |||
| 113f1e668d | |||
| 9b1caa28ef | |||
|
|
bd927b7ea6 | ||
| 1688ac67c2 | |||
| eda944741e | |||
| e744629f85 | |||
|
|
e38ba5b70c | ||
| 860f83445a |
@@ -96,16 +96,27 @@ jobs:
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Create PR via API
|
# Create PR via API
|
||||||
RESPONSE=$(curl -s -X POST \
|
echo "Making API request to: $GITEA_URL/api/v1/repos/$GITEA_OWNER/$GITEA_REPO/pulls"
|
||||||
|
echo "Request body:"
|
||||||
|
cat /tmp/pr_body.json
|
||||||
|
|
||||||
|
RESPONSE=$(curl -s -w "\nHTTP_CODE:%{http_code}" -X POST \
|
||||||
-H "Authorization: token $GITEA_TOKEN" \
|
-H "Authorization: token $GITEA_TOKEN" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d @/tmp/pr_body.json \
|
-d @/tmp/pr_body.json \
|
||||||
"$GITEA_URL/api/v1/repos/$GITEA_OWNER/$GITEA_REPO/pulls")
|
"$GITEA_URL/api/v1/repos/$GITEA_OWNER/$GITEA_REPO/pulls")
|
||||||
|
|
||||||
# Extract PR number and URL from response
|
# Extract HTTP code and response body
|
||||||
PR_NUMBER=$(echo "$RESPONSE" | grep -o '"number":[0-9]*' | head -1 | cut -d':' -f2)
|
HTTP_CODE=$(echo "$RESPONSE" | grep "HTTP_CODE:" | cut -d':' -f2)
|
||||||
|
RESPONSE_BODY=$(echo "$RESPONSE" | sed '/HTTP_CODE:/d')
|
||||||
|
|
||||||
if [ -n "$PR_NUMBER" ]; then
|
echo "API Response (HTTP $HTTP_CODE):"
|
||||||
|
echo "$RESPONSE_BODY"
|
||||||
|
|
||||||
|
# Extract PR number and URL from response
|
||||||
|
PR_NUMBER=$(echo "$RESPONSE_BODY" | grep -o '"number":[0-9]*' | head -1 | cut -d':' -f2)
|
||||||
|
|
||||||
|
if [ -n "$PR_NUMBER" ] && [ "$HTTP_CODE" = "201" ]; then
|
||||||
echo "✅ Pull Request created successfully!"
|
echo "✅ Pull Request created successfully!"
|
||||||
echo "📝 PR #$PR_NUMBER"
|
echo "📝 PR #$PR_NUMBER"
|
||||||
echo "🔗 URL: $GITEA_URL/$GITEA_OWNER/$GITEA_REPO/pulls/$PR_NUMBER"
|
echo "🔗 URL: $GITEA_URL/$GITEA_OWNER/$GITEA_REPO/pulls/$PR_NUMBER"
|
||||||
@@ -114,8 +125,15 @@ jobs:
|
|||||||
echo "pr_number=$PR_NUMBER" >> $GITHUB_OUTPUT
|
echo "pr_number=$PR_NUMBER" >> $GITHUB_OUTPUT
|
||||||
echo "pr_url=$GITEA_URL/$GITEA_OWNER/$GITEA_REPO/pulls/$PR_NUMBER" >> $GITHUB_OUTPUT
|
echo "pr_url=$GITEA_URL/$GITEA_OWNER/$GITEA_REPO/pulls/$PR_NUMBER" >> $GITHUB_OUTPUT
|
||||||
else
|
else
|
||||||
echo "⚠️ Failed to create Pull Request"
|
echo "⚠️ Failed to create Pull Request (HTTP $HTTP_CODE)"
|
||||||
echo "Response: $RESPONSE"
|
echo "Response: $RESPONSE_BODY"
|
||||||
|
|
||||||
|
# Check if PR already exists
|
||||||
|
if echo "$RESPONSE_BODY" | grep -q "already exists"; then
|
||||||
|
echo "ℹ️ PR already exists for this branch"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -16,16 +16,17 @@ ArgoCD homelab project
|
|||||||
| **authentik** | [](https://ag.hexor.cy/applications/argocd/authentik) |
|
| **authentik** | [](https://ag.hexor.cy/applications/argocd/authentik) |
|
||||||
| **cert-manager** | [](https://ag.hexor.cy/applications/argocd/cert-manager) |
|
| **cert-manager** | [](https://ag.hexor.cy/applications/argocd/cert-manager) |
|
||||||
| **external-secrets** | [](https://ag.hexor.cy/applications/argocd/external-secrets) |
|
| **external-secrets** | [](https://ag.hexor.cy/applications/argocd/external-secrets) |
|
||||||
| **k3s-system-upgrade** | [](https://ag.hexor.cy/applications/argocd/k3s-system-upgrade) |
|
|
||||||
| **kube-system-custom** | [](https://ag.hexor.cy/applications/argocd/kube-system-custom) |
|
| **kube-system-custom** | [](https://ag.hexor.cy/applications/argocd/kube-system-custom) |
|
||||||
| **kubernetes-dashboard** | [](https://ag.hexor.cy/applications/argocd/kubernetes-dashboard) |
|
| **kubernetes-dashboard** | [](https://ag.hexor.cy/applications/argocd/kubernetes-dashboard) |
|
||||||
| **postgresql** | [](https://ag.hexor.cy/applications/argocd/postgresql) |
|
| **postgresql** | [](https://ag.hexor.cy/applications/argocd/postgresql) |
|
||||||
| **prom-stack** | [](https://ag.hexor.cy/applications/argocd/prom-stack) |
|
| **prom-stack** | [](https://ag.hexor.cy/applications/argocd/prom-stack) |
|
||||||
|
| **system-upgrade** | [](https://ag.hexor.cy/applications/argocd/system-upgrade) |
|
||||||
|
|
||||||
### Games
|
### Games
|
||||||
|
|
||||||
| Application | Status |
|
| Application | Status |
|
||||||
| :--- | :---: |
|
| :--- | :---: |
|
||||||
|
| **beam-ng** | [](https://ag.hexor.cy/applications/argocd/beam-ng) |
|
||||||
| **counter-strike-16** | [](https://ag.hexor.cy/applications/argocd/counter-strike-16) |
|
| **counter-strike-16** | [](https://ag.hexor.cy/applications/argocd/counter-strike-16) |
|
||||||
| **minecraft** | [](https://ag.hexor.cy/applications/argocd/minecraft) |
|
| **minecraft** | [](https://ag.hexor.cy/applications/argocd/minecraft) |
|
||||||
</td>
|
</td>
|
||||||
@@ -36,15 +37,19 @@ ArgoCD homelab project
|
|||||||
| Application | Status |
|
| Application | Status |
|
||||||
| :--- | :---: |
|
| :--- | :---: |
|
||||||
| **gitea** | [](https://ag.hexor.cy/applications/argocd/gitea) |
|
| **gitea** | [](https://ag.hexor.cy/applications/argocd/gitea) |
|
||||||
|
| **greece-notifier** | [](https://ag.hexor.cy/applications/argocd/greece-notifier) |
|
||||||
| **hexound** | [](https://ag.hexor.cy/applications/argocd/hexound) |
|
| **hexound** | [](https://ag.hexor.cy/applications/argocd/hexound) |
|
||||||
| **immich** | [](https://ag.hexor.cy/applications/argocd/immich) |
|
| **immich** | [](https://ag.hexor.cy/applications/argocd/immich) |
|
||||||
| **jellyfin** | [](https://ag.hexor.cy/applications/argocd/jellyfin) |
|
| **jellyfin** | [](https://ag.hexor.cy/applications/argocd/jellyfin) |
|
||||||
| **k8s-secrets** | [](https://ag.hexor.cy/applications/argocd/k8s-secrets) |
|
| **k8s-secrets** | [](https://ag.hexor.cy/applications/argocd/k8s-secrets) |
|
||||||
| **khm** | [](https://ag.hexor.cy/applications/argocd/khm) |
|
| **khm** | [](https://ag.hexor.cy/applications/argocd/khm) |
|
||||||
|
| **ollama** | [](https://ag.hexor.cy/applications/argocd/ollama) |
|
||||||
| **paperless** | [](https://ag.hexor.cy/applications/argocd/paperless) |
|
| **paperless** | [](https://ag.hexor.cy/applications/argocd/paperless) |
|
||||||
| **pasarguard** | [](https://ag.hexor.cy/applications/argocd/pasarguard) |
|
| **pasarguard** | [](https://ag.hexor.cy/applications/argocd/pasarguard) |
|
||||||
| **qbittorent-nas** | [](https://ag.hexor.cy/applications/argocd/qbittorent-nas) |
|
| **qbittorent-nas** | [](https://ag.hexor.cy/applications/argocd/qbittorent-nas) |
|
||||||
| **rustdesk** | [](https://ag.hexor.cy/applications/argocd/rustdesk) |
|
| **rustdesk** | [](https://ag.hexor.cy/applications/argocd/rustdesk) |
|
||||||
|
| **sonarr-stack** | [](https://ag.hexor.cy/applications/argocd/sonarr-stack) |
|
||||||
|
| **stirling-pdf** | [](https://ag.hexor.cy/applications/argocd/stirling-pdf) |
|
||||||
| **syncthing** | [](https://ag.hexor.cy/applications/argocd/syncthing) |
|
| **syncthing** | [](https://ag.hexor.cy/applications/argocd/syncthing) |
|
||||||
| **tg-bots** | [](https://ag.hexor.cy/applications/argocd/tg-bots) |
|
| **tg-bots** | [](https://ag.hexor.cy/applications/argocd/tg-bots) |
|
||||||
| **vaultwarden** | [](https://ag.hexor.cy/applications/argocd/vaultwarden) |
|
| **vaultwarden** | [](https://ag.hexor.cy/applications/argocd/vaultwarden) |
|
||||||
@@ -52,4 +57,4 @@ ArgoCD homelab project
|
|||||||
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
|
|||||||
21
k8s/apps/ollama/app.yaml
Normal file
21
k8s/apps/ollama/app.yaml
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
apiVersion: argoproj.io/v1alpha1
|
||||||
|
kind: Application
|
||||||
|
metadata:
|
||||||
|
name: ollama
|
||||||
|
namespace: argocd
|
||||||
|
spec:
|
||||||
|
project: apps
|
||||||
|
destination:
|
||||||
|
namespace: ollama
|
||||||
|
server: https://kubernetes.default.svc
|
||||||
|
source:
|
||||||
|
repoURL: ssh://git@gt.hexor.cy:30022/ab/homelab.git
|
||||||
|
targetRevision: HEAD
|
||||||
|
path: k8s/apps/ollama
|
||||||
|
syncPolicy:
|
||||||
|
automated:
|
||||||
|
selfHeal: true
|
||||||
|
prune: true
|
||||||
|
syncOptions:
|
||||||
|
- CreateNamespace=true
|
||||||
|
|
||||||
11
k8s/apps/ollama/kustomization.yaml
Normal file
11
k8s/apps/ollama/kustomization.yaml
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
apiVersion: kustomize.config.k8s.io/v1beta1
|
||||||
|
kind: Kustomization
|
||||||
|
|
||||||
|
helmCharts:
|
||||||
|
- name: ollama
|
||||||
|
repo: https://otwld.github.io/ollama-helm/
|
||||||
|
version: 0.4.0
|
||||||
|
releaseName: ollama
|
||||||
|
namespace: ollama
|
||||||
|
valuesFile: ollama-values.yaml
|
||||||
|
includeCRDs: true
|
||||||
8
k8s/apps/ollama/ollama-values.yaml
Normal file
8
k8s/apps/ollama/ollama-values.yaml
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
image:
|
||||||
|
repository: ollama/ollama
|
||||||
|
pullPolicy: Always
|
||||||
|
tag: "latest"
|
||||||
|
nodeSelector:
|
||||||
|
kubernetes.io/hostname: master.tail2fe2d.ts.net
|
||||||
|
ingress:
|
||||||
|
enabled: false
|
||||||
@@ -11,7 +11,7 @@ spec:
|
|||||||
source:
|
source:
|
||||||
repoURL: ssh://git@gt.hexor.cy:30022/ab/homelab.git
|
repoURL: ssh://git@gt.hexor.cy:30022/ab/homelab.git
|
||||||
targetRevision: HEAD
|
targetRevision: HEAD
|
||||||
path: k8s/core/prometheus
|
path: k8s/core/prom-stack
|
||||||
syncPolicy:
|
syncPolicy:
|
||||||
automated:
|
automated:
|
||||||
selfHeal: true
|
selfHeal: true
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
apiVersion: argoproj.io/v1alpha1
|
apiVersion: argoproj.io/v1alpha1
|
||||||
kind: Application
|
kind: Application
|
||||||
metadata:
|
metadata:
|
||||||
name: k3s-system-upgrade
|
name: system-upgrade
|
||||||
namespace: argocd
|
namespace: argocd
|
||||||
spec:
|
spec:
|
||||||
project: core
|
project: core
|
||||||
|
|||||||
@@ -206,5 +206,19 @@ EOT
|
|||||||
create_group = true
|
create_group = true
|
||||||
access_groups = ["admins"]
|
access_groups = ["admins"]
|
||||||
}
|
}
|
||||||
|
"ollama" = {
|
||||||
|
name = "Ollama API"
|
||||||
|
slug = "ollama"
|
||||||
|
group = "Tools"
|
||||||
|
external_host = "https://ai.hexor.cy"
|
||||||
|
internal_host = "http://ollama.ollama.svc:11434"
|
||||||
|
internal_host_ssl_validation = false
|
||||||
|
meta_description = "Ollama API"
|
||||||
|
meta_icon = "https://ollama.com/public/ollama.png"
|
||||||
|
mode = "proxy"
|
||||||
|
outpost = "kubernetes-outpost"
|
||||||
|
create_group = true
|
||||||
|
access_groups = ["admins"]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user