Compare commits
1 Commits
auto-updat
...
auto-updat
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2e3d93a50f |
@@ -96,27 +96,16 @@ jobs:
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Create PR via API
|
# Create PR via API
|
||||||
echo "Making API request to: $GITEA_URL/api/v1/repos/$GITEA_OWNER/$GITEA_REPO/pulls"
|
RESPONSE=$(curl -s -X POST \
|
||||||
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 HTTP code and response body
|
|
||||||
HTTP_CODE=$(echo "$RESPONSE" | grep "HTTP_CODE:" | cut -d':' -f2)
|
|
||||||
RESPONSE_BODY=$(echo "$RESPONSE" | sed '/HTTP_CODE:/d')
|
|
||||||
|
|
||||||
echo "API Response (HTTP $HTTP_CODE):"
|
|
||||||
echo "$RESPONSE_BODY"
|
|
||||||
|
|
||||||
# Extract PR number and URL from response
|
# Extract PR number and URL from response
|
||||||
PR_NUMBER=$(echo "$RESPONSE_BODY" | grep -o '"number":[0-9]*' | head -1 | cut -d':' -f2)
|
PR_NUMBER=$(echo "$RESPONSE" | grep -o '"number":[0-9]*' | head -1 | cut -d':' -f2)
|
||||||
|
|
||||||
if [ -n "$PR_NUMBER" ] && [ "$HTTP_CODE" = "201" ]; then
|
if [ -n "$PR_NUMBER" ]; 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"
|
||||||
@@ -125,15 +114,8 @@ 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 (HTTP $HTTP_CODE)"
|
echo "⚠️ Failed to create Pull Request"
|
||||||
echo "Response: $RESPONSE_BODY"
|
echo "Response: $RESPONSE"
|
||||||
|
|
||||||
# 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
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ ArgoCD homelab project
|
|||||||
| **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) |
|
| **prometheus** | [](https://ag.hexor.cy/applications/argocd/prometheus) |
|
||||||
| **system-upgrade** | [](https://ag.hexor.cy/applications/argocd/system-upgrade) |
|
| **system-upgrade** | [](https://ag.hexor.cy/applications/argocd/system-upgrade) |
|
||||||
|
|
||||||
### Games
|
### Games
|
||||||
@@ -43,7 +43,6 @@ ArgoCD homelab project
|
|||||||
| **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) |
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
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
|
|
||||||
- name: open-webui
|
|
||||||
repo: https://helm.openwebui.com/
|
|
||||||
version: 8.14.0
|
|
||||||
releaseName: openweb-ui
|
|
||||||
namespace: ollama
|
|
||||||
valuesFile: openweb-ui-values.yaml
|
|
||||||
includeCRDs: true
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
image:
|
|
||||||
repository: ollama/ollama
|
|
||||||
pullPolicy: Always
|
|
||||||
tag: "latest"
|
|
||||||
nodeSelector:
|
|
||||||
kubernetes.io/hostname: master.tail2fe2d.ts.net
|
|
||||||
ingress:
|
|
||||||
enabled: false
|
|
||||||
@@ -47,7 +47,6 @@ server:
|
|||||||
- minecraft.hexor.cy # Minecraft UI and server
|
- minecraft.hexor.cy # Minecraft UI and server
|
||||||
- pass.hexor.cy # k8s-secret for openai
|
- pass.hexor.cy # k8s-secret for openai
|
||||||
- ps.hexor.cy # pasarguard UI
|
- ps.hexor.cy # pasarguard UI
|
||||||
- ai.hexor.cy # ollama API
|
|
||||||
tls:
|
tls:
|
||||||
- secretName: idm-tls
|
- secretName: idm-tls
|
||||||
hosts:
|
hosts:
|
||||||
|
|||||||
@@ -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/prom-stack
|
path: k8s/core/prometheus
|
||||||
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: system-upgrade
|
name: k3s-system-upgrade
|
||||||
namespace: argocd
|
namespace: argocd
|
||||||
spec:
|
spec:
|
||||||
project: core
|
project: core
|
||||||
|
|||||||
@@ -206,19 +206,5 @@ 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