Commit fefb38b
Reducing example apps from static code (#315)
* feat(content): laod example-apps via content-loader functionality
- Move example-app definitions from `argocd/example-apps` and `applications/` into `examples/example-apps-via-content-loader`
- Adjust Dockerfile to initialize example-apps folder as standalone git repo for content-loader
- Update `GitopsPlaygroundCli` to include content examples via `--content.examples` flag
- Extend config merging logic (`MapUtils.deepMerge`) to support additional example content source
- Update schema, configurator, and tests to handle example-apps path and validation
- Clean up redundant templates and adjust paths accordingly
This refactor isolates example application definitions into a dedicated content-loader directory,
simplifying configuration handling and enabling dynamic content loading via the CLI.
* - helm-with-dependencies not existing anymore
- extract hardcoded references for example-apps in unit test
* add config.yaml referenced origin feature branch until it get merged back to main for test evaluation
* re-inserted unit test in its previous components reduced by the SetCredentials verification parts
* - Remove exercises
- Remove not used constants
- Add references for e.g., two registries operation inside the content-loader doc
* - Remove SCMM exercises and example app destroy handler entries
* Bugfix from merging main into this branch
* test
* add template scm variable to freemarker
* Bugfix null value of scm-provider
* Bugfix null value of scm-provider: move cloneContentRepos to enable method
* Remove double scm config in content loader template
* Bugfix repoUrl for SCM-Manager: remove hard coded URL
* Bugfix add missing baseUrl, host and protocol in template
* Bugfix jenkins: env SCM_URL to SCMM_URL
* Bugfix content loader : use repo based templating
* Bugfix false user-name in jenkins: scmm-user instead of scm-user
* Renaming scmm-user to scm-user and SCMM_USER to SCM_USER
* Bugfix scm.repoUrl and gitops user crendentials for 3rd-party dependencies
* Rename jenkins environment variables and fix unit test
* Fix unit test
* Move helm-umbrella into apps
* Rename helm-umbrella folder to nginx-helm-umbrella folder
* Add README.md into misc folder
* Add name prefix for 3rd-party-dependencies
* Add name prefix for 3rd-party-dependencies in Jenkins files
* Add name prefix for jenkins global environment SCM_URL
* test:SCM_URL back to normal baseUrl
* Add new environment variable PREFIXED_SCM_URL for 3rd-party-dependencies in Jnekins
* Bugfix use tenant gitProvider in ContentLoader
* rename --gitlab-parent-id to --gitlab-group-id for consistency
* cleanup
* cleanup config.yaml
* rename ref back to feature/extract-example-apps config.yaml
---------
Co-authored-by: Philipp Markiewka <[email protected]>
Co-authored-by: Anna Vetcininova <[email protected]>1 parent 6cf807d commit fefb38b
File tree
81 files changed
+464
-860
lines changed- applications/argocd
- nginx
- helm-jenkins
- k8s
- helm-umbrella
- petclinic/helm/k8s
- production
- staging
- docs
- content-loader
- argocd/argocd
- applications
- projects
- example-tenant/gitops/argocd
- examples/example-apps-via-content-loader
- argocd
- argocd
- applications
- projects
- example-apps
- apps
- nginx-helm-umbrella
- argocd
- misc
- nginx-helm-jenkins
- k8s
- production
- staging
- petclinic-helm
- k8s
- production
- secrets
- staging
- secrets
- petclinic-plain
- k8s
- production
- staging
- exercises/nginx-validation
- src
- main/groovy/com/cloudogu/gitops
- cli
- config
- destroy
- features
- git
- config
- git
- providers
- gitlab
- scmmanager
- utils
- test
- groovy/com/cloudogu/gitops
- config/schema
- features
- argocd
- git
- resources
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
81 files changed
+464
-860
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| 6 | + | |
6 | 7 | | |
7 | 8 | | |
8 | 9 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
163 | 163 | | |
164 | 164 | | |
165 | 165 | | |
166 | | - | |
| 166 | + | |
| 167 | + | |
167 | 168 | | |
168 | 169 | | |
169 | 170 | | |
| |||
177 | 178 | | |
178 | 179 | | |
179 | 180 | | |
180 | | - | |
181 | | - | |
182 | 181 | | |
183 | 182 | | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
184 | 205 | | |
185 | 206 | | |
186 | 207 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
384 | 384 | | |
385 | 385 | | |
386 | 386 | | |
387 | | - | |
388 | | - | |
389 | | - | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
390 | 390 | | |
391 | | - | |
392 | | - | |
393 | | - | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
394 | 394 | | |
395 | 395 | | |
396 | 396 | | |
| |||
This file was deleted.
This file was deleted.
Lines changed: 0 additions & 12 deletions
This file was deleted.
This file was deleted.
Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 0 additions & 13 deletions
This file was deleted.
0 commit comments