Skip to content

Gitops for SCMM, Registry, Jenkins#386

Open
nihussmann wants to merge 57 commits into
developfrom
feature/argocd-chart
Open

Gitops for SCMM, Registry, Jenkins#386
nihussmann wants to merge 57 commits into
developfrom
feature/argocd-chart

Conversation

@nihussmann

@nihussmann nihussmann commented Apr 17, 2026

Copy link
Copy Markdown
Contributor

-> removed Argocd Wrapper chart and using Argocd MultiSource Applications instatt
-> Updating Argocd to 9.4.15
-> Adding Jenkins, Registry and SCM Manager to Argocd
-> Adding operator installation to project

@nihussmann nihussmann marked this pull request as draft April 17, 2026 08:25
nihussmann and others added 21 commits April 17, 2026 11:17
@nihussmann
Merge remote-tracking branch 'origin/main' into feature/argocd-chart
045e513 
# Conflicts:
#	argocd/cluster-resources/apps/argocd/argocd/Chart.lock
#	src/main/groovy/com/cloudogu/gitops/Feature.groovy
#	src/main/groovy/com/cloudogu/gitops/cli/GitopsPlaygroundCliMainScripted.groovy
#	src/main/groovy/com/cloudogu/gitops/config/Config.groovy
#	src/main/groovy/com/cloudogu/gitops/features/CertManager.groovy
#	src/main/groovy/com/cloudogu/gitops/features/Ingress.groovy
#	src/main/groovy/com/cloudogu/gitops/features/Mail.groovy
#	src/main/groovy/com/cloudogu/gitops/features/deployment/ArgoCdApplicationStrategy.groovy
#	src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/ScmManager.groovy
#	src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/ScmManagerSetup.groovy
@nihussmann
Tests und DI fixed
380ca40
@nihussmann
Merge branch 'feature/CLIMainScripted-removed' into feature/argocd-chart
cba2b33 
# Conflicts:
#	argocd/cluster-resources/apps/argocd/argocd/Chart.lock
#	argocd/cluster-resources/apps/argocd/argocd/Chart.yaml
#	src/main/groovy/com/cloudogu/gitops/cli/GitopsPlaygroundCliMainScripted.groovy
#	src/main/groovy/com/cloudogu/gitops/config/Config.groovy
#	src/main/groovy/com/cloudogu/gitops/features/deployment/Deployer.groovy
#	src/test/groovy/com/cloudogu/gitops/features/argocd/ArgoCDTest.groovy
@renovate-bot
Update dependency prism-api to v1.30.0-723.v97277866cece
d67bfe4
@nihussmann
merge fixed
f2f4eb1
@nihussmann
Merge remote-tracking branch 'origin/main' into feature/argocd-chart
8d565c1 
# Conflicts:
#	src/main/groovy/com/cloudogu/gitops/Application.groovy
#	src/main/groovy/com/cloudogu/gitops/config/ConfigConstants.groovy
#	src/main/groovy/com/cloudogu/gitops/features/argocd/ArgoCD.groovy
#	src/test/groovy/com/cloudogu/gitops/features/ContentLoaderTest.groovy
#	src/test/groovy/com/cloudogu/gitops/features/JenkinsTest.groovy
@nihussmann
merge fixed
b6eba10
@renovate-bot
Update dependency credentials-binding to v720
0487374
@renovate-bot
Update dependency script-security to v1402
a075139
@nihussmann
merge fixed
6e24674
@DerDaehne
Merge pull request #476 from cloudogu/renovate/main-credentials-bindi…
322d5a9 
…ng-720.x

Update dependency credentials-binding to v720 (main)
@DerDaehne
Merge pull request #475 from cloudogu/renovate/main-prism-api-1.x
e048242 
Update dependency prism-api to v1.30.0-723.v97277866cece (main)
@DerDaehne
Merge pull request #478 from cloudogu/renovate/main-script-security-1…
754ef12 
…402.x

Update dependency script-security to v1402 (main)
@avetgit
Merge branch 'develop' into feature/argocd-chart
a0c3524 
# Conflicts:
#	src/main/groovy/com/cloudogu/gitops/Application.groovy
#	src/main/groovy/com/cloudogu/gitops/Feature.groovy
#	src/main/groovy/com/cloudogu/gitops/config/Config.groovy
#	src/main/groovy/com/cloudogu/gitops/config/ConfigConstants.groovy
#	src/main/groovy/com/cloudogu/gitops/features/ContentLoader.groovy
#	src/main/groovy/com/cloudogu/gitops/features/ExternalSecretsOperator.groovy
#	src/main/groovy/com/cloudogu/gitops/features/Jenkins.groovy
#	src/main/groovy/com/cloudogu/gitops/features/Monitoring.groovy
#	src/main/groovy/com/cloudogu/gitops/features/Registry.groovy
#	src/main/groovy/com/cloudogu/gitops/features/Vault.groovy
#	src/main/groovy/com/cloudogu/gitops/features/argocd/ArgoCD.groovy
#	src/main/groovy/com/cloudogu/gitops/features/deployment/ArgoCdApplicationStrategy.groovy
#	src/main/groovy/com/cloudogu/gitops/features/git/GitHandler.groovy
#	src/main/groovy/com/cloudogu/gitops/git/GitRepo.groovy
#	src/main/groovy/com/cloudogu/gitops/git/providers/scmmanager/ScmManager.groovy
#	src/main/groovy/com/cloudogu/gitops/infrastructure/deployment/Deployer.groovy
#	src/main/groovy/com/cloudogu/gitops/kubernetes/api/K8sJavaApiClient.groovy
#	src/main/groovy/com/cloudogu/gitops/tools/CertManager.groovy
#	src/main/groovy/com/cloudogu/gitops/tools/Ingress.groovy
#	src/main/groovy/com/cloudogu/gitops/tools/core/ScmManagerSetup.groovy
#	src/test/groovy/com/cloudogu/gitops/ApplicationConfiguratorTest.groovy
#	src/test/groovy/com/cloudogu/gitops/features/ContentLoaderTest.groovy
#	src/test/groovy/com/cloudogu/gitops/features/ExternalSecretsOperatorTest.groovy
#	src/test/groovy/com/cloudogu/gitops/features/IngressTest.groovy
#	src/test/groovy/com/cloudogu/gitops/features/JenkinsTest.groovy
#	src/test/groovy/com/cloudogu/gitops/features/MonitoringTest.groovy
#	src/test/groovy/com/cloudogu/gitops/features/RegistryTest.groovy
#	src/test/groovy/com/cloudogu/gitops/features/VaultTest.groovy
#	src/test/groovy/com/cloudogu/gitops/features/argocd/ArgoCDTest.groovy
#	src/test/groovy/com/cloudogu/gitops/features/deployment/DeployerTest.groovy
#	src/test/groovy/com/cloudogu/gitops/git/providers/scmmanager/ScmManagerSetupTest.groovy
#	src/test/groovy/com/cloudogu/gitops/tools/CertManagerTest.groovy
@avetgit
Merge Tests
59ca8da
@avetgit
Merge branch 'develop' into feature/argocd-chart
20f0ef3 
# Conflicts:
#	src/main/groovy/com/cloudogu/gitops/infrastructure/kubernetes/api/K8sClient.groovy
#	src/main/groovy/com/cloudogu/gitops/tools/core/argocd/ArgoCD.groovy
@avetgit
Add ContentLoaderTest, remove obsolete test folder ../features
6d8468c
@DerDaehne
introduce sane defaults for renovate
25590ae
@DerDaehne
Merge pull request #494 from cloudogu/fix/update-renovate-config
e59ba46 
introduce sane defaults for renovate
@avetgit
Fix bug rollout with operator-mandants profile
6bbeed4
@avetgit
Merge branch 'main' into feature/argocd-chart
87a49a6
@avetgit avetgit marked this pull request as ready for review May 29, 2026 12:32
avetgit added 12 commits June 1, 2026 14:10
@avetgit
Remove installOperator
9b07341
@avetgit
Fix unit tests
292c1d1
@avetgit
Merge branch 'develop' into feature/argocd-chart
a8e22c3 
# Conflicts:
#	src/test/groovy/com/cloudogu/gitops/integration/TestK8sHelper.groovy
#	src/test/groovy/com/cloudogu/gitops/integration/features/ArgoCdTestIT.groovy
#	src/test/groovy/com/cloudogu/gitops/integration/features/CertManagerTestIT.groovy
#	src/test/groovy/com/cloudogu/gitops/integration/features/MonitoringTestIT.groovy
#	src/test/groovy/com/cloudogu/gitops/integration/profiles/ArgoCDProfileTestIT.groovy
#	src/test/groovy/com/cloudogu/gitops/integration/profiles/FullProfileTestIT.groovy
#	src/test/groovy/com/cloudogu/gitops/integration/profiles/MandantProfileTestIT.groovy
#	src/test/groovy/com/cloudogu/gitops/integration/profiles/PetclinicProfileTestIT.groovy
#	src/test/groovy/com/cloudogu/gitops/integration/profiles/PrefixProfileTestIT.groovy
#	src/test/groovy/com/cloudogu/gitops/tools/MonitoringTest.groovy
#	src/test/groovy/com/cloudogu/gitops/tools/core/argocd/ArgoCDTest.groovy
@avetgit
Add missing unit tests
8d32a55
@avetgit
Fiy unit test ArgoCD by using deployer instead of helmCommands
fb6bb43
@avetgit
Fiy unit test compile errors
c054e0c
@avetgit
Fiy unit test ArgoCDTest by removing test for repoUrl with prefix, be…
e538365 
…cause this is tested already by ScmManagerUrlResolver
@avetgit
Renaming values file in template back to values.ftl.yaml; Fix ArgoCDT…
adf937d 
…est and remove test for prefix in repoURL(tested by ScmManagerUrlResolver)
@avetgit
Fix Jenkins unit tests and some of ArgoCDTest
87fc328
@avetgit
Fix ArgoCDTest with email address
53e7df4
@avetgit
Fix RegistryTest
4e5f47f
@avetgit
Fix ContentLoaderTest and comment out airgapped-mode test in ArgoCDTest
db45b99
@DerDaehne DerDaehne changed the base branch from main to develop June 4, 2026 07:21
@ThomasMichael1811 ThomasMichael1811 requested a review from Copilot June 8, 2026 11:45
Copilot AI reviewed Jun 8, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Copilot wasn't able to review this pull request because it exceeds the maximum number of lines (20,000). Try reducing the number of changed lines and requesting a review from Copilot again.

avetgit added 7 commits June 8, 2026 19:44
@avetgit
Support local Helm chart deployment in air-gapped mode
1a5fca2 
Adjust the ArgoCD air-gapped deployment path so the initial Helm-based
installation can use a locally mirrored chart instead of trying to deploy a
Git-backed chart via the Helm CLI.

Also ensure AirGappedUtils is injected into ArgoCD and update the related test
setup to mock air-gapped repository mirroring where the test only verifies
repository preparation.
@avetgit
Revert back to status before
7b6ab5e
@avetgit
Fix ArgoCD air-gapped repository preparation test
303c179 
Align the ArgoCD air-gapped test with the CertManager setup by mocking the
mirrored Helm repository handling and providing a local Chart.yaml for the
argo-cd chart.

This allows the test to exercise the existing air-gapped deployment path while
verifying that generated AppProject source repositories use the mirrored SCM
repository instead of the public Helm repository.
@avetgit
Fix deployHelmChart: add missing repoURL etc.
92b2ce3
@avetgit
use umbrella chart for argocd and remove multi-source applications
e93a175
@avetgit
Merge branch 'develop' into feature/argocd-chart
55b8f31 
# Conflicts:
#	argocd/cluster-resources/apps/argocd/applications/applications.ftl.yaml
#	argocd/cluster-resources/apps/argocd/applications/argocd.ftl.yaml
#	docs/Configuration.md
#	src/main/groovy/com/cloudogu/gitops/application/Application.groovy
#	src/main/groovy/com/cloudogu/gitops/application/orchestration/GitHandler.groovy
#	src/main/groovy/com/cloudogu/gitops/cli/ApplicationConfigurator.groovy
#	src/main/groovy/com/cloudogu/gitops/cli/GenerateJsonSchema.groovy
#	src/main/groovy/com/cloudogu/gitops/config/Config.groovy
#	src/main/groovy/com/cloudogu/gitops/config/ConfigConstants.groovy
#	src/main/groovy/com/cloudogu/gitops/destroy/ArgoCDDestructionHandler.groovy
#	src/main/groovy/com/cloudogu/gitops/infrastructure/deployment/ArgoCdApplicationStrategy.groovy
#	src/main/groovy/com/cloudogu/gitops/tools/ExternalSecretsOperator.groovy
#	src/main/groovy/com/cloudogu/gitops/tools/Monitoring.groovy
#	src/main/groovy/com/cloudogu/gitops/tools/Registry.groovy
#	src/main/groovy/com/cloudogu/gitops/tools/Vault.groovy
#	src/main/groovy/com/cloudogu/gitops/tools/core/Jenkins.groovy
#	src/test/groovy/com/cloudogu/gitops/cli/ApplicationConfiguratorTest.groovy
@avetgit
Small cleanup after merge
4cb587a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

At least 1 approving review is required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@nihussmann @renovate-bot @DerDaehne @avetgit