Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .github/workflows/deploy-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,25 @@ jobs:
limits:
cpu: 500m
memory: 128Mi
webhookServer:
sources:
github:
enabled: true
secretName: github-webhook-secret
resources:
requests:
cpu: 100m
memory: 128Mi
EOF
bin/kelos install -f /tmp/kelos-dev-values.yaml
kubectl rollout restart deployment/kelos-controller-manager -n kelos-system
kubectl rollout status deployment/kelos-controller-manager -n kelos-system --timeout=120s
kubectl rollout restart deployment -l kelos.dev/component=ghproxy -n "${KELOS_NAMESPACE}"
kubectl rollout restart deployment -l kelos.dev/component=spawner -n "${KELOS_NAMESPACE}"
kubectl rollout restart deployment/kelos-webhook-github -n kelos-system
kubectl rollout status deployment -l kelos.dev/component=ghproxy -n "${KELOS_NAMESPACE}" --timeout=120s
kubectl rollout status deployment -l kelos.dev/component=spawner -n "${KELOS_NAMESPACE}" --timeout=120s
kubectl rollout status deployment/kelos-webhook-github -n kelos-system --timeout=120s

- name: Apply PodMonitoring
run: |
Expand Down Expand Up @@ -138,6 +149,23 @@ jobs:
endpoints:
- port: metrics
interval: 30s
---
apiVersion: monitoring.googleapis.com/v1
kind: PodMonitoring
metadata:
name: kelos-webhook-github
namespace: kelos-system
labels:
app.kubernetes.io/name: kelos
app.kubernetes.io/component: webhook-github
spec:
selector:
matchLabels:
app.kubernetes.io/name: kelos
app.kubernetes.io/component: webhook-github
endpoints:
- port: metrics
interval: 30s
EOF

- name: Apply self-development resources
Expand Down
17 changes: 4 additions & 13 deletions internal/webhook/github_filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -429,19 +429,10 @@ func ExtractGitHubWorkItem(eventData *GitHubEventData) map[string]interface{} {
"Kind": "webhook",
}

// Add number, body, URL if available
if eventData.Number > 0 {
vars["Number"] = eventData.Number
}
if eventData.Body != "" {
vars["Body"] = eventData.Body
}
if eventData.URL != "" {
vars["URL"] = eventData.URL
}
if eventData.Branch != "" {
vars["Branch"] = eventData.Branch
}
vars["Number"] = eventData.Number
vars["Body"] = eventData.Body
vars["URL"] = eventData.URL
vars["Branch"] = eventData.Branch

return vars
}
26 changes: 13 additions & 13 deletions self-development/kelos-reviewer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ metadata:
name: kelos-reviewer
spec:
when:
githubPullRequests:
state: open
commentPolicy:
triggerComment: /kelos review
excludeComments:
- /kelos needs-input
allowedUsers:
- gjkim42
- kelos-bot[bot]
draft: false
reporting:
enabled: true
pollInterval: 1m
githubWebhook:
repository: "kelos-dev/kelos"
events:
- "issue_comment"
filters:
- event: "issue_comment"
action: "created"
bodyContains: "/kelos review"
author: "gjkim42"
- event: "issue_comment"
action: "created"
bodyContains: "/kelos review"
author: "kelos-bot[bot]"
maxConcurrency: 3
taskTemplate:
workspaceRef:
Expand Down
Loading