feat: initProvider

Author: patrickleet

.github/workflows/on-push-main.yaml

@@ -44,6 +44,7 @@ jobs:
       github: true
       gh-app-id: "2650923"
       gh-owner: ${{ github.repository_owner }}
+      github-auth-mode: app
     secrets:
       GH_APP_KEY: ${{ secrets.GH_APP_KEY }}
 

functions/render/210-github-repository.yaml.gotmpl

@@ -20,6 +20,13 @@ spec:
     description: {{ $repo.description }}
     visibility: {{ $repo.visibility }}
     hasIssues: true
+    {{- if $repo.topics }}
+    topics:
+      {{- toYaml $repo.topics | nindent 6 }}
+    {{- end }}
+  # Create-only repo settings belong in initProvider so provider-upjet-github
+  # does not keep driving follow-up updates for initialization fields.
+  initProvider:
     deleteBranchOnMerge: {{ $repo.deleteBranchOnMerge }}
     {{- if $repo.template.repository }}
     template:
@@ -29,10 +36,6 @@ spec:
     {{- else }}
     autoInit: {{ $repo.autoInit }}
     {{- end }}
-    {{- if $repo.topics }}
-    topics:
-      {{- toYaml $repo.topics | nindent 6 }}
-    {{- end }}
   providerConfigRef:
     name: {{ $state.githubProviderConfigRef.name }}
     kind: {{ $state.githubProviderConfigRef.kind }}

tests/e2etest-gitops/main.k

@@ -11,11 +11,14 @@ import models.io.upbound.dev.meta.v1alpha1 as metav1alpha1
 # Creates a real GitHub repository and installs ArgoCD via Helm.
 #
 # Credentials required:
-#   secrets/github-creds  - GitHub App installation token JSON
+#   secrets/github-creds  - provider-upjet-github credentials JSON.
+#                          Token form:
 #                          {"token":"ghs_...","owner":"hops-ops"}
+#                          App auth form:
+#                          {"owner":"hops-ops","app_auth":[{"id":"123456","installation_id":"78901234","pem_file":"-----BEGIN RSA PRIVATE KEY-----\n..."}]}
 #
-# The shared e2e workflow populates secrets/github-creds from a GitHub App token.
-# It must request the organization owner installation so repo creation against
+# The shared e2e workflow currently writes this file for the test. The GitHub
+# App installation must target the organization owner so repo creation against
 # POST /orgs/{org}/repos is allowed.
 #
 # Run: make e2e

tests/test-render/main.k

@@ -226,6 +226,8 @@ _items = [
                         name = "test-cluster-gitops"
                         visibility = "private"
                         hasIssues = True
+                    }
+                    spec.initProvider = {
                         deleteBranchOnMerge = True
                         template = [
                             {
@@ -264,10 +266,12 @@ _items = [
                     metadata.name = "init-test-gitops-repo"
                     spec.forProvider = {
                         name = "test-cluster-gitops"
-                        autoInit = True
                         visibility = "private"
                         hasIssues = True
+                    }
+                    spec.initProvider = {
                         deleteBranchOnMerge = True
+                        autoInit = True
                     }
                 }
             ]
@@ -475,6 +479,8 @@ _items = [
                         visibility = "public"
                         topics = ["gitops", "kubernetes"]
                         hasIssues = True
+                    }
+                    spec.initProvider = {
                         deleteBranchOnMerge = True
                         autoInit = True
                     }