Skip to content

Rendre l'URL et la révision du dépôt socle configurables via le CRD #962

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benji78 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Rendre l'URL et la révision du dépôt socle configurables via le CRD #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1719,13 +1719,14 @@ kubectl explain dsc.spec.global.backup.cnpg
## Offline / air gap

En mode air gap ou déconnecté d'internet, certaines valeurs de la `dsc` devront être adaptées.
- `dsc.sonarqube:`
- `dsc.sonarqube` :
- `pluginDownloadUrl` et `prometheusJavaagentVersion`
- `dsc.gitlabCatalog.catalogRepoUrl`
- `dsc.argocd.privateGitlabDomain`
- `dsc.grafanaOperator.ociChartUrl`
- `helmRepoUrl` pour chaque service à savoir :
- `argocd`, `certmanager`, `cloudnativepg`, `console`, `glexporter`, `gitlabOperator`, `gitlabrunner`, `harbor`, `keycloak`, `kyverno`, `sonarqube` et `vault`
- `dsc.awx.repoSocle.url` (et optionnellement : `dsc.awx.repoSocle.revision`)

## Platform

Expand Down
2 changes: 1 addition & 1 deletion roles/gitops/rendering-apps-files/templates/awx/values/200-ansible-job.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cpn-ansible-job:
- /bin/sh
- -c
- |
git clone https://github.com/cloud-pi-native/socle.git && \
git clone {{ dsc.awx.repoSocle.url }} -b {{ dsc.awx.repoSocle.revision }} socle && \
cd socle && \
ansible-playbook post-install/awx-oidc.yaml
{% if dsc.proxy.enabled %}
Expand Down
4 changes: 2 additions & 2 deletions roles/gitops/rendering-apps-files/templates/gitlab/values/200-ansible-job.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cpn-ansible-job:
- /bin/sh
- -c
- |
git clone https://github.com/cloud-pi-native/socle.git && \
git clone {{ dsc.awx.repoSocle.url }} -b {{ dsc.awx.repoSocle.revision }} socle && \
cd socle && \
ansible-playbook post-install/gitlab.yaml
extraEnvFrom:
Expand All @@ -22,6 +22,6 @@ cpn-ansible-job:
- /bin/sh
- -c
- |
git clone https://github.com/cloud-pi-native/socle.git && \
git clone {{ dsc.awx.repoSocle.url }} -b {{ dsc.awx.repoSocle.revision }} socle && \
cd socle && \
ansible-playbook post-install/gitlab-ci-catalog.yaml
2 changes: 1 addition & 1 deletion roles/gitops/rendering-apps-files/templates/global/values/200-ansible-job.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cpn-ansible-job:
- /bin/sh
- -c
- |
git clone https://github.com/cloud-pi-native/socle.git && \
git clone {{ dsc.awx.repoSocle.url }} -b {{ dsc.awx.repoSocle.revision }} socle && \
cd socle && \
ansible-playbook post-install/pgdump.yaml
{% if dsc.global.backup.s3.endpointCA is defined %}
Expand Down
2 changes: 1 addition & 1 deletion roles/gitops/rendering-apps-files/templates/harbor/values/200-ansible-job.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cpn-ansible-job:
- /bin/sh
- -c
- |
git clone https://github.com/cloud-pi-native/socle.git && \
git clone {{ dsc.awx.repoSocle.url }} -b {{ dsc.awx.repoSocle.revision }} socle && \
cd socle && \
ansible-playbook post-install/harbor.yaml
extraEnvFrom:
Expand Down
2 changes: 1 addition & 1 deletion roles/gitops/rendering-apps-files/templates/keycloak/values/200-ansible-job.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cpn-ansible-job:
- /bin/sh
- -c
- |
git clone https://github.com/cloud-pi-native/socle.git && \
git clone {{ dsc.awx.repoSocle.url }} -b {{ dsc.awx.repoSocle.revision }} socle && \
cd socle && \
ansible-playbook post-install/keycloak.yaml
extraEnvFrom:
Expand Down
2 changes: 1 addition & 1 deletion roles/gitops/rendering-apps-files/templates/sonarqube/values/200-ansible-job.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cpn-ansible-job:
- /bin/sh
- -c
- |
git clone https://github.com/cloud-pi-native/socle.git && \
git clone {{ dsc.awx.repoSocle.url }} -b {{ dsc.awx.repoSocle.revision }} socle && \
cd socle && \
ansible-playbook post-install/sonarqube.yaml
extraEnvFrom:
Expand Down
2 changes: 1 addition & 1 deletion roles/gitops/rendering-apps-files/templates/vault/values/200-ansible-job.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cpn-ansible-job:
- /bin/sh
- -c
- |
git clone https://github.com/cloud-pi-native/socle.git && \
git clone {{ dsc.awx.repoSocle.url }} -b {{ dsc.awx.repoSocle.revision }} socle && \
cd socle && \
ansible-playbook post-install/vault.yaml
extraEnvFrom:
Expand Down
14 changes: 12 additions & 2 deletions roles/socle-config/templates/crd-conf-dso.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,16 @@ spec:
chartVersion:
description: AWX Operator helm chart version (e.g., "2.19.1").
type: string
repoSocle:
type: object
description: Configuration for the socle Git repository used by Ansible jobs for post-installation tasks.
properties:
url:
type: string
description: URL of the socle Git repository containing the post-installation Ansible playbooks.
revision:
type: string
description: Branch, tag, or commit hash of the Git repository to clone for Ansible jobs.
defaultAwxVersion:
description: |
AWX default version related to chartVersion is required only
Expand All @@ -200,7 +210,7 @@ spec:
type: string
default: 10Gi
helmRepoUrl:
description: AWX repository url.
description: AWX helm repository url.
type: string
cnpg:
description: Configuration for cnpg clusters.
Expand All @@ -215,7 +225,7 @@ spec:
- replica
- restore
exposed:
description: Whether or not the cnpg cluster shoul be exposed via NodePort.
description: Whether or not the cnpg cluster should be exposed via NodePort.
Copy link
Collaborator

@Falltrades Falltrades Jan 19, 2026

Choose a reason for hiding this comment

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

thought: seems like we forgot to remove support of this option for this service.

Copy link
Contributor Author

@benji78 benji78 Jan 19, 2026

Choose a reason for hiding this comment

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

Indeed, it seems none of these dsc.awx.cnpg options were ever even used since they were added here: 5451db5

type: boolean
default: false
nodePort:
Expand Down