From cc391645e17fb2fd65f607e5d413c2af5113b0f9 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sat, 28 Feb 2026 00:34:34 +0000
Subject: [PATCH] Change API group from git.k8s.io to git-k8s.imjasonh.com

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
---
 .github/workflows/ci.yaml                        | 10 +++++-----
 ...aml => git-k8s.imjasonh.com_gitbranches.yaml} |  6 ++----
 ...it-k8s.imjasonh.com_gitpushtransactions.yaml} |  6 ++----
 ...=> git-k8s.imjasonh.com_gitrepositories.yaml} |  6 ++----
 ...ml => git-k8s.imjasonh.com_gitreposyncs.yaml} |  6 ++----
 config/rbac/role.yaml                            |  6 +++---
 pkg/apis/git/v1alpha1/doc.go                     |  2 +-
 pkg/apis/git/v1alpha1/groupversion_info.go       |  2 +-
 pkg/client/clientset.go                          |  4 ++--
 pkg/reconciler/resolver/resolver.go              | 16 ++++++++--------
 pkg/reconciler/sync/sync.go                      |  4 ++--
 11 files changed, 30 insertions(+), 38 deletions(-)
 rename config/crds/{git.k8s.io_gitbranches.yaml => git-k8s.imjasonh.com_gitbranches.yaml} (93%)
 rename config/crds/{git.k8s.io_gitpushtransactions.yaml => git-k8s.imjasonh.com_gitpushtransactions.yaml} (95%)
 rename config/crds/{git.k8s.io_gitrepositories.yaml => git-k8s.imjasonh.com_gitrepositories.yaml} (93%)
 rename config/crds/{git.k8s.io_gitreposyncs.yaml => git-k8s.imjasonh.com_gitreposyncs.yaml} (95%)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2fcf6a1..575f6d4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -87,15 +87,15 @@ jobs:
 
       - name: Verify CRDs are installed
         run: |
-          kubectl get crd gitrepositories.git.k8s.io
-          kubectl get crd gitbranches.git.k8s.io
-          kubectl get crd gitpushtransactions.git.k8s.io
-          kubectl get crd gitreposyncs.git.k8s.io
+          kubectl get crd gitrepositories.git-k8s.imjasonh.com
+          kubectl get crd gitbranches.git-k8s.imjasonh.com
+          kubectl get crd gitpushtransactions.git-k8s.imjasonh.com
+          kubectl get crd gitreposyncs.git-k8s.imjasonh.com
 
       - name: Smoke test - create a GitRepository
         run: |
           cat <<EOF | kubectl apply -f -
-          apiVersion: git.k8s.io/v1alpha1
+          apiVersion: git-k8s.imjasonh.com/v1alpha1
           kind: GitRepository
           metadata:
             name: test-repo
diff --git a/config/crds/git.k8s.io_gitbranches.yaml b/config/crds/git-k8s.imjasonh.com_gitbranches.yaml
similarity index 93%
rename from config/crds/git.k8s.io_gitbranches.yaml
rename to config/crds/git-k8s.imjasonh.com_gitbranches.yaml
index 6ca1a2b..a74936f 100644
--- a/config/crds/git.k8s.io_gitbranches.yaml
+++ b/config/crds/git-k8s.imjasonh.com_gitbranches.yaml
@@ -1,11 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: gitbranches.git.k8s.io
-  annotations:
-    api-approved.kubernetes.io: "https://github.com/imjasonh/git-k8s"
+  name: gitbranches.git-k8s.imjasonh.com
 spec:
-  group: git.k8s.io
+  group: git-k8s.imjasonh.com
   names:
     kind: GitBranch
     listKind: GitBranchList
diff --git a/config/crds/git.k8s.io_gitpushtransactions.yaml b/config/crds/git-k8s.imjasonh.com_gitpushtransactions.yaml
similarity index 95%
rename from config/crds/git.k8s.io_gitpushtransactions.yaml
rename to config/crds/git-k8s.imjasonh.com_gitpushtransactions.yaml
index c15ad95..bbcbffa 100644
--- a/config/crds/git.k8s.io_gitpushtransactions.yaml
+++ b/config/crds/git-k8s.imjasonh.com_gitpushtransactions.yaml
@@ -1,11 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: gitpushtransactions.git.k8s.io
-  annotations:
-    api-approved.kubernetes.io: "https://github.com/imjasonh/git-k8s"
+  name: gitpushtransactions.git-k8s.imjasonh.com
 spec:
-  group: git.k8s.io
+  group: git-k8s.imjasonh.com
   names:
     kind: GitPushTransaction
     listKind: GitPushTransactionList
diff --git a/config/crds/git.k8s.io_gitrepositories.yaml b/config/crds/git-k8s.imjasonh.com_gitrepositories.yaml
similarity index 93%
rename from config/crds/git.k8s.io_gitrepositories.yaml
rename to config/crds/git-k8s.imjasonh.com_gitrepositories.yaml
index 5e61b0d..e2da1d5 100644
--- a/config/crds/git.k8s.io_gitrepositories.yaml
+++ b/config/crds/git-k8s.imjasonh.com_gitrepositories.yaml
@@ -1,11 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: gitrepositories.git.k8s.io
-  annotations:
-    api-approved.kubernetes.io: "https://github.com/imjasonh/git-k8s"
+  name: gitrepositories.git-k8s.imjasonh.com
 spec:
-  group: git.k8s.io
+  group: git-k8s.imjasonh.com
   names:
     kind: GitRepository
     listKind: GitRepositoryList
diff --git a/config/crds/git.k8s.io_gitreposyncs.yaml b/config/crds/git-k8s.imjasonh.com_gitreposyncs.yaml
similarity index 95%
rename from config/crds/git.k8s.io_gitreposyncs.yaml
rename to config/crds/git-k8s.imjasonh.com_gitreposyncs.yaml
index ff5c696..b167c18 100644
--- a/config/crds/git.k8s.io_gitreposyncs.yaml
+++ b/config/crds/git-k8s.imjasonh.com_gitreposyncs.yaml
@@ -1,11 +1,9 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: gitreposyncs.git.k8s.io
-  annotations:
-    api-approved.kubernetes.io: "https://github.com/imjasonh/git-k8s"
+  name: gitreposyncs.git-k8s.imjasonh.com
 spec:
-  group: git.k8s.io
+  group: git-k8s.imjasonh.com
   names:
     kind: GitRepoSync
     listKind: GitRepoSyncList
diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
index 0b33517..904a739 100644
--- a/config/rbac/role.yaml
+++ b/config/rbac/role.yaml
@@ -5,9 +5,9 @@ metadata:
   labels:
     app.kubernetes.io/name: git-k8s
 rules:
-  # Full access to all git.k8s.io custom resources.
+  # Full access to all git-k8s.imjasonh.com custom resources.
   - apiGroups:
-      - git.k8s.io
+      - git-k8s.imjasonh.com
     resources:
       - gitrepositories
       - gitbranches
@@ -23,7 +23,7 @@ rules:
       - delete
   # Status subresource access.
   - apiGroups:
-      - git.k8s.io
+      - git-k8s.imjasonh.com
     resources:
       - gitrepositories/status
       - gitbranches/status
diff --git a/pkg/apis/git/v1alpha1/doc.go b/pkg/apis/git/v1alpha1/doc.go
index 01350f3..e77cf60 100644
--- a/pkg/apis/git/v1alpha1/doc.go
+++ b/pkg/apis/git/v1alpha1/doc.go
@@ -1,5 +1,5 @@
 // Package v1alpha1 contains API Schema definitions for the git v1alpha1 API group.
 //
 // +k8s:deepcopy-gen=package,register
-// +groupName=git.k8s.io
+// +groupName=git-k8s.imjasonh.com
 package v1alpha1
diff --git a/pkg/apis/git/v1alpha1/groupversion_info.go b/pkg/apis/git/v1alpha1/groupversion_info.go
index 448e47f..1858fc3 100644
--- a/pkg/apis/git/v1alpha1/groupversion_info.go
+++ b/pkg/apis/git/v1alpha1/groupversion_info.go
@@ -8,7 +8,7 @@ import (
 
 const (
 	// GroupName is the name of the API group.
-	GroupName = "git.k8s.io"
+	GroupName = "git-k8s.imjasonh.com"
 
 	// Version is the version of the API group.
 	Version = "v1alpha1"
diff --git a/pkg/client/clientset.go b/pkg/client/clientset.go
index 5e6a13f..ddbd5a5 100644
--- a/pkg/client/clientset.go
+++ b/pkg/client/clientset.go
@@ -1,4 +1,4 @@
-// Package client provides a typed Kubernetes client for the git.k8s.io API group.
+// Package client provides a typed Kubernetes client for the git-k8s.imjasonh.com API group.
 //
 // In a full Knative injection setup, this package would be auto-generated and
 // clients would be retrieved from context via injection (e.g., gitclient.Get(ctx)).
@@ -20,7 +20,7 @@ import (
 	gitv1alpha1 "github.com/imjasonh/git-k8s/pkg/apis/git/v1alpha1"
 )
 
-// GitV1alpha1Client provides typed access to git.k8s.io/v1alpha1 resources.
+// GitV1alpha1Client provides typed access to git-k8s.imjasonh.com/v1alpha1 resources.
 type GitV1alpha1Client struct {
 	client dynamic.Interface
 }
diff --git a/pkg/reconciler/resolver/resolver.go b/pkg/reconciler/resolver/resolver.go
index 469d3b3..5bc3d0e 100644
--- a/pkg/reconciler/resolver/resolver.go
+++ b/pkg/reconciler/resolver/resolver.go
@@ -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{
 				{
diff --git a/pkg/reconciler/sync/sync.go b/pkg/reconciler/sync/sync.go
index 0d8c333..10a3f62 100644
--- a/pkg/reconciler/sync/sync.go
+++ b/pkg/reconciler/sync/sync.go
@@ -162,8 +162,8 @@ func (r *Reconciler) createPushTransaction(ctx context.Context, namespace string
 			GenerateName: fmt.Sprintf("%s-sync-", syncObj.Name),
 			Namespace:    namespace,
 			Labels: map[string]string{
-				"git.k8s.io/repo-sync": syncObj.Name,
-				"git.k8s.io/target":    targetRepo,
+				"git-k8s.imjasonh.com/repo-sync": syncObj.Name,
+				"git-k8s.imjasonh.com/target":    targetRepo,
 			},
 			OwnerReferences: []metav1.OwnerReference{
 				{