Skip to content

feat: BYO Git#2914

Merged
CasLubbers merged 65 commits intomainfrom
APL-1465
Feb 13, 2026
Merged

feat: BYO Git#2914
CasLubbers merged 65 commits intomainfrom
APL-1465

Conversation

@CasLubbers
Copy link
Contributor

@CasLubbers CasLubbers commented Feb 5, 2026

Only merge with:

📌 Summary

  • Gitea is now optional. Its default set to true in the defaults.yaml
  • Consolidated all the Git config under otomi.git.* jsonpath
  • Renamed all Gitea reference that were basically a reference to Git to Git
  • Added secret apl-git-credentials and configmap apl-git-config.
  • Added a migration script that these secret and configmap getting created after migration

🔍 Reviewer Notes

🧹 Checklist

  • Code is readable, maintainable, and robust.
  • Unit tests added/updated

CasLubbers and others added 23 commits January 20, 2026 16:53
@linode linode deleted a comment from svcAPLBot Feb 5, 2026
@linode linode deleted a comment from svcAPLBot Feb 5, 2026
@linode linode deleted a comment from svcAPLBot Feb 5, 2026
@CasLubbers CasLubbers marked this pull request as ready for review February 10, 2026 13:42
@svcAPLBot
Copy link
Contributor

svcAPLBot commented Feb 10, 2026

Comparison of Helm chart templating output:

@@ data.giteaPassword @@
# v1/Secret/apl-gitea-operator/apl-gitea-operator-secret
! ± value change
- Z2l0ZWFBZG1pblBhc3N3b3Jk
+ Z2l0UGFzc3dvcmRGb3JUZXN0aW5n


@@ spec.template.metadata @@
! + one map entry added:
+ annotations:
+   # Restart pod when git credentials or config changes (important for migration)
+ checksum/git-credentials: cca965a8824cc32153ec28b2a259b856cf7a97fd1c41b1ada29474d4f2bf8bff
+   checksum/git-config: 42222a02649e732ca3ce292c87cbc4bc66622c96cb4588c7c1f517d8c23d3aa9

@@ spec.template.spec.containers.apl-operator @@
! + one map entry added:
+ envFrom:
+ - secretRef:
+     name: apl-sops-secrets
+ - secretRef:
+     name: apl-git-credentials


@@ stringData @@
# v1/Secret/apl-operator/gitea-credentials
! ± type change from map to <nil>
- GIT_USERNAME: otomi-admin
  GIT_PASSWORD: giteaAdminPassword
+ <nil>

@@ (root level) @@
# v1/Secret/apl-git-credentials
! + one document added:
+ ---
+ type: Opaque
+ # Source: apl-operator/templates/secrets.yaml
+ apiVersion: v1
+ kind: Secret
+ metadata:
+   name: apl-git-credentials
+ stringData:
+   username: otomi-admin
+   password: gitPasswordForTesting


@@ data.password @@
# v1/Secret/argocd/argocd-repo-creds-gitea
! ± value change
- Z2l0ZWFBZG1pblBhc3N3b3Jk
+ Z2l0UGFzc3dvcmRGb3JUZXN0aW5n

@@ data.password @@
# v1/Secret/argocd/argocd-repo-creds-gitea-internal
! ± value change
- Z2l0ZWFBZG1pblBhc3N3b3Jk
+ Z2l0UGFzc3dvcmRGb3JUZXN0aW5n


@@ data.password @@
# v1/Secret/gitea-admin-secret
! ± value change
- Z2l0ZWFBZG1pblBhc3N3b3Jk
+ Z2l0UGFzc3dvcmRGb3JUZXN0aW5n


@@ data.GIT_REPO_URL @@
! ± value change
- http://gitea-http.gitea.svc.cluster.local:3000/otomi/values
+ http://gitea-http.gitea.svc.cluster.local:3000/otomi/values.git



@@ data.GIT_EMAIL @@
! ± value change
- bm90QHVzLmVk
+ cGlwZWxpbmVAY2x1c3Rlci5sb2NhbA==

@@ data.GIT_PASSWORD @@
! ± value change
- Z2l0ZWFBZG1pblBhc3N3b3Jk
+ Z2l0UGFzc3dvcmRGb3JUZXN0aW5n



@@ spec.workspaces.git-credentials.secret.secretName @@
# tekton.dev/v1/PipelineRun/docker-build-demo-java1-v0-0-1
! ± value change
- gitea-credentials
+ apl-git-credentials


@@ apps.gitea @@
! - two map entries removed:
- adminUsername: otomi-admin
- adminPassword: giteaAdminPassword

@@ apps.otomi-api @@
! - one map entry removed:
- git:
-   email: some@secret.value
-   user: someuser
-   password: somesecretvalue

@@ otomi @@
! + one map entry added:
+ git:
+   branch: main
+   repoUrl: "http://gitea-http.gitea.svc.cluster.local:3000/otomi/values.git"
+   username: otomi-admin
+   email: pipeline@cluster.local
+   password: gitPasswordForTesting

Copy link
Contributor

@Ani1357 Ani1357 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Tested by deploying a new cluster using this branch.

@CasLubbers CasLubbers merged commit c8cf17a into main Feb 13, 2026
15 checks passed
@CasLubbers CasLubbers deleted the APL-1465 branch February 13, 2026 13:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants