imjasonh/git-k8s
1
0
Fork 0
mirror of https://github.com/imjasonh/git-k8s synced 2026-07-18 06:55:48 +00:00
Code Activity

Change API group from git.k8s.io to git-k8s.imjasonh.com

Browse source 
The *.k8s.io group is protected in Kubernetes and requires an
api-approved.kubernetes.io annotation. Switch to a custom domain
to avoid the restriction entirely.

https://claude.ai/code/session_01QfFzqKQUsxxBsiZUhuJ3pG
This commit is contained in:
Claude 2026-02-28 00:34:34 +00:00
parent 2f694f6f1f
commit cc391645e1
No known key found for this signature in database
11 changed files with 30 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

16
pkg/reconciler/resolver/resolver.go
View file

@ -171,12 +171,12 @@ func (r *Reconciler) attemptMerge(ctx context.Context, repoURL, commitAHash, com
mergeCommit := &object.Commit{
Author: object.Signature{
Name: "git-k8s-resolver",
Email: "resolver@git.k8s.io",
Email: "resolver@git-k8s.imjasonh.com",
When: time.Now(),
},
Committer: object.Signature{
Name: "git-k8s-resolver",
Email: "resolver@git.k8s.io",
Email: "resolver@git-k8s.imjasonh.com",
When: time.Now(),
},
Message: fmt.Sprintf("Merge %s and %s\n\nAutomated merge by git-k8s conflict resolver.", commitAHash[:8], commitBHash[:8]),
@ -216,9 +216,9 @@ func (r *Reconciler) createMergePushTransactions(ctx context.Context, namespace
GenerateName: fmt.Sprintf("%s-merge-a-", syncObj.Name),
Namespace: namespace,
Labels: map[string]string{
"git.k8s.io/repo-sync": syncObj.Name,
"git.k8s.io/target": syncObj.Spec.RepoA.Name,
"git.k8s.io/merge": "true",
"git-k8s.imjasonh.com/repo-sync": syncObj.Name,
"git-k8s.imjasonh.com/target": syncObj.Spec.RepoA.Name,
"git-k8s.imjasonh.com/merge": "true",
},
OwnerReferences: []metav1.OwnerReference{
{
@ -248,9 +248,9 @@ func (r *Reconciler) createMergePushTransactions(ctx context.Context, namespace
GenerateName: fmt.Sprintf("%s-merge-b-", syncObj.Name),
Namespace: namespace,
Labels: map[string]string{
"git.k8s.io/repo-sync": syncObj.Name,
"git.k8s.io/target": syncObj.Spec.RepoB.Name,
"git.k8s.io/merge": "true",
"git-k8s.imjasonh.com/repo-sync": syncObj.Name,
"git-k8s.imjasonh.com/target": syncObj.Spec.RepoB.Name,
"git-k8s.imjasonh.com/merge": "true",
},
OwnerReferences: []metav1.OwnerReference{
{